diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8c3c5379392..cb9a78c81cd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -101,4 +101,4 @@
       <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/dictionaries/svyatoslav_kuzmich.xml b/.idea/dictionaries/svyatoslav_kuzmich.xml
new file mode 100644
index 00000000000..c5c5f0f09d1
--- /dev/null
+++ b/.idea/dictionaries/svyatoslav_kuzmich.xml
@@ -0,0 +1,27 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="svyatoslav.kuzmich">
+    <words>
+      <w>anyfunc</w>
+      <w>copysign</w>
+      <w>eqref</w>
+      <w>exnref</w>
+      <w>externref</w>
+      <w>funcref</w>
+      <w>jetbrains</w>
+      <w>kotlinx</w>
+      <w>ktor</w>
+      <w>optref</w>
+      <w>popcnt</w>
+      <w>rotl</w>
+      <w>rotr</w>
+      <w>simd</w>
+      <w>sqrt</w>
+      <w>testsuite</w>
+      <w>uninstantiable</w>
+      <w>unlinkable</w>
+      <w>vtable</w>
+      <w>wabt</w>
+      <w>xopt</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index d18ab3d82aa..018eca501da 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -453,4 +453,4 @@
       <option name="ignoreNonEmtpyLoops" value="false" />
     </inspection_tool>
   </profile>
-</component>
\ No newline at end of file
+</component>
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 2d3b4c8368c..da1f8219e70 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -40,9 +40,7 @@ dependencies {
     compile(project(":compiler:cli"))
     compile(intellijCoreDep()) { includeJars("intellij-core") }
     compile(jpsStandalone()) { includeJars("jps-model") }
-    Platform[192].orHigher {
-        compile(intellijPluginDep("java"))
-    }
+    compile(intellijPluginDep("java"))
     compile(intellijDep()) { includeIntellijCoreJarDependencies(project) }
     compile("org.jetbrains.kotlinx:kotlinx.benchmark.runtime-jvm:$benchmarks_version")
 }
diff --git a/build-common/src/com/intellij/util/io/JpsPersistentHashMap.java.193 b/build-common/src/com/intellij/util/io/JpsPersistentHashMap.java.193
deleted file mode 100644
index c38d1a0c418..00000000000
--- a/build-common/src/com/intellij/util/io/JpsPersistentHashMap.java.193
+++ /dev/null
@@ -1,1013 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.util.io;
-
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.LowMemoryWatcher;
-import com.intellij.openapi.util.ThreadLocalCachedValue;
-import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.*;
-import com.intellij.util.containers.LimitedPool;
-import com.intellij.util.containers.SLRUCache;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * This class shouldn't be used. It's temporary solution for JSP only and should be removed
- * after updating Intellij SDK version
- */
-@Deprecated
-public class JpsPersistentHashMap<Key, Value> extends PersistentEnumeratorDelegate<Key> implements PersistentMap<Key, Value> {
-    // PersistentHashMap (PHM) works in the following (generic) way:
-    // - Particular key is translated via myEnumerator into an int.
-    // - As part of enumeration process for the new key, additional space is reserved in
-    // myEnumerator.myStorage for offset in ".values" file (myValueStorage) where (serialized) value is stored.
-    // - Once new value is written the offset storage is updated.
-    // - When the key is removed from PHM, offset storage is set to zero.
-    //
-    // It is important to note that offset
-    // is non-negative and can be 4 or 8 bytes, depending on the size of the ".values" file.
-    // PHM can work in appendable mode: for particular key additional calculated chunk of value can be appended to ".values" file with the offset
-    // of previously calculated chunk.
-    // For performance reasons we try hard to minimize storage occupied by keys / offsets in ".values" file: this storage is allocated as (limited)
-    // direct byte buffers so 4 bytes offset is used until it is possible. Generic record produced by enumerator used with PHM as part of new
-    // key enumeration is <enumerated_id>? [.values file offset 4 or 8 bytes], however for unique integral keys enumerate_id isn't produced.
-    // Also for certain Value types it is possible to avoid random reads at all: e.g. in case Value is non-negative integer the value can be stored
-    // directly in storage used for offset and in case of btree enumerator directly in btree leaf.
-    private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.PersistentHashMap");
-    private static final boolean myDoTrace = SystemProperties.getBooleanProperty("idea.trace.persistent.map", false);
-    private static final int DEAD_KEY_NUMBER_MASK = 0xFFFFFFFF;
-
-    private final File myStorageFile;
-    private final boolean myIsReadOnly;
-    private final KeyDescriptor<Key> myKeyDescriptor;
-    private PersistentHashMapValueStorage myValueStorage;
-    protected final DataExternalizer<Value> myValueExternalizer;
-    private static final long NULL_ADDR = 0;
-    private static final int INITIAL_INDEX_SIZE;
-
-    static {
-        String property = System.getProperty("idea.initialIndexSize");
-        INITIAL_INDEX_SIZE = property == null ? 4 * 1024 : Integer.valueOf(property);
-    }
-
-    @NonNls
-    static final String DATA_FILE_EXTENSION = ".values";
-    private long myLiveAndGarbageKeysCounter;
-    // first four bytes contain live keys count (updated via LIVE_KEY_MASK), last four bytes - number of dead keys
-    private int myReadCompactionGarbageSize;
-    private static final long LIVE_KEY_MASK = 1L << 32;
-    private static final long USED_LONG_VALUE_MASK = 1L << 62;
-    private static final int POSITIVE_VALUE_SHIFT = 1;
-    private final int myParentValueRefOffset;
-    @NotNull private final byte[] myRecordBuffer;
-    @NotNull private final byte[] mySmallRecordBuffer;
-    private final boolean myIntMapping;
-    private final boolean myDirectlyStoreLongFileOffsetMode;
-    private final boolean myCanReEnumerate;
-    private int myLargeIndexWatermarkId;  // starting with this id we store offset in adjacent file in long format
-    private boolean myIntAddressForNewRecord;
-    private static final boolean doHardConsistencyChecks = false;
-    private volatile boolean myBusyReading;
-
-    private static class AppendStream extends DataOutputStream {
-        private AppendStream() {
-            super(null);
-        }
-
-        private void setOut(BufferExposingByteArrayOutputStream stream) {
-            out = stream;
-        }
-    }
-
-    private final LimitedPool<BufferExposingByteArrayOutputStream> myStreamPool =
-            new LimitedPool<>(10, new LimitedPool.ObjectFactory<BufferExposingByteArrayOutputStream>() {
-                @Override
-                @NotNull
-                public BufferExposingByteArrayOutputStream create() {
-                    return new BufferExposingByteArrayOutputStream();
-                }
-
-                @Override
-                public void cleanup(@NotNull final BufferExposingByteArrayOutputStream appendStream) {
-                    appendStream.reset();
-                }
-            });
-
-    private final SLRUCache<Key, BufferExposingByteArrayOutputStream> myAppendCache;
-
-    private boolean canUseIntAddressForNewRecord(long size) {
-        return myCanReEnumerate && size + POSITIVE_VALUE_SHIFT < Integer.MAX_VALUE;
-    }
-
-    private final LowMemoryWatcher myAppendCacheFlusher = LowMemoryWatcher.register(this::dropMemoryCaches);
-
-    public JpsPersistentHashMap(@NotNull final File file,
-            @NotNull KeyDescriptor<Key> keyDescriptor,
-            @NotNull DataExternalizer<Value> valueExternalizer) throws IOException {
-        this(file, keyDescriptor, valueExternalizer, INITIAL_INDEX_SIZE);
-    }
-
-    public JpsPersistentHashMap(@NotNull final File file,
-            @NotNull KeyDescriptor<Key> keyDescriptor,
-            @NotNull DataExternalizer<Value> valueExternalizer,
-            final int initialSize) throws IOException {
-        this(file, keyDescriptor, valueExternalizer, initialSize, 0);
-    }
-
-    public JpsPersistentHashMap(@NotNull final File file,
-            @NotNull KeyDescriptor<Key> keyDescriptor,
-            @NotNull DataExternalizer<Value> valueExternalizer,
-            final int initialSize,
-            int version) throws IOException {
-        this(file, keyDescriptor, valueExternalizer, initialSize, version, null);
-    }
-
-    public JpsPersistentHashMap(@NotNull final File file,
-            @NotNull KeyDescriptor<Key> keyDescriptor,
-            @NotNull DataExternalizer<Value> valueExternalizer,
-            final int initialSize,
-            int version,
-            @Nullable PagedFileStorage.StorageLockContext lockContext) throws IOException {
-        this(file, keyDescriptor, valueExternalizer, initialSize, version, lockContext,
-             PersistentHashMapValueStorage.CreationTimeOptions.threadLocalOptions());
-    }
-
-    private JpsPersistentHashMap(@NotNull final File file,
-            @NotNull KeyDescriptor<Key> keyDescriptor,
-            @NotNull DataExternalizer<Value> valueExternalizer,
-            final int initialSize,
-            int version,
-            @Nullable PagedFileStorage.StorageLockContext lockContext,
-            @NotNull PersistentHashMapValueStorage.CreationTimeOptions options) throws IOException {
-        super(checkDataFiles(file), keyDescriptor, initialSize, lockContext, modifyVersionDependingOnOptions(version, options));
-
-        myStorageFile = file;
-        myKeyDescriptor = keyDescriptor;
-        myIsReadOnly = isReadOnly();
-        if (myIsReadOnly) options = options.setReadOnly();
-
-        myAppendCache = createAppendCache(keyDescriptor);
-        final PersistentEnumeratorBase.RecordBufferHandler<PersistentEnumeratorBase> recordHandler = myEnumerator.getRecordHandler();
-        myParentValueRefOffset = recordHandler.getRecordBuffer(myEnumerator).length;
-        myIntMapping = valueExternalizer instanceof IntInlineKeyDescriptor && wantNonNegativeIntegralValues();
-        myDirectlyStoreLongFileOffsetMode = keyDescriptor instanceof InlineKeyDescriptor && myEnumerator instanceof PersistentBTreeEnumerator;
-
-        myRecordBuffer = myDirectlyStoreLongFileOffsetMode ? ArrayUtilRt.EMPTY_BYTE_ARRAY : new byte[myParentValueRefOffset + 8];
-        mySmallRecordBuffer = myDirectlyStoreLongFileOffsetMode ? ArrayUtilRt.EMPTY_BYTE_ARRAY : new byte[myParentValueRefOffset + 4];
-
-        myEnumerator.setRecordHandler(new PersistentEnumeratorBase.RecordBufferHandler<PersistentEnumeratorBase>() {
-            @Override
-            int recordWriteOffset(PersistentEnumeratorBase enumerator, byte[] buf) {
-                return recordHandler.recordWriteOffset(enumerator, buf);
-            }
-
-            @NotNull
-            @Override
-            byte[] getRecordBuffer(PersistentEnumeratorBase enumerator) {
-                return myIntAddressForNewRecord ? mySmallRecordBuffer : myRecordBuffer;
-            }
-
-            @Override
-            void setupRecord(PersistentEnumeratorBase enumerator, int hashCode, int dataOffset, @NotNull byte[] buf) {
-                recordHandler.setupRecord(enumerator, hashCode, dataOffset, buf);
-                for (int i = myParentValueRefOffset; i < buf.length; i++) {
-                    buf[i] = 0;
-                }
-            }
-        });
-
-        myEnumerator.setMarkCleanCallback(
-                new Flushable() {
-                    @Override
-                    public void flush() {
-                        myEnumerator.putMetaData(myLiveAndGarbageKeysCounter);
-                        myEnumerator.putMetaData2(myLargeIndexWatermarkId | ((long)myReadCompactionGarbageSize << 32));
-                    }
-                }
-        );
-
-        if (myDoTrace) LOG.info("Opened " + file);
-        try {
-            myValueExternalizer = valueExternalizer;
-            myValueStorage = PersistentHashMapValueStorage.create(getDataFile(file).getPath(), options);
-            myLiveAndGarbageKeysCounter = myEnumerator.getMetaData();
-            long data2 = myEnumerator.getMetaData2();
-            myLargeIndexWatermarkId = (int)(data2 & DEAD_KEY_NUMBER_MASK);
-            myReadCompactionGarbageSize = (int)(data2 >>> 32);
-            myCanReEnumerate = myEnumerator.canReEnumerate();
-
-            if (makesSenseToCompact()) {
-                compact();
-            }
-        }
-        catch (IOException e) {
-            try {
-                // attempt to close already opened resources
-                close();
-            }
-            catch (Throwable ignored) {
-            }
-            throw e; // rethrow
-        }
-        catch (Throwable t) {
-            LOG.error(t);
-            try {
-                // attempt to close already opened resources
-                close();
-            }
-            catch (Throwable ignored) {
-            }
-            throw new PersistentEnumerator.CorruptedException(file);
-        }
-    }
-
-    private static int modifyVersionDependingOnOptions(int version, @NotNull PersistentHashMapValueStorage.CreationTimeOptions options) {
-        return version + options.getVersion();
-    }
-
-    protected boolean wantNonNegativeIntegralValues() {
-        return false;
-    }
-
-    protected boolean isReadOnly() {
-        return false;
-    }
-
-    private static final int MAX_RECYCLED_BUFFER_SIZE = 4096;
-
-    private SLRUCache<Key, BufferExposingByteArrayOutputStream> createAppendCache(final KeyDescriptor<Key> keyDescriptor) {
-        return new SLRUCache<Key, BufferExposingByteArrayOutputStream>(16 * 1024, 4 * 1024, keyDescriptor) {
-            @Override
-            @NotNull
-            public BufferExposingByteArrayOutputStream createValue(final Key key) {
-                return myStreamPool.alloc();
-            }
-
-            @Override
-            protected void onDropFromCache(final Key key, @NotNull final BufferExposingByteArrayOutputStream bytes) {
-                appendDataWithoutCache(key, bytes);
-            }
-        };
-    }
-
-    private static boolean doNewCompact() {
-        return System.getProperty("idea.persistent.hash.map.oldcompact") == null;
-    }
-
-    private boolean forceNewCompact() {
-        return System.getProperty("idea.persistent.hash.map.newcompact") != null &&
-               (int)(myLiveAndGarbageKeysCounter & DEAD_KEY_NUMBER_MASK) > 0;
-    }
-
-    public final void dropMemoryCaches() {
-        if (myDoTrace) LOG.info("Drop memory caches " + myStorageFile);
-        synchronized (myEnumerator) {
-            doDropMemoryCaches();
-        }
-    }
-
-    protected void doDropMemoryCaches() {
-        myEnumerator.lockStorage();
-        try {
-            clearAppenderCaches();
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-    }
-
-    int getGarbageSize() {
-        return (int)myLiveAndGarbageKeysCounter;
-    }
-
-    public File getBaseFile() {
-        return myEnumerator.myFile;
-    }
-
-    @TestOnly // public for tests
-    @SuppressWarnings("WeakerAccess") // used in upsource for some reason
-    public boolean makesSenseToCompact() {
-        if (myIsReadOnly) return false;
-
-        final long fileSize = myValueStorage.getSize();
-        final int megabyte = 1024 * 1024;
-
-        if (fileSize > 5 * megabyte) { // file is longer than 5MB and (more than 50% of keys is garbage or approximate benefit larger than 100M)
-            int liveKeys = (int)(myLiveAndGarbageKeysCounter / LIVE_KEY_MASK);
-            int deadKeys = (int)(myLiveAndGarbageKeysCounter & DEAD_KEY_NUMBER_MASK);
-
-            if (fileSize > 50 * megabyte && forceNewCompact()) return true;
-            if (deadKeys < 50) return false;
-
-            final long benefitSize = Math.max(100 * megabyte, fileSize / 4);
-            final long avgValueSize = fileSize / (liveKeys + deadKeys);
-
-            return deadKeys > liveKeys ||
-                   avgValueSize * deadKeys > benefitSize ||
-                   myReadCompactionGarbageSize > fileSize / 2;
-        }
-        return false;
-    }
-
-    @NotNull
-    private static File checkDataFiles(@NotNull final File file) {
-        if (!file.exists()) {
-            deleteFilesStartingWith(getDataFile(file));
-        }
-        return file;
-    }
-
-    public static void deleteFilesStartingWith(@NotNull File prefixFile) {
-        IOUtil.deleteAllFilesStartingWith(prefixFile);
-    }
-
-    @NotNull
-    static File getDataFile(@NotNull final File file) { // made public for testing
-        return new File(file.getParentFile(), file.getName() + DATA_FILE_EXTENSION);
-    }
-
-    @Override
-    public final void put(Key key, Value value) throws IOException {
-        if (myIsReadOnly) throw new IncorrectOperationException();
-        synchronized (myEnumerator) {
-            try {
-                doPut(key, value);
-            }
-            catch (IOException ex) {
-                myEnumerator.markCorrupted();
-                throw ex;
-            }
-        }
-    }
-
-    protected void doPut(Key key, Value value) throws IOException {
-        long newValueOffset = -1;
-
-        if (!myIntMapping) {
-            final BufferExposingByteArrayOutputStream bytes = new BufferExposingByteArrayOutputStream();
-            AppendStream appenderStream = ourFlyweightAppenderStream.getValue();
-            appenderStream.setOut(bytes);
-            myValueExternalizer.save(appenderStream, value);
-            appenderStream.setOut(null);
-            newValueOffset = myValueStorage.appendBytes(bytes.toByteArraySequence(), 0);
-        }
-
-        myEnumerator.lockStorage();
-        try {
-            myEnumerator.markDirty(true);
-            myAppendCache.remove(key);
-
-            long oldValueOffset;
-            if (myDirectlyStoreLongFileOffsetMode) {
-                if (myIntMapping) {
-                    ((PersistentBTreeEnumerator<Key>)myEnumerator).putNonNegativeValue(key, (Integer)value);
-                    return;
-                }
-                oldValueOffset = ((PersistentBTreeEnumerator<Key>)myEnumerator).getNonNegativeValue(key);
-                ((PersistentBTreeEnumerator<Key>)myEnumerator).putNonNegativeValue(key, newValueOffset);
-            }
-            else {
-                final int id = enumerate(key);
-                if (myIntMapping) {
-                    myEnumerator.myStorage.putInt(id + myParentValueRefOffset, (Integer)value);
-                    return;
-                }
-
-                oldValueOffset = readValueId(id);
-                updateValueId(id, newValueOffset, oldValueOffset, key, 0);
-            }
-
-            if (oldValueOffset != NULL_ADDR) {
-                myLiveAndGarbageKeysCounter++;
-            }
-            else {
-                myLiveAndGarbageKeysCounter += LIVE_KEY_MASK;
-            }
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-    }
-
-    @Override
-    public final int enumerate(Key name) throws IOException {
-        if (myIsReadOnly) throw new IncorrectOperationException();
-        synchronized (myEnumerator) {
-            myIntAddressForNewRecord = canUseIntAddressForNewRecord(myValueStorage.getSize());
-            return super.enumerate(name);
-        }
-    }
-
-    /**
-     * Appends value chunk from specified appender to key's value.
-     * Important use note: value externalizer used by this map should process all bytes from DataInput during deserialization and make sure
-     * that deserialized value is consistent with value chunks appended.
-     * E.g. Value can be Set of String and individual Strings can be appended with this method for particular key, when {@link #get(Object)} will
-     * be eventually called for the key, deserializer will read all bytes retrieving Strings and collecting them into Set
-     */
-    public final void appendData(Key key, @NotNull PersistentHashMap.ValueDataAppender appender) throws IOException {
-        if (myIsReadOnly) throw new IncorrectOperationException();
-        synchronized (myEnumerator) {
-            try {
-                doAppendData(key, appender);
-            }
-            catch (IOException ex) {
-                myEnumerator.markCorrupted();
-                throw ex;
-            }
-        }
-    }
-
-    public final void appendDataWithoutCache(Key key, Value value) throws IOException {
-        synchronized (myEnumerator) {
-            try {
-                final BufferExposingByteArrayOutputStream bytes = new BufferExposingByteArrayOutputStream();
-                AppendStream appenderStream = ourFlyweightAppenderStream.getValue();
-                appenderStream.setOut(bytes);
-                myValueExternalizer.save(appenderStream, value);
-                appenderStream.setOut(null);
-                appendDataWithoutCache(key, bytes);
-            }
-            catch (IOException ex) {
-                markCorrupted();
-                throw ex;
-            }
-        }
-    }
-
-    private void appendDataWithoutCache(Key key, @NotNull final BufferExposingByteArrayOutputStream bytes) {
-        myEnumerator.lockStorage();
-        try {
-            long previousRecord;
-            final int id;
-            if (myDirectlyStoreLongFileOffsetMode) {
-                previousRecord = ((PersistentBTreeEnumerator<Key>)myEnumerator).getNonNegativeValue(key);
-                id = -1;
-            }
-            else {
-                id = enumerate(key);
-                previousRecord = readValueId(id);
-            }
-
-            long headerRecord = myValueStorage.appendBytes(bytes.toByteArraySequence(), previousRecord);
-
-            if (myDirectlyStoreLongFileOffsetMode) {
-                ((PersistentBTreeEnumerator<Key>)myEnumerator).putNonNegativeValue(key, headerRecord);
-            }
-            else {
-                updateValueId(id, headerRecord, previousRecord, key, 0);
-            }
-
-            if (previousRecord == NULL_ADDR) {
-                myLiveAndGarbageKeysCounter += LIVE_KEY_MASK;
-            }
-
-            if (bytes.getInternalBuffer().length <= MAX_RECYCLED_BUFFER_SIZE) {
-                // Avoid internal fragmentation by not retaining / reusing large append buffers (IDEA-208533)
-                myStreamPool.recycle(bytes);
-            }
-        }
-        catch (IOException e) {
-            markCorrupted();
-            throw new RuntimeException(e);
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-    }
-
-    private static final ThreadLocalCachedValue<AppendStream> ourFlyweightAppenderStream = new ThreadLocalCachedValue<AppendStream>() {
-        @NotNull
-        @Override
-        protected AppendStream create() {
-            return new AppendStream();
-        }
-    };
-
-    private void doAppendData(Key key, @NotNull PersistentHashMap.ValueDataAppender appender) throws IOException {
-        assert !myIntMapping;
-        myEnumerator.markDirty(true);
-
-        AppendStream appenderStream = ourFlyweightAppenderStream.getValue();
-        BufferExposingByteArrayOutputStream stream = myAppendCache.get(key);
-        appenderStream.setOut(stream);
-        myValueStorage.checkAppendsAllowed(stream.size());
-        appender.append(appenderStream);
-        appenderStream.setOut(null);
-    }
-
-    /**
-     * Process all keys registered in the map. Note that keys which were removed after {@link #compact()} call will be processed as well. Use
-     * {@link #processKeysWithExistingMapping(Processor)} to process only keys with existing mappings
-     */
-    @Override
-    public final boolean processKeys(@NotNull Processor<? super Key> processor) throws IOException {
-        synchronized (myEnumerator) {
-            try {
-                myAppendCache.clear();
-                return myEnumerator.iterateData(processor);
-            }
-            catch (IOException e) {
-                myEnumerator.markCorrupted();
-                throw e;
-            }
-        }
-    }
-
-    @NotNull
-    public Collection<Key> getAllKeysWithExistingMapping() throws IOException {
-        final List<Key> values = new ArrayList<>();
-        processKeysWithExistingMapping(new CommonProcessors.CollectProcessor<>(values));
-        return values;
-    }
-
-    public final boolean processKeysWithExistingMapping(Processor<? super Key> processor) throws IOException {
-        synchronized (myEnumerator) {
-            try {
-                myAppendCache.clear();
-                return myEnumerator.processAllDataObject(processor, new PersistentEnumerator.DataFilter() {
-                    @Override
-                    public boolean accept(final int id) {
-                        return readValueId(id) != NULL_ADDR;
-                    }
-                });
-            }
-            catch (IOException e) {
-                myEnumerator.markCorrupted();
-                throw e;
-            }
-        }
-    }
-
-    @Override
-    public final Value get(Key key) throws IOException {
-        synchronized (myEnumerator) {
-            myBusyReading = true;
-            try {
-                return doGet(key);
-            }
-            catch (IOException ex) {
-                myEnumerator.markCorrupted();
-                throw ex;
-            }
-            finally {
-                myBusyReading = false;
-            }
-        }
-    }
-
-    public boolean isBusyReading() {
-        return myBusyReading;
-    }
-
-    @Nullable
-    protected Value doGet(Key key) throws IOException {
-        myEnumerator.lockStorage();
-        final long valueOffset;
-        final int id;
-        try {
-            myAppendCache.remove(key);
-
-            if (myDirectlyStoreLongFileOffsetMode) {
-                valueOffset = ((PersistentBTreeEnumerator<Key>)myEnumerator).getNonNegativeValue(key);
-                if (myIntMapping) {
-                    return (Value)(Integer)(int)valueOffset;
-                }
-                id = -1;
-            }
-            else {
-                id = tryEnumerate(key);
-                if (id == PersistentEnumeratorBase.NULL_ID) {
-                    return null;
-                }
-
-                if (myIntMapping) {
-                    return (Value)(Integer)myEnumerator.myStorage.getInt(id + myParentValueRefOffset);
-                }
-
-                valueOffset = readValueId(id);
-            }
-
-            if (valueOffset == NULL_ADDR) {
-                return null;
-            }
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-
-        final PersistentHashMapValueStorage.ReadResult readResult = myValueStorage.readBytes(valueOffset);
-
-        final Value valueRead;
-        try (DataInputStream input = new DataInputStream(new UnsyncByteArrayInputStream(readResult.buffer))) {
-            valueRead = myValueExternalizer.read(input);
-        }
-
-        if (myValueStorage.performChunksCompaction(readResult.chunksCount, readResult.buffer.length)) {
-
-            long newValueOffset = myValueStorage.compactChunks(new PersistentHashMap.ValueDataAppender() {
-                @Override
-                public void append(DataOutput out) throws IOException {
-                    myValueExternalizer.save(out, valueRead);
-                }
-            }, readResult);
-
-            myEnumerator.lockStorage();
-            try {
-                myEnumerator.markDirty(true);
-
-                if (myDirectlyStoreLongFileOffsetMode) {
-                    ((PersistentBTreeEnumerator<Key>)myEnumerator).putNonNegativeValue(key, newValueOffset);
-                }
-                else {
-                    updateValueId(id, newValueOffset, valueOffset, key, 0);
-                }
-                myLiveAndGarbageKeysCounter++;
-                myReadCompactionGarbageSize += readResult.buffer.length;
-            }
-            finally {
-                myEnumerator.unlockStorage();
-            }
-        }
-        return valueRead;
-    }
-
-    public final boolean containsMapping(Key key) throws IOException {
-        synchronized (myEnumerator) {
-            return doContainsMapping(key);
-        }
-    }
-
-    private boolean doContainsMapping(Key key) throws IOException {
-        myEnumerator.lockStorage();
-        try {
-            myAppendCache.remove(key);
-            if (myDirectlyStoreLongFileOffsetMode) {
-                return ((PersistentBTreeEnumerator<Key>)myEnumerator).getNonNegativeValue(key) != NULL_ADDR;
-            }
-            else {
-                final int id = tryEnumerate(key);
-                if (id == PersistentEnumeratorBase.NULL_ID) {
-                    return false;
-                }
-                if (myIntMapping) return true;
-                return readValueId(id) != NULL_ADDR;
-            }
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-    }
-
-    public final void remove(Key key) throws IOException {
-        if (myIsReadOnly) throw new IncorrectOperationException();
-        synchronized (myEnumerator) {
-            doRemove(key);
-        }
-    }
-
-    protected void doRemove(Key key) throws IOException {
-        myEnumerator.lockStorage();
-        try {
-
-            myAppendCache.remove(key);
-            final long record;
-            if (myDirectlyStoreLongFileOffsetMode) {
-                assert !myIntMapping; // removal isn't supported
-                record = ((PersistentBTreeEnumerator<Key>)myEnumerator).getNonNegativeValue(key);
-                if (record != NULL_ADDR) {
-                    ((PersistentBTreeEnumerator<Key>)myEnumerator).putNonNegativeValue(key, NULL_ADDR);
-                }
-            }
-            else {
-                final int id = tryEnumerate(key);
-                if (id == PersistentEnumeratorBase.NULL_ID) {
-                    return;
-                }
-                assert !myIntMapping; // removal isn't supported
-                myEnumerator.markDirty(true);
-
-                record = readValueId(id);
-                updateValueId(id, NULL_ADDR, record, key, 0);
-            }
-            if (record != NULL_ADDR) {
-                myLiveAndGarbageKeysCounter++;
-                myLiveAndGarbageKeysCounter -= LIVE_KEY_MASK;
-            }
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-    }
-
-    @Override
-    public final void force() {
-        if (myIsReadOnly) return;
-        if (myDoTrace) LOG.info("Forcing " + myStorageFile);
-        synchronized (myEnumerator) {
-            doForce();
-        }
-    }
-
-    protected void doForce() {
-        myEnumerator.lockStorage();
-        try {
-            try {
-                clearAppenderCaches();
-            }
-            finally {
-                super.force();
-            }
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-    }
-
-    private void clearAppenderCaches() {
-        myAppendCache.clear();
-        myValueStorage.force();
-    }
-
-    @Override
-    public final void close() throws IOException {
-        if (myDoTrace) LOG.info("Closed " + myStorageFile);
-        synchronized (myEnumerator) {
-            doClose();
-        }
-    }
-
-    private void doClose() throws IOException {
-        myEnumerator.lockStorage();
-        try {
-            try {
-                myAppendCacheFlusher.stop();
-                try {
-                    myAppendCache.clear();
-                }
-                catch (RuntimeException ex) {
-                    Throwable cause = ex.getCause();
-                    if (cause instanceof IOException) throw (IOException)cause;
-                    throw ex;
-                }
-            }
-            finally {
-                final PersistentHashMapValueStorage valueStorage = myValueStorage;
-                try {
-                    if (valueStorage != null) {
-                        valueStorage.dispose();
-                    }
-                }
-                finally {
-                    super.close();
-                }
-            }
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-    }
-
-    //static class CompactionRecordInfo {
-    //    final int key;
-    //    final int address;
-    //    long valueAddress;
-    //    long newValueAddress;
-    //    byte[] value;
-    //
-    //    CompactionRecordInfo(int _key, long _valueAddress, int _address) {
-    //        key = _key;
-    //        address = _address;
-    //        valueAddress = _valueAddress;
-    //    }
-    //}
-
-    // made public for tests
-    public void compact() throws IOException {
-        if (myIsReadOnly) throw new IncorrectOperationException();
-        synchronized (myEnumerator) {
-            force();
-            LOG.info("Compacting " + myEnumerator.myFile.getPath());
-            LOG.info("Live keys:" + (int)(myLiveAndGarbageKeysCounter / LIVE_KEY_MASK) +
-                     ", dead keys:" + (int)(myLiveAndGarbageKeysCounter & DEAD_KEY_NUMBER_MASK) +
-                     ", read compaction size:" + myReadCompactionGarbageSize);
-
-            final long now = System.currentTimeMillis();
-
-            final File oldDataFile = getDataFile(myEnumerator.myFile);
-            final String oldDataFileBaseName = oldDataFile.getName();
-            final File[] oldFiles = getFilesInDirectoryWithNameStartingWith(oldDataFile, oldDataFileBaseName);
-
-            final String newPath = getDataFile(myEnumerator.myFile).getPath() + ".new";
-            PersistentHashMapValueStorage.CreationTimeOptions options = myValueStorage.getOptions();
-            final PersistentHashMapValueStorage newStorage = PersistentHashMapValueStorage.create(newPath, options);
-            myValueStorage.switchToCompactionMode();
-            myEnumerator.markDirty(true);
-            long sizeBefore = myValueStorage.getSize();
-
-            myLiveAndGarbageKeysCounter = 0;
-            myReadCompactionGarbageSize = 0;
-
-            try {
-                if (doNewCompact()) {
-                    newCompact(newStorage);
-                }
-                else {
-                    traverseAllRecords(new PersistentEnumerator.RecordsProcessor() {
-                        @Override
-                        public boolean process(final int keyId) throws IOException {
-                            final long record = readValueId(keyId);
-                            if (record != NULL_ADDR) {
-                                PersistentHashMapValueStorage.ReadResult readResult = myValueStorage.readBytes(record);
-                                long value = newStorage.appendBytes(readResult.buffer, 0, readResult.buffer.length, 0);
-                                updateValueId(keyId, value, record, null, getCurrentKey());
-                                myLiveAndGarbageKeysCounter += LIVE_KEY_MASK;
-                            }
-                            return true;
-                        }
-                    });
-                }
-            }
-            finally {
-                newStorage.dispose();
-            }
-
-            myValueStorage.dispose();
-
-            if (oldFiles != null) {
-                for (File f : oldFiles) {
-                    assert FileUtil.deleteWithRenaming(f);
-                }
-            }
-
-            final long newSize = newStorage.getSize();
-
-            File newDataFile = new File(newPath);
-            final String newBaseName = newDataFile.getName();
-            final File[] newFiles = getFilesInDirectoryWithNameStartingWith(newDataFile, newBaseName);
-
-            if (newFiles != null) {
-                File parentFile = newDataFile.getParentFile();
-
-                // newFiles should get the same names as oldDataFiles
-                for (File f : newFiles) {
-                    String nameAfterRename = StringUtil.replace(f.getName(), newBaseName, oldDataFileBaseName);
-                    FileUtil.rename(f, new File(parentFile, nameAfterRename));
-                }
-            }
-
-            myValueStorage = PersistentHashMapValueStorage.create(oldDataFile.getPath(), options);
-            LOG.info("Compacted " + myEnumerator.myFile.getPath() + ":" + sizeBefore + " bytes into " +
-                     newSize + " bytes in " + (System.currentTimeMillis() - now) + "ms.");
-            myEnumerator.putMetaData(myLiveAndGarbageKeysCounter);
-            myEnumerator.putMetaData2(myLargeIndexWatermarkId);
-            if (myDoTrace) LOG.assertTrue(myEnumerator.isDirty());
-        }
-    }
-
-    private static File[] getFilesInDirectoryWithNameStartingWith(@NotNull File fileFromDirectory, @NotNull final String baseFileName) {
-        File parentFile = fileFromDirectory.getParentFile();
-        return parentFile != null ? parentFile.listFiles(pathname -> pathname.getName().startsWith(baseFileName)) : null;
-    }
-
-    private void newCompact(@NotNull PersistentHashMapValueStorage newStorage) throws IOException {
-        long started = System.currentTimeMillis();
-        final List<PersistentHashMap.CompactionRecordInfo> infos = new ArrayList<>(10000);
-
-        traverseAllRecords(new PersistentEnumerator.RecordsProcessor() {
-            @Override
-            public boolean process(final int keyId) {
-                final long record = readValueId(keyId);
-                if (record != NULL_ADDR) {
-                    infos.add(new PersistentHashMap.CompactionRecordInfo(getCurrentKey(), record, keyId));
-                }
-                return true;
-            }
-        });
-
-        LOG.info("Loaded mappings:" + (System.currentTimeMillis() - started) + "ms, keys:" + infos.size());
-        started = System.currentTimeMillis();
-        long fragments = 0;
-        if (!infos.isEmpty()) {
-            try {
-                fragments = myValueStorage.compactValues(infos, newStorage);
-            }
-            catch (Throwable t) {
-                if (!(t instanceof IOException)) throw new IOException("Compaction failed", t);
-                throw (IOException)t;
-            }
-        }
-
-        LOG.info("Compacted values for:" + (System.currentTimeMillis() - started) + "ms fragments:" +
-                 (int)fragments + ", new fragments:" + (fragments >> 32));
-
-        started = System.currentTimeMillis();
-        try {
-            myEnumerator.lockStorage();
-
-            for (PersistentHashMap.CompactionRecordInfo info : infos) {
-                updateValueId(info.address, info.newValueAddress, info.valueAddress, null, info.key);
-                myLiveAndGarbageKeysCounter += LIVE_KEY_MASK;
-            }
-        }
-        finally {
-            myEnumerator.unlockStorage();
-        }
-        LOG.info("Updated mappings:" + (System.currentTimeMillis() - started) + " ms");
-    }
-
-    private long readValueId(final int keyId) {
-        if (myDirectlyStoreLongFileOffsetMode) {
-            return ((PersistentBTreeEnumerator<Key>)myEnumerator).keyIdToNonNegativeOffset(keyId);
-        }
-        long address = myEnumerator.myStorage.getInt(keyId + myParentValueRefOffset);
-        if (address == 0 || address == -POSITIVE_VALUE_SHIFT) {
-            return NULL_ADDR;
-        }
-
-        if (address < 0) {
-            address = -address - POSITIVE_VALUE_SHIFT;
-        }
-        else {
-            long value = myEnumerator.myStorage.getInt(keyId + myParentValueRefOffset + 4) & 0xFFFFFFFFL;
-            address = ((address << 32) + value) & ~USED_LONG_VALUE_MASK;
-        }
-
-        return address;
-    }
-
-    private int smallKeys;
-    private int largeKeys;
-    private int transformedKeys;
-    private int requests;
-
-    private int updateValueId(int keyId, long value, long oldValue, @Nullable Key key, int processingKey) throws IOException {
-        if (myDirectlyStoreLongFileOffsetMode) {
-            ((PersistentBTreeEnumerator<Key>)myEnumerator).putNonNegativeValue(((InlineKeyDescriptor<Key>)myKeyDescriptor).fromInt(processingKey), value);
-            return keyId;
-        }
-        final boolean newKey = oldValue == NULL_ADDR;
-        if (newKey) ++requests;
-        boolean defaultSizeInfo = true;
-
-        if (myCanReEnumerate) {
-            if (canUseIntAddressForNewRecord(value)) {
-                defaultSizeInfo = false;
-                myEnumerator.myStorage.putInt(keyId + myParentValueRefOffset, -(int)(value + POSITIVE_VALUE_SHIFT));
-                if (newKey) ++smallKeys;
-            }
-            else if ((keyId < myLargeIndexWatermarkId || myLargeIndexWatermarkId == 0) && (newKey || canUseIntAddressForNewRecord(oldValue))) {
-                // keyId is result of enumerate, if we do re-enumerate then it is no longer accessible unless somebody cached it
-                myIntAddressForNewRecord = false;
-                keyId = myEnumerator.reEnumerate(key == null ? myEnumerator.getValue(keyId, processingKey) : key);
-                ++transformedKeys;
-                if (myLargeIndexWatermarkId == 0) {
-                    myLargeIndexWatermarkId = keyId;
-                }
-            }
-        }
-
-        if (defaultSizeInfo) {
-            value |= USED_LONG_VALUE_MASK;
-
-            myEnumerator.myStorage.putInt(keyId + myParentValueRefOffset, (int)(value >>> 32));
-            myEnumerator.myStorage.putInt(keyId + myParentValueRefOffset + 4, (int)value);
-
-            if (newKey) ++largeKeys;
-        }
-
-        if (newKey && IOStatistics.DEBUG && (requests & IOStatistics.KEYS_FACTOR_MASK) == 0) {
-            IOStatistics.dump("small:" + smallKeys + ", large:" + largeKeys + ", transformed:" + transformedKeys +
-                              ",@" + getBaseFile().getPath());
-        }
-        if (doHardConsistencyChecks) {
-            long checkRecord = readValueId(keyId);
-            assert checkRecord == (value & ~USED_LONG_VALUE_MASK) : value;
-        }
-        return keyId;
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + ": " + myStorageFile;
-    }
-
-    @TestOnly
-    PersistentHashMapValueStorage getValueStorage() {
-        return myValueStorage;
-    }
-
-    @TestOnly
-    public boolean getReadOnly() {
-        return myIsReadOnly;
-    }
-}
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt.193 b/build-common/src/org/jetbrains/kotlin/build/ExecutionStrategy.kt
similarity index 58%
rename from idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt.193
rename to build-common/src/org/jetbrains/kotlin/build/ExecutionStrategy.kt
index 08d9f4b8f3c..f3cb6cb302b 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt.193
+++ b/build-common/src/org/jetbrains/kotlin/build/ExecutionStrategy.kt
@@ -3,9 +3,10 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.findUsages
+package org.jetbrains.kotlin.build
 
-import com.intellij.util.Processor
+import java.io.Serializable
 
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias ProcessorInCompat<T> = Processor<T>
\ No newline at end of file
+enum class ExecutionStrategy : Serializable {
+    DAEMON, IN_PROCESS, OUT_OF_PROCESS
+}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/BuildReporter.kt b/build-common/src/org/jetbrains/kotlin/build/report/BuildReporter.kt
new file mode 100644
index 00000000000..c6547bff350
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/BuildReporter.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report
+
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
+import org.jetbrains.kotlin.build.report.metrics.RemoteBuildMetricsReporter
+
+open class BuildReporter(
+    protected open val icReporter: ICReporter,
+    protected open val buildMetricsReporter: BuildMetricsReporter
+) : ICReporter by icReporter, BuildMetricsReporter by buildMetricsReporter
+
+class RemoteBuildReporter(
+    override val icReporter: RemoteICReporter,
+    override val buildMetricsReporter: RemoteBuildMetricsReporter
+) : BuildReporter(icReporter, buildMetricsReporter), RemoteReporter {
+    override fun flush() {
+        icReporter.flush()
+        buildMetricsReporter.flush()
+    }
+}
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt b/build-common/src/org/jetbrains/kotlin/build/report/ICReporter.kt
similarity index 94%
rename from build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
rename to build-common/src/org/jetbrains/kotlin/build/report/ICReporter.kt
index 4668f0a83f1..b08e2feef41 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/ICReporter.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.incremental
+package org.jetbrains.kotlin.build.report
 
 import org.jetbrains.kotlin.cli.common.ExitCode
 import java.io.File
@@ -17,3 +17,5 @@ interface ICReporter {
     fun reportMarkDirtyMember(affectedFiles: Iterable<File>, scope: String, name: String)
     fun reportMarkDirty(affectedFiles: Iterable<File>, reason: String)
 }
+
+
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ICReporterBase.kt b/build-common/src/org/jetbrains/kotlin/build/report/ICReporterBase.kt
similarity index 92%
rename from build-common/src/org/jetbrains/kotlin/incremental/ICReporterBase.kt
rename to build-common/src/org/jetbrains/kotlin/build/report/ICReporterBase.kt
index 6449169c62f..db03207f8b2 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/ICReporterBase.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/ICReporterBase.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.incremental
+package org.jetbrains.kotlin.build.report
 
 import java.io.File
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.193 b/build-common/src/org/jetbrains/kotlin/build/report/RemoteICReporter.kt
similarity index 52%
rename from idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.193
rename to build-common/src/org/jetbrains/kotlin/build/report/RemoteICReporter.kt
index e05f305edd5..ae1993da9eb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.193
+++ b/build-common/src/org/jetbrains/kotlin/build/report/RemoteICReporter.kt
@@ -3,9 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.projectView
+package org.jetbrains.kotlin.build.report
 
-import com.intellij.ide.util.treeView.AbstractTreeNode
-
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias AbstractTreeNodeAny = AbstractTreeNode<Any>
\ No newline at end of file
+interface RemoteICReporter : ICReporter,
+    RemoteReporter
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.193 b/build-common/src/org/jetbrains/kotlin/build/report/RemoteReporter.kt
similarity index 55%
rename from idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.193
rename to build-common/src/org/jetbrains/kotlin/build/report/RemoteReporter.kt
index ba5a504a5b8..464e70b7044 100644
--- a/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.193
+++ b/build-common/src/org/jetbrains/kotlin/build/report/RemoteReporter.kt
@@ -3,11 +3,9 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea
+package org.jetbrains.kotlin.build.report
 
-import com.intellij.openapi.project.Project
+interface RemoteReporter {
+    fun flush()
+}
 
-// FIX ME WHEN BUNCH 193 REMOVED
-fun runActivity(project: Project) {
-    // nothing for 193
-}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttribute.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttribute.kt
new file mode 100644
index 00000000000..31793ed66d4
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttribute.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report.metrics
+
+import java.io.Serializable
+
+enum class BuildAttributeKind : Serializable {
+    REBUILD_REASON;
+
+    companion object {
+        const val serialVersionUID = 0L
+    }
+}
+
+enum class BuildAttribute(val kind: BuildAttributeKind) : Serializable {
+    NO_BUILD_HISTORY(BuildAttributeKind.REBUILD_REASON),
+    CACHE_CORRUPTION(BuildAttributeKind.REBUILD_REASON),
+    UNKNOWN_CHANGES_IN_GRADLE_INPUTS(BuildAttributeKind.REBUILD_REASON),
+    JAVA_CHANGE_UNTRACKED_FILE_IS_REMOVED(BuildAttributeKind.REBUILD_REASON),
+    JAVA_CHANGE_UNEXPECTED_PSI(BuildAttributeKind.REBUILD_REASON),
+    JAVA_CHANGE_UNKNOWN_QUALIFIER(BuildAttributeKind.REBUILD_REASON),
+    DEP_CHANGE_REMOVED_ENTRY(BuildAttributeKind.REBUILD_REASON),
+    DEP_CHANGE_HISTORY_IS_NOT_FOUND(BuildAttributeKind.REBUILD_REASON),
+    DEP_CHANGE_HISTORY_CANNOT_BE_READ(BuildAttributeKind.REBUILD_REASON),
+    DEP_CHANGE_HISTORY_NO_KNOWN_BUILDS(BuildAttributeKind.REBUILD_REASON),
+    DEP_CHANGE_NON_INCREMENTAL_BUILD_IN_DEP(BuildAttributeKind.REBUILD_REASON),
+    IN_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON),
+    OUT_OF_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON),
+    IC_IS_NOT_ENABLED(BuildAttributeKind.REBUILD_REASON);
+
+    companion object {
+        const val serialVersionUID = 0L
+    }
+}
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttributes.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttributes.kt
new file mode 100644
index 00000000000..867d2adbcc7
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttributes.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report.metrics
+
+import java.io.Serializable
+import java.util.*
+
+class BuildAttributes : Serializable {
+    private val myAttributes =
+        EnumMap<BuildAttribute, Int>(
+            BuildAttribute::class.java
+        )
+
+    fun add(attr: BuildAttribute, count: Int = 1) {
+        myAttributes[attr] = myAttributes.getOrDefault(attr, 0) + count
+    }
+
+    fun addAll(other: BuildAttributes) {
+        other.myAttributes.forEach { (attr, n) -> add(attr, n) }
+    }
+
+    fun asMap(): Map<BuildAttribute, Int> = myAttributes
+
+    companion object {
+        const val serialVersionUID = 0L
+    }
+}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetrics.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetrics.kt
new file mode 100644
index 00000000000..94c48e07579
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetrics.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report.metrics
+
+import java.io.Serializable
+
+data class BuildMetrics(
+    val buildTimes: BuildTimes = BuildTimes(),
+    val buildAttributes: BuildAttributes = BuildAttributes()
+) : Serializable {
+    fun addAll(other: BuildMetrics) {
+        buildTimes.addAll(other.buildTimes)
+        buildAttributes.addAll(other.buildAttributes)
+    }
+
+    companion object {
+        const val serialVersionUID = 0L
+    }
+}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporter.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporter.kt
new file mode 100644
index 00000000000..e27d5a70223
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporter.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report.metrics
+
+interface BuildMetricsReporter {
+    fun startMeasure(metric: BuildTime, startNs: Long)
+    fun endMeasure(metric: BuildTime, endNs: Long)
+
+    fun addAttribute(attribute: BuildAttribute)
+
+    fun getMetrics(): BuildMetrics
+    fun addMetrics(metrics: BuildMetrics?)
+}
+
+inline fun <T> BuildMetricsReporter.measure(metric: BuildTime, fn: () -> T): T {
+    val start = System.nanoTime()
+    startMeasure(metric, start)
+
+    try {
+        return fn()
+    } finally {
+        val end = System.nanoTime()
+        endMeasure(metric, end)
+    }
+}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporterImpl.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporterImpl.kt
new file mode 100644
index 00000000000..be6a28b28cc
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporterImpl.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report.metrics
+
+import java.util.*
+
+class BuildMetricsReporterImpl : BuildMetricsReporter {
+    private val myBuildTimeStartNs: EnumMap<BuildTime, Long> =
+        EnumMap(
+            BuildTime::class.java
+        )
+    private val myBuildTimes = BuildTimes()
+    private val myBuildAttributes = BuildAttributes()
+
+    override fun startMeasure(metric: BuildTime, startNs: Long) {
+        if (metric in myBuildTimeStartNs) {
+            error("$metric was restarted before it finished")
+        }
+        myBuildTimeStartNs[metric] = startNs
+    }
+
+    override fun endMeasure(metric: BuildTime, endNs: Long) {
+        val startNs = myBuildTimeStartNs.remove(metric) ?: error("$metric finished before it started")
+        val durationNs = endNs - startNs
+        myBuildTimes.add(metric, durationNs)
+    }
+
+    override fun addAttribute(attribute: BuildAttribute) {
+        myBuildAttributes.add(attribute)
+    }
+
+    override fun getMetrics(): BuildMetrics =
+        BuildMetrics(
+            buildTimes = myBuildTimes,
+            buildAttributes = myBuildAttributes
+        )
+
+    override fun addMetrics(metrics: BuildMetrics?) {
+        if (metrics == null) return
+
+        myBuildAttributes.addAll(metrics.buildAttributes)
+        myBuildTimes.addAll(metrics.buildTimes)
+    }
+}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTime.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTime.kt
new file mode 100644
index 00000000000..cd7b22996c7
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTime.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report.metrics
+
+import java.io.Serializable
+
+@Suppress("Reformat")
+enum class BuildTime(val parent: BuildTime? = null) : Serializable {
+    GRADLE_TASK,
+        CLEAR_OUTPUT(GRADLE_TASK),
+        BACKUP_OUTPUT(GRADLE_TASK),
+        RESTORE_OUTPUT_FROM_BACKUP(GRADLE_TASK),
+        CONNECT_TO_DAEMON(GRADLE_TASK),
+        CLEAR_JAR_CACHE(GRADLE_TASK),
+        RUN_COMPILER(GRADLE_TASK),
+            NON_INCREMENTAL_COMPILATION_IN_PROCESS(RUN_COMPILER),
+            NON_INCREMENTAL_COMPILATION_OUT_OF_PROCESS(RUN_COMPILER),
+            NON_INCREMENTAL_COMPILATION_DAEMON(RUN_COMPILER),
+            INCREMENTAL_COMPILATION(RUN_COMPILER),
+                IC_CALCULATE_INITIAL_DIRTY_SET(INCREMENTAL_COMPILATION),
+                    IC_ANALYZE_CHANGES_IN_DEPENDENCIES(IC_CALCULATE_INITIAL_DIRTY_SET),
+                        IC_FIND_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES),
+                        IC_ANALYZE_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES),
+                    IC_ANALYZE_CHANGES_IN_JAVA_SOURCES(IC_CALCULATE_INITIAL_DIRTY_SET),
+                    IC_ANALYZE_CHANGES_IN_ANDROID_LAYOUTS(IC_CALCULATE_INITIAL_DIRTY_SET),
+                    IC_DETECT_REMOVED_CLASSES(IC_CALCULATE_INITIAL_DIRTY_SET),
+                CLEAR_OUTPUT_ON_REBUILD(INCREMENTAL_COMPILATION),
+                IC_UPDATE_CACHES(INCREMENTAL_COMPILATION),
+                INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION),
+                NON_INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION),
+                IC_WRITE_HISTORY_FILE(INCREMENTAL_COMPILATION);
+
+    companion object {
+        const val serialVersionUID = 0L
+
+        val children by lazy {
+            values().filter { it.parent != null }.groupBy { it.parent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTimes.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTimes.kt
new file mode 100644
index 00000000000..a052c1af2c3
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTimes.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report.metrics
+
+import java.io.Serializable
+import java.util.*
+
+class BuildTimes : Serializable {
+    private val myBuildTimes = EnumMap<BuildTime, Long>(BuildTime::class.java)
+
+    fun addAll(other: BuildTimes) {
+        for ((bt, timeNs) in other.myBuildTimes) {
+            add(bt, timeNs)
+        }
+    }
+
+    fun add(buildTime: BuildTime, timeNs: Long) {
+        myBuildTimes[buildTime] = myBuildTimes.getOrDefault(buildTime, 0) + timeNs
+    }
+
+    fun asMap(): Map<BuildTime, Long> = myBuildTimes
+
+    companion object {
+        const val serialVersionUID = 0L
+    }
+}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/build/report/metrics/DoNothingBuildMetricsReporter.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/DoNothingBuildMetricsReporter.kt
new file mode 100644
index 00000000000..500e6db1238
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/DoNothingBuildMetricsReporter.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.build.report.metrics
+
+object DoNothingBuildMetricsReporter : BuildMetricsReporter {
+    override fun startMeasure(metric: BuildTime, startNs: Long) {
+    }
+
+    override fun endMeasure(metric: BuildTime, endNs: Long) {
+    }
+
+    override fun addAttribute(attribute: BuildAttribute) {
+    }
+
+    override fun getMetrics(): BuildMetrics =
+        BuildMetrics(
+            BuildTimes(),
+            BuildAttributes()
+        )
+
+    override fun addMetrics(metrics: BuildMetrics?) {}
+}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt b/build-common/src/org/jetbrains/kotlin/build/report/metrics/RemoteBuildMetricsReporter.kt
similarity index 53%
rename from idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt
rename to build-common/src/org/jetbrains/kotlin/build/report/metrics/RemoteBuildMetricsReporter.kt
index eab090985d7..6ec8561954b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/RemoteBuildMetricsReporter.kt
@@ -3,9 +3,9 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.projectView
+package org.jetbrains.kotlin.build.report.metrics
 
-import com.intellij.ide.util.treeView.AbstractTreeNode
+import org.jetbrains.kotlin.build.report.RemoteReporter
 
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias AbstractTreeNodeAny = AbstractTreeNode<*>
\ No newline at end of file
+interface RemoteBuildMetricsReporter : BuildMetricsReporter,
+    RemoteReporter
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
index 0f400f9fd99..745453842f6 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.build.GeneratedFile
 import org.jetbrains.kotlin.build.GeneratedJvmClass
 import org.jetbrains.kotlin.build.JvmSourceRoot
 import org.jetbrains.kotlin.build.isModuleMappingFile
+import org.jetbrains.kotlin.build.report.ICReporter
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
@@ -31,6 +32,7 @@ import org.jetbrains.kotlin.progress.CompilationCanceledStatus
 import org.jetbrains.kotlin.resolve.sam.SAM_LOOKUP_NAME
 import org.jetbrains.kotlin.utils.addToStdlib.flattenTo
 import java.io.File
+import java.nio.file.Files
 import java.util.*
 import kotlin.collections.HashSet
 import kotlin.collections.LinkedHashSet
@@ -66,7 +68,7 @@ fun makeModuleFile(
         friendDirs
     )
 
-    val scriptFile = File.createTempFile("kjps", sanitizeJavaIdentifier(name) + ".script.xml")
+    val scriptFile = Files.createTempFile("kjps", sanitizeJavaIdentifier(name) + ".script.xml").toFile()
     scriptFile.writeText(builder.asText().toString())
     return scriptFile
 }
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverter.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverter.kt
new file mode 100644
index 00000000000..8f4441bbf00
--- /dev/null
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverter.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.incremental.storage
+
+import java.io.File
+
+open class IncrementalFileToPathConverter(val rootProjectDir: File?) : FileToPathConverter {
+    //project root dir
+    private val projectDirPath = rootProjectDir?.normalize()?.absolutePath
+
+    override fun toPath(file: File): String {
+        val path = file.normalize().absolutePath
+        return when {
+            projectDirPath == null || !path.startsWith(projectDirPath) -> path
+            else -> PROJECT_DIR_PLACEHOLDER + path.substring(projectDirPath.length)
+        }
+    }
+
+    override fun toFile(path: String): File =
+        when {
+            rootProjectDir != null && path.startsWith(PROJECT_DIR_PLACEHOLDER) -> rootProjectDir.resolve(path.substring(PATH_PREFIX.length))
+            else -> File(path)
+        }
+
+    private companion object {
+        private const val PROJECT_DIR_PLACEHOLDER = "${'$'}PROJECT_DIR$"
+        //use only for prefix length because it OS dependent
+        private const val PATH_PREFIX = "$PROJECT_DIR_PLACEHOLDER/"
+
+    }
+}
\ No newline at end of file
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/NonCachingLazyStorage.kt.193 b/build-common/src/org/jetbrains/kotlin/incremental/storage/NonCachingLazyStorage.kt.193
deleted file mode 100644
index 7cfcb00a89f..00000000000
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/NonCachingLazyStorage.kt.193
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.incremental.storage
-
-import com.intellij.util.io.DataExternalizer
-import com.intellij.util.io.KeyDescriptor
-import com.intellij.util.io.JpsPersistentHashMap
-import java.io.File
-
-
-class NonCachingLazyStorage<K, V>(
-    private val storageFile: File,
-    private val keyDescriptor: KeyDescriptor<K>,
-    private val valueExternalizer: DataExternalizer<V>
-) : LazyStorage<K, V> {
-    @Volatile
-    private var storage: JpsPersistentHashMap<K, V>? = null
-
-    @Synchronized
-    private fun getStorageIfExists(): JpsPersistentHashMap<K, V>? {
-        if (storage != null) return storage
-
-        if (storageFile.exists()) {
-            storage = createMap()
-            return storage
-        }
-
-        return null
-    }
-
-    @Synchronized
-    private fun getStorageOrCreateNew(): JpsPersistentHashMap<K, V> {
-        if (storage == null) {
-            storage = createMap()
-        }
-
-        return storage!!
-    }
-
-    override val keys: Collection<K>
-        get() = getStorageIfExists()?.allKeysWithExistingMapping ?: listOf()
-
-    override operator fun contains(key: K): Boolean =
-        getStorageIfExists()?.containsMapping(key) ?: false
-
-    override operator fun get(key: K): V? =
-        getStorageIfExists()?.get(key)
-
-    override operator fun set(key: K, value: V) {
-        getStorageOrCreateNew().put(key, value)
-    }
-
-    override fun remove(key: K) {
-        getStorageIfExists()?.remove(key)
-    }
-
-    override fun append(key: K, value: V) {
-        getStorageOrCreateNew().appendDataWithoutCache(key, value)
-    }
-
-    @Synchronized
-    override fun clean() {
-        try {
-            storage?.close()
-        } catch (ignored: Throwable) {
-        }
-
-        JpsPersistentHashMap.deleteFilesStartingWith(storageFile)
-        storage = null
-    }
-
-    @Synchronized
-    override fun flush(memoryCachesOnly: Boolean) {
-        val existingStorage = storage ?: return
-
-        if (memoryCachesOnly) {
-            if (existingStorage.isDirty) {
-                existingStorage.dropMemoryCaches()
-            }
-        } else {
-            existingStorage.force()
-        }
-    }
-
-    @Synchronized
-    override fun close() {
-        storage?.close()
-    }
-
-    private fun createMap(): JpsPersistentHashMap<K, V> =
-        JpsPersistentHashMap(storageFile, keyDescriptor, valueExternalizer)
-}
diff --git a/build-common/test/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverterTest.kt b/build-common/test/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverterTest.kt
new file mode 100644
index 00000000000..cfe017e0426
--- /dev/null
+++ b/build-common/test/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverterTest.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.incremental.storage
+
+import org.jetbrains.kotlin.TestWithWorkingDir
+import org.junit.Test
+import java.io.File
+
+internal class IncrementalFileToPathConverterTest : TestWithWorkingDir() {
+    val separator: String = File.separator
+
+    @Test
+    fun testPathTransform() {
+        val relativeFilePath = "testFile.txt"
+        val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
+
+        assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
+    }
+
+    @Test
+    fun testComplicatedProjectRootPath() {
+        val relativeFilePath = "testFile.txt"
+        val transformedPath = testPathTransformation(workingDir.resolve("first$separator..${separator}testDir"), relativeFilePath)
+
+        assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
+    }
+
+    @Test
+    fun testInccorectProjectRootPath() {
+        val relativeFilePath = "testFile.txt"
+        val transformedPath = testPathTransformation(workingDir.resolve("testDir$separator"), relativeFilePath)
+
+        assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
+    }
+
+    @Test
+    fun testFileOutOfProject() {
+        val relativeFilePath = "..${separator}testFile.txt"
+        val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
+
+        assertEquals("${workingDir.absolutePath}${separator}testFile.txt", transformedPath)
+    }
+
+    @Test
+    fun testFileWithExtraSlash() {
+        val relativeFilePath = "testFile.txt$separator"
+        val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
+
+        assertEquals("${'$'}PROJECT_DIR${'$'}${separator}testFile.txt", transformedPath)
+    }
+
+    private fun testPathTransformation(projectRoot: File, relativeFilePath: String): String {
+        val pathConverter = IncrementalFileToPathConverter(projectRoot)
+        val testFile = projectRoot.resolve(relativeFilePath)
+        val transformedPath = pathConverter.toPath(testFile)
+        assertEquals(testFile.normalize().absolutePath, pathConverter.toFile(transformedPath).normalize().absolutePath)
+        return transformedPath
+    }
+}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index cca0a2be505..5c1fa82d816 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,8 +27,9 @@ buildscript {
     dependencies {
         bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
 
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.20")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
         classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
+        classpath(kotlin("serialization", bootstrapKotlinVersion))
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
         classpath("org.jfrog.buildinfo:build-info-extractor-gradle:4.17.2")
     }
@@ -167,9 +168,8 @@ extra["versions.junit"] = "4.12"
 extra["versions.javaslang"] = "2.0.6"
 extra["versions.ant"] = "1.8.2"
 extra["versions.android"] = "2.3.1"
-val coroutinesVersion = if (Platform[192].orHigher()) "1.3.7" else "1.1.1"
-extra["versions.kotlinx-coroutines-core"] = coroutinesVersion
-extra["versions.kotlinx-coroutines-jdk8"] = coroutinesVersion
+extra["versions.kotlinx-coroutines-core"] = "1.3.8"
+extra["versions.kotlinx-coroutines-jdk8"] = "1.3.8"
 extra["versions.json"] = "20160807"
 extra["versions.native-platform"] = "0.14"
 extra["versions.ant-launcher"] = "1.8.0"
@@ -188,13 +188,13 @@ extra["versions.kotlinx-collections-immutable-jvm"] = immutablesVersion
 extra["versions.ktor-network"] = "1.0.1"
 
 if (!project.hasProperty("versions.kotlin-native")) {
-    extra["versions.kotlin-native"] = "1.4.30-dev-16766"
+    extra["versions.kotlin-native"] = "1.4.30-dev-17200"
 }
 
 val intellijUltimateEnabled by extra(project.kotlinBuildProperties.intellijUltimateEnabled)
 val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
 val newInferenceEnabled by extra(project.getBooleanProperty("kotlin.compiler.newInferenceEnabled") ?: false)
-val useJvmIrBackend by extra(project.getBooleanProperty("kotlin.build.useIR") ?: false)
+val useJvmIrBackend by extra(project.kotlinBuildProperties.useIR)
 
 val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
 
@@ -292,7 +292,8 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:jvm",
     ":compiler:fir:checkers",
     ":compiler:fir:entrypoint",
-    ":compiler:fir:analysis-tests"
+    ":compiler:fir:analysis-tests",
+    ":wasm:wasm.ir"
 )
 
 extra["compilerModulesForJps"] = listOf(
@@ -650,8 +651,11 @@ tasks {
     }
 
     register("wasmCompilerTest") {
-//  TODO: fix once
-//        dependsOn(":js:js.tests:wasmTest")
+        dependsOn(":js:js.tests:wasmTest")
+        // Windows WABT release requires Visual C++ Redistributable
+        if (!kotlinBuildProperties.isTeamcityBuild || !org.gradle.internal.os.OperatingSystem.current().isWindows) {
+            dependsOn(":wasm:wasm.ir:test")
+        }
     }
 
     register("nativeCompilerTest") {
@@ -781,9 +785,10 @@ tasks {
     }
 
     register("idea-plugin-performance-tests") {
-        dependsOn("dist")
         dependsOn(
-            ":idea:performanceTests:performanceTest"
+            "dist",
+            ":idea:performanceTests:performanceTest",
+            ":idea:performanceTests:aggregateResults"
         )
     }
 
@@ -865,8 +870,8 @@ tasks {
             ":compiler:test",
             ":js:js.tests:test"
         )
-        if (Ide.IJ193.orHigher())
-            dependsOn(":kotlin-gradle-plugin-integration-tests:test")
+
+        dependsOn(":kotlin-gradle-plugin-integration-tests:test")
         if (Ide.AS40.orHigher())
             dependsOn(":kotlin-ultimate:ide:android-studio-native:test")
 
@@ -900,7 +905,6 @@ tasks {
                 ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide:publish",
-                ":prepare:ide-plugin-dependencies:kotlin-dist-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide:publish",
@@ -921,7 +925,8 @@ tasks {
                 ":kotlin-reflect:publish",
                 ":kotlin-main-kts:publish",
                 ":kotlin-stdlib-js:publish",
-                ":kotlin-test:kotlin-test-js:publish"
+                ":kotlin-test:kotlin-test-js:publish",
+                ":kotlin-coroutines-experimental-compat:publish"
             )
         }
     }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 497edb3f8d4..145258fee11 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 extra["versions.native-platform"] = "0.14"
 
 buildscript {
@@ -22,7 +24,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.20")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
         classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}")
     }
@@ -97,7 +99,7 @@ repositories {
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.20")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
     implementation("com.gradle.publish:plugin-publish-plugin:0.12.0")
 
     implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
@@ -126,6 +128,11 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs +=
+        listOf("-Xopt-in=kotlin.RequiresOptIn", "-Xskip-runtime-version-check")
+}
+
 tasks["build"].dependsOn(":prepare-deps:build")
 
 allprojects {
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index 6f3b44f653c..04df243f589 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -20,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.20")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt
index 83f21aa310b..225b0cf3846 100644
--- a/buildSrc/src/main/kotlin/embeddable.kt
+++ b/buildSrc/src/main/kotlin/embeddable.kt
@@ -5,10 +5,13 @@ import org.gradle.api.Project
 import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.jvm.tasks.Jar
-import org.gradle.kotlin.dsl.*
+import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.project
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.kotlin.dsl.register
 import java.io.File
 
-val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin"
+const val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin"
 
 val packagesToRelocate =
     listOf(
@@ -31,21 +34,23 @@ val packagesToRelocate =
 // But due to the shadow plugin bug (https://github.com/johnrengelman/shadow/issues/262) it is not possible to use
 // packagesToRelocate list to for the include list. Therefore the exclude list has to be created.
 val packagesToExcludeFromDummy =
-        listOf("org/jetbrains/kotlin/**",
-               "org/intellij/lang/annotations/**",
-               "org/jetbrains/jps/**",
-               "META-INF/**",
-               "com/sun/jna/**",
-               "com/thoughtworks/xstream/**",
-               "javaslang/**",
-               "*.proto",
-               "messages/**",
-               "net/sf/cglib/**",
-               "one/util/streamex/**",
-               "org/iq80/snappy/**",
-               "org/jline/**",
-               "org/xmlpull/**",
-               "*.txt")
+    listOf(
+        "org/jetbrains/kotlin/**",
+        "org/intellij/lang/annotations/**",
+        "org/jetbrains/jps/**",
+        "META-INF/**",
+        "com/sun/jna/**",
+        "com/thoughtworks/xstream/**",
+        "javaslang/**",
+        "*.proto",
+        "messages/**",
+        "net/sf/cglib/**",
+        "one/util/streamex/**",
+        "org/iq80/snappy/**",
+        "org/jline/**",
+        "org/xmlpull/**",
+        "*.txt"
+    )
 
 private fun ShadowJar.configureEmbeddableCompilerRelocation(withJavaxInject: Boolean = true) {
     relocate("com.google.protobuf", "org.jetbrains.kotlin.protobuf")
@@ -67,8 +72,8 @@ private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Un
     dependencies.add(compilerJar.name, dependencies.project(":kotlin-compiler", configuration = "runtimeJar"))
 
     return tasks.register<ShadowJar>(taskName) {
-        destinationDir = File(buildDir, "libs")
-        setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+        destinationDirectory.set(project.file(File(buildDir, "libs")))
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         from(compilerJar)
         body()
     }
@@ -107,8 +112,8 @@ fun Project.embeddableCompilerDummyForDependenciesRewriting(
     )
 
     return tasks.register<ShadowJar>(taskName) {
-        destinationDir = File(buildDir, "libs")
-        setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+        destinationDirectory.set(project.file(File(buildDir, "libs")))
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         from(compilerDummyJar)
         configureEmbeddableCompilerRelocation(withJavaxInject = false)
         body()
@@ -119,7 +124,7 @@ fun Project.rewriteDepsToShadedJar(
     originalJarTask: TaskProvider<out Jar>, shadowJarTask: TaskProvider<out Jar>, body: Jar.() -> Unit = {}
 ): TaskProvider<out Jar> {
     originalJarTask.configure {
-        classifier = "original"
+        archiveClassifier.set("original")
     }
 
     val compilerDummyJarFile by lazy { configurations.getAt("compilerDummyJar").singleFile }
@@ -132,7 +137,7 @@ fun Project.rewriteDepsToShadedJar(
         // which leads to the content of that JAR being excluded as well:
         exclude { it.file == compilerDummyJarFile }
 
-        classifier = ""
+        archiveClassifier.set("original")
         body()
     }
     return shadowJarTask
diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt
index 0a4923403c4..ab23a4af3f7 100644
--- a/buildSrc/src/main/kotlin/localDependencies.kt
+++ b/buildSrc/src/main/kotlin/localDependencies.kt
@@ -132,12 +132,10 @@ object IntellijRootUtils {
     }
 }
 
-fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project) =
-    includeJars(*(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).toTypedArray(), rootProject = project.rootProject)
-
-fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFilterPredicate: (String) -> Boolean) =
+@Suppress("UNCHECKED_CAST")
+fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFilterPredicate: (String) -> Boolean = { true }): Unit =
     includeJars(
-        *(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).filter { jarsFilterPredicate(it) }.toTypedArray(),
+        *(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).filter(jarsFilterPredicate).toTypedArray(),
         rootProject = project.rootProject
     )
 
diff --git a/buildSrc/src/main/kotlin/pluginMarkers.kt b/buildSrc/src/main/kotlin/pluginMarkers.kt
index 76be460c42b..8509609ec01 100644
--- a/buildSrc/src/main/kotlin/pluginMarkers.kt
+++ b/buildSrc/src/main/kotlin/pluginMarkers.kt
@@ -18,7 +18,7 @@ import java.util.*
 
 internal const val PLUGIN_MARKER_SUFFIX = ".gradle.plugin"
 
-@UseExperimental(ExperimentalStdlibApi::class)
+@OptIn(ExperimentalStdlibApi::class)
 fun Project.publishPluginMarkers(withEmptyJars: Boolean = true) {
     val pluginDevelopment = extensions.getByType<PluginBundleExtension>()
     val publishingExtension = extensions.getByType<PublishingExtension>()
diff --git a/buildSrc/src/main/kotlin/plugins/KotlinBuildPublishingPlugin.kt b/buildSrc/src/main/kotlin/plugins/KotlinBuildPublishingPlugin.kt
index a3da701ad7f..00ff6701d4f 100644
--- a/buildSrc/src/main/kotlin/plugins/KotlinBuildPublishingPlugin.kt
+++ b/buildSrc/src/main/kotlin/plugins/KotlinBuildPublishingPlugin.kt
@@ -8,7 +8,6 @@ package plugins
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.attributes.Usage
-import org.gradle.api.component.AdhocComponentWithVariants
 import org.gradle.api.component.SoftwareComponentFactory
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.publish.PublishingExtension
@@ -23,7 +22,6 @@ import org.gradle.plugins.signing.SigningPlugin
 import java.util.*
 import javax.inject.Inject
 
-
 class KotlinBuildPublishingPlugin @Inject constructor(
     private val componentFactory: SoftwareComponentFactory
 ) : Plugin<Project> {
@@ -47,7 +45,7 @@ class KotlinBuildPublishingPlugin @Inject constructor(
             }
         }
 
-        val kotlinLibraryComponent = componentFactory.adhoc(ADHOC_COMPONENT_NAME) as AdhocComponentWithVariants
+        val kotlinLibraryComponent = componentFactory.adhoc(ADHOC_COMPONENT_NAME)
         components.add(kotlinLibraryComponent)
         kotlinLibraryComponent.addVariantsFromConfiguration(publishedCompile) { mapToMavenScope("compile") }
         kotlinLibraryComponent.addVariantsFromConfiguration(publishedRuntime) { mapToMavenScope("runtime") }
@@ -139,7 +137,7 @@ class KotlinBuildPublishingPlugin @Inject constructor(
         const val COMPILE_CONFIGURATION = "publishedCompile"
         const val RUNTIME_CONFIGURATION = "publishedRuntime"
 
-        @UseExperimental(ExperimentalStdlibApi::class)
+        @OptIn(ExperimentalStdlibApi::class)
         fun humanReadableName(project: Project) =
             project.name.split("-").joinToString(separator = " ") { it.capitalize(Locale.ROOT) }
     }
@@ -163,4 +161,4 @@ fun TaskProvider<PublishToMavenRepository>.configureRepository() = configure {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt b/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
index 1597bedd6f7..016a51c988c 100644
--- a/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
+++ b/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
@@ -1,3 +1,4 @@
+@file:Suppress("DEPRECATION")
 package plugins
 
 import org.codehaus.groovy.runtime.InvokerHelper
@@ -16,10 +17,8 @@ import org.gradle.plugins.signing.Sign
 import org.gradle.plugins.signing.SigningExtension
 import kotlin.properties.Delegates
 
-
 /**
  * Configures a Kotlin module for publication.
- *
  */
 open class PublishedKotlinModule : Plugin<Project> {
 
diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt
index 5810bfb46a3..69ad840581a 100644
--- a/buildSrc/src/main/kotlin/tasks.kt
+++ b/buildSrc/src/main/kotlin/tasks.kt
@@ -154,7 +154,7 @@ fun Project.projectTest(
 
     var subProjectTempRoot: Path? = null
     doFirst {
-        val teamcity = rootProject.findProperty("teamcity") as? Map<Any?, *>
+        val teamcity = rootProject.findProperty("teamcity") as? Map<*, *>
         val systemTempRoot =
             // TC by default doesn't switch `teamcity.build.tempDir` to 'java.io.tmpdir' so it could cause to wasted disk space
             // Should be fixed soon on Teamcity side
@@ -180,7 +180,7 @@ fun Project.projectTest(
     if (parallel) {
         maxParallelForks =
             project.findProperty("kotlin.test.maxParallelForks")?.toString()?.toInt()
-                ?: Math.max(Runtime.getRuntime().availableProcessors() / if (kotlinBuildProperties.isTeamcityBuild) 2 else 4, 1)
+                ?: (Runtime.getRuntime().availableProcessors() / if (kotlinBuildProperties.isTeamcityBuild) 2 else 4).coerceAtLeast(1)
     }
     body()
 }
diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index ca9641470b3..fd8efcf8ecf 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -34,9 +34,7 @@ dependencies {
     Platform[201].orLower {
         testCompile(intellijDep()) { includeJars("groovy-all", rootProject = rootProject) }
     }
-    Platform[192].orHigher {
-        testCompile(intellijPluginDep("java")) { includeJars("jps-builders") }
-    }
+    testCompile(intellijPluginDep("java")) { includeJars("jps-builders") }
     testCompile(jpsStandalone()) { includeJars("jps-model") }
     testCompile(jpsBuildTest())
 }
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
index 8c2fb54095c..059e1760748 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
@@ -27,6 +27,9 @@ import org.junit.Assert
 import java.io.File
 import java.io.FileWriter
 import java.io.IOException
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.Path
+import kotlin.io.path.createTempDirectory
 import kotlin.test.assertTrue
 
 data class ConfigurationKey(val kind: ConfigurationKind, val jdkKind: TestJdkKind, val configuration: String)
@@ -345,14 +348,15 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
             FileWriter(file).use { fw -> fw.write("sdk.dir=$sdkRoot") }
         }
 
+        @OptIn(ExperimentalPathApi::class)
         @JvmStatic
         fun main(args: Array<String>) {
-            val tmpFolder = createTempDir()
-            println("Created temporary folder for android tests: " + tmpFolder.absolutePath)
-            val rootFolder = File("")
-            val pathManager = PathManager(rootFolder.absolutePath, tmpFolder.absolutePath)
+            val tmpFolder = createTempDirectory().toAbsolutePath().toString()
+            println("Created temporary folder for android tests: $tmpFolder")
+            val rootFolder = Path("").toAbsolutePath().toString()
+            val pathManager = PathManager(rootFolder, tmpFolder)
             generate(pathManager, true)
-            println("Android test project is generated into " + tmpFolder.absolutePath + " folder")
+            println("Android test project is generated into $tmpFolder folder")
         }
     }
 }
diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/BackendException.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/BackendException.kt
new file mode 100644
index 00000000000..df889509b6c
--- /dev/null
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/BackendException.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.common
+
+class BackendException(message: String, cause: Throwable?) : IllegalStateException(message, cause)
diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt
index 8b8f776ccc6..8933c7fb15c 100644
--- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt
@@ -232,12 +232,13 @@ object CodegenUtil {
     }
 
     @JvmStatic
-    fun reportBackendException(exception: Throwable, phase: String, fileUrl: String?): Nothing {
+    fun reportBackendException(exception: Throwable, phase: String, location: String?, additionalMessage: String? = null): Nothing {
         // CompilationException (the only KotlinExceptionWithAttachments possible here) is already supposed
         // to have all information about the context.
         if (exception is KotlinExceptionWithAttachments) throw exception
-        throw IllegalStateException(
-            getExceptionMessage("Backend", "Exception during $phase", exception, fileUrl),
+        throw BackendException(
+            getExceptionMessage("Backend", "Exception during $phase", exception, location) +
+                    additionalMessage?.let { "\n" + it }.orEmpty(),
             exception
         )
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
index 87620c140b1..f6fe43879ad 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
@@ -254,14 +254,14 @@ public class ClassFileFactory implements OutputFileCollection {
     public PackageCodegen forPackage(@NotNull FqName fqName, @NotNull Collection<KtFile> files) {
         assert !isDone : "Already done!";
         registerSourceFiles(files);
-        return state.getCodegenFactory().createPackageCodegen(state, files, fqName);
+        return new PackageCodegenImpl(state, files, fqName);
     }
 
     @NotNull
     public MultifileClassCodegen forMultifileClass(@NotNull FqName facadeFqName, @NotNull Collection<KtFile> files) {
         assert !isDone : "Already done!";
         registerSourceFiles(files);
-        return state.getCodegenFactory().createMultifileClassCodegen(state, files, facadeFqName);
+        return new MultifileClassCodegenImpl(state, files, facadeFqName);
     }
 
     private void registerSourceFiles(Collection<KtFile> files) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFactory.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFactory.kt
index 7097de4a5bd..224882e1080 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFactory.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFactory.kt
@@ -26,10 +26,6 @@ import org.jetbrains.kotlin.psi.KtFile
 interface CodegenFactory {
     fun generateModule(state: GenerationState, files: Collection<KtFile>)
 
-    fun createPackageCodegen(state: GenerationState, files: Collection<KtFile>, fqName: FqName): PackageCodegen
-
-    fun createMultifileClassCodegen(state: GenerationState, files: Collection<KtFile>, fqName: FqName): MultifileClassCodegen
-
     companion object {
         fun doCheckCancelled(state: GenerationState) {
             if (state.classBuilderMode.generateBodies) {
@@ -49,8 +45,7 @@ object DefaultCodegenFactory : CodegenFactory {
 
             if (fileClassInfo.withJvmMultifileClass) {
                 filesInMultifileClasses.putValue(fileClassInfo.facadeClassFqName, file)
-            }
-            else {
+            } else {
                 filesInPackages.putValue(file.packageFqName, file)
             }
         }
@@ -68,23 +63,17 @@ object DefaultCodegenFactory : CodegenFactory {
         }
     }
 
-    override fun createPackageCodegen(state: GenerationState, files: Collection<KtFile>, fqName: FqName) =
-            PackageCodegenImpl(state, files, fqName)
-
-    override fun createMultifileClassCodegen(state: GenerationState, files: Collection<KtFile>, fqName: FqName) =
-            MultifileClassCodegenImpl(state, files, fqName)
-
     private fun generateMultifileClass(state: GenerationState, multifileClassFqName: FqName, files: Collection<KtFile>) {
         state.factory.forMultifileClass(multifileClassFqName, files).generate()
     }
 
     fun generatePackage(
-            state: GenerationState,
-            packageFqName: FqName,
-            jetFiles: Collection<KtFile>
+        state: GenerationState,
+        packageFqName: FqName,
+        ktFiles: Collection<KtFile>
     ) {
         // We do not really generate package class, but use old package fqName to identify package in module-info.
         //FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(packageFqName);
-        state.factory.forPackage(packageFqName, jetFiles).generate()
+        state.factory.forPackage(packageFqName, ktFiles).generate()
     }
 }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ConstructorCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ConstructorCodegen.java
index 336210c8b9a..cf1bb8fab10 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ConstructorCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ConstructorCodegen.java
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
+import org.jetbrains.kotlin.resolve.InlineClassesUtilsKt;
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
 import org.jetbrains.kotlin.resolve.jvm.InlineClassManglingRulesKt;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
@@ -192,6 +193,7 @@ public class ConstructorCodegen {
         markLineNumberForConstructor(constructorDescriptor, primaryConstructor, codegen);
 
         if (OwnerKind.ERASED_INLINE_CLASS == kind) {
+            memberCodegen.generateInitializers(() -> codegen);
             Type t = typeMapper.mapType(constructorDescriptor.getContainingDeclaration());
             iv.load(0, t);
             iv.areturn(t);
@@ -226,7 +228,7 @@ public class ConstructorCodegen {
         }
 
         //object initialization was moved to initializeObjects()
-        if (!isObject(descriptor)) {
+        if (!isObject(descriptor) && !InlineClassesUtilsKt.isInlineClass(descriptor)) {
             memberCodegen.generateInitializers(() -> codegen);
         }
         iv.visitInsn(RETURN);
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
index 0eb229f90e1..2e646cde807 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.kotlin.codegen.JvmCodegenUtil.getDispatchReceiverParameterForConstructorCall
+import org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface
 import org.jetbrains.kotlin.codegen.binding.CodegenBinding
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.config.LanguageFeature
@@ -32,6 +33,7 @@ import org.jetbrains.kotlin.resolve.jvm.AsmTypes
 import org.jetbrains.kotlin.resolve.jvm.annotations.findJvmOverloadsAnnotation
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
+import org.jetbrains.kotlin.resolve.jvm.shouldHideConstructorDueToInlineClassTypeValueParameters
 import org.jetbrains.org.objectweb.asm.Label
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
@@ -134,8 +136,9 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) {
             remainingParameters.map { DescriptorToSourceUtils.descriptorToDeclaration(it) as? KtParameter }
 
         val generateAsFinal =
-            functionDescriptor.modality == Modality.FINAL ||
-                    state.languageVersionSettings.supportsFeature(LanguageFeature.GenerateJvmOverloadsAsFinal)
+            (functionDescriptor.modality == Modality.FINAL ||
+                    state.languageVersionSettings.supportsFeature(LanguageFeature.GenerateJvmOverloadsAsFinal)) &&
+                    !isJvmInterface(functionDescriptor.containingDeclaration)
         val flags =
             baseMethodFlags or
                     (if (isStatic) Opcodes.ACC_STATIC else 0) or
@@ -265,6 +268,7 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) {
 
         if (classOrObject.isLocal) return false
         if (classDescriptor.isInline) return false
+        if (shouldHideConstructorDueToInlineClassTypeValueParameters(constructorDescriptor)) return false
 
         if (CodegenBinding.canHaveOuter(state.bindingContext, classDescriptor)) return false
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java
index 350cbe3026a..c1e84140240 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java
@@ -188,8 +188,7 @@ public class DescriptorAsmUtil {
 
         if (functionDescriptor.getModality() == Modality.FINAL && !(functionDescriptor instanceof ConstructorDescriptor)) {
             DeclarationDescriptor containingDeclaration = functionDescriptor.getContainingDeclaration();
-            if (!(containingDeclaration instanceof ClassDescriptor) ||
-                ((ClassDescriptor) containingDeclaration).getKind() != ClassKind.INTERFACE) {
+            if (!isJvmInterface(containingDeclaration)) {
                 flags |= ACC_FINAL;
             }
         }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index 92fc055765a..fc6b458a0ad 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -44,8 +44,10 @@ import org.jetbrains.kotlin.codegen.when.SwitchCodegen;
 import org.jetbrains.kotlin.codegen.when.SwitchCodegenProvider;
 import org.jetbrains.kotlin.config.ApiVersion;
 import org.jetbrains.kotlin.config.JVMAssertionsMode;
+import org.jetbrains.kotlin.config.JVMConfigurationKeys;
 import org.jetbrains.kotlin.config.LanguageFeature;
 import org.jetbrains.kotlin.descriptors.*;
+import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor;
@@ -1705,26 +1707,38 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
             Type returnType;
             KotlinType returnKotlinType;
             if (isNonLocalReturn) {
-                // This is inline lambda. Find inline-site and check, whether it is suspend functions returning unboxed inline class
-                CodegenContext<?> inlineSiteContext = this.context.getFirstCrossInlineOrNonInlineContext();
-                KotlinType originalInlineClass = null;
-                boolean invokeSuspendOfLambda = false;
-                FunctionDescriptor inlineSiteDescriptor = null;
-                if (inlineSiteContext instanceof MethodContext) {
-                    inlineSiteDescriptor = ((MethodContext) inlineSiteContext).getFunctionDescriptor();
-                    originalInlineClass = CoroutineCodegenUtilKt
-                            .originalReturnTypeOfSuspendFunctionReturningUnboxedInlineClass(inlineSiteDescriptor, typeMapper);
-                    invokeSuspendOfLambda = CoroutineCodegenUtilKt.isInvokeSuspendOfLambda(inlineSiteDescriptor);
-                }
-                if (originalInlineClass != null) {
-                    returnType = typeMapper.mapType(originalInlineClass);
-                    returnKotlinType = originalInlineClass;
-                } else if (!invokeSuspendOfLambda) {
-                    returnType = nonLocalReturn.returnType.getType();
-                    returnKotlinType = nonLocalReturn.returnType.getKotlinType();
-                } else {
+                FunctionDescriptor returnTarget =
+                        nonLocalReturn.descriptor instanceof FunctionDescriptor
+                        ? (FunctionDescriptor) nonLocalReturn.descriptor
+                        : null;
+                if (returnTarget == null || !returnTarget.isSuspend()) {
+                    JvmKotlinType jvmKotlinType = nonLocalReturn.getJvmKotlinType(typeMapper);
+                    returnType = jvmKotlinType.getType();
+                    returnKotlinType = jvmKotlinType.getKotlinType();
+                } else if (returnTarget instanceof AnonymousFunctionDescriptor) {
+                    // Suspend lambdas always return Any?
                     returnType = OBJECT_TYPE;
-                    returnKotlinType = inlineSiteDescriptor.getReturnType();
+                    returnKotlinType = state.getModule().getBuiltIns().getNullableAnyType();
+                } else {
+                    // This is inline lambda, but return target is ordinary, yet suspend, function.
+                    // Find inline-site and check, whether it is suspend functions returning unboxed inline class
+                    CodegenContext<?> inlineSiteContext = this.context.getFirstCrossInlineOrNonInlineContext();
+                    KotlinType originalInlineClass = null;
+                    if (inlineSiteContext instanceof MethodContext) {
+                        FunctionDescriptor view = CoroutineCodegenUtilKt.getOrCreateJvmSuspendFunctionView(returnTarget, state);
+                        originalInlineClass =
+                                CoroutineCodegenUtilKt.originalReturnTypeOfSuspendFunctionReturningUnboxedInlineClass(view, typeMapper);
+                    }
+                    if (originalInlineClass != null) {
+                        // As an optimization, suspend functions, returning inline classes with reference underlying
+                        // type return unboxed inline class. Save the type so the coercer will not box it.
+                        returnType = typeMapper.mapType(originalInlineClass);
+                        returnKotlinType = originalInlineClass;
+                    } else {
+                        JvmKotlinType jvmKotlinType = nonLocalReturn.getJvmKotlinType(typeMapper);
+                        returnType = jvmKotlinType.getType();
+                        returnKotlinType = jvmKotlinType.getKotlinType();
+                    }
                 }
             }
             else {
@@ -1788,13 +1802,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
                     FunctionDescriptor containingFunction =
                             BindingContextUtils.getContainingFunctionSkipFunctionLiterals(descriptor, true).getFirst();
                     //FIRST_FUN_LABEL to prevent clashing with existing labels
-                    return new NonLocalReturnInfo(
-                            new JvmKotlinType(
-                                    typeMapper.mapReturnType(containingFunction),
-                                    containingFunction.getReturnType()
-                            ),
-                            FIRST_FUN_LABEL
-                    );
+                    return new NonLocalReturnInfo(containingFunction, FIRST_FUN_LABEL);
                 } else {
                     //local
                     return null;
@@ -1807,10 +1815,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
                 assert element != null : "Expression should be not null " + expression.getText();
                 assert elementDescriptor != null : "Descriptor should be not null: " + element.getText();
                 CallableDescriptor function = (CallableDescriptor) elementDescriptor;
-                return new NonLocalReturnInfo(
-                        new JvmKotlinType(typeMapper.mapReturnType(function), function.getReturnType()),
-                        expression.getLabelName()
-                );
+                return new NonLocalReturnInfo(function, expression.getLabelName());
             }
         }
         return null;
@@ -2680,7 +2685,21 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
             fd = ArgumentGeneratorKt.getFunctionWithDefaultArguments(fd);
         }
 
-        return typeMapper.mapToCallableMethod(fd, superCall, null, resolvedCall);
+        CallableMethod method = typeMapper.mapToCallableMethod(fd, superCall, null, resolvedCall);
+
+        if (method.getAsmMethod().getName().contains("-") &&
+            !state.getConfiguration().getBoolean(JVMConfigurationKeys.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME)
+        ) {
+            Boolean classFileContainsMethod =
+                    InlineClassesCodegenUtilKt.classFileContainsMethod(fd, state, method.getAsmMethod());
+            if (classFileContainsMethod != null && !classFileContainsMethod) {
+                typeMapper.setUseOldManglingRulesForFunctionAcceptingInlineClass(true);
+                method = typeMapper.mapToCallableMethod(fd, superCall, null, resolvedCall);
+                typeMapper.setUseOldManglingRulesForFunctionAcceptingInlineClass(false);
+            }
+        }
+
+        return method;
     }
 
     public void invokeMethodWithArguments(
@@ -2896,6 +2915,17 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
 
         sourceCompiler.initializeInlineFunctionContext(functionDescriptor);
         JvmMethodSignature signature = typeMapper.mapSignatureWithGeneric(functionDescriptor, sourceCompiler.getContextKind());
+        if (signature.getAsmMethod().getName().contains("-") &&
+            !state.getConfiguration().getBoolean(JVMConfigurationKeys.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME)
+        ) {
+            Boolean classFileContainsMethod =
+                    InlineClassesCodegenUtilKt.classFileContainsMethod(functionDescriptor, state, signature.getAsmMethod());
+            if (classFileContainsMethod != null && !classFileContainsMethod) {
+                typeMapper.setUseOldManglingRulesForFunctionAcceptingInlineClass(true);
+                signature = typeMapper.mapSignatureWithGeneric(functionDescriptor, sourceCompiler.getContextKind());
+                typeMapper.setUseOldManglingRulesForFunctionAcceptingInlineClass(false);
+            }
+        }
         Type methodOwner = typeMapper.mapImplementationOwner(functionDescriptor);
         if (isDefaultCompilation) {
             return new InlineCodegenForDefaultBody(functionDescriptor, this, state, methodOwner, signature, sourceCompiler);
@@ -5427,14 +5457,18 @@ The "returned" value of try expression with no finally is either the last expres
 
     private static class NonLocalReturnInfo {
 
-        private final JvmKotlinType returnType;
+        private final CallableDescriptor descriptor;
 
         private final String labelName;
 
-        private NonLocalReturnInfo(@NotNull JvmKotlinType type, @NotNull String name) {
-            returnType = type;
+        private NonLocalReturnInfo(@NotNull CallableDescriptor descriptor, @NotNull String name) {
+            this.descriptor = descriptor;
             labelName = name;
         }
+
+        private JvmKotlinType getJvmKotlinType(@NotNull KotlinTypeMapper typeMapper) {
+            return new JvmKotlinType(typeMapper.mapReturnType(descriptor), descriptor.getReturnType());
+        }
     }
 
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
index 0e0cc818355..3bc84e5c944 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
@@ -85,7 +85,6 @@ import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.*;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
 public class FunctionCodegen {
-    private static final String JAVA_LANG_DEPRECATED = Type.getType(Deprecated.class).getDescriptor();
 
     public final GenerationState state;
     private final KotlinTypeMapper typeMapper;
@@ -225,7 +224,7 @@ public class FunctionCodegen {
                 InlineClassDescriptorResolver.isSpecializedEqualsMethod(functionDescriptor);
         generateMethodAnnotationsIfRequired(
                 functionDescriptor, asmMethod, jvmSignature, mv,
-                isCompatibilityStubInDefaultImpls ? Collections.singletonList(JAVA_LANG_DEPRECATED) : Collections.emptyList(),
+                isCompatibilityStubInDefaultImpls ? Collections.singletonList(CodegenUtilKt.JAVA_LANG_DEPRECATED) : Collections.emptyList(),
                 skipNullabilityAnnotations
         );
         GenerateJava8ParameterNamesKt.generateParameterNames(functionDescriptor, mv, jvmSignature, state, (flags & ACC_SYNTHETIC) != 0);
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 27a5e100f0b..2f0cf3eef55 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -903,19 +903,26 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
     }
 
     private void generateCompanionObjectBackingFieldCopies() {
-        if (companionObjectPropertiesToCopy == null) return;
+        if (companionObjectPropertiesToCopy == null || companionObjectPropertiesToCopy.isEmpty()) return;
 
+        boolean isPrivateCompanion =
+                DescriptorVisibilities.isPrivate(
+                        ((ClassDescriptor) companionObjectPropertiesToCopy.get(0).descriptor.getContainingDeclaration()).getVisibility());
+
+        int modifiers = ACC_STATIC | ACC_FINAL | ACC_PUBLIC | (isPrivateCompanion ? ACC_DEPRECATED : 0);
+        List<String> additionalVisibleAnnotations =
+                isPrivateCompanion ? Collections.singletonList(CodegenUtilKt.JAVA_LANG_DEPRECATED) : Collections.emptyList();
         for (PropertyAndDefaultValue info : companionObjectPropertiesToCopy) {
             PropertyDescriptor property = info.descriptor;
 
             Type type = typeMapper.mapType(property);
-            int modifiers = ACC_STATIC | ACC_FINAL | ACC_PUBLIC;
+
             FieldVisitor fv = v.newField(JvmDeclarationOriginKt.Synthetic(DescriptorToSourceUtils.descriptorToDeclaration(property), property),
                                          modifiers, context.getFieldName(property, false),
                                          type.getDescriptor(), typeMapper.mapFieldSignature(property.getType(), property),
                                          info.defaultValue);
 
-            AnnotationCodegen.forField(fv, this, state).genAnnotations(property, type, null);
+            AnnotationCodegen.forField(fv, this, state).genAnnotations(property, type, null, null, additionalVisibleAnnotations);
 
             //This field are always static and final so if it has constant initializer don't do anything in clinit,
             //field would be initialized via default value in v.newField(...) - see JVM SPEC Ch.4
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java
index e0d2b6466ef..0edd2925ec2 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java
@@ -75,7 +75,7 @@ public class PackageCodegenImpl implements PackageCodegen {
             }
             catch (Throwable e) {
                 VirtualFile vFile = file.getVirtualFile();
-                CodegenUtil.reportBackendException(e, "file facade code generation", vFile == null ? null : vFile.getUrl());
+                CodegenUtil.reportBackendException(e, "file facade code generation", vFile == null ? null : vFile.getUrl(), null);
             }
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
index 874c29396ec..0cd60d0c0fb 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
@@ -42,9 +42,11 @@ import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import static org.jetbrains.kotlin.codegen.DescriptorAsmUtil.writeAnnotationData;
 import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.METADATA_PACKAGE_NAME_FIELD_NAME;
+import static org.jetbrains.kotlin.resolve.jvm.annotations.JvmAnnotationUtilKt.JVM_SYNTHETIC_ANNOTATION_FQ_NAME;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
 public class PackagePartCodegen extends MemberCodegen<KtFile> {
@@ -63,8 +65,20 @@ public class PackagePartCodegen extends MemberCodegen<KtFile> {
 
     @Override
     protected void generateDeclaration() {
+        boolean isSynthetic = false;
+        List<AnnotationDescriptor> fileAnnotationDescriptors = new ArrayList<>();
+        for (KtAnnotationEntry annotationEntry : element.getAnnotationEntries()) {
+            AnnotationDescriptor annotationDescriptor = state.getBindingContext().get(BindingContext.ANNOTATION, annotationEntry);
+            if (annotationDescriptor != null) {
+                fileAnnotationDescriptors.add(annotationDescriptor);
+                if (Objects.equals(annotationDescriptor.getFqName(), JVM_SYNTHETIC_ANNOTATION_FQ_NAME)) {
+                    isSynthetic = true;
+                }
+            }
+        }
+
         v.defineClass(element, state.getClassFileVersion(),
-                      ACC_PUBLIC | ACC_FINAL | ACC_SUPER,
+                      ACC_PUBLIC | ACC_FINAL | ACC_SUPER | (isSynthetic ? ACC_SYNTHETIC : 0),
                       packagePartType.getInternalName(),
                       null,
                       "java/lang/Object",
@@ -74,17 +88,6 @@ public class PackagePartCodegen extends MemberCodegen<KtFile> {
 
         generatePropertyMetadataArrayFieldIfNeeded(packagePartType);
 
-        generateAnnotationsForPartClass();
-    }
-
-    private void generateAnnotationsForPartClass() {
-        List<AnnotationDescriptor> fileAnnotationDescriptors = new ArrayList<>();
-        for (KtAnnotationEntry annotationEntry : element.getAnnotationEntries()) {
-            AnnotationDescriptor annotationDescriptor = state.getBindingContext().get(BindingContext.ANNOTATION, annotationEntry);
-            if (annotationDescriptor != null) {
-                fileAnnotationDescriptors.add(annotationDescriptor);
-            }
-        }
         Annotated annotatedFile = new AnnotatedImpl(Annotations.Companion.create(fileAnnotationDescriptors));
         AnnotationCodegen.forClass(v.getVisitor(), this, state).genAnnotations(annotatedFile, null, null);
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
index c50baeac347..c10a8e61814 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
@@ -42,6 +42,7 @@ import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 import org.jetbrains.org.objectweb.asm.commons.Method;
 
+import java.util.Collections;
 import java.util.List;
 
 import static org.jetbrains.kotlin.codegen.DescriptorAsmUtil.getDeprecatedAccessFlag;
@@ -408,6 +409,7 @@ public class PropertyCodegen {
         ClassBuilder builder = v;
 
         FieldOwnerContext backingFieldContext = context;
+        List<String> additionalVisibleAnnotations = Collections.emptyList();
         if (DescriptorAsmUtil.isInstancePropertyWithStaticBackingField(propertyDescriptor) ) {
             modifiers |= ACC_STATIC;
 
@@ -415,6 +417,10 @@ public class PropertyCodegen {
                 ImplementationBodyCodegen codegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen();
                 builder = codegen.v;
                 backingFieldContext = codegen.context;
+                if (DescriptorVisibilities.isPrivate(((ClassDescriptor) propertyDescriptor.getContainingDeclaration()).getVisibility())) {
+                    modifiers |= ACC_DEPRECATED;
+                    additionalVisibleAnnotations = Collections.singletonList(CodegenUtilKt.JAVA_LANG_DEPRECATED);
+                }
             }
         }
         modifiers |= getVisibilityForBackingField(propertyDescriptor, isDelegate);
@@ -442,7 +448,7 @@ public class PropertyCodegen {
                         (modifiers & ACC_SYNTHETIC) != 0 ||
                         propertyDescriptor.isLateInit();
                 AnnotationCodegen.forField(fv, memberCodegen, state, skipNullabilityAnnotations)
-                        .genAnnotations(annotatedField, type, propertyDescriptor.getType());
+                        .genAnnotations(annotatedField, type, propertyDescriptor.getType(), null, additionalVisibleAnnotations);
             }
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
index 773400b32db..d72d53dc740 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
@@ -672,8 +672,8 @@ public abstract class StackValue {
                 box(fromType, toType, v);
             }
         }
-        else if (fromType.getSort() == Type.OBJECT) {
-            //toType is primitive here
+        else if (fromType.getSort() == Type.OBJECT || fromType.getSort() == Type.ARRAY) {
+            // here toType is primitive and fromType is reference (object or array)
             Type unboxedType = unboxPrimitiveTypeOrNull(fromType);
             if (unboxedType != null) {
                 unbox(fromType, unboxedType, v);
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/codegenUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/codegenUtil.kt
index 88dcc1a093e..94b7a4d8e76 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/codegenUtil.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/codegenUtil.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.codegen
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.UnsignedTypes
+import org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface
 import org.jetbrains.kotlin.codegen.binding.CodegenBinding
 import org.jetbrains.kotlin.codegen.context.CodegenContext
 import org.jetbrains.kotlin.codegen.context.FieldOwnerContext
@@ -24,8 +25,8 @@ import org.jetbrains.kotlin.config.isReleaseCoroutines
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.deserialization.PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
-import org.jetbrains.kotlin.load.java.SpecialGenericSignatures.SpecialSignatureInfo
 import org.jetbrains.kotlin.load.java.DescriptorsJvmAbiUtil
+import org.jetbrains.kotlin.load.java.SpecialGenericSignatures.SpecialSignatureInfo
 import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
@@ -60,8 +61,12 @@ import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import org.jetbrains.org.objectweb.asm.commons.Method
 import org.jetbrains.org.objectweb.asm.tree.LabelNode
+import java.lang.Deprecated
 import java.util.*
 
+@JvmField
+internal val JAVA_LANG_DEPRECATED = Type.getType(Deprecated::class.java).descriptor
+
 fun generateIsCheck(
     v: InstructionAdapter,
     kotlinType: KotlinType,
@@ -240,7 +245,7 @@ fun CallableDescriptor.isJvmStaticInObjectOrClassOrInterface(): Boolean =
         DescriptorUtils.isNonCompanionObject(it) ||
                 // This is necessary because for generation of @JvmStatic methods from companion of class A
                 // we create a synthesized descriptor containing in class A
-                DescriptorUtils.isClassOrEnumClass(it) || DescriptorUtils.isInterface(it)
+                DescriptorUtils.isClassOrEnumClass(it) || isJvmInterface(it)
     }
 
 fun CallableDescriptor.isJvmStaticInCompanionObject(): Boolean =
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
index d5cb052a383..fd1620a1e4c 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
@@ -84,15 +84,20 @@ class SourceMapper(val sourceInfo: SourceInfo?) {
     val resultMappings: List<FileMapping>
         get() = fileMappings.values.toList()
 
+    companion object {
+        const val FAKE_FILE_NAME = "fake.kt"
+        const val FAKE_PATH = "kotlin/jvm/internal/FakeKt"
+    }
+
     init {
         sourceInfo?.let { sourceInfo ->
-            // If 'sourceFileName' is null, this class doesn't have debug information
-            // (e.g., multi-file class facade with multiple parts).
-            sourceInfo.sourceFileName?.let { sourceFileName ->
-                // Explicitly map the file to itself -- we'll probably need a lot of lines from it, so this will produce fewer ranges.
-                getOrRegisterNewSource(sourceFileName, sourceInfo.pathOrCleanFQN)
-                    .mapNewInterval(1, 1, sourceInfo.linesInFile)
-            }
+            // If 'sourceFileName' is null we are dealing with a synthesized class
+            // (e.g., multi-file class facade with multiple parts). Such classes
+            // only have synthetic debug information and we use a fake file name.
+            val sourceFileName = sourceInfo.sourceFileName ?: FAKE_FILE_NAME
+            // Explicitly map the file to itself -- we'll probably need a lot of lines from it, so this will produce fewer ranges.
+            getOrRegisterNewSource(sourceFileName, sourceInfo.pathOrCleanFQN)
+                .mapNewInterval(1, 1, sourceInfo.linesInFile)
         }
     }
 
@@ -110,7 +115,7 @@ class SourceMapper(val sourceInfo: SourceInfo?) {
     }
 
     fun mapSyntheticLineNumber(id: Int): Int {
-        return mapLineNumber(SourcePosition(id, "fake.kt", "kotlin/jvm/internal/FakeKt"), null)
+        return mapLineNumber(SourcePosition(id, FAKE_FILE_NAME, FAKE_PATH), null)
     }
 }
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inlineClassesCodegenUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inlineClassesCodegenUtil.kt
index cb76c239864..bb3a5ddb850 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inlineClassesCodegenUtil.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inlineClassesCodegenUtil.kt
@@ -5,15 +5,28 @@
 
 package org.jetbrains.kotlin.codegen
 
+import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor
+import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource
+import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.resolve.descriptorUtil.classId
 import org.jetbrains.kotlin.resolve.isInlineClassType
 import org.jetbrains.kotlin.resolve.underlyingRepresentation
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.typeUtil.isAnyOrNullableAny
 import org.jetbrains.kotlin.types.typeUtil.isTypeParameter
+import org.jetbrains.org.objectweb.asm.ClassReader
+import org.jetbrains.org.objectweb.asm.ClassVisitor
+import org.jetbrains.org.objectweb.asm.MethodVisitor
+import org.jetbrains.org.objectweb.asm.Opcodes
+import org.jetbrains.org.objectweb.asm.commons.Method
 
 fun KotlinType.isInlineClassWithUnderlyingTypeAnyOrAnyN(): Boolean {
     if (!isInlineClassType()) return false
@@ -26,4 +39,39 @@ fun CallableDescriptor.isGenericParameter(): Boolean {
     if (containingDeclaration is AnonymousFunctionDescriptor) return true
     val index = containingDeclaration.valueParameters.indexOf(this)
     return containingDeclaration.overriddenDescriptors.any { it.original.valueParameters[index].type.isTypeParameter() }
+}
+
+fun classFileContainsMethod(descriptor: FunctionDescriptor, state: GenerationState, method: Method): Boolean? {
+    if (descriptor !is DeserializedSimpleFunctionDescriptor) return null
+
+    val classId: ClassId = when {
+        descriptor.containingDeclaration is DeserializedClassDescriptor -> {
+            (descriptor.containingDeclaration as DeserializedClassDescriptor).classId ?: return null
+        }
+        descriptor.containerSource is JvmPackagePartSource -> {
+            (descriptor.containerSource as JvmPackagePartSource).classId
+        }
+        else -> {
+            return null
+        }
+    }
+
+    val bytes = VirtualFileFinder.getInstance(state.project, state.module).findVirtualFileWithHeader(classId)
+        ?.contentsToByteArray() ?: return null
+    var found = false
+    ClassReader(bytes).accept(object : ClassVisitor(Opcodes.API_VERSION) {
+        override fun visitMethod(
+            access: Int,
+            name: String?,
+            descriptor: String?,
+            signature: String?,
+            exceptions: Array<out String>?
+        ): MethodVisitor? {
+            if (name == method.name && descriptor == method.descriptor) {
+                found = true
+            }
+            return super.visitMethod(access, name, descriptor, signature, exceptions)
+        }
+    }, ClassReader.SKIP_FRAMES)
+    return found
 }
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.kt
index 10da4a93ccd..16da0103cff 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.codegen.createFreeFakeLocalPropertyDescriptor
 import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.*
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapperBase
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.config.JvmDefaultMode
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.*
@@ -60,6 +61,7 @@ class JvmSerializerExtension @JvmOverloads constructor(
     override val metadataVersion = state.metadataVersion
     private val jvmDefaultMode = state.jvmDefaultMode
     private val approximator = state.typeApproximator
+    private val useOldManglingScheme = state.useOldManglingSchemeForFunctionsWithInlineClassesInSignatures
 
     override fun shouldUseTypeTable(): Boolean = useTypeTable
     override fun shouldSerializeFunction(descriptor: FunctionDescriptor): Boolean {
@@ -215,6 +217,13 @@ class JvmSerializerExtension @JvmOverloads constructor(
         ) {
             versionRequirementTable?.writeFunctionNameManglingForReturnTypeRequirement(proto::addVersionRequirement)
         }
+
+        if ((requiresFunctionNameManglingForReturnType(descriptor) ||
+                    requiresFunctionNameManglingForParameterTypes(descriptor)) &&
+            !DescriptorUtils.hasJvmNameAnnotation(descriptor) && !useOldManglingScheme
+        ) {
+            versionRequirementTable?.writeNewFunctionNameManglingRequirement(proto::addVersionRequirement)
+        }
     }
 
     private fun MutableVersionRequirementTable.writeInlineParameterNullCheckRequirement(add: (Int) -> Unit) {
@@ -231,6 +240,10 @@ class JvmSerializerExtension @JvmOverloads constructor(
         }
     }
 
+    private fun MutableVersionRequirementTable.writeNewFunctionNameManglingRequirement(add: (Int) -> Unit) {
+        add(writeVersionRequirement(1, 4, 30, ProtoBuf.VersionRequirement.VersionKind.COMPILER_VERSION, this))
+    }
+
     private fun FunctionDescriptor.needsInlineParameterNullCheckRequirement(): Boolean =
         isInline && !isSuspend && !isParamAssertionsDisabled &&
                 !DescriptorVisibilities.isPrivate(visibility) &&
@@ -278,6 +291,9 @@ class JvmSerializerExtension @JvmOverloads constructor(
         }
 
         if (!DescriptorUtils.hasJvmNameAnnotation(descriptor) && requiresFunctionNameManglingForReturnType(descriptor)) {
+            if (!useOldManglingScheme) {
+                versionRequirementTable?.writeNewFunctionNameManglingRequirement(proto::addVersionRequirement)
+            }
             versionRequirementTable?.writeFunctionNameManglingForReturnTypeRequirement(proto::addVersionRequirement)
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
index 40f005190c5..46393b7686d 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
@@ -17,7 +17,8 @@ class KotlinToJvmSignatureMapperImpl : KotlinToJvmSignatureMapper {
     private val typeMapper = KotlinTypeMapper(
         BindingContext.EMPTY, ClassBuilderMode.LIGHT_CLASSES,
         JvmProtoBufUtil.DEFAULT_MODULE_NAME,
-        KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT// TODO use proper LanguageVersionSettings
+        KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT,// TODO use proper LanguageVersionSettings
+        useOldInlineClassesManglingScheme = false
     )
 
     override fun mapToJvmMethodSignature(function: FunctionDescriptor) = typeMapper.mapAsmMethod(function)
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
index 8ebd8c1892d..2c689fec4c5 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
@@ -50,12 +50,14 @@ class BuilderFactoryForDuplicateSignatureDiagnostics(
     private val diagnostics: DiagnosticSink,
     moduleName: String,
     languageVersionSettings: LanguageVersionSettings,
+    useOldInlineClassesManglingScheme: Boolean,
     shouldGenerate: (JvmDeclarationOrigin) -> Boolean,
 ) : SignatureCollectingClassBuilderFactory(builderFactory, shouldGenerate) {
 
     private val mapAsmMethod: (FunctionDescriptor) -> Method = KotlinTypeMapper(
         // Avoid errors when some classes are not loaded for some reason
-        bindingContext, ClassBuilderMode.LIGHT_CLASSES, moduleName, languageVersionSettings, isIrBackend = false
+        bindingContext, ClassBuilderMode.LIGHT_CLASSES, moduleName, languageVersionSettings, isIrBackend = false,
+        useOldInlineClassesManglingScheme = useOldInlineClassesManglingScheme
     )::mapAsmMethod
 
     private val reportDiagnosticsTasks = ArrayList<() -> Unit>()
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
index e23fefd48c8..1dbf3d2ffc8 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.resolve.*
 import org.jetbrains.kotlin.resolve.deprecation.CoroutineCompatibilitySupport
 import org.jetbrains.kotlin.resolve.deprecation.DeprecationResolver
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
+import org.jetbrains.kotlin.resolve.diagnostics.PrecomputedSuppressCache
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind.*
@@ -178,7 +179,11 @@ class GenerationState private constructor(
     }
 
     val extraJvmDiagnosticsTrace: BindingTrace =
-        DelegatingBindingTrace(originalFrontendBindingContext, "For extra diagnostics in ${this::class.java}", false)
+        DelegatingBindingTrace(
+            originalFrontendBindingContext, "For extra diagnostics in ${this::class.java}", false,
+            customSuppressCache = if (isIrBackend) PrecomputedSuppressCache(originalFrontendBindingContext, files) else null,
+        )
+
     private val interceptedBuilderFactory: ClassBuilderFactory
     private var used = false
 
@@ -190,6 +195,10 @@ class GenerationState private constructor(
 
     val languageVersionSettings = configuration.languageVersionSettings
 
+    val useOldManglingSchemeForFunctionsWithInlineClassesInSignatures =
+        configuration.getBoolean(JVMConfigurationKeys.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME) ||
+                languageVersionSettings.languageVersion.run { major == 1 && minor < 4 }
+
     val target = configuration.get(JVMConfigurationKeys.JVM_TARGET) ?: JvmTarget.DEFAULT
     val runtimeStringConcat =
         if (target.bytecodeVersion >= JvmTarget.JVM_9.bytecodeVersion)
@@ -209,6 +218,7 @@ class GenerationState private constructor(
         classBuilderMode,
         this.moduleName,
         languageVersionSettings,
+        useOldManglingSchemeForFunctionsWithInlineClassesInSignatures,
         IncompatibleClassTrackerImpl(extraJvmDiagnosticsTrace),
         target,
         isIrBackend
@@ -242,6 +252,7 @@ class GenerationState private constructor(
         var earlierScriptsForReplInterpreter: List<ScriptDescriptor>? = null
         // and the rest is an output from the codegen
         var resultFieldName: String? = null
+        var resultTypeString: String? = null
         var resultType: KotlinType? = null
     }
 
@@ -312,6 +323,7 @@ class GenerationState private constructor(
                     else
                         BuilderFactoryForDuplicateSignatureDiagnostics(
                             it, bindingContext, diagnostics, this.moduleName, languageVersionSettings,
+                            useOldManglingSchemeForFunctionsWithInlineClassesInSignatures,
                             shouldGenerate = { origin -> !shouldOnlyCollectSignatures(origin) },
                         ).apply { duplicateSignatureFactory = this }
                 },
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt
index defc6208da7..f02057dcf4d 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt
@@ -83,6 +83,7 @@ class KotlinTypeMapper @JvmOverloads constructor(
     val classBuilderMode: ClassBuilderMode,
     private val moduleName: String,
     val languageVersionSettings: LanguageVersionSettings,
+    private val useOldInlineClassesManglingScheme: Boolean,
     private val incompatibleClassTracker: IncompatibleClassTracker = IncompatibleClassTracker.DoNothing,
     val jvmTarget: JvmTarget = JvmTarget.DEFAULT,
     private val isIrBackend: Boolean = false,
@@ -91,6 +92,11 @@ class KotlinTypeMapper @JvmOverloads constructor(
 ) : KotlinTypeMapperBase() {
     private val isReleaseCoroutines = languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines)
     val jvmDefaultMode = languageVersionSettings.getFlag(JvmAnalysisFlags.jvmDefaultMode)
+    var useOldManglingRulesForFunctionAcceptingInlineClass: Boolean = useOldInlineClassesManglingScheme
+        set(value) {
+            require(!useOldInlineClassesManglingScheme)
+            field = value
+        }
 
     private val typeMappingConfiguration = object : TypeMappingConfiguration<Type> {
         override fun commonSupertype(types: Collection<KotlinType>): KotlinType {
@@ -636,7 +642,11 @@ class KotlinTypeMapper @JvmOverloads constructor(
         // so that we don't have to repeat the same logic in reflection
         // in case of properties without getter methods.
         if (kind !== OwnerKind.PROPERTY_REFERENCE_SIGNATURE || descriptor.isPropertyWithGetterSignaturePresent()) {
-            val suffix = getManglingSuffixBasedOnKotlinSignature(descriptor, shouldMangleByReturnType)
+            val suffix = getManglingSuffixBasedOnKotlinSignature(
+                descriptor,
+                shouldMangleByReturnType,
+                useOldManglingRulesForFunctionAcceptingInlineClass
+            )
             if (suffix != null) {
                 newName += suffix
             } else if (kind === OwnerKind.ERASED_INLINE_CLASS) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/inlineClassManglingUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/inlineClassManglingUtils.kt
index edf1a14238d..0e787796758 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/inlineClassManglingUtils.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/inlineClassManglingUtils.kt
@@ -7,8 +7,11 @@ package org.jetbrains.kotlin.codegen.state
 
 import org.jetbrains.kotlin.codegen.coroutines.unwrapInitialDescriptorForSuspendFunction
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.name.FqNameUnsafe
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.InlineClassDescriptorResolver
+import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
 import org.jetbrains.kotlin.resolve.jvm.requiresFunctionNameManglingForParameterTypes
 import org.jetbrains.kotlin.resolve.jvm.requiresFunctionNameManglingForReturnType
@@ -17,9 +20,68 @@ import org.jetbrains.kotlin.types.typeUtil.representativeUpperBound
 import java.security.MessageDigest
 import java.util.*
 
+const val NOT_INLINE_CLASS_PARAMETER_PLACEHOLDER = "_"
+
+class InfoForMangling(
+    val fqName: FqNameUnsafe,
+    val isInline: Boolean,
+    val isNullable: Boolean
+)
+
+fun collectFunctionSignatureForManglingSuffix(
+    useOldManglingRules: Boolean,
+    requiresFunctionNameManglingForParameterTypes: Boolean,
+    fqNamesForMangling: List<InfoForMangling?>,
+    returnTypeInfo: InfoForMangling?,
+): String? {
+    fun getSignatureElementForMangling(info: InfoForMangling?): String = buildString {
+        if (info == null) return ""
+        if (useOldManglingRules || info.isInline) {
+            append('L')
+            append(info.fqName)
+            if (info.isNullable) append('?')
+            append(';')
+        } else {
+            append(NOT_INLINE_CLASS_PARAMETER_PLACEHOLDER)
+        }
+    }
+
+    fun collectSignatureForMangling(): String =
+        fqNamesForMangling.joinToString(separator = if (useOldManglingRules) ", " else "") {
+            getSignatureElementForMangling(it)
+        }
+
+    if (useOldManglingRules) {
+        if (requiresFunctionNameManglingForParameterTypes) {
+            return collectSignatureForMangling()
+        }
+
+        // If a class member function returns inline class value, mangle its name.
+        // NB here function can be a suspend function JVM view with return type replaced with 'Any',
+        // should unwrap it and take original return type instead.
+        if (returnTypeInfo != null) {
+            return ":" + getSignatureElementForMangling(returnTypeInfo)
+        }
+    } else {
+        // If a function accepts inline class parameters, mangle its name.
+        if (requiresFunctionNameManglingForParameterTypes || returnTypeInfo != null) {
+            // If a class member function returns inline class value, mangle its name.
+            // NB here function can be a suspend function JVM view with return type replaced with 'Any',
+            // should unwrap it and take original return type instead.
+            val signature = collectSignatureForMangling() +
+                    if (returnTypeInfo != null)
+                        ":" + getSignatureElementForMangling(returnTypeInfo)
+                    else ""
+            return signature
+        }
+    }
+    return null
+}
+
 fun getManglingSuffixBasedOnKotlinSignature(
     descriptor: CallableMemberDescriptor,
-    shouldMangleByReturnType: Boolean
+    shouldMangleByReturnType: Boolean,
+    useOldManglingRules: Boolean
 ): String? {
     if (descriptor !is FunctionDescriptor) return null
     if (descriptor is ConstructorDescriptor) return null
@@ -29,41 +91,33 @@ fun getManglingSuffixBasedOnKotlinSignature(
     // Some stdlib functions ('Result.success', 'Result.failure') are annotated with '@JvmName' as a workaround for forward compatibility.
     if (DescriptorUtils.hasJvmNameAnnotation(descriptor)) return null
 
-    // If a function accepts inline class parameters, mangle its name.
-    if (requiresFunctionNameManglingForParameterTypes(descriptor)) {
-        return "-" + md5base64(collectSignatureForMangling(descriptor))
-    }
+    val unwrappedDescriptor = descriptor.unwrapInitialDescriptorForSuspendFunction()
 
-    // If a class member function returns inline class value, mangle its name.
-    // NB here function can be a suspend function JVM view with return type replaced with 'Any',
-    // should unwrap it and take original return type instead.
-    if (shouldMangleByReturnType) {
-        val unwrappedDescriptor = descriptor.unwrapInitialDescriptorForSuspendFunction()
-        if (requiresFunctionNameManglingForReturnType(unwrappedDescriptor)) {
-            return "-" + md5base64(":" + getSignatureElementForMangling(unwrappedDescriptor.returnType!!))
-        }
-    }
-    return null
+    val resultNew = collectFunctionSignatureForManglingSuffix(
+        useOldManglingRules = useOldManglingRules,
+        requiresFunctionNameManglingForParameterTypes = requiresFunctionNameManglingForParameterTypes(descriptor),
+        fqNamesForMangling =
+        (listOfNotNull(descriptor.extensionReceiverParameter?.type) + descriptor.valueParameters.map { it.type })
+            .map { getInfoForMangling(it) },
+        returnTypeInfo =
+        if (shouldMangleByReturnType && requiresFunctionNameManglingForReturnType(unwrappedDescriptor))
+            getInfoForMangling(unwrappedDescriptor.returnType!!)
+        else null
+    )
+
+    return resultNew?.let { "-" + md5base64(it) }
 }
 
-private fun collectSignatureForMangling(descriptor: CallableMemberDescriptor): String {
-    val types = listOfNotNull(descriptor.extensionReceiverParameter?.type) + descriptor.valueParameters.map { it.type }
-    return types.joinToString { getSignatureElementForMangling(it) }
-}
-
-private fun getSignatureElementForMangling(type: KotlinType): String = buildString {
-    val descriptor = type.constructor.declarationDescriptor ?: return ""
-    when (descriptor) {
-        is ClassDescriptor -> {
-            append('L')
-            append(descriptor.fqNameUnsafe)
-            if (type.isMarkedNullable) append('?')
-            append(';')
-        }
+private fun getInfoForMangling(type: KotlinType): InfoForMangling? {
+    val descriptor = type.constructor.declarationDescriptor ?: return null
+    return when (descriptor) {
+        is ClassDescriptor -> InfoForMangling(descriptor.fqNameUnsafe, descriptor.isInline, type.isMarkedNullable)
 
         is TypeParameterDescriptor -> {
-            append(getSignatureElementForMangling(descriptor.representativeUpperBound))
+            getInfoForMangling(descriptor.representativeUpperBound)
         }
+
+        else -> null
     }
 }
 
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index ba115e786e8..117a754fa41 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -57,14 +57,9 @@ dependencies {
         testCompileOnly(project(it))
     }
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    Platform[193].orLower {
-        testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
-    }
     testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
 
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    testRuntimeOnly(intellijPluginDep("java"))
 
     testRuntime(project(":kotlin-reflect"))
     testRuntime(androidDxJar())
diff --git a/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml b/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
index 43b8f776155..12bfac8d042 100644
--- a/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
+++ b/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
@@ -71,5 +71,7 @@
                         interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.DescriptorSerializerPlugin"
                         interface="org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.defaultErrorMessages"
+                        interface="org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages.Extension"/>
     </extensionPoints>
 </idea-plugin>
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
index 5e551b146ed..4c7a24a22bc 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
@@ -352,12 +352,6 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
     )
     var explicitApi: String by FreezableVar(ExplicitApiMode.DISABLED.state)
 
-    @Argument(
-        value = "-Xdeserialize-fake-overrides",
-        description = "Fallback to deserializing fake overrides"
-    )
-    var deserializeFakeOverrides: Boolean by FreezableVar(false)
-
     @Argument(
         value = "-Xinference-compatibility",
         description = "Enable compatibility changes for generic type inference algorithm"
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt
index a9e2c90a927..064b1edb16d 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt
@@ -172,12 +172,15 @@ class K2JSCompilerArguments : CommonCompilerArguments() {
     @Argument(value = "-Xenable-js-scripting", description = "Enable experimental support of .kts files using K/JS (with -Xir only)")
     var enableJsScripting: Boolean by FreezableVar(false)
 
-    @Argument(value = "-Xdisable-fake-override-validator", description = "Disable IR fake override validator")
-    var disableFakeOverrideValidator: Boolean by FreezableVar(false)
+    @Argument(value = "-Xfake-override-validator", description = "Enable IR fake override validator")
+    var fakeOverrideValidator: Boolean by FreezableVar(false)
 
     @Argument(value = "-Xerror-tolerance-policy", description = "Set up error tolerance policy (NONE, SEMANTIC, SYNTAX, ALL)")
     var errorTolerancePolicy: String? by NullableStringFreezableVar(null)
 
+    @Argument(value = "-Xwasm", description = "Use experimental WebAssembly compiler backend")
+    var wasm: Boolean by FreezableVar(false)
+
     override fun checkIrSupport(languageVersionSettings: LanguageVersionSettings, collector: MessageCollector) {
         if (!isIrBackendEnabled()) return
 
@@ -196,4 +199,4 @@ fun K2JSCompilerArguments.isPreIrBackendDisabled(): Boolean =
     irOnly || irProduceJs || irProduceKlibFile
 
 fun K2JSCompilerArguments.isIrBackendEnabled(): Boolean =
-    irProduceKlibDir || irProduceJs || irProduceKlibFile
\ No newline at end of file
+    irProduceKlibDir || irProduceJs || irProduceKlibFile || wasm
\ No newline at end of file
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
index d0a8677957c..e86edf8ff64 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
@@ -377,6 +377,12 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     )
     var noKotlinNothingValueException: Boolean by FreezableVar(false)
 
+    @Argument(
+        value = "-Xno-reset-jar-timestamps",
+        description = "Do not reset jar entry timestamps to a fixed date"
+    )
+    var noResetJarTimestamps: Boolean by FreezableVar(false)
+
     @Argument(
         value = "-Xno-unified-null-checks",
         description = "Use pre-1.4 exception types in null checks instead of java.lang.NPE. See KT-22275 for more details"
@@ -406,6 +412,12 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     )
     var useOldSpilledVarTypeAnalysis: Boolean by FreezableVar(false)
 
+    @Argument(
+        value = "-Xuse-14-inline-classes-mangling-scheme",
+        description = "Use 1.4 inline classes mangling scheme instead of 1.4.30 one"
+    )
+    var useOldInlineClassesManglingScheme: Boolean by FreezableVar(false)
+
     override fun configureAnalysisFlags(collector: MessageCollector): MutableMap<AnalysisFlag<*>, Any> {
         val result = super.configureAnalysisFlags(collector)
         result[JvmAnalysisFlags.strictMetadataVersionSemantics] = strictMetadataVersionSemantics
diff --git a/compiler/cli/cli-js/build.gradle.kts b/compiler/cli/cli-js/build.gradle.kts
index 4fbc4db747c..70d7c6f3adc 100644
--- a/compiler/cli/cli-js/build.gradle.kts
+++ b/compiler/cli/cli-js/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     compile(project(":compiler:ir.backend.common"))
     compile(project(":compiler:ir.serialization.js"))
     compile(project(":compiler:backend.js"))
+    compile(project(":compiler:backend.wasm"))
     compile(project(":js:js.translator"))
     compile(project(":js:js.serializer"))
     compile(project(":js:js.dce"))
diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
index 2e14b5261f8..75fdfead4a5 100644
--- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
+++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
@@ -8,7 +8,10 @@ package org.jetbrains.kotlin.cli.js
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.text.StringUtil
+import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
 import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion
+import org.jetbrains.kotlin.backend.wasm.compileWasm
+import org.jetbrains.kotlin.backend.wasm.wasmPhases
 import org.jetbrains.kotlin.cli.common.*
 import org.jetbrains.kotlin.cli.common.ExitCode.COMPILATION_ERROR
 import org.jetbrains.kotlin.cli.common.ExitCode.OK
@@ -34,6 +37,7 @@ import org.jetbrains.kotlin.ir.backend.js.*
 import org.jetbrains.kotlin.ir.declarations.persistent.PersistentIrFactory
 import org.jetbrains.kotlin.js.config.*
 import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
+import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.serialization.js.ModuleKind
 import org.jetbrains.kotlin.util.Logger
@@ -216,6 +220,33 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
                 MainModule.SourceFiles(sourcesFiles)
             }
 
+            if (arguments.wasm) {
+                val res = compileWasm(
+                    projectJs,
+                    mainModule,
+                    AnalyzerWithCompilerReport(config.configuration),
+                    config.configuration,
+                    PhaseConfig(wasmPhases),
+                    allDependencies = resolvedLibraries,
+                    friendDependencies = friendDependencies,
+                    exportedDeclarations = setOf(FqName("main"))
+                )
+                val outputWasmFile = outputFile.withReplacedExtensionOrNull(outputFile.extension, "wasm")!!
+                outputWasmFile.writeBytes(res.wasm)
+                val outputWatFile = outputFile.withReplacedExtensionOrNull(outputFile.extension, "wat")!!
+                outputWatFile.writeText(res.wat)
+
+                val runner = """
+                    const wasmBinary = read(String.raw`${outputWasmFile.absoluteFile}`, 'binary');
+                    const wasmModule = new WebAssembly.Module(wasmBinary);
+                    const wasmInstance = new WebAssembly.Instance(wasmModule, { runtime, js_code });
+                    wasmInstance.exports.main();
+                """.trimIndent()
+
+                outputFile.writeText(res.js + "\n" + runner)
+                return OK
+            }
+
             val compiledModule = try {
                 compile(
                     projectJs,
@@ -333,7 +364,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
         }
 
         configuration.put(JSConfigurationKeys.PRINT_REACHABILITY_INFO, arguments.irDcePrintReachabilityInfo)
-        configuration.put(JSConfigurationKeys.DISABLE_FAKE_OVERRIDE_VALIDATOR, arguments.disableFakeOverrideValidator)
+        configuration.put(JSConfigurationKeys.FAKE_OVERRIDE_VALIDATOR, arguments.fakeOverrideValidator)
     }
 
     override fun executableScriptFileName(): String {
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt
index e457826ed7c..7bc1c2c720f 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt
@@ -27,7 +27,6 @@ fun <A : CommonCompilerArguments> CompilerConfiguration.setupCommonArguments(
     put(CommonConfigurationKeys.EXPECT_ACTUAL_LINKER, arguments.expectActualLinker)
     putIfNotNull(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT, arguments.intellijPluginRoot)
     put(CommonConfigurationKeys.REPORT_OUTPUT_FILES, arguments.reportOutputFiles)
-    put(CommonConfigurationKeys.DESERIALIZE_FAKE_OVERRIDES, arguments.deserializeFakeOverrides)
 
     val metadataVersionString = arguments.metadataVersion
     if (metadataVersionString != null) {
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
index 53ddc5f4960..6cb009f43ad 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
@@ -87,6 +87,7 @@ class CliLightClassGenerationSupport(
                 ClassBuilderMode.LIGHT_CLASSES,
                 moduleName,
                 languageVersionSettings,
+                useOldInlineClassesManglingScheme = false,
                 jvmTarget = JvmTarget.JVM_1_8,
                 typePreprocessor = KotlinType::cleanFromAnonymousTypes,
                 namePreprocessor = ::tryGetPredefinedName
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
index fd11c7d910a..bc73eeeb1b9 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -31,11 +31,15 @@ import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 import org.jetbrains.kotlin.utils.PathUtil;
 
 import java.io.*;
+import java.util.*;
 import java.util.jar.*;
 
 import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR;
 
 public class CompileEnvironmentUtil {
+
+    public static long DOS_EPOCH = new GregorianCalendar(1980, Calendar.JANUARY, 1, 0, 0, 0).getTimeInMillis();
+
     @NotNull
     public static ModuleChunk loadModuleChunk(File buildFile, MessageCollector messageCollector) {
         if (!buildFile.exists()) {
@@ -51,7 +55,11 @@ public class CompileEnvironmentUtil {
 
     // TODO: includeRuntime should be not a flag but a path to runtime
     private static void doWriteToJar(
-            OutputFileCollection outputFiles, OutputStream fos, @Nullable FqName mainClass, boolean includeRuntime
+            OutputFileCollection outputFiles,
+            OutputStream fos,
+            @Nullable FqName mainClass,
+            boolean includeRuntime,
+            boolean resetJarTimestamps
     ) {
         try {
             Manifest manifest = new Manifest();
@@ -61,13 +69,25 @@ public class CompileEnvironmentUtil {
             if (mainClass != null) {
                 mainAttributes.putValue("Main-Class", mainClass.asString());
             }
-            JarOutputStream stream = new JarOutputStream(fos, manifest);
+
+            JarOutputStream stream = new JarOutputStream(fos);
+            JarEntry manifestEntry = new JarEntry(JarFile.MANIFEST_NAME);
+            if (resetJarTimestamps) {
+                manifestEntry.setTime(DOS_EPOCH);
+            }
+            stream.putNextEntry(manifestEntry);
+            manifest.write(new BufferedOutputStream(stream));
+
             for (OutputFile outputFile : outputFiles.asList()) {
-                stream.putNextEntry(new JarEntry(outputFile.getRelativePath()));
+                JarEntry entry = new JarEntry(outputFile.getRelativePath());
+                if (resetJarTimestamps) {
+                    entry.setTime(DOS_EPOCH);
+                }
+                stream.putNextEntry(entry);
                 stream.write(outputFile.asByteArray());
             }
             if (includeRuntime) {
-                writeRuntimeToJar(stream);
+                writeRuntimeToJar(stream, resetJarTimestamps);
             }
             stream.finish();
         }
@@ -76,11 +96,13 @@ public class CompileEnvironmentUtil {
         }
     }
 
-    public static void writeToJar(File jarPath, boolean jarRuntime, FqName mainClass, OutputFileCollection outputFiles) {
+    public static void writeToJar(
+            File jarPath, boolean jarRuntime, boolean resetJarTimestamps, FqName mainClass, OutputFileCollection outputFiles
+    ) {
         FileOutputStream outputStream = null;
         try {
             outputStream = new FileOutputStream(jarPath);
-            doWriteToJar(outputFiles, outputStream, mainClass, jarRuntime);
+            doWriteToJar(outputFiles, outputStream, mainClass, jarRuntime, resetJarTimestamps);
             outputStream.close();
         }
         catch (FileNotFoundException e) {
@@ -94,21 +116,24 @@ public class CompileEnvironmentUtil {
         }
     }
 
-    private static void writeRuntimeToJar(JarOutputStream stream) throws IOException {
+    private static void writeRuntimeToJar(JarOutputStream stream, boolean resetJarTimestamps) throws IOException {
         File stdlibPath = PathUtil.getKotlinPathsForCompiler().getStdlibPath();
         if (!stdlibPath.exists()) {
             throw new CompileEnvironmentException("Couldn't find kotlin-stdlib at " + stdlibPath);
         }
-        copyJarImpl(stream, stdlibPath);
+        copyJarImpl(stream, stdlibPath, resetJarTimestamps);
     }
 
-    private static void copyJarImpl(JarOutputStream stream, File jarPath) throws IOException {
+    private static void copyJarImpl(JarOutputStream stream, File jarPath, boolean resetJarTimestamps) throws IOException {
         try (JarInputStream jis = new JarInputStream(new FileInputStream(jarPath))) {
             while (true) {
                 JarEntry e = jis.getNextJarEntry();
                 if (e == null) {
                     break;
                 }
+                if (resetJarTimestamps) {
+                    e.setTime(DOS_EPOCH);
+                }
                 if (FileUtilRt.extensionEquals(e.getName(), "class")) {
                     stream.putNextEntry(e);
                     FileUtil.copy(jis, stream);
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.193 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.193
deleted file mode 100644
index f5a5525c63e..00000000000
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.193
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package org.jetbrains.kotlin.cli.jvm.compiler;
-
-import com.intellij.codeInsight.ContainerProvider;
-import com.intellij.codeInsight.JavaContainerProvider;
-import com.intellij.codeInsight.folding.JavaCodeFoldingSettings;
-import com.intellij.codeInsight.folding.impl.JavaCodeFoldingSettingsBase;
-import com.intellij.codeInsight.folding.impl.JavaFoldingBuilderBase;
-import com.intellij.codeInsight.runner.JavaMainMethodProvider;
-import com.intellij.core.CoreApplicationEnvironment;
-import com.intellij.core.CoreJavaDirectoryService;
-import com.intellij.core.CorePsiPackageImplementationHelper;
-import com.intellij.ide.highlighter.ArchiveFileType;
-import com.intellij.ide.highlighter.JavaClassFileType;
-import com.intellij.ide.highlighter.JavaFileType;
-import com.intellij.lang.LanguageASTFactory;
-import com.intellij.lang.MetaLanguage;
-import com.intellij.lang.folding.LanguageFolding;
-import com.intellij.lang.java.JavaLanguage;
-import com.intellij.lang.java.JavaParserDefinition;
-import com.intellij.navigation.ItemPresentationProviders;
-import com.intellij.openapi.Disposable;
-import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.extensions.ExtensionsArea;
-import com.intellij.openapi.fileTypes.FileTypeExtensionPoint;
-import com.intellij.openapi.fileTypes.PlainTextFileType;
-import com.intellij.openapi.fileTypes.PlainTextLanguage;
-import com.intellij.openapi.fileTypes.PlainTextParserDefinition;
-import com.intellij.openapi.projectRoots.JavaVersionService;
-import com.intellij.openapi.vfs.VirtualFileSystem;
-import com.intellij.psi.*;
-import com.intellij.psi.augment.PsiAugmentProvider;
-import com.intellij.psi.augment.TypeAnnotationModifier;
-import com.intellij.psi.compiled.ClassFileDecompilers;
-import com.intellij.psi.impl.LanguageConstantExpressionEvaluator;
-import com.intellij.psi.impl.PsiExpressionEvaluator;
-import com.intellij.psi.impl.PsiSubstitutorFactoryImpl;
-import com.intellij.psi.impl.compiled.ClassFileStubBuilder;
-import com.intellij.psi.impl.file.PsiPackageImplementationHelper;
-import com.intellij.psi.impl.search.MethodSuperSearcher;
-import com.intellij.psi.impl.source.tree.JavaASTFactory;
-import com.intellij.psi.impl.source.tree.PlainTextASTFactory;
-import com.intellij.psi.meta.MetaDataContributor;
-import com.intellij.psi.presentation.java.*;
-import com.intellij.psi.search.searches.SuperMethodsSearch;
-import com.intellij.psi.stubs.BinaryFileStubBuilders;
-import com.intellij.util.QueryExecutor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem;
-
-/**
- * adapted from com.intellij.core.JavaCoreApplicationEnvironment
- * TODO: initiate removal original from com.intellij.core since it seems that there are no usages left
- */
-public class KotlinCoreApplicationEnvironment extends CoreApplicationEnvironment {
-
-  public static KotlinCoreApplicationEnvironment create(@NotNull Disposable parentDisposable, boolean unitTestMode) {
-    return new KotlinCoreApplicationEnvironment(parentDisposable, unitTestMode);
-  }
-
-  private KotlinCoreApplicationEnvironment(@NotNull Disposable parentDisposable, boolean unitTestMode) {
-    super(parentDisposable, unitTestMode);
-
-    registerExtensionPoints();
-
-    registerExtensions();
-  }
-
-  private void registerExtensionPoints() {
-    ExtensionsArea area = Extensions.getRootArea();
-
-    CoreApplicationEnvironment.registerExtensionPoint(area, BinaryFileStubBuilders.EP_NAME, FileTypeExtensionPoint.class);
-    CoreApplicationEnvironment.registerExtensionPoint(area, FileContextProvider.EP_NAME, FileContextProvider.class);
-
-    CoreApplicationEnvironment.registerExtensionPoint(area, MetaDataContributor.EP_NAME, MetaDataContributor.class);
-    CoreApplicationEnvironment.registerExtensionPoint(area, PsiAugmentProvider.EP_NAME, PsiAugmentProvider.class);
-    CoreApplicationEnvironment.registerExtensionPoint(area, JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider.class);
-
-    CoreApplicationEnvironment.registerExtensionPoint(area, ContainerProvider.EP_NAME, ContainerProvider.class);
-    CoreApplicationEnvironment.registerExtensionPoint(area, ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler.class);
-
-    CoreApplicationEnvironment.registerExtensionPoint(area, TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier.class);
-    CoreApplicationEnvironment.registerExtensionPoint(area, MetaLanguage.EP_NAME, MetaLanguage.class);
-
-    IdeaExtensionPoints.INSTANCE.registerVersionSpecificAppExtensionPoints(area);
-  }
-
-  private void registerExtensions() {
-    registerFileType(JavaClassFileType.INSTANCE, "class");
-    registerFileType(JavaFileType.INSTANCE, "java");
-    registerFileType(ArchiveFileType.INSTANCE, "jar;zip");
-    registerFileType(PlainTextFileType.INSTANCE, "txt;sh;bat;cmd;policy;log;cgi;MF;jad;jam;htaccess");
-
-    addExplicitExtension(LanguageASTFactory.INSTANCE, PlainTextLanguage.INSTANCE, new PlainTextASTFactory());
-    registerParserDefinition(new PlainTextParserDefinition());
-
-    addExplicitExtension(FileTypeFileViewProviders.INSTANCE, JavaClassFileType.INSTANCE, new ClassFileViewProviderFactory());
-    addExplicitExtension(BinaryFileStubBuilders.INSTANCE, JavaClassFileType.INSTANCE, new ClassFileStubBuilder());
-
-    addExplicitExtension(LanguageASTFactory.INSTANCE, JavaLanguage.INSTANCE, new JavaASTFactory());
-    registerParserDefinition(new JavaParserDefinition());
-    addExplicitExtension(LanguageConstantExpressionEvaluator.INSTANCE, JavaLanguage.INSTANCE, new PsiExpressionEvaluator());
-
-    addExtension(ContainerProvider.EP_NAME, new JavaContainerProvider());
-
-    myApplication.registerService(PsiPackageImplementationHelper.class, new CorePsiPackageImplementationHelper());
-    myApplication.registerService(PsiSubstitutorFactory.class, new PsiSubstitutorFactoryImpl());
-
-    myApplication.registerService(JavaDirectoryService.class, createJavaDirectoryService());
-    myApplication.registerService(JavaVersionService.class, new JavaVersionService());
-
-    addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiPackage.class, new PackagePresentationProvider());
-    addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiClass.class, new ClassPresentationProvider());
-    addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiMethod.class, new MethodPresentationProvider());
-    addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiField.class, new FieldPresentationProvider());
-    addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiLocalVariable.class, new VariablePresentationProvider());
-    addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiParameter.class, new VariablePresentationProvider());
-
-    registerApplicationService(JavaCodeFoldingSettings.class, new JavaCodeFoldingSettingsBase());
-    addExplicitExtension(LanguageFolding.INSTANCE, JavaLanguage.INSTANCE, new JavaFoldingBuilderBase() {
-      @Override
-      protected boolean shouldShowExplicitLambdaType(@NotNull PsiAnonymousClass anonymousClass, @NotNull PsiNewExpression expression) {
-        return false;
-      }
-
-      @Override
-      protected boolean isBelowRightMargin(@NotNull PsiFile file, int lineLength) {
-        return false;
-      }
-    });
-
-    registerApplicationExtensionPoint(SuperMethodsSearch.EP_NAME, QueryExecutor.class);
-    addExtension(SuperMethodsSearch.EP_NAME, new MethodSuperSearcher());
-  }
-
-  // overridden in upsource
-  protected CoreJavaDirectoryService createJavaDirectoryService() {
-    return new CoreJavaDirectoryService();
-  }
-
-  @Nullable
-  @Override
-  protected VirtualFileSystem createJrtFileSystem() {
-    return new CoreJrtFileSystem();
-  }
-}
\ No newline at end of file
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index 638065c077b..c9c2c34e730 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -102,6 +102,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
 import org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
+import java.nio.file.FileSystems
 import java.util.zip.ZipFile
 
 class KotlinCoreEnvironment private constructor(
@@ -536,7 +537,11 @@ class KotlinCoreEnvironment private constructor(
                                 "(cp:\n  ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n  ") { it.file }})"
                     )
 
-            registerExtensionPointAndExtensionsEx(pluginRoot, configFilePath, Extensions.getRootArea())
+            CoreApplicationEnvironment.registerExtensionPointAndExtensions(
+                FileSystems.getDefault().getPath(pluginRoot.path),
+                configFilePath,
+                Extensions.getRootArea()
+            )
         }
 
         @JvmStatic
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42
index e2785e46e04..b1fc1f6e4c3 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42
@@ -106,6 +106,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
 import org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
+import java.nio.file.FileSystems
 import java.util.zip.ZipFile
 
 class KotlinCoreEnvironment private constructor(
@@ -534,7 +535,11 @@ class KotlinCoreEnvironment private constructor(
                                 "(cp:\n  ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n  ") { it.file }})"
                     )
 
-            registerExtensionPointAndExtensionsEx(pluginRoot, configFilePath, Extensions.getRootArea())
+            CoreApplicationEnvironment.registerExtensionPointAndExtensions(
+                FileSystems.getDefault().getPath(pluginRoot.path),
+                configFilePath,
+                Extensions.getRootArea()
+            )
         }
 
         @JvmStatic
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
index 6228bb33514..4d7659ad974 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
@@ -25,7 +25,6 @@ import com.intellij.psi.search.DelegatingGlobalSearchScope
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.ProjectScope
 import org.jetbrains.kotlin.analyzer.AnalysisResult
-import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.asJava.FilteredJvmDiagnostics
 import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection
@@ -37,7 +36,8 @@ import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.checkKotlinPackageUsage
 import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.OUTPUT
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.WARNING
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil
 import org.jetbrains.kotlin.cli.common.output.writeAll
@@ -54,13 +54,13 @@ import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.diagnostics.*
 import org.jetbrains.kotlin.fir.FirPsiSourceElement
-import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.analysis.FirAnalyzerFacade
 import org.jetbrains.kotlin.fir.analysis.diagnostics.*
 import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver
 import org.jetbrains.kotlin.fir.backend.jvm.FirMetadataSerializer
 import org.jetbrains.kotlin.fir.checkers.registerExtendedCommonCheckers
 import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider
+import org.jetbrains.kotlin.fir.session.FirJvmModuleInfo
 import org.jetbrains.kotlin.fir.session.FirSessionFactory
 import org.jetbrains.kotlin.ir.backend.jvm.jvmResolveLibraries
 import org.jetbrains.kotlin.javac.JavacWrapper
@@ -68,16 +68,11 @@ import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager
 import org.jetbrains.kotlin.modules.Module
 import org.jetbrains.kotlin.modules.TargetId
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.CompilerEnvironment
-import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
 import org.jetbrains.kotlin.resolve.diagnostics.SimpleDiagnostics
 import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices
 import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory
 import org.jetbrains.kotlin.utils.newLinkedHashMapWithExpectedSize
 import java.io.File
@@ -93,7 +88,8 @@ object KotlinToJVMBytecodeCompiler {
         val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
         if (jarPath != null) {
             val includeRuntime = configuration.get(JVMConfigurationKeys.INCLUDE_RUNTIME, false)
-            CompileEnvironmentUtil.writeToJar(jarPath, includeRuntime, mainClassFqName, outputFiles)
+            val resetJarTimestamps = !configuration.get(JVMConfigurationKeys.NO_RESET_JAR_TIMESTAMPS, false)
+            CompileEnvironmentUtil.writeToJar(jarPath, includeRuntime, resetJarTimestamps, mainClassFqName, outputFiles)
             if (reportOutputFiles) {
                 val message = OutputMessageUtil.formatOutputMessage(outputFiles.asList().flatMap { it.sourceFiles }.distinct(), jarPath)
                 messageCollector.report(OUTPUT, message)
@@ -325,43 +321,26 @@ object KotlinToJVMBytecodeCompiler {
 
             val scope = GlobalSearchScope.filesScope(project, ktFiles.map { it.virtualFile })
                 .uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(project))
-            val provider = FirProjectSessionProvider(project)
+            val provider = FirProjectSessionProvider()
 
-            class FirJvmModuleInfo(override val name: Name) : ModuleInfo {
-                constructor(moduleName: String) : this(Name.identifier(moduleName))
+            val librariesModuleInfo = FirJvmModuleInfo.createForLibraries()
+            val librariesScope = ProjectScope.getLibrariesScope(project)
+            FirSessionFactory.createLibrarySession(
+                librariesModuleInfo, provider, librariesScope,
+                project, environment.createPackagePartProvider(librariesScope)
+            )
 
-                val dependencies: MutableList<ModuleInfo> = mutableListOf()
-
-                override val platform: TargetPlatform
-                    get() = JvmPlatforms.unspecifiedJvmPlatform
-
-                override val analyzerServices: PlatformDependentAnalyzerServices
-                    get() = JvmPlatformAnalyzerServices
-
-                override fun dependencies(): List<ModuleInfo> {
-                    return dependencies
-                }
-            }
-
-            val moduleInfo = FirJvmModuleInfo(module.getModuleName())
-            val session: FirSession = FirSessionFactory.createJavaModuleBasedSession(moduleInfo, provider, scope) {
+            val moduleInfo = FirJvmModuleInfo(module.getModuleName(), listOf(librariesModuleInfo))
+            val session = FirSessionFactory.createJavaModuleBasedSession(moduleInfo, provider, scope, project) {
                 if (extendedAnalysisMode) {
                     registerExtendedCommonCheckers()
                 }
-            }.also {
-                val dependenciesInfo = FirJvmModuleInfo(Name.special("<dependencies>"))
-                moduleInfo.dependencies.add(dependenciesInfo)
-                val librariesScope = ProjectScope.getLibrariesScope(project)
-                FirSessionFactory.createLibrarySession(
-                    dependenciesInfo, provider, librariesScope,
-                    project, environment.createPackagePartProvider(librariesScope)
-                )
             }
 
             val firAnalyzerFacade = FirAnalyzerFacade(session, moduleConfiguration.languageVersionSettings, ktFiles)
 
             firAnalyzerFacade.runResolution()
-            val firDiagnostics = firAnalyzerFacade.runCheckers()
+            val firDiagnostics = firAnalyzerFacade.runCheckers().values.flatten()
             AnalyzerWithCompilerReport.reportDiagnostics(
                 SimpleDiagnostics(
                     firDiagnostics.map { it.toRegularDiagnostic() }
@@ -616,17 +595,8 @@ object KotlinToJVMBytecodeCompiler {
         sourceFiles: List<KtFile>,
         module: Module?
     ): GenerationState {
-        // The IR backend does not handle .kts files yet.
-        var isIR = (configuration.getBoolean(JVMConfigurationKeys.IR) ||
+        val isIR = (configuration.getBoolean(JVMConfigurationKeys.IR) ||
                 configuration.getBoolean(CommonConfigurationKeys.USE_FIR))
-        val anyKts = sourceFiles.any { it.isScript() }
-        if (isIR && anyKts) {
-            environment.messageCollector.report(
-                STRONG_WARNING,
-                "IR backend does not support .kts scripts, switching to old JVM backend"
-            )
-            isIR = false
-        }
         val generationState = GenerationState.Builder(
             environment.project,
             ClassBuilderFactories.BINARIES,
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt.193 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt.193
deleted file mode 100644
index 746e54decd7..00000000000
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt.193
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.cli.jvm.compiler
-
-import com.intellij.codeInsight.ExternalAnnotationsManager
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.*
-
-class MockExternalAnnotationsManager : ExternalAnnotationsManager() {
-    override fun chooseAnnotationsPlace(element: PsiElement): AnnotationPlace = AnnotationPlace.NOWHERE
-
-    override fun isExternalAnnotationWritable(listOwner: PsiModifierListOwner, annotationFQN: String): Boolean = false
-    override fun isExternalAnnotation(annotation: PsiAnnotation): Boolean = false
-
-    override fun findExternalAnnotationsFiles(listOwner: PsiModifierListOwner): List<PsiFile>? = null
-    override fun findExternalAnnotation(listOwner: PsiModifierListOwner, annotationFQN: String): PsiAnnotation? = null
-    override fun findExternalAnnotations(listOwner: PsiModifierListOwner): Array<out PsiAnnotation>? = null
-
-    override fun annotateExternally(
-        listOwner: PsiModifierListOwner,
-        annotationFQName: String,
-        fromFile: PsiFile,
-        value: Array<out PsiNameValuePair>?
-    ) {
-        throw UnsupportedOperationException("not implemented")
-    }
-
-    override fun deannotate(listOwner: PsiModifierListOwner, annotationFQN: String): Boolean {
-        throw UnsupportedOperationException("not implemented")
-    }
-
-    override fun editExternalAnnotation(
-        listOwner: PsiModifierListOwner,
-        annotationFQN: String,
-        value: Array<out PsiNameValuePair>?
-    ): Boolean {
-        throw UnsupportedOperationException("not implemented")
-    }
-
-    override fun hasAnnotationRootsForFile(file: VirtualFile): Boolean = false
-
-    override fun findDefaultConstructorExternalAnnotations(aClass: PsiClass, annotationFQN: String): List<PsiAnnotation> = emptyList()
-
-    override fun findDefaultConstructorExternalAnnotations(aClass: PsiClass): List<PsiAnnotation> = emptyList()
-
-    override fun findExternalAnnotations(listOwner: PsiModifierListOwner, annotationFQN: String): List<PsiAnnotation> = emptyList()
-}
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.193 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.193
deleted file mode 100644
index e7316778db5..00000000000
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.193
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.cli.jvm.compiler
-
-fun setupIdeaStandaloneExecution() {
-}
\ No newline at end of file
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt
deleted file mode 100644
index 92159dbf2a1..00000000000
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.cli.jvm.compiler
-
-import com.intellij.core.CoreApplicationEnvironment
-import com.intellij.openapi.extensions.ExtensionsArea
-import java.io.File
-import java.nio.file.FileSystems
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun registerExtensionPointAndExtensionsEx(pluginFile: File, fileName: String, area: ExtensionsArea) {
-    val pluginRoot = FileSystems.getDefault().getPath(pluginFile.path)
-    @Suppress("MissingRecentApi")
-    CoreApplicationEnvironment.registerExtensionPointAndExtensions(pluginRoot, fileName, area)
-}
\ No newline at end of file
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt.193 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt.193
deleted file mode 100644
index 8327a2b97a9..00000000000
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt.193
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.cli.jvm.compiler
-
-import com.intellij.core.CoreApplicationEnvironment
-import com.intellij.openapi.extensions.ExtensionsArea
-import java.io.File
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun registerExtensionPointAndExtensionsEx(pluginFile: File, fileName: String, area: ExtensionsArea) {
-    @Suppress("MissingRecentApi")
-    CoreApplicationEnvironment.registerExtensionPointAndExtensions(pluginFile, fileName, area)
-}
\ No newline at end of file
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
index b7884bb298c..102a62e533e 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
@@ -185,6 +185,7 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr
     put(JVMConfigurationKeys.EMIT_JVM_TYPE_ANNOTATIONS, arguments.emitJvmTypeAnnotations)
     put(JVMConfigurationKeys.NO_OPTIMIZED_CALLABLE_REFERENCES, arguments.noOptimizedCallableReferences)
     put(JVMConfigurationKeys.NO_KOTLIN_NOTHING_VALUE_EXCEPTION, arguments.noKotlinNothingValueException)
+    put(JVMConfigurationKeys.NO_RESET_JAR_TIMESTAMPS, arguments.noResetJarTimestamps)
     put(JVMConfigurationKeys.NO_UNIFIED_NULL_CHECKS, arguments.noUnifiedNullChecks)
 
     if (!JVMConstructorCallNormalizationMode.isSupportedValue(arguments.constructorCallNormalizationMode)) {
@@ -230,6 +231,7 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr
     put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage)
     put(JVMConfigurationKeys.USE_SINGLE_MODULE, arguments.singleModule)
     put(JVMConfigurationKeys.USE_OLD_SPILLED_VAR_TYPE_ANALYSIS, arguments.useOldSpilledVarTypeAnalysis)
+    put(JVMConfigurationKeys.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME, arguments.useOldInlineClassesManglingScheme)
 
     arguments.declarationsOutputPath?.let { put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, it) }
 }
diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
index 80f7e118b29..bc896a1f725 100644
--- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
+++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
@@ -129,9 +129,15 @@ public class JVMConfigurationKeys {
     public static final CompilerConfigurationKey<Boolean> NO_KOTLIN_NOTHING_VALUE_EXCEPTION =
             CompilerConfigurationKey.create("Do not use KotlinNothingValueException available since 1.4");
 
+    public static final CompilerConfigurationKey<Boolean> NO_RESET_JAR_TIMESTAMPS =
+            CompilerConfigurationKey.create("Do not reset timestamps in jar entries");
+
     public static final CompilerConfigurationKey<Boolean> NO_UNIFIED_NULL_CHECKS =
             CompilerConfigurationKey.create("Use pre-1.4 exception types in null checks instead of java.lang.NPE");
 
     public static final CompilerConfigurationKey<Boolean> USE_OLD_SPILLED_VAR_TYPE_ANALYSIS =
             CompilerConfigurationKey.create("Use old, SourceInterpreter-based analysis for fields, used for spilled variables in coroutines");
+
+    public static final CompilerConfigurationKey<Boolean> USE_OLD_INLINE_CLASSES_MANGLING_SCHEME =
+            CompilerConfigurationKey.create("Use old, 1.4 version of inline classes mangling scheme");
 }
diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
index 6f2ab9253f7..1626c05fa15 100644
--- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
+++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
@@ -13,7 +13,7 @@ object JvmAnalysisFlags {
     val strictMetadataVersionSemantics by AnalysisFlag.Delegates.Boolean
 
     @JvmStatic
-    val javaTypeEnhancementState by AnalysisFlag.Delegates.JavaTypeEnhancementStateWarnByDefault
+    val javaTypeEnhancementState by Delegates.JavaTypeEnhancementStateWarnByDefault
 
     @JvmStatic
     val jvmDefaultMode by Delegates.JvmDefaultModeDisabledByDefault
@@ -34,7 +34,7 @@ object JvmAnalysisFlags {
     val disableUltraLightClasses by AnalysisFlag.Delegates.Boolean
 
     private object Delegates {
-        object Jsr305StateWarnByDefault {
+        object JavaTypeEnhancementStateWarnByDefault {
             operator fun provideDelegate(instance: Any?, property: KProperty<*>): AnalysisFlag.Delegate<JavaTypeEnhancementState> =
                 AnalysisFlag.Delegate(property.name, JavaTypeEnhancementState.DEFAULT)
         }
diff --git a/compiler/config/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt b/compiler/config/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt
index f407fd00e9b..a26f51a3eae 100644
--- a/compiler/config/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt
+++ b/compiler/config/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt
@@ -48,9 +48,6 @@ object CommonConfigurationKeys {
     @JvmField
     val EXPECT_ACTUAL_LINKER = CompilerConfigurationKey.create<Boolean>("Experimental expext/actual linker")
 
-    @JvmField
-    val DESERIALIZE_FAKE_OVERRIDES = CompilerConfigurationKey.create<Boolean>("Deserialize fake overrides")
-
     @JvmField
     val USE_FIR_EXTENDED_CHECKERS = CompilerConfigurationKey.create<Boolean>("fir extended checkers")
 }
diff --git a/compiler/daemon/daemon-client-new/src/org/jetbrains/kotlin/daemon/client/experimental/KotlinCompilerClient.kt b/compiler/daemon/daemon-client-new/src/org/jetbrains/kotlin/daemon/client/experimental/KotlinCompilerClient.kt
index 5d2ce0bc463..16e26d29b41 100644
--- a/compiler/daemon/daemon-client-new/src/org/jetbrains/kotlin/daemon/client/experimental/KotlinCompilerClient.kt
+++ b/compiler/daemon/daemon-client-new/src/org/jetbrains/kotlin/daemon/client/experimental/KotlinCompilerClient.kt
@@ -25,6 +25,7 @@ import java.io.File
 import java.io.Serializable
 import java.net.SocketException
 import java.nio.channels.ClosedChannelException
+import java.nio.file.Files
 import java.rmi.ConnectException
 import java.rmi.ConnectIOException
 import java.rmi.UnmarshalException
@@ -422,7 +423,7 @@ class KotlinCompilerClient : KotlinCompilerDaemonClient {
         report: (DaemonReportCategory, String) -> Unit
     ): Deferred<Pair<CompileServiceAsync?, DaemonJVMOptions>> = GlobalScope.async {
         registryDir.mkdirs()
-        val timestampMarker = createTempFile("kotlin-daemon-client-tsmarker", directory = registryDir)
+        val timestampMarker = Files.createTempFile(registryDir.toPath(), "kotlin-daemon-client-tsmarker", null).toFile()
         val aliveWithMetadata = try {
             walkDaemonsAsync(registryDir, compilerId, timestampMarker, report = report)
         } finally {
diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
index d05d67ca80c..38d45247c73 100644
--- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
+++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
@@ -26,6 +26,7 @@ import java.io.File
 import java.io.OutputStream
 import java.io.PrintStream
 import java.net.SocketException
+import java.nio.file.Files
 import java.rmi.ConnectException
 import java.rmi.ConnectIOException
 import java.rmi.UnmarshalException
@@ -347,7 +348,7 @@ object KotlinCompilerClient {
 
     private fun tryFindSuitableDaemonOrNewOpts(registryDir: File, compilerId: CompilerId, daemonJVMOptions: DaemonJVMOptions, report: (DaemonReportCategory, String) -> Unit): Pair<CompileService?, DaemonJVMOptions> {
         registryDir.mkdirs()
-        val timestampMarker = createTempFile("kotlin-daemon-client-tsmarker", directory = registryDir)
+        val timestampMarker = Files.createTempFile(registryDir.toPath(), "kotlin-daemon-client-tsmarker", null).toFile()
         val aliveWithMetadata = try {
             walkDaemons(registryDir, compilerId, timestampMarker, report = report).toList()
         }
diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt
index 8bf0712a9d5..d5dc62c89b1 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.daemon.common
 
 import java.io.File
+import java.nio.file.Files
 import java.rmi.registry.LocateRegistry
 
 
@@ -106,7 +107,12 @@ private inline fun tryConnectToDaemon(port: Int, report: (DaemonReportCategory,
 private const val validFlagFileKeywordChars = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 
 fun makeAutodeletingFlagFile(keyword: String = "compiler-client", baseDir: File? = null): File {
-    val flagFile = File.createTempFile("kotlin-${keyword.filter { validFlagFileKeywordChars.contains(it.toLowerCase()) }}-", "-is-running", baseDir?.takeIf { it.isDirectory && it.exists() })
+    val prefix = "kotlin-${keyword.filter { validFlagFileKeywordChars.contains(it.toLowerCase()) }}-"
+    val flagFile = if (baseDir?.isDirectory == true)
+        Files.createTempFile(baseDir.toPath(), prefix, "-is-running").toFile()
+    else
+        Files.createTempFile(prefix, "-is-running").toFile()
+
     flagFile.deleteOnExit()
     return flagFile
 }
diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt
index 60876993244..ef684aa0e9d 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt
@@ -29,6 +29,7 @@ enum class CompilationResultCategory(val code: Int) {
     IC_COMPILE_ITERATION(0),
     BUILD_REPORT_LINES(1),
     VERBOSE_BUILD_REPORT_LINES(2),
+    BUILD_METRICS(3)
 }
 
 interface CompilationResultsAsync {
diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
index 44f942530a9..8ca966bcb29 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
@@ -323,17 +323,19 @@ fun configureDaemonJVMOptions(opts: DaemonJVMOptions,
 
 private val jvmAssertArgsRegex = "(es?a|ds?a|(enable|disable)(system)?assertions)(${'$'}|:)".toRegex()
 
-fun configureDaemonJVMOptions(vararg additionalParams: String,
-                              inheritMemoryLimits: Boolean,
-                              inheritOtherJvmOptions: Boolean,
-                              inheritAdditionalProperties: Boolean
+fun configureDaemonJVMOptions(
+    vararg additionalParams: String,
+    inheritMemoryLimits: Boolean,
+    inheritOtherJvmOptions: Boolean,
+    inheritAdditionalProperties: Boolean
 ): DaemonJVMOptions =
-        configureDaemonJVMOptions(DaemonJVMOptions(),
-                                  additionalParams = additionalParams,
-                                  inheritMemoryLimits = inheritMemoryLimits,
-                                  inheritOtherJvmOptions = inheritOtherJvmOptions,
-                                  inheritAdditionalProperties = inheritAdditionalProperties)
-
+    configureDaemonJVMOptions(
+        DaemonJVMOptions(),
+        *additionalParams,
+        inheritMemoryLimits = inheritMemoryLimits,
+        inheritOtherJvmOptions = inheritOtherJvmOptions,
+        inheritAdditionalProperties = inheritAdditionalProperties,
+    )
 
 fun configureDaemonOptions(opts: DaemonOptions): DaemonOptions {
     System.getProperty(COMPILE_DAEMON_OPTIONS_PROPERTY)?.let {
diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt
index 60fc772faa2..3dc53a600bf 100644
--- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt
+++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt
@@ -35,7 +35,10 @@ import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.PrintStream
 import java.net.URLClassLoader
+import java.nio.file.Path
+import kotlin.io.path.*
 
+@OptIn(ExperimentalPathApi::class)
 class CompilerApiTest : KotlinIntegrationTestBase() {
 
     private val compilerLibDir = getCompilerLib()
@@ -119,7 +122,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
                                               verbose = true,
                                               reportPerf = true)
 
-            val logFile = createTempFile("kotlin-daemon-test.", ".log")
+            val logFile: Path = createTempFile("kotlin-daemon-test.", ".log")
 
             val daemonJVMOptions = configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"",
                                                              inheritMemoryLimits = false, inheritOtherJvmOptions = false, inheritAdditionalProperties = false)
@@ -137,7 +140,8 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
             }
             finally {
                 KotlinCompilerClient.shutdownCompileService(compilerId, daemonOptions)
-                logFile.delete()
+                runCatching { logFile.deleteIfExists() }
+                    .onFailure { e -> println("Failed to delete log file: $e") }
             }
         }
     }
@@ -158,7 +162,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
                                               verbose = true,
                                               reportPerf = true)
 
-            val logFile = createTempFile("kotlin-daemon-test.", ".log")
+            val logFile: Path = createTempFile("kotlin-daemon-test.", ".log")
 
             val daemonJVMOptions = configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"",
                                                              inheritMemoryLimits = false, inheritOtherJvmOptions = false, inheritAdditionalProperties = false)
@@ -174,7 +178,8 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
             }
             finally {
                 KotlinCompilerClient.shutdownCompileService(compilerId, daemonOptions)
-                logFile.delete()
+                runCatching { logFile.deleteIfExists() }
+                    .onFailure { e -> println("Failed to delete log file: $e") }
             }
         }
     }
diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
index fd53833dd37..143c22d721b 100644
--- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
@@ -36,10 +36,13 @@ import java.lang.management.ManagementFactory
 import java.net.URL
 import java.net.URLClassLoader
 import java.nio.charset.Charset
+import java.nio.file.Path
 import java.rmi.server.UnicastRemoteObject
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.invariantSeparatorsPath
 import kotlin.script.dependencies.Environment
 import kotlin.script.dependencies.ScriptContents
 import kotlin.script.experimental.dependencies.DependenciesResolver
@@ -997,9 +1000,12 @@ internal inline fun withLogFile(prefix: String, suffix: String = ".log", printLo
 // if file path is given in windows form (using backslash as a separator); the reason is unknown
 // this function makes a path with forward slashed, that works on windows too
 internal val File.loggerCompatiblePath: String
-    get() =
-        if (OSKind.current == OSKind.Windows) absolutePath.replace('\\', '/')
-        else absolutePath
+    get() = invariantSeparatorsPath
+
+@OptIn(ExperimentalPathApi::class)
+internal val Path.loggerCompatiblePath: String
+    get() = invariantSeparatorsPath
+
 
 open class TestKotlinScriptDummyDependenciesResolver : DependenciesResolver {
 
diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt
index 2c163181386..b28d713f0c1 100644
--- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt
+++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt
@@ -28,13 +28,16 @@ import org.junit.Assert
 import org.junit.runner.RunWith
 import java.io.File
 import java.net.URLClassLoader
+import java.nio.file.Path
 import java.util.logging.LogManager
 import java.util.logging.Logger
+import kotlin.io.path.*
 
 private val logFiles = arrayListOf<String>()
 
 // TODO: remove ignore annotation from tests.
 
+@OptIn(ExperimentalPathApi::class)
 @RunWith(IgnoreAll::class)
 class CompilerApiTest : KotlinIntegrationTestBase() {
 
@@ -43,7 +46,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
 
     private val compilerLibDir = getCompilerLib()
 
-    private fun createNewLogFile(): File {
+    private fun createNewLogFile(): Path {
         println("creating logFile")
         val newLogFile = createTempFile("kotlin-daemon-experimental-test.", ".log")
         println("logFile created (${newLogFile.loggerCompatiblePath})")
@@ -51,7 +54,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
         return newLogFile
     }
 
-    private val currentLogFile: File by lazy {
+    private val currentLogFile: Path by lazy {
         val newLogFile = createNewLogFile()
         val cfg: String =
             "handlers = java.util.logging.FileHandler\n" +
@@ -67,7 +70,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
         newLogFile
     }
 
-    private val externalLogFile: File by lazy { createNewLogFile() }
+    private val externalLogFile: Path by lazy { createNewLogFile() }
 
     private val log by lazy {
         currentLogFile
diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt
index e6cde507d29..40b3248281b 100644
--- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt
+++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt
@@ -3,6 +3,8 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(ExperimentalPathApi::class)
+
 package org.jetbrains.kotlin.daemon.experimental.integration
 
 import junit.framework.TestCase
@@ -38,6 +40,7 @@ import java.net.URL
 import java.net.URLClassLoader
 import java.nio.channels.ClosedChannelException
 import java.nio.charset.Charset
+import java.nio.file.Path
 import java.rmi.ConnectException
 import java.rmi.ConnectIOException
 import java.rmi.UnmarshalException
@@ -46,6 +49,7 @@ import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import java.util.logging.LogManager
 import kotlin.concurrent.thread
+import kotlin.io.path.*
 import kotlin.script.dependencies.Environment
 import kotlin.script.dependencies.ScriptContents
 import kotlin.script.experimental.dependencies.DependenciesResolver
@@ -64,7 +68,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
     val kotlinCompilerClientInstance = KotlinCompilerDaemonClient.instantiate(DaemonProtocolVariant.SOCKETS)
 
-    private fun createNewLogFile(): File {
+    private fun createNewLogFile(): Path {
         println("creating logFile")
         val newLogFile = createTempFile("kotlin-daemon-experimental-test.", ".log")
         println("logFile created (${newLogFile.loggerCompatiblePath})")
@@ -595,8 +599,8 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
                 shutdownDelayMilliseconds = 1,
                 runFilesPath = File(tmpdir, getTestName(true)).absolutePath
             )
-            val clientFlag = createTempFile(getTestName(true), "-client.alive")
-            val sessionFlag = createTempFile(getTestName(true), "-session.alive")
+            val clientFlag = createTempFile(getTestName(true), "-client.alive").toFile()
+            val sessionFlag = createTempFile(getTestName(true), "-session.alive").toFile()
             try {
                 withLogFile("kotlin-daemon-test") { logFile ->
                     val daemonJVMOptions = makeTestDaemonJvmOptions(logFile)
@@ -635,8 +639,8 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
                 shutdownDelayMilliseconds = 1,
                 runFilesPath = File(tmpdir, getTestName(true)).absolutePath
             )
-            val clientFlag = createTempFile(getTestName(true), "-client.alive")
-            val sessionFlag = createTempFile(getTestName(true), "-session.alive")
+            val clientFlag = createTempFile(getTestName(true), "-client.alive").toFile()
+            val sessionFlag = createTempFile(getTestName(true), "-session.alive").toFile()
             try {
                 withLogFile("kotlin-daemon-test") { logFile ->
                     val daemonJVMOptions = makeTestDaemonJvmOptions(logFile)
@@ -678,8 +682,8 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
                 shutdownDelayMilliseconds = 3000,
                 runFilesPath = File(tmpdir, getTestName(true)).absolutePath
             )
-            val clientFlag = createTempFile(getTestName(true), "-client.alive")
-            val clientFlag2 = createTempFile(getTestName(true), "-client.alive")
+            val clientFlag = createTempFile(getTestName(true), "-client.alive").toFile()
+            val clientFlag2 = createTempFile(getTestName(true), "-client.alive").toFile()
             try {
                 withLogFile("kotlin-daemon-test") { logFile ->
                     val daemonJVMOptions = makeTestDaemonJvmOptions(logFile)
@@ -769,8 +773,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
             assertEquals("Compilation failed:\n$resOutput", 0, resCode)
             println("OK")
         } finally {
-            if (clientAliveFile.exists())
-                clientAliveFile.delete()
+            clientAliveFile.deleteIfExists()
         }
     }
 
@@ -1427,7 +1430,7 @@ fun restoreSystemProperty(propertyName: String, backupValue: String?) {
 }
 
 internal inline fun withFlagFile(prefix: String, suffix: String? = null, body: (File) -> Unit) {
-    val file = createTempFile(prefix, suffix)
+    val file = createTempFile(prefix, suffix).toFile()
     try {
         body(file)
     } finally {
@@ -1436,7 +1439,7 @@ internal inline fun withFlagFile(prefix: String, suffix: String? = null, body: (
 }
 
 internal inline fun withLogFile(prefix: String, suffix: String = ".log", printLogOnException: Boolean = true, body: (File) -> Unit) {
-    val logFile = createTempFile(prefix, suffix)
+    val logFile = createTempFile(prefix, suffix).toFile()
     println("LOG FILE : ${logFile.path}")
     try {
         body(logFile)
@@ -1449,13 +1452,6 @@ internal inline fun withLogFile(prefix: String, suffix: String = ".log", printLo
     }
 }
 
-// java.util.Logger used in the daemon silently forgets to log into a file specified in the config on Windows,
-// if file path is given in windows form (using backslash as a separator); the reason is unknown
-// this function makes a path with forward slashed, that works on windows too
-internal val File.loggerCompatiblePath: String
-    get() =
-        if (OSKind.current == OSKind.Windows) absolutePath.replace('\\', '/')
-        else absolutePath
 
 open class TestKotlinScriptDummyDependenciesResolver : DependenciesResolver {
 
diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ClientSerializationTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ClientSerializationTest.kt
index b105ad13513..a3fa8a051bd 100644
--- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ClientSerializationTest.kt
+++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ClientSerializationTest.kt
@@ -24,6 +24,7 @@ import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 import java.net.InetSocketAddress
 import java.util.logging.Logger
+import kotlin.io.path.*
 
 @OptIn(KtorExperimentalAPI::class)
 class TestServer(val serverPort: Int = 6999) {
@@ -44,6 +45,7 @@ val testServer = TestServer()
 
 @RunWith(IgnoreAll::class)
 @Suppress("UNCHECKED_CAST")
+@OptIn(ExperimentalPathApi::class)
 class ClientSerializationTest : KotlinIntegrationTestBase() {
 
     val file = createTempFile()
diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt
index cc205bae8ab..399f4d19086 100644
--- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt
+++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt
@@ -31,11 +31,14 @@ import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.IOException
 import java.io.PrintStream
+import java.nio.file.Path
 import java.util.*
 import java.util.logging.LogManager
 import java.util.logging.Logger
 import kotlin.concurrent.schedule
+import kotlin.io.path.*
 
+@OptIn(ExperimentalPathApi::class)
 @RunWith(IgnoreAll::class)
 class ConnectionsTest : KotlinIntegrationTestBase() {
 
@@ -247,15 +250,15 @@ class ConnectionsTest : KotlinIntegrationTestBase() {
         extraAction
     )
 
-    private val clientFiles = arrayListOf<File>()
+    private val clientFiles = mutableListOf<Path>()
     private fun generateClient(): String {
         val file = createTempFile(getTestName(true), ".alive")
         clientFiles.add(file)
-        return file.absolutePath
+        return file.toAbsolutePath().toString()
     }
 
     private fun deleteClients() {
-        clientFiles.forEach { it.delete() }
+        clientFiles.forEach { it.deleteIfExists() }
     }
 
     private fun endTest() {
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
index 53fa924fe76..faa86159517 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
@@ -21,6 +21,9 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.vfs.impl.ZipHandler
 import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
 import org.jetbrains.kotlin.build.DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
+import org.jetbrains.kotlin.build.report.BuildReporter
+import org.jetbrains.kotlin.build.report.RemoteBuildReporter
+import org.jetbrains.kotlin.build.report.RemoteReporter
 import org.jetbrains.kotlin.cli.common.CLICompiler
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY
@@ -286,7 +289,7 @@ abstract class CompileServiceImplBase(
         createMessageCollector: (ServicesFacadeT, CompilationOptions) -> MessageCollector,
         createReporter: (ServicesFacadeT, CompilationOptions) -> DaemonMessageReporter,
         createServices: (JpsServicesFacadeT, EventManager, Profiler) -> Services,
-        getICReporter: (ServicesFacadeT, CompilationResultsT?, IncrementalCompilationOptions) -> RemoteICReporter
+        getICReporter: (ServicesFacadeT, CompilationResultsT?, IncrementalCompilationOptions) -> RemoteBuildReporter
     ) = kotlin.run {
         val messageCollector = createMessageCollector(servicesFacade, compilationOptions)
         val daemonReporter = createReporter(servicesFacade, compilationOptions)
@@ -514,7 +517,7 @@ abstract class CompileServiceImplBase(
         args: K2JSCompilerArguments,
         incrementalCompilationOptions: IncrementalCompilationOptions,
         compilerMessageCollector: MessageCollector,
-        reporter: RemoteICReporter
+        reporter: RemoteBuildReporter
     ): ExitCode {
         val allKotlinFiles = arrayListOf<File>()
         val freeArgsWithoutKotlinFiles = arrayListOf<String>()
@@ -554,7 +557,7 @@ abstract class CompileServiceImplBase(
         k2jvmArgs: K2JVMCompilerArguments,
         incrementalCompilationOptions: IncrementalCompilationOptions,
         compilerMessageCollector: MessageCollector,
-        reporter: RemoteICReporter
+        reporter: RemoteBuildReporter
     ): ExitCode {
         val allKotlinExtensions = (DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS +
                 (incrementalCompilationOptions.kotlinScriptExtensions ?: emptyArray())).distinct()
@@ -589,6 +592,8 @@ abstract class CompileServiceImplBase(
             }
         }
 
+        val projectRoot = incrementalCompilationOptions.modulesInfo.projectRoot
+
         val compiler = IncrementalJvmCompilerRunner(
             workingDir,
             reporter,
@@ -599,7 +604,7 @@ abstract class CompileServiceImplBase(
             kotlinSourceFilesExtensions = allKotlinExtensions
         )
         return try {
-            compiler.compile(allKotlinFiles, k2jvmArgs, compilerMessageCollector, changedFiles)
+            compiler.compile(allKotlinFiles, k2jvmArgs, compilerMessageCollector, changedFiles, projectRoot)
         } finally {
             reporter.flush()
         }
@@ -782,7 +787,7 @@ class CompileServiceImpl(
         createMessageCollector = ::CompileServicesFacadeMessageCollector,
         createReporter = ::DaemonMessageReporter,
         createServices = this::createCompileServices,
-        getICReporter = { a, b, c -> getICReporter(a, b!!, c)}
+        getICReporter = { a, b, c -> getBuildReporter(a, b!!, c)}
     )
 
     override fun leaseReplSession(
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/BuildReportICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/BuildReportICReporter.kt
index e214850647f..e60c68fdeb0 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/BuildReportICReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/BuildReportICReporter.kt
@@ -8,10 +8,12 @@ package org.jetbrains.kotlin.daemon.report
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.daemon.common.CompilationResultCategory
 import org.jetbrains.kotlin.daemon.common.CompilationResults
-import org.jetbrains.kotlin.incremental.ICReporterBase
+import org.jetbrains.kotlin.build.report.ICReporterBase
+import org.jetbrains.kotlin.build.report.RemoteICReporter
 import java.io.File
-import java.util.HashMap
+import java.util.*
 
+// todo: sync BuildReportICReporterAsync
 internal class BuildReportICReporter(
     private val compilationResults: CompilationResults,
     rootDir: File,
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileIterationICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileIterationICReporter.kt
index fe3bf2d6ba6..dd67aae6e91 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileIterationICReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileIterationICReporter.kt
@@ -9,7 +9,8 @@ import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.daemon.common.CompilationResultCategory
 import org.jetbrains.kotlin.daemon.common.CompilationResults
 import org.jetbrains.kotlin.daemon.common.CompileIterationResult
-import org.jetbrains.kotlin.incremental.ICReporterBase
+import org.jetbrains.kotlin.build.report.ICReporterBase
+import org.jetbrains.kotlin.build.report.RemoteICReporter
 import java.io.File
 
 internal class CompileIterationICReporter(
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompositeICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompositeICReporter.kt
index 0fb458e9bec..89e59dabe87 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompositeICReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompositeICReporter.kt
@@ -5,11 +5,11 @@
 
 package org.jetbrains.kotlin.daemon.report
 
+import org.jetbrains.kotlin.build.report.RemoteICReporter
 import org.jetbrains.kotlin.cli.common.ExitCode
 import java.io.File
 
-internal class CompositeICReporter(private val reporters: Iterable<RemoteICReporter>) :
-    RemoteICReporter {
+internal class CompositeICReporter(private val reporters: Iterable<RemoteICReporter>) : RemoteICReporter {
     override fun report(message: () -> String) {
         reporters.forEach { it.report(message) }
     }
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/DebugMessagesICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/DebugMessagesICReporter.kt
index ef8bc6a4e97..d416cdf3cb5 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/DebugMessagesICReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/DebugMessagesICReporter.kt
@@ -7,7 +7,8 @@ package org.jetbrains.kotlin.daemon.report
 
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.daemon.common.*
-import org.jetbrains.kotlin.incremental.ICReporterBase
+import org.jetbrains.kotlin.build.report.ICReporterBase
+import org.jetbrains.kotlin.build.report.RemoteICReporter
 import java.io.File
 
 internal class DebugMessagesICReporter(
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteBuildMetricsReporterAdapter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteBuildMetricsReporterAdapter.kt
new file mode 100644
index 00000000000..9f248742915
--- /dev/null
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteBuildMetricsReporterAdapter.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.daemon.report
+
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
+import org.jetbrains.kotlin.build.report.metrics.RemoteBuildMetricsReporter
+import org.jetbrains.kotlin.daemon.common.CompilationResultCategory
+import org.jetbrains.kotlin.daemon.common.CompilationResults
+
+class RemoteBuildMetricsReporterAdapter(
+    private val delegate: BuildMetricsReporter,
+    private val shouldReport: Boolean,
+    private val compilationResults: CompilationResults
+) :
+    BuildMetricsReporter by delegate,
+    RemoteBuildMetricsReporter {
+
+    override fun flush() {
+        if (shouldReport) {
+            val metrics = delegate.getMetrics()
+            compilationResults.add(CompilationResultCategory.BUILD_METRICS.code, metrics)
+        }
+    }
+}
\ No newline at end of file
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt
deleted file mode 100644
index 0a10d1141c2..00000000000
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.daemon.report
-
-import org.jetbrains.kotlin.incremental.ICReporter
-
-interface RemoteICReporter : ICReporter {
-    fun flush()
-}
\ No newline at end of file
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/experimental/RemoteICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/experimental/RemoteICReporter.kt
index 7dd3220a1a8..cb7d92e00c5 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/experimental/RemoteICReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/experimental/RemoteICReporter.kt
@@ -5,25 +5,29 @@
 
 package org.jetbrains.kotlin.daemon.report.experimental
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import org.jetbrains.kotlin.build.report.ICReporterBase
+import org.jetbrains.kotlin.build.report.RemoteBuildReporter
+import org.jetbrains.kotlin.build.report.RemoteICReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
+import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter
+import org.jetbrains.kotlin.build.report.metrics.RemoteBuildMetricsReporter
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.daemon.common.*
-import org.jetbrains.kotlin.daemon.report.RemoteICReporter
-import org.jetbrains.kotlin.incremental.ICReporter
-import org.jetbrains.kotlin.incremental.ICReporterBase
+import org.jetbrains.kotlin.daemon.report.CompositeICReporter
 import java.io.File
-import java.io.Serializable
 
 internal class DebugMessagesICReporterAsync(
-        private val servicesFacade: CompilerServicesFacadeBaseAsync,
-        rootDir: File,
-        private val isVerbose: Boolean
+    private val servicesFacade: CompilerServicesFacadeBaseAsync,
+    rootDir: File,
+    private val isVerbose: Boolean
 ) : ICReporterBase(rootDir), RemoteICReporter {
     override fun report(message: () -> String) {
         GlobalScope.async {
             servicesFacade.report(
-                    ReportCategory.IC_MESSAGE,
-                    ReportSeverity.DEBUG, message()
+                ReportCategory.IC_MESSAGE,
+                ReportSeverity.DEBUG, message()
             )
         }
     }
@@ -42,13 +46,13 @@ internal class DebugMessagesICReporterAsync(
 }
 
 internal class CompileIterationICReporterAsync(
-        private val compilationResults: CompilationResultsAsync?
+    private val compilationResults: CompilationResultsAsync?
 ) : ICReporterBase(), RemoteICReporter {
     override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
         GlobalScope.async {
             compilationResults?.add(
-                    CompilationResultCategory.IC_COMPILE_ITERATION.code,
-                    CompileIterationResult(sourceFiles, exitCode.toString())
+                CompilationResultCategory.IC_COMPILE_ITERATION.code,
+                CompileIterationResult(sourceFiles, exitCode.toString())
             )
         }
     }
@@ -64,9 +68,9 @@ internal class CompileIterationICReporterAsync(
 }
 
 internal class BuildReportICReporterAsync(
-        private val compilationResults: CompilationResultsAsync?,
-        rootDir: File,
-        private val isVerbose: Boolean = false
+    private val compilationResults: CompilationResultsAsync?,
+    rootDir: File,
+    private val isVerbose: Boolean = false
 ) : ICReporterBase(rootDir), RemoteICReporter {
     private val icLogLines = arrayListOf<String>()
     private val recompilationReason = HashMap<File, String>()
@@ -103,42 +107,11 @@ internal class BuildReportICReporterAsync(
     }
 }
 
-internal class CompositeICReporterAsync(private val reporters: Iterable<RemoteICReporter>) :
-    RemoteICReporter {
-    override fun report(message: () -> String) {
-        reporters.forEach { it.report(message) }
-    }
-
-    override fun reportVerbose(message: () -> String) {
-        reporters.forEach { it.reportVerbose(message) }
-    }
-
-    override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
-        reporters.forEach { it.reportCompileIteration(incremental, sourceFiles, exitCode) }
-    }
-
-    override fun reportMarkDirtyClass(affectedFiles: Iterable<File>, classFqName: String) {
-        reporters.forEach { it.reportMarkDirtyClass(affectedFiles, classFqName) }
-    }
-
-    override fun reportMarkDirtyMember(affectedFiles: Iterable<File>, scope: String, name: String) {
-        reporters.forEach { it.reportMarkDirtyMember(affectedFiles, scope, name) }
-    }
-
-    override fun reportMarkDirty(affectedFiles: Iterable<File>, reason: String) {
-        reporters.forEach { it.reportMarkDirty(affectedFiles, reason) }
-    }
-
-    override fun flush() {
-        reporters.forEach { it.flush() }
-    }
-}
-
 fun getICReporterAsync(
-        servicesFacade: CompilerServicesFacadeBaseAsync,
-        compilationResults: CompilationResultsAsync?,
-        compilationOptions: IncrementalCompilationOptions
-): RemoteICReporter {
+    servicesFacade: CompilerServicesFacadeBaseAsync,
+    compilationResults: CompilationResultsAsync?,
+    compilationOptions: IncrementalCompilationOptions
+): RemoteBuildReporter {
     val root = compilationOptions.modulesInfo.projectRoot
     val reporters = ArrayList<RemoteICReporter>()
 
@@ -148,23 +121,32 @@ fun getICReporterAsync(
     }
 
     val requestedResults = compilationOptions
-            .requestedCompilationResults
-            .mapNotNullTo(HashSet()) { resultCode ->
-                CompilationResultCategory.values().getOrNull(resultCode)
-            }
-    requestedResults.mapTo(reporters) { requestedResult ->
+        .requestedCompilationResults
+        .mapNotNullTo(HashSet()) { resultCode ->
+            CompilationResultCategory.values().getOrNull(resultCode)
+        }
+    for (requestedResult in requestedResults) {
         when (requestedResult) {
             CompilationResultCategory.IC_COMPILE_ITERATION -> {
-                CompileIterationICReporterAsync(compilationResults)
+                reporters.add(CompileIterationICReporterAsync(compilationResults))
             }
             CompilationResultCategory.BUILD_REPORT_LINES -> {
-                BuildReportICReporterAsync(compilationResults, root)
+                reporters.add(BuildReportICReporterAsync(compilationResults, root))
             }
             CompilationResultCategory.VERBOSE_BUILD_REPORT_LINES -> {
-                BuildReportICReporterAsync(compilationResults, root, isVerbose = true)
+                reporters.add(BuildReportICReporterAsync(compilationResults, root, isVerbose = true))
+            }
+            CompilationResultCategory.BUILD_METRICS -> {
             }
         }
     }
 
-    return CompositeICReporterAsync(reporters)
-}
\ No newline at end of file
+    val icReporter = CompositeICReporter(reporters)
+    val metricsReporter = DoNothingRemoteBuildMetricsReporter
+    return RemoteBuildReporter(icReporter, metricsReporter)
+}
+
+object DoNothingRemoteBuildMetricsReporter : BuildMetricsReporter by DoNothingBuildMetricsReporter, RemoteBuildMetricsReporter {
+    override fun flush() {
+    }
+}
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/getICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/getICReporter.kt
index 02292783073..8476d7818b3 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/getICReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/getICReporter.kt
@@ -16,15 +16,18 @@
 
 package org.jetbrains.kotlin.daemon.report
 
+import org.jetbrains.kotlin.build.report.RemoteBuildReporter
+import org.jetbrains.kotlin.build.report.RemoteICReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporterImpl
+import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter
 import org.jetbrains.kotlin.daemon.common.*
-import java.io.File
 import java.util.*
 
-fun getICReporter(
+fun getBuildReporter(
     servicesFacade: CompilerServicesFacadeBase,
     compilationResults: CompilationResults,
     compilationOptions: IncrementalCompilationOptions
-): RemoteICReporter {
+): RemoteBuildReporter {
     val root = compilationOptions.modulesInfo.projectRoot
     val reporters = ArrayList<RemoteICReporter>()
 
@@ -38,21 +41,25 @@ fun getICReporter(
         .mapNotNullTo(HashSet()) { resultCode ->
             CompilationResultCategory.values().getOrNull(resultCode)
         }
-    requestedResults.mapTo(reporters) { requestedResult ->
+    for (requestedResult in requestedResults) {
         when (requestedResult) {
             CompilationResultCategory.IC_COMPILE_ITERATION -> {
-                CompileIterationICReporter(compilationResults)
+                reporters.add(CompileIterationICReporter(compilationResults))
             }
             CompilationResultCategory.BUILD_REPORT_LINES -> {
-                BuildReportICReporter(compilationResults, root)
+                reporters.add(BuildReportICReporter(compilationResults, root))
             }
             CompilationResultCategory.VERBOSE_BUILD_REPORT_LINES -> {
-                BuildReportICReporter(compilationResults, root, isVerbose = true)
+                reporters.add(BuildReportICReporter(compilationResults, root, isVerbose = true))
+            }
+            CompilationResultCategory.BUILD_METRICS -> {
             }
         }
     }
+    val areBuildMetricsNeeded = CompilationResultCategory.BUILD_METRICS in requestedResults
+    val metricsReporter =
+        (if (areBuildMetricsNeeded) BuildMetricsReporterImpl() else DoNothingBuildMetricsReporter)
+            .let { RemoteBuildMetricsReporterAdapter(it, areBuildMetricsNeeded, compilationResults) }
 
-    return CompositeICReporter(reporters)
+    return RemoteBuildReporter(CompositeICReporter(reporters), metricsReporter)
 }
-
-
diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts
index 7134dd4ce17..1dfff8ea7b3 100644
--- a/compiler/fir/analysis-tests/build.gradle.kts
+++ b/compiler/fir/analysis-tests/build.gradle.kts
@@ -25,10 +25,8 @@ dependencies {
     testRuntime(project(":kotlin-reflect"))
     testRuntime(project(":core:descriptors.runtime"))
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-        testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt b/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt
index bd04691f1f4..6ae2c2fa494 100644
--- a/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt
+++ b/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt
@@ -1,5 +1,5 @@
 public/*package*/ open class ArraysUtilJVM : R|kotlin/Any| {
-    public/*package*/ open static fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> asList(p0: ):
+    public/*package*/ open static fun <T : R|ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!|> asList(p0: ):
 
     public/*package*/ constructor(): R|kotlin/collections/ArraysUtilJVM|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt
index 8ce65f344fe..161025c1fc1 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt
@@ -3,9 +3,9 @@
 
 }
 public open class NonNullNever : R|kotlin/Any| {
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String?|
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open field field: R|@FlexibleNullability kotlin/String?|
 
-    @R|MyNullable|() public open fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String?|, @R|MyNullable|() y: R|kotlin/CharSequence?|): R|kotlin/String?|
+    @R|MyNullable|() public open fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|@FlexibleNullability kotlin/String?|, @R|MyNullable|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|@FlexibleNullability kotlin/String?|
 
     public constructor(): R|NonNullNever|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/Simple.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/Simple.fir.txt
index d0d677fb61b..4d457f18346 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/Simple.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/Simple.fir.txt
@@ -1,9 +1,9 @@
 public open class Simple : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
+    @R|javax/annotation/Nullable|() public open field field: R|@FlexibleNullability kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String?|
+    @R|javax/annotation/Nullable|() public open fun foo(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|@FlexibleNullability kotlin/String?|
 
-    @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
     public constructor(): R|Simple|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt
index 3d41c1703cd..8488d8a9c4c 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt
@@ -1,9 +1,9 @@
 public open class Strange : R|kotlin/Any| {
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<kotlin/String, kotlin/String?>!|
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence?|): R|kotlin/String?|
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|@FlexibleNullability kotlin/CharSequence?|): R|@FlexibleNullability kotlin/String?|
 
-    @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
     public constructor(): R|Strange|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
index 9df2309bf85..ad6909b7480 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
@@ -1,11 +1,11 @@
 @R|FieldsAreNullable|() public open class A : R|kotlin/Any| {
-    public open field field: R|kotlin/String?|
+    public open field field: R|@FlexibleNullability kotlin/String?|
 
-    @R|javax/annotation/Nonnull|() public open field nonNullField: R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open field nonNullField: R|@EnhancedNullability kotlin/String|
 
-    public open fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun foo(q: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
index 678b989dda3..f62cdd4dae6 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
@@ -1,7 +1,7 @@
 @R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
-    public open fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String|
+    public open fun foo(x: R|@FlexibleNullability kotlin/String|, @R|spr/Nullable|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|@FlexibleNullability kotlin/String|
 
-    @R|spr/ForceFlexibility|() public open fun bar(x: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>!|
+    @R|spr/ForceFlexibility|() public open fun bar(x: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
index d7cb91761aa..7baebbc698e 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
@@ -1,23 +1,23 @@
 @R|spr/NonNullApi|() public open class A : R|kotlin/Any|, R|B| {
-    @R|spr/ForceFlexibility|() public open fun foo(x: R|kotlin/String|): R|kotlin/Unit|
+    @R|spr/ForceFlexibility|() public open fun foo(x: R|@FlexibleNullability kotlin/String|): R|kotlin/Unit|
 
-    public open fun bar(@R|spr/ForceFlexibility|() x: R|kotlin/String|): R|kotlin/Unit|
+    public open fun bar(@R|spr/ForceFlexibility|() x: R|@FlexibleNullability kotlin/String|): R|kotlin/Unit|
 
-    public open fun baz(@R|spr/UnknownNullability|() x: R|kotlin/String|): R|kotlin/Unit|
+    public open fun baz(@R|spr/UnknownNullability|() x: R|@FlexibleNullability kotlin/String|): R|kotlin/Unit|
 
-    public open fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
 }
 public abstract interface B : R|kotlin/Any| {
-    public abstract fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
+    public abstract fun foo(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
 
-    public abstract fun bar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
+    public abstract fun bar(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
 
-    public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
+    public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
 
-    public abstract fun foobar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
+    public abstract fun foobar(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
 
 }
 @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|kotlin/Annotation| {
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
index 04d67d4e2f8..64945db905e 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
@@ -1,55 +1,55 @@
 @R|NonNullApi|() public open class A : R|kotlin/Any| {
-    public open fun foo1(x: R|kotlin/String|): R|kotlin/String|
+    public open fun foo1(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
-    public open fun foo2(x: R|kotlin/String|): R|kotlin/String|
+    public open fun foo2(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
-    public open fun foo3(x: R|kotlin/String|): R|kotlin/String|
+    public open fun foo3(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
-    @R|javax/annotation/Nullable|() public open fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
+    @R|javax/annotation/Nullable|() public open fun bar1(@R|javax/annotation/Nullable|() x: R|@FlexibleNullability kotlin/String?|): R|@FlexibleNullability kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
+    @R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|@FlexibleNullability kotlin/String?|): R|@FlexibleNullability kotlin/String?|
 
-    public open fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
+    public open fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
     public constructor(): R|A|
 
 }
 @R|NonNullApi|() public abstract interface AInt : R|kotlin/Any| {
-    public abstract fun foo1(x: R|kotlin/String|): R|kotlin/CharSequence|
+    public abstract fun foo1(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/CharSequence|
 
-    public abstract fun foo2(x: R|kotlin/String|): R|kotlin/CharSequence|
+    public abstract fun foo2(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/CharSequence|
 
-    public abstract fun foo3(x: R|kotlin/String|): R|kotlin/CharSequence|
+    public abstract fun foo3(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/CharSequence|
 
-    @R|javax/annotation/Nullable|() public abstract fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
+    @R|javax/annotation/Nullable|() public abstract fun bar1(@R|javax/annotation/Nullable|() x: R|@FlexibleNullability kotlin/String?|): R|@FlexibleNullability kotlin/CharSequence?|
 
-    @R|javax/annotation/Nullable|() public abstract fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
+    @R|javax/annotation/Nullable|() public abstract fun bar2(@R|javax/annotation/Nullable|() x: R|@FlexibleNullability kotlin/String?|): R|@FlexibleNullability kotlin/CharSequence?|
 
-    public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/CharSequence|
+    public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|@FlexibleNullability kotlin/CharSequence|
 
 }
 @R|NullableApi|() public open class B : R|A|, R|AInt| {
-    public open fun foo1(x: R|kotlin/String|): R|kotlin/String|
+    public open fun foo1(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
-    @R|javax/annotation/Nonnull|() public open fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open fun foo2(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|@EnhancedNullability kotlin/String|
 
-    public open fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
+    public open fun bar1(x: R|@FlexibleNullability kotlin/String?|): R|@FlexibleNullability kotlin/String?|
 
-    public open fun baz(x: R|kotlin/String|): R|kotlin/String|
+    public open fun baz(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
     public constructor(): R|B|
 
 }
 @R|NonNullApi|() public open class C : R|A|, R|AInt| {
-    public open fun foo1(x: R|kotlin/String|): R|kotlin/String|
+    public open fun foo1(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
-    public open fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
+    public open fun foo2(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
-    public open fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
+    public open fun bar1(x: R|@FlexibleNullability kotlin/String?|): R|@FlexibleNullability kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
+    @R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|@FlexibleNullability kotlin/String?|): R|@FlexibleNullability kotlin/String?|
 
-    public open fun baz(x: R|kotlin/String|): R|kotlin/String|
+    public open fun baz(x: R|@FlexibleNullability kotlin/String|): R|@FlexibleNullability kotlin/String|
 
     public constructor(): R|C|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
index 82219eb5895..5b850fc9c7c 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
@@ -1,13 +1,13 @@
 @R|NonNullApi|() public open class A : R|kotlin/Any| {
-    public open field field: R|kotlin/String|
+    public open field field: R|@FlexibleNullability kotlin/String|
 
-    public open fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String|
+    public open fun foo(x: R|@FlexibleNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|@FlexibleNullability kotlin/String|
 
-    @R|NullableApi|() public open fun foobar(x: R|kotlin/String?|, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String?|
+    @R|NullableApi|() public open fun foobar(x: R|@FlexibleNullability kotlin/String?|, @R|NonNullApi|() y: R|@FlexibleNullability kotlin/CharSequence|): R|@FlexibleNullability kotlin/String?|
 
-    public open fun bar(): R|kotlin/String|
+    public open fun bar(): R|@FlexibleNullability kotlin/String|
 
-    @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
+    @R|javax/annotation/Nullable|() public open fun baz(): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
index 5c8964984e6..c5f7d7e6690 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
@@ -1,9 +1,9 @@
 @R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
+    @R|javax/annotation/Nullable|() public open field field: R|@FlexibleNullability kotlin/String?|
 
-    public open fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun foo(q: R|@FlexibleNullability kotlin/String|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
index 69e4ed575dc..7d4ed3a7e23 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
@@ -1,19 +1,19 @@
 public open class A : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
+    @R|javax/annotation/Nullable|() public open field field: R|@FlexibleNullability kotlin/String?|
 
-    public open fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun foo(q: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
     public constructor(): R|test/A|
 
 }
 public open class A2 : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
+    @R|javax/annotation/Nullable|() public open field field: R|@FlexibleNullability kotlin/String?|
 
-    public open fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun foo(q: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
     public constructor(): R|test2/A2|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
index 7b90385c6e7..5568d4bb56f 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
@@ -1,11 +1,11 @@
 @R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
-    public open field field: R|ft<kotlin/String, kotlin/String?>!|
+    public open field field: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    public open fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String|
+    public open fun foo(x: R|@FlexibleNullability kotlin/String|, @R|spr/Nullable|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|@FlexibleNullability kotlin/String|
 
-    public open fun bar(): R|kotlin/String|
+    public open fun bar(): R|@FlexibleNullability kotlin/String|
 
-    @R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
+    @R|spr/Nullable|() public open fun baz(): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
index 22dddd0a533..cbf1eb777ed 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
@@ -1,11 +1,11 @@
 public open class A : R|kotlin/Any| {
-    public open field field: R|ft<kotlin/String, kotlin/String?>!|
+    public open field field: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    public open fun foo(x: R|ft<kotlin/String, kotlin/String?>!|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun foo(x: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|spr/Nullable|() y: R|@FlexibleNullability kotlin/CharSequence?|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    public open fun bar(): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun bar(): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    @R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
+    @R|spr/Nullable|() public open fun baz(): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|test/A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt
index be553283c51..e998133e4e1 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt
@@ -1,4 +1,4 @@
-public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>| {
+public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>| {
     public constructor(): R|AbstractMap|
 
 }
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
index 4aa3a27d177..330f35301ef 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
@@ -1,17 +1,17 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<Signs, Signs?>!| = R|/Signs.HELLO|): R|ft<Signs, Signs?>!|
+    public open fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<@FlexibleNullability Signs, Signs?>!| = R|/Signs.HELLO|): R|ft<@FlexibleNullability Signs, Signs?>!|
 
-    public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<Signs, Signs?>!| = R|/Signs.X|): R|ft<Signs, Signs?>!|
+    public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<@FlexibleNullability Signs, Signs?>!| = R|/Signs.X|): R|ft<@FlexibleNullability Signs, Signs?>!|
 
-    public open fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Signs, Signs?>!|): R|ft<Signs, Signs?>!|
+    public open fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<@FlexibleNullability Signs, Signs?>!|): R|ft<@FlexibleNullability Signs, Signs?>!|
 
-    public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>!| = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>!|
+    public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<@FlexibleNullability Mixed, Mixed?>!| = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<@FlexibleNullability Mixed, Mixed?>!|
 
     public/*package*/ constructor(): R|A|
 
 }
-public final enum class Mixed : R|kotlin/Enum<ft<Mixed, Mixed?>!>| {
-    public final static enum entry NOT_ENTRY_EITHER: R|Mixed|
+public final enum class Mixed : R|kotlin/Enum<ft<@FlexibleNullability Mixed, Mixed?>!>| {
+    public final static enum entry NOT_ENTRY_EITHER: R|@FlexibleNullability Mixed|
     public final static fun values(): R|kotlin/Array<Mixed>| {
     }
 
@@ -19,10 +19,10 @@ public final enum class Mixed : R|kotlin/Enum<ft<Mixed, Mixed?>!>| {
     }
 
 }
-public final enum class Signs : R|kotlin/Enum<ft<Signs, Signs?>!>| {
-    public final static enum entry HELLO: R|Signs|
-    public final static enum entry WORLD: R|Signs|
-    public final static field X: R|ft<Signs, Signs?>!|
+public final enum class Signs : R|kotlin/Enum<ft<@FlexibleNullability Signs, Signs?>!>| {
+    public final static enum entry HELLO: R|@FlexibleNullability Signs|
+    public final static enum entry WORLD: R|@FlexibleNullability Signs|
+    public final static field X: R|ft<@FlexibleNullability Signs, Signs?>!|
 
     public final static fun values(): R|kotlin/Array<Signs>| {
     }
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
index dc92ec4082f..c1955e3f730 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
@@ -1,23 +1,23 @@
 public open class A : R|kotlin/Any| {
-    public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(31)): R|kotlin/Unit|
+    public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<@FlexibleNullability kotlin/Long, kotlin/Long?>!| = Long(31)): R|kotlin/Unit|
 
-    public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(31)): R|kotlin/Unit|
+    public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<@FlexibleNullability kotlin/Long, kotlin/Long?>!| = Long(31)): R|kotlin/Unit|
 
-    public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(10)): R|kotlin/Unit|
+    public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft<@FlexibleNullability kotlin/Long, kotlin/Long?>!| = Long(10)): R|kotlin/Unit|
 
-    public open fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(10)): R|kotlin/Unit|
+    public open fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<@FlexibleNullability kotlin/Long, kotlin/Long?>!| = Long(10)): R|kotlin/Unit|
 
     public constructor(): R|A|
 
 }
 public open class B : R|kotlin/Any| {
-    public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
+    public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<@FlexibleNullability kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
+    public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<@FlexibleNullability kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
+    public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft<@FlexibleNullability kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
+    public open fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<@FlexibleNullability kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
     public constructor(): R|B|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
index 1243895032e..dabe74a9ee5 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
+    public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
     public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit|
 
@@ -7,7 +7,7 @@ public open class A : R|kotlin/Any| {
 
 }
 public open class B<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>!| = Null(null)): R|kotlin/Unit|
+    public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<@FlexibleNullability T, T?>!| = Null(null)): R|kotlin/Unit|
 
     public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|B<T>|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
index 1bf73e44a09..e9f356b4f8c 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
@@ -1,27 +1,27 @@
 public open class A : R|kotlin/Any| {
-    public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
+    public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
+    public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
+    public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
+    public open fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
     public constructor(): R|A|
 
 }
 public abstract interface AInt : R|kotlin/Any| {
-    public abstract fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
+    public abstract fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
-    public abstract fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
+    public abstract fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
 }
 public open class B : R|A| {
-    public open fun foo(i: R|ft<kotlin/Int, kotlin/Int?>!|): R|kotlin/Unit|
+    public open fun foo(i: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|): R|kotlin/Unit|
 
-    public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
+    public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
-    public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
+    public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
     public constructor(): R|B|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
index b06d35c2685..f7075d724e5 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
@@ -1,13 +1,13 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<kotlin/String, kotlin/String?>!| = String(hello)): R|kotlin/Unit|
+    public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(hello)): R|kotlin/Unit|
 
-    public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>!| = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<kotlin/String, kotlin/String?>!| = String(second)): R|kotlin/Unit|
+    public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(second)): R|kotlin/Unit|
 
-    public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>!| = String(first), b: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(first), b: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open fun fourth(first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft<kotlin/String, kotlin/String?>!| = String(second)): R|kotlin/Unit|
+    public open fun fourth(first: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(second)): R|kotlin/Unit|
 
-    public open fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>!|): R|kotlin/Unit|
+    public open fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
index df83a692002..950fee2ec14 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
@@ -1,9 +1,9 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
+    public open fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
 
-    public open fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
index 06ce0ed7930..5b1de90168c 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
+    public open fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
index e56ddaf0148..8496ac8c6e7 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
index c71fc3e0e10..7bbbe502442 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
@@ -1,7 +1,7 @@
 public open class A : R|kotlin/Any| {
-    public open fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
index d35168c69a1..4b39e431056 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
@@ -1,5 +1,5 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open static fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>!| = String(OK)): R|ft<kotlin/String, kotlin/String?>!|
+    public open static fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(OK)): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public/*package*/ constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt b/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt
index 99c24ccda3c..d11a97c7a6e 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt
+++ b/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt
@@ -37,31 +37,31 @@ FILE: CanBeValChecker.kt
     }
     public final fun destructuringDeclaration(): R|kotlin/Unit| {
         lval <destruct>: R|kotlin/Pair<kotlin/Int, kotlin/String>| = R|/getPair|()
-        lvar v1: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
-        lvar v2: R|kotlin/String| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component2: R|kotlin/String|>|()
+        lvar v1: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
+        lvar v2: R|kotlin/String| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component2: R|kotlin/String|>|()
         R|kotlin/io/print|(R|<local>/v1|)
         lval <destruct>: R|kotlin/Pair<kotlin/Int, kotlin/String>| = R|/getPair|()
-        lvar v3: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
-        lvar v4: R|kotlin/String| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component2: R|kotlin/String|>|()
+        lvar v3: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
+        lvar v4: R|kotlin/String| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component2: R|kotlin/String|>|()
         R|kotlin/io/print|(R|<local>/v3|)
         R|<local>/v4| = String()
         lval <destruct>: R|kotlin/Pair<kotlin/Int, kotlin/String>| = R|/getPair|()
-        lvar v5: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
-        lvar v6: R|kotlin/String| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component2: R|kotlin/String|>|()
+        lvar v5: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
+        lvar v6: R|kotlin/String| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component2: R|kotlin/String|>|()
         R|<local>/v5| = Int(1)
         lval <destruct>: R|kotlin/Pair<kotlin/Int, kotlin/String>| = R|/getPair|()
-        lvar v7: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
-        lvar v8: R|kotlin/String| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component2: R|kotlin/String|>|()
+        lvar v7: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
+        lvar v8: R|kotlin/String| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component2: R|kotlin/String|>|()
         R|<local>/v7| = Int(2)
         R|<local>/v8| = String(42)
         lval <destruct>: R|kotlin/Triple<kotlin/Int, kotlin/Int, kotlin/Int>| = R|kotlin/Triple.Triple|<R|kotlin/Int|, R|kotlin/Int|, R|kotlin/Int|>(Int(1), Int(1), Int(1))
-        lval a: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Triple.component1: R|kotlin/Int|>|()
-        lval b: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Triple.component2: R|kotlin/Int|>|()
-        lval c: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Triple.component3: R|kotlin/Int|>|()
+        lval a: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Triple.component1: R|kotlin/Int|>|()
+        lval b: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Triple.component2: R|kotlin/Int|>|()
+        lval c: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Triple.component3: R|kotlin/Int|>|()
         lval <destruct>: R|kotlin/Triple<kotlin/Int, kotlin/Int, kotlin/Int>| = R|kotlin/Triple.Triple|<R|kotlin/Int|, R|kotlin/Int|, R|kotlin/Int|>(Int(1), Int(1), Int(1))
-        lvar x: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Triple.component1: R|kotlin/Int|>|()
-        lvar y: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Triple.component2: R|kotlin/Int|>|()
-        lvar z: R|kotlin/Int| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Triple.component3: R|kotlin/Int|>|()
+        lvar x: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Triple.component1: R|kotlin/Int|>|()
+        lvar y: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Triple.component2: R|kotlin/Int|>|()
+        lvar z: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Triple.component3: R|kotlin/Int|>|()
     }
     public final fun stackOverflowBug(): R|kotlin/Unit| {
         lvar a: R|kotlin/Int|
@@ -169,7 +169,7 @@ FILE: CanBeValChecker.kt
         lval unused: R|kotlin/Int| = Int(0)
         when () {
             ==(R|<local>/args|.R|kotlin/Array.size|, Int(1)) ->  {
-                R|<local>/a| = R|<local>/args|.R|FakeOverride<kotlin/Array.get: R|kotlin/String?|>|(Int(0))
+                R|<local>/a| = R|<local>/args|.R|SubstitutionOverride<kotlin/Array.get: R|kotlin/String?|>|(Int(0))
             }
             else ->  {
                 R|<local>/a| = R|<local>/args|.R|kotlin/Any.toString|()
@@ -184,7 +184,7 @@ FILE: CanBeValChecker.kt
 
     }
     public final fun run(f: R|() -> kotlin/Unit|): R|kotlin/Unit| {
-        ^run R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        ^run R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun lambda(): R|kotlin/Unit| {
         lvar a: R|kotlin/Int|
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt
index 2aefb692f05..ede0c8c0e4e 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt
+++ b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt
@@ -55,7 +55,7 @@ FILE: RedundantReturnUnitTypeChecker.kt
         }
 
         public final fun <T> run(f: R|() -> T|): R|T| {
-            ^run R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()
+            ^run R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()
         }
 
         public final fun foo(): R|kotlin/Unit| {
@@ -70,7 +70,7 @@ FILE: RedundantReturnUnitTypeChecker.kt
         }
 
         public final fun call(f: R|() -> kotlin/Unit|): R|kotlin/Unit| {
-            ^call R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            ^call R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
         }
 
         public final fun boo(): R|kotlin/Unit| {
@@ -84,7 +84,7 @@ FILE: RedundantReturnUnitTypeChecker.kt
         }
 
         public final fun <T, R> R|T|.let(f: R|(T) -> R|): R|R| {
-            ^let R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|R|>|(this@R|/B.let|)
+            ^let R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|R|>|(this@R|/B.let|)
         }
 
         public final fun goo(): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.txt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.txt
index 17162b3a946..33f8dbee0aa 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.txt
+++ b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.txt
@@ -20,11 +20,11 @@ FILE: RedundantSingleExpressionStringTemplateChecker.kt
             public get(): R|ProductGroup?|
 
         public final val name: R|kotlin/String| = when () {
-            ==(R|<local>/parent|, Null(null)) ->  {
-                R|<local>/short_name|
+            ==(this@R|/ProductGroup|.R|/ProductGroup.parent|, Null(null)) ->  {
+                this@R|/ProductGroup|.R|/ProductGroup.short_name|
             }
             else ->  {
-                <strcat>(R|<local>/parent|.R|/ProductGroup.name|.R|kotlin/Any.toString|(), String( ), R|<local>/short_name|.R|kotlin/Any.toString|())
+                <strcat>(this@R|/ProductGroup|.R|/ProductGroup.parent|.R|/ProductGroup.name|.R|kotlin/Any.toString|(), String( ), this@R|/ProductGroup|.R|/ProductGroup.short_name|.R|kotlin/Any.toString|())
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.txt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.txt
index 9ad108acef4..c298e4ac41a 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.txt
+++ b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.txt
@@ -1,6 +1,6 @@
 FILE: flexibleTypeBug.kt
     public final fun foo(): R|kotlin/Unit| {
-        lvar list1: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!| = Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|ft<kotlin/String, kotlin/String?>!|>()
+        lvar list1: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!| = Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|ft<kotlin/String, kotlin/String?>!|>()
         lval list2: R|kotlin/collections/List<kotlin/String>| = R|kotlin/collections/listOf|<R|kotlin/String|>(String(b))
         R|<local>/list1| = R|<local>/list1|.R|kotlin/collections/plus|<R|ft<kotlin/String, kotlin/String?>!|>(R|<local>/list2|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt
index 7c42da7e6a0..3dea6735b4a 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt
@@ -3,5 +3,5 @@ FILE: extensionLambdaInDefaultArgument.kt
         ^ this@R|special/anonymous|.R|kotlin/String.length|
     }
     ): R|kotlin/Int| {
-        ^test R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(String())
+        ^test R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(String())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt
index 706ab6d2439..cc8dc269bc0 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt
@@ -1,6 +1,6 @@
 FILE: tryInLambda.kt
     public final fun <T> myRun(block: R|() -> T|): R|T| {
-        ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()
+        ^myRun R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()
     }
     public final fun foo(): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt
index cdfb6761a7b..c97776166dc 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt
@@ -45,11 +45,11 @@ FILE: arraySet.kt
 
     }
     public final fun test_1(a: R|A<B>|): R|kotlin/Unit| {
-        R|<local>/a|.R|FakeOverride</A.set: R|kotlin/Unit|>|(Int(0), R|/B.B|())
+        R|<local>/a|.R|SubstitutionOverride</A.set: R|kotlin/Unit|>|(Int(0), R|/B.B|())
     }
     public final fun test_2(a: R|A<C>|): R|kotlin/Unit| {
-        R|<local>/a|.R|FakeOverride</A.set: R|kotlin/Unit|>|(Int(0), R|/C.C|())
+        R|<local>/a|.R|SubstitutionOverride</A.set: R|kotlin/Unit|>|(Int(0), R|/C.C|())
     }
     public final fun test_3(a: R|A<D>|): R|kotlin/Unit| {
-        R|<local>/a|.R|FakeOverride</A.set: R|kotlin/Unit|>|(Int(0), R|/D.D|())
+        R|<local>/a|.R|SubstitutionOverride</A.set: R|kotlin/Unit|>|(Int(0), R|/D.D|())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt
index 12e34b5f38f..63d6038e171 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt
@@ -45,18 +45,18 @@ FILE: arraySetWithOperation.kt
 
     }
     public final fun test_1(a: R|A<B>|): R|kotlin/Unit| {
-        R|<local>/a|.R|FakeOverride</A.get: R|B|>|(Int(0)).R|/B.plusAssign|(R|/B.B|())
+        R|<local>/a|.R|SubstitutionOverride</A.get: R|B|>|(Int(0)).R|/B.plusAssign|(R|/B.B|())
     }
     public final fun test_2(a: R|A<C>|): R|kotlin/Unit| {
          {
             lval <<array>>: R|A<C>| = R|<local>/a|
             lval <<index_0>>: R|kotlin/Int| = Int(0)
-            R|<local>/<<array>>|.R|FakeOverride</A.set: R|kotlin/Unit|>|(R|<local>/<<index_0>>|, R|<local>/<<array>>|.R|FakeOverride</A.get: R|C|>|(R|<local>/<<index_0>>|).R|/C.plus|(R|/C.C|()))
+            R|<local>/<<array>>|.R|SubstitutionOverride</A.set: R|kotlin/Unit|>|(R|<local>/<<index_0>>|, R|<local>/<<array>>|.R|SubstitutionOverride</A.get: R|C|>|(R|<local>/<<index_0>>|).R|/C.plus|(R|/C.C|()))
         }
 
     }
     public final fun test_3(a: R|A<D>|): R|kotlin/Unit| {
-        ArraySet:[R|<local>/a|.R|FakeOverride</A.get: R|D|>|(Int(0)).R|/D.plusAssign|(R|/D.D|())]
+        ArraySet:[R|<local>/a|.R|SubstitutionOverride</A.get: R|D|>|(Int(0)).R|/D.plusAssign|(R|/D.D|())]
     }
     public final fun test_4(b: R|B|): R|kotlin/Unit| {
         ArraySet:[R|<local>/b|.<Unresolved name: get>#(Int(0)).<Unresolved name: plusAssign>#(R|/B.B|())]
diff --git a/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt b/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt
index ff938aa3861..bafd0824c34 100644
--- a/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt
@@ -8,17 +8,17 @@ FILE: bareTypes.kt
     public abstract interface MutableString : R|MutableA<kotlin/String>| {
     }
     public final fun test(a: R|A<kotlin/String>|): R|kotlin/Unit| {
-        (R|<local>/a| as? R|MutableA<kotlin/String>|)?.{ $subj$.R|FakeOverride</MutableA.add: R|kotlin/Unit|>|(String()) }
-        (R|<local>/a| as R|MutableA<kotlin/String>|).R|FakeOverride</MutableA.add: R|kotlin/Unit|>|(String())
+        (R|<local>/a| as? R|MutableA<kotlin/String>|)?.{ $subj$.R|SubstitutionOverride</MutableA.add: R|kotlin/Unit|>|(String()) }
+        (R|<local>/a| as R|MutableA<kotlin/String>|).R|SubstitutionOverride</MutableA.add: R|kotlin/Unit|>|(String())
     }
     public final fun test2(a: R|A<kotlin/String>|): R|kotlin/Unit| {
         lval b: R|MutableString| = (R|<local>/a| as R|MutableString|)
-        R|<local>/b|.R|FakeOverride</MutableString.add: R|kotlin/Unit|>|(String())
+        R|<local>/b|.R|SubstitutionOverride</MutableString.add: R|kotlin/Unit|>|(String())
     }
     public final fun test3(a: R|A<kotlin/String>|): R|kotlin/Unit| {
         when () {
             (R|<local>/a| is R|MutableA<kotlin/String>|) ->  {
-                R|<local>/a|.R|FakeOverride</MutableA.add: R|kotlin/Unit|>|(String())
+                R|<local>/a|.R|SubstitutionOverride</MutableA.add: R|kotlin/Unit|>|(String())
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt
index 0b651079380..d474407501f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt
@@ -2,8 +2,8 @@ FILE: extensionInvokeAfterSafeCall.kt
     public abstract interface A : R|kotlin/Any| {
     }
     public final fun test_1(a: R|A?|, convert: R|A.() -> kotlin/String|): R|kotlin/Unit| {
-        lval s: R|kotlin/String?| = R|<local>/a|?.{ R|<local>/convert|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/String|>|($subj$) }
+        lval s: R|kotlin/String?| = R|<local>/a|?.{ R|<local>/convert|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/String|>|($subj$) }
     }
     public final fun test_2(a: R|A|, convert: R|A.() -> kotlin/String|): R|kotlin/Unit| {
-        lval s: R|kotlin/String| = R|<local>/convert|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/String|>|(R|<local>/a|)
+        lval s: R|kotlin/String| = R|<local>/convert|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/String|>|(R|<local>/a|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt
index ce527faf1de..a5fe0f925bb 100644
--- a/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt
@@ -33,8 +33,8 @@ FILE: invokeWithReceiverAndArgument.kt
         }
 
         public final fun test(func: R|(AbstractBuilderConfigurator.LeafBuilderConfigurationContext<FirTreeBuilder>) -> kotlin/Unit|): R|kotlin/Unit| {
-            lval context: R|AbstractBuilderConfigurator.LeafBuilderConfigurationContext<FirTreeBuilder>| = this@R|/BuilderConfigurator|.R|/AbstractBuilderConfigurator.LeafBuilderConfigurationContext.LeafBuilderConfigurationContext|()
-            R|<local>/func|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/context|)
+            lval context: R|AbstractBuilderConfigurator.LeafBuilderConfigurationContext<FirTreeBuilder>| = this@R|/BuilderConfigurator|.R|SubstitutionOverride</AbstractBuilderConfigurator.LeafBuilderConfigurationContext.LeafBuilderConfigurationContext>|()
+            R|<local>/func|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/context|)
         }
 
     }
@@ -51,9 +51,9 @@ FILE: invokeWithReceiverAndArgument.kt
         }
 
         public final fun foo(x: R|(Outer.Inner<E>) -> kotlin/Unit|, y: R|Outer.Inner<E>.() -> kotlin/Unit|): R|kotlin/Unit| {
-            this@R|/Outer|.R|/Outer.bar|(this@R|/Outer|.R|/Outer.Inner.Inner|())
-            R|<local>/x|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/Outer|.R|/Outer.Inner.Inner|())
-            R|<local>/y|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/Outer|.R|/Outer.Inner.Inner|())
+            this@R|/Outer|.R|/Outer.bar|(this@R|/Outer|.R|SubstitutionOverride</Outer.Inner.Inner>|())
+            R|<local>/x|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/Outer|.R|SubstitutionOverride</Outer.Inner.Inner>|())
+            R|<local>/y|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/Outer|.R|SubstitutionOverride</Outer.Inner.Inner>|())
         }
 
         public final fun bar(i: R|Outer.Inner<E>|): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.kt b/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.kt
new file mode 100644
index 00000000000..543f908a55b
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.kt
@@ -0,0 +1,14 @@
+fun (() -> String).foo() {}
+fun String.foo() {}
+
+fun String.bar() {}
+
+fun main1() {
+    { "" }.foo()
+    "".foo()
+}
+
+fun main2() {
+    { "" }.<!INAPPLICABLE_CANDIDATE!>bar<!>()
+    "".bar()
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.txt
new file mode 100644
index 00000000000..021cd8e6ff4
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.txt
@@ -0,0 +1,21 @@
+FILE: lambdaAsReceiver.kt
+    public final fun R|() -> kotlin/String|.foo(): R|kotlin/Unit| {
+    }
+    public final fun R|kotlin/String|.foo(): R|kotlin/Unit| {
+    }
+    public final fun R|kotlin/String|.bar(): R|kotlin/Unit| {
+    }
+    public final fun main1(): R|kotlin/Unit| {
+        fun <anonymous>(): R|kotlin/String| {
+            ^ String()
+        }
+        .R|/foo|()
+        String().R|/foo|()
+    }
+    public final fun main2(): R|kotlin/Unit| {
+        fun <anonymous>(): R|kotlin/String| {
+            ^ String()
+        }
+        .<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): /bar>#()
+        String().R|/bar|()
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt
index 6857a6129fe..23cb5301cc6 100644
--- a/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt
@@ -2,7 +2,7 @@ FILE: safeCallOnTypeAlias.kt
     public final typealias MyTypeAlias = R|() -> kotlin/String?|
     public final fun foo(x: R|MyTypeAlias|): R|kotlin/Unit| {
         R|<local>/x|?.{ $subj$.R|kotlin/let|<R|() -> kotlin/String?|, R|kotlin/String|>(<L> = let@fun <anonymous>(y: R|() -> kotlin/String?|): R|kotlin/String| <kind=EXACTLY_ONCE>  {
-            ^ R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String?|>|()?.{ $subj$.R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(<L> = let@fun <anonymous>(result: R|kotlin/String|): R|kotlin/String| <kind=EXACTLY_ONCE>  {
+            ^ R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String?|>|()?.{ $subj$.R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(<L> = let@fun <anonymous>(result: R|kotlin/String|): R|kotlin/String| <kind=EXACTLY_ONCE>  {
                 ^ R|/bar|(R|<local>/result|)
             }
             ) }
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt
index 9e7d91a50ef..d8831061cc2 100644
--- a/compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt
@@ -6,14 +6,14 @@ FILE: main.kt
             ^ Int(1)
         }
     public final fun bar(a: R|A|): R|kotlin/Unit| {
-        R|<local>/a|.R|/foo|.R|tests/_checkType/checkType|<R|kotlin/Int|>(checkType@fun R|tests/_checkType/Inv<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/Int|>()
+        R|<local>/a|.R|/foo|.R|/checkType|<R|kotlin/Int|>(checkType@fun R|CheckTypeInv<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/Int|>()
         }
         )
     }
     public final fun R|JavaClass|.bar(a: R|A|): R|kotlin/Unit| {
-        R|<local>/a|.R|/foo|.R|tests/_checkType/checkType|<R|kotlin/Int|>(checkType@fun R|tests/_checkType/Inv<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/Int|>()
+        R|<local>/a|.R|/foo|.R|/checkType|<R|kotlin/Int|>(checkType@fun R|CheckTypeInv<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/Int|>()
         }
         )
     }
@@ -21,13 +21,13 @@ FILE: CHECK_TYPE.kt
     public final fun <T> checkSubtype(t: R|T|): R|T| {
         ^checkSubtype R|<local>/t|
     }
-    public final class Inv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|tests/_checkType/Inv<T>| {
+    public final class CheckTypeInv<T> : R|kotlin/Any| {
+        public constructor<T>(): R|CheckTypeInv<T>| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public final fun <E> R|tests/_checkType/Inv<E>|._(): R|kotlin/Unit| {
+    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
     }
-    public final infix fun <T> R|T|.checkType(f: R|tests/_checkType/Inv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
+    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot
index 022e4c2c93a..fe0c1fe4a1e 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot
@@ -153,13 +153,14 @@ digraph complex_kt {
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {26};
-    26 -> {54 31 27};
+    25 -> {26 31};
+    26 -> {27};
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {38};
-    31 -> {54 32};
+    30 -> {38 31};
+    31 -> {32};
+    31 -> {54}    [label=onUncaughtException];
     32 -> {33};
     33 -> {34};
     34 -> {35};
@@ -191,7 +192,7 @@ digraph complex_kt {
             color=blue
             56 [label="Enter block"];
             57 [label="Access variable this@R|/firstIsInstanceOrNull|"];
-            58 [label="Function call: this@R|/firstIsInstanceOrNull|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<CapturedType(*)>|>|()"];
+            58 [label="Function call: this@R|/firstIsInstanceOrNull|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<CapturedType(*)>|>|()"];
             59 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>|"];
             subgraph cluster_20 {
                 color=blue
@@ -210,7 +211,7 @@ digraph complex_kt {
                         color=blue
                         66 [label="Enter block"];
                         67 [label="Access variable R|<local>/<iterator>|"];
-                        68 [label="Function call: R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()"];
+                        68 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()"];
                         69 [label="Variable declaration: lval element: R|kotlin/Any?|"];
                         subgraph cluster_24 {
                             color=blue
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt
index a2016e5403d..306f1dcf7cc 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt
@@ -25,9 +25,9 @@ FILE: complex.kt
 
     }
     public final inline fun <reified T : R|kotlin/Any|> R|kotlin/collections/List<*>|.firstIsInstanceOrNull(): R|T?| {
-        lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>| = this@R|/firstIsInstanceOrNull|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<CapturedType(*)>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>| = this@R|/firstIsInstanceOrNull|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<CapturedType(*)>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval element: R|kotlin/Any?| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()
+            lval element: R|kotlin/Any?| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()
             when () {
                 (R|<local>/element| is R|T|) ->  {
                     ^firstIsInstanceOrNull R|<local>/element|
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot
index 83866f3eaad..d6567a732ae 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot
@@ -25,8 +25,8 @@ digraph flowFromInplaceLambda_kt {
             5 [label="Enter block"];
             6 [label="Access variable R|<local>/x|"];
             7 [label="Const: Int(0)"];
-            8 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Array.get: R|CapturedType(out K)|>|(...)"];
-            9 [label="Jump: ^select R|<local>/x|.R|FakeOverride<kotlin/Array.get: R|CapturedType(out K)|>|(Int(0))"];
+            8 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Array.get: R|CapturedType(out K)|>|(...)"];
+            9 [label="Jump: ^select R|<local>/x|.R|SubstitutionOverride<kotlin/Array.get: R|CapturedType(out K)|>|(Int(0))"];
             10 [label="Stub" style="filled" fillcolor=gray];
             11 [label="Exit block" style="filled" fillcolor=gray];
         }
@@ -92,8 +92,8 @@ digraph flowFromInplaceLambda_kt {
         subgraph cluster_9 {
             color=blue
             29 [label="Enter block"];
-            30 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
-            31 [label="Jump: ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
+            30 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()"];
+            31 [label="Jump: ^myRun R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()"];
             32 [label="Stub" style="filled" fillcolor=gray];
             33 [label="Exit block" style="filled" fillcolor=gray];
         }
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt
index b32220c0e42..153057e60ca 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt
@@ -2,7 +2,7 @@ FILE: flowFromInplaceLambda.kt
     public final fun takeInt(x: R|kotlin/Int|): R|kotlin/Unit| {
     }
     public final fun <K> select(vararg x: R|kotlin/Array<out K>|): R|K| {
-        ^select R|<local>/x|.R|FakeOverride<kotlin/Array.get: R|CapturedType(out K)|>|(Int(0))
+        ^select R|<local>/x|.R|SubstitutionOverride<kotlin/Array.get: R|CapturedType(out K)|>|(Int(0))
     }
     public final fun <T> id(x: R|T|): R|T| {
         ^id R|<local>/x|
@@ -11,7 +11,7 @@ FILE: flowFromInplaceLambda.kt
         ^materialize Null(null)!!
     }
     public final fun <R> myRun(block: R|() -> R|): R|R| {
-        ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()
+        ^myRun R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()
     }
     public final fun test_1(x: R|kotlin/Any|): R|kotlin/Unit| {
         R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot
index 5ded06dbbe7..e9de33a5a30 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot
@@ -167,8 +167,8 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     }
     37 -> {38};
     38 -> {39};
-    39 -> {40};
-    40 -> {56 47 41};
+    39 -> {40 47};
+    40 -> {41};
     41 -> {42};
     42 -> {57};
     42 -> {43} [color=red];
@@ -176,8 +176,9 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {52};
-    47 -> {56 48};
+    46 -> {52 47};
+    47 -> {48};
+    47 -> {56}    [label=onUncaughtException];
     48 -> {49};
     49 -> {50};
     50 -> {51};
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot
index b47aa41cfbe..eaa243f263c 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot
@@ -358,7 +358,7 @@ digraph jumps_kt {
         subgraph cluster_36 {
             color=blue
             120 [label="Enter block"];
-            121 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            121 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             122 [label="Exit block"];
         }
         123 [label="Exit function run" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt
index 407edd0f5a1..70b306b1ba8 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt
@@ -52,7 +52,7 @@ FILE: jumps.kt
 
     }
     public final inline fun run(block: R|() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test_6(): R|kotlin/Unit| {
         R|/run|(<L> = run@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot
index 57acba80ead..ba85a36cc4b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot
@@ -94,8 +94,8 @@ digraph lambdaAsReturnOfLambda_kt {
         subgraph cluster_10 {
             color=blue
             28 [label="Enter block"];
-            29 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
-            30 [label="Jump: ^run R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
+            29 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()"];
+            30 [label="Jump: ^run R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()"];
             31 [label="Stub" style="filled" fillcolor=gray];
             32 [label="Exit block" style="filled" fillcolor=gray];
         }
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt
index de61711d288..69310a90f05 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt
@@ -10,5 +10,5 @@ FILE: lambdaAsReturnOfLambda.kt
     public final fun bar(s: R|kotlin/String|): R|kotlin/Unit| {
     }
     public final fun <R> run(block: R|() -> R|): R|R| {
-        ^run R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()
+        ^run R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot
index 2d4159aa89d..8c9a84341e4 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot
@@ -9,7 +9,7 @@ digraph lambdas_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter block"];
-            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            2 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             3 [label="Exit block"];
         }
         4 [label="Exit function run" style="filled" fillcolor=red];
@@ -166,7 +166,7 @@ digraph lambdas_kt {
         subgraph cluster_17 {
             color=blue
             54 [label="Enter block"];
-            55 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            55 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             56 [label="Const: Int(1)"];
             57 [label="Jump: ^getInt Int(1)"];
             58 [label="Stub" style="filled" fillcolor=gray];
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt
index d3cd05f2903..602beccfbad 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt
@@ -1,6 +1,6 @@
 FILE: lambdas.kt
     public final inline fun run(block: R|() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test_1(x: R|kotlin/Any?|): R|kotlin/Unit| {
         when () {
@@ -25,7 +25,7 @@ FILE: lambdas.kt
 
     }
     public final inline fun getInt(block: R|() -> kotlin/Unit|): R|kotlin/Int| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
         ^getInt Int(1)
     }
     public final fun test_3(): R|kotlin/Int| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot
index 48c18690863..a74efc7b0e4 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot
@@ -9,8 +9,8 @@ digraph localClassesWithImplicit_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter block"];
-            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
-            3 [label="Jump: ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
+            2 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
+            3 [label="Jump: ^myRun R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
             4 [label="Stub" style="filled" fillcolor=gray];
             5 [label="Exit block" style="filled" fillcolor=gray];
         }
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt
index ff1a208629b..3e229b140ad 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt
@@ -1,6 +1,6 @@
 FILE: localClassesWithImplicit.kt
     public final inline fun <T> myRun(block: R|() -> T|): R|T| {
-        ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()
+        ^myRun R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()
     }
     public final fun test(a: R|kotlin/Any|, b: R|kotlin/Any|): R|kotlin/Unit| {
         when () {
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot
index a83a6c8ea69..3cce0048a67 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot
@@ -9,7 +9,7 @@ digraph propertiesAndInitBlocks_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter block"];
-            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            2 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             3 [label="Exit block"];
         }
         4 [label="Exit function run" style="filled" fillcolor=red];
@@ -246,7 +246,7 @@ digraph propertiesAndInitBlocks_kt {
     28 -> {48 34} [color=green];
     28 -> {48 34} [style=dashed];
     29 -> {30};
-    30 -> {33};
+    30 -> {81};
     30 -> {31} [style=dotted];
     31 -> {32} [style=dotted];
     32 -> {33} [style=dotted];
@@ -308,14 +308,15 @@ digraph propertiesAndInitBlocks_kt {
         102 [label="Exit property" style="filled" fillcolor=red];
     }
     84 -> {85};
-    85 -> {86};
-    86 -> {102 91 87};
-    86 -> {96}    [label=onUncaughtException];
+    85 -> {86 91};
+    85 -> {96}    [label=onUncaughtException];
+    86 -> {87};
     87 -> {88};
     88 -> {89};
     89 -> {90};
-    90 -> {96};
-    91 -> {102 92};
+    90 -> {96 91};
+    91 -> {92};
+    91 -> {96}    [label=onUncaughtException];
     92 -> {93};
     93 -> {94};
     94 -> {95};
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt
index 392deb388ef..6f5c52dafee 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt
@@ -1,6 +1,6 @@
 FILE: propertiesAndInitBlocks.kt
     public final inline fun run(block: R|() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final val x1: R|kotlin/Int| = Int(1)
         public get(): R|kotlin/Int|
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot
index b43fddaad3a..d39a20b3769 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot
@@ -56,20 +56,22 @@ digraph tryCatch_kt {
     }
     0 -> {1};
     1 -> {2};
-    2 -> {3};
-    3 -> {23 15 9 4};
+    2 -> {3 15 9};
+    3 -> {4};
     4 -> {5};
     5 -> {6};
     6 -> {7};
     7 -> {8};
-    8 -> {21};
-    9 -> {23 10};
+    8 -> {21 15 9};
+    9 -> {10};
+    9 -> {23}    [label=onUncaughtException];
     10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {21};
-    15 -> {23 16};
+    15 -> {16};
+    15 -> {23}    [label=onUncaughtException];
     16 -> {17};
     17 -> {18};
     18 -> {19};
@@ -118,13 +120,14 @@ digraph tryCatch_kt {
     }
     24 -> {25};
     25 -> {26};
-    26 -> {27};
-    27 -> {40 32 28};
+    26 -> {27 32};
+    27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {37};
-    32 -> {40 33};
+    31 -> {37 32};
+    32 -> {33};
+    32 -> {40}    [label=onUncaughtException];
     33 -> {34};
     34 -> {35};
     35 -> {36};
@@ -261,8 +264,8 @@ digraph tryCatch_kt {
     46 -> {87} [style=dotted];
     47 -> {48};
     48 -> {49};
-    49 -> {50};
-    50 -> {102 91 81 51};
+    49 -> {50 91 81};
+    50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
@@ -294,8 +297,9 @@ digraph tryCatch_kt {
     77 -> {78} [style=dotted];
     78 -> {79};
     79 -> {80};
-    80 -> {97};
-    81 -> {102 82};
+    80 -> {97 91 81};
+    81 -> {82};
+    81 -> {102}    [label=onUncaughtException];
     82 -> {83};
     83 -> {87};
     83 -> {84} [style=dotted];
@@ -306,7 +310,8 @@ digraph tryCatch_kt {
     88 -> {89};
     89 -> {90};
     90 -> {102};
-    91 -> {102 92};
+    91 -> {92};
+    91 -> {102}    [label=onUncaughtException];
     92 -> {93};
     93 -> {94} [style=dotted];
     93 -> {43} [color=green style=dashed];
diff --git a/compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.kt b/compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.kt
new file mode 100644
index 00000000000..5abbfe98669
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.kt
@@ -0,0 +1,10 @@
+enum class A {
+    X, Y;
+    companion object {
+        fun foo(): Int {
+            return 1
+        }
+    }
+
+    fun foo(): Int = Companion.foo()
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.txt b/compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.txt
new file mode 100644
index 00000000000..85480189a3d
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.txt
@@ -0,0 +1,30 @@
+FILE: companionAccessInEnum.kt
+    public final enum class A : R|kotlin/Enum<A>| {
+        private constructor(): R|A| {
+            super<R|kotlin/Enum<A>|>()
+        }
+
+        public final static enum entry X: R|A|
+        public final static enum entry Y: R|A|
+        public final companion object Companion : R|kotlin/Any| {
+            private constructor(): R|A.Companion| {
+                super<R|kotlin/Any|>()
+            }
+
+            public final fun foo(): R|kotlin/Int| {
+                ^foo Int(1)
+            }
+
+        }
+
+        public final fun foo(): R|kotlin/Int| {
+            ^foo Q|A.Companion|.R|/A.Companion.foo|()
+        }
+
+        public final static fun values(): R|kotlin/Array<A>| {
+        }
+
+        public final static fun valueOf(value: R|kotlin/String|): R|A| {
+        }
+
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/constantValues.txt b/compiler/fir/analysis-tests/testData/resolve/constantValues.txt
index 9eb98c7d42e..d4ece21144a 100644
--- a/compiler/fir/analysis-tests/testData/resolve/constantValues.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/constantValues.txt
@@ -85,12 +85,12 @@ FILE: constantValues.kt
         }
 
         public final fun getArgumentType(): R|KotlinType| {
-            when (this@R|/KClassValue|.R|FakeOverride</KClassValue.value: R|KClassValue.Value|>|) {
+            when (this@R|/KClassValue|.R|SubstitutionOverride</KClassValue.value: R|KClassValue.Value|>|) {
                 ($subj$ is R|KClassValue.Value.LocalClass|) ->  {
-                    ^getArgumentType this@R|/KClassValue|.R|FakeOverride</KClassValue.value: R|KClassValue.Value|>|.R|/KClassValue.Value.LocalClass.type|
+                    ^getArgumentType this@R|/KClassValue|.R|SubstitutionOverride</KClassValue.value: R|KClassValue.Value|>|.R|/KClassValue.Value.LocalClass.type|
                 }
                 ($subj$ is R|KClassValue.Value.NormalClass|) ->  {
-                    lval <destruct>: R|ClassLiteralValue| = this@R|/KClassValue|.R|FakeOverride</KClassValue.value: R|KClassValue.Value|>|.R|/KClassValue.Value.NormalClass.value|
+                    lval <destruct>: R|ClassLiteralValue| = this@R|/KClassValue|.R|SubstitutionOverride</KClassValue.value: R|KClassValue.Value|>|.R|/KClassValue.Value.NormalClass.value|
                     lval classId: R|ClassId| = R|<local>/<destruct>|.R|/ClassLiteralValue.component1|()
                     lval arrayDimensions: R|kotlin/Int| = R|<local>/<destruct>|.R|/ClassLiteralValue.component2|()
                 }
diff --git a/compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.kt b/compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.kt
new file mode 100644
index 00000000000..25c7662648e
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.kt
@@ -0,0 +1,15 @@
+// FILE: main.kt
+
+fun foo(j: MyJavaClass) {
+    j.bar()
+}
+
+abstract class MyClass {
+    open fun bar(y: String? = null) {}
+}
+
+// FILE: MyJavaClass.java
+
+public class MyJavaClass extends MyClass {
+    public void bar(String y) {}
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.txt b/compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.txt
new file mode 100644
index 00000000000..fd03999f732
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.txt
@@ -0,0 +1,13 @@
+FILE: main.kt
+    public final fun foo(j: R|MyJavaClass|): R|kotlin/Unit| {
+        R|<local>/j|.R|/MyJavaClass.bar|()
+    }
+    public abstract class MyClass : R|kotlin/Any| {
+        public constructor(): R|MyClass| {
+            super<R|kotlin/Any|>()
+        }
+
+        public open fun bar(y: R|kotlin/String?| = Null(null)): R|kotlin/Unit| {
+        }
+
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt
index 3ade51617c5..03d12b5be37 100644
--- a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt
@@ -42,18 +42,18 @@ FILE: delegateInference.kt
 
         public final var x: R|kotlin/Boolean|by R|/FreezableVar.FreezableVar|<R|kotlin/Boolean|>(Boolean(true))
             public get(): R|kotlin/Boolean| {
-                ^ this@R|/Test|.D|/Test.x|.R|FakeOverride</FreezableVar.getValue: R|kotlin/Boolean|>|(this@R|/Test|, ::R|/Test.x|)
+                ^ this@R|/Test|.D|/Test.x|.R|SubstitutionOverride</FreezableVar.getValue: R|kotlin/Boolean|>|(this@R|/Test|, ::R|/Test.x|)
             }
             public set(<set-?>: R|kotlin/Boolean|): R|kotlin/Unit| {
-                this@R|/Test|.D|/Test.x|.R|FakeOverride</FreezableVar.setValue: R|kotlin/Unit|>|(this@R|/Test|, ::R|/Test.x|, R|<local>/x|)
+                this@R|/Test|.D|/Test.x|.R|SubstitutionOverride</FreezableVar.setValue: R|kotlin/Unit|>|(this@R|/Test|, ::R|/Test.x|, R|<local>/x|)
             }
 
         public final var y: R|kotlin/String|by R|/FreezableVar.FreezableVar|<R|kotlin/String|>(String())
             public get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.y|.R|FakeOverride</FreezableVar.getValue: R|kotlin/String|>|(this@R|/Test|, ::R|/Test.y|)
+                ^ this@R|/Test|.D|/Test.y|.R|SubstitutionOverride</FreezableVar.getValue: R|kotlin/String|>|(this@R|/Test|, ::R|/Test.y|)
             }
             public set(<set-?>: R|kotlin/String|): R|kotlin/Unit| {
-                this@R|/Test|.D|/Test.y|.R|FakeOverride</FreezableVar.setValue: R|kotlin/Unit|>|(this@R|/Test|, ::R|/Test.y|, R|<local>/y|)
+                this@R|/Test|.D|/Test.y|.R|SubstitutionOverride</FreezableVar.setValue: R|kotlin/Unit|>|(this@R|/Test|, ::R|/Test.y|, R|<local>/y|)
             }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt
index 3ef531fe1e7..53dcfa22d92 100644
--- a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt
@@ -13,7 +13,7 @@ FILE: delegateWithLambda.kt
 
     }
     public final fun <T> lazy(block: R|() -> T|): R|LazyDelegate<T>| {
-        ^lazy R|/LazyDelegate.LazyDelegate|<R|T|>(R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|())
+        ^lazy R|/LazyDelegate.LazyDelegate|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
     }
     public final fun getAny(): R|kotlin/Any?| {
         ^getAny Null(null)
@@ -29,7 +29,7 @@ FILE: delegateWithLambda.kt
         }
         )
             public get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.x|.R|FakeOverride</LazyDelegate.getValue: R|kotlin/String|>|(this@R|/Test|, ::R|/Test.x|)
+                ^ this@R|/Test|.D|/Test.x|.R|SubstitutionOverride</LazyDelegate.getValue: R|kotlin/String|>|(this@R|/Test|, ::R|/Test.x|)
             }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt
index bbc7fc040cc..016df2dc72f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt
@@ -1,6 +1,6 @@
 FILE: extensionGenericGetValue.kt
     public final inline fun <L> runLogged(action: R|() -> L|): R|L| {
-        ^runLogged R|<local>/action|.R|FakeOverride<kotlin/Function0.invoke: R|L|>|()
+        ^runLogged R|<local>/action|.R|SubstitutionOverride<kotlin/Function0.invoke: R|L|>|()
     }
     public final operator fun <V> R|V|.getValue(receiver: R|kotlin/Any?|, p: R|kotlin/Any|): R|V| {
         ^getValue R|/runLogged|<R|V|>(<L> = runLogged@fun <anonymous>(): R|V| <kind=UNKNOWN>  {
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt
index 658adcd678f..900eba0d010 100644
--- a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt
@@ -1,6 +1,6 @@
 FILE: extensionGetValueWithTypeVariableAsReceiver.kt
     public final inline fun <L> runLogged(action: R|() -> L|): R|L| {
-        ^runLogged R|<local>/action|.R|FakeOverride<kotlin/Function0.invoke: R|L|>|()
+        ^runLogged R|<local>/action|.R|SubstitutionOverride<kotlin/Function0.invoke: R|L|>|()
     }
     public final operator fun R|kotlin/String|.getValue(receiver: R|kotlin/Any?|, p: R|kotlin/Any|): R|kotlin/String| {
         ^getValue R|/runLogged|<R|kotlin/String|>(<L> = runLogged@fun <anonymous>(): R|kotlin/String| <kind=UNKNOWN>  {
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt
index 311e74b6499..baec6ec1789 100644
--- a/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt
@@ -31,10 +31,10 @@ FILE: kt41982.kt
         }
         )
             public get(): R|kotlin/Long| {
-                ^ this@R|/Test|.D|/Test.start|.R|FakeOverride</Delegate.getValue: R|kotlin/Long|>|(this@R|/Test|, ::R|/Test.start|)
+                ^ this@R|/Test|.D|/Test.start|.R|SubstitutionOverride</Delegate.getValue: R|kotlin/Long|>|(this@R|/Test|, ::R|/Test.start|)
             }
             public set(<set-?>: R|kotlin/Long|): R|kotlin/Unit| {
-                this@R|/Test|.D|/Test.start|.R|FakeOverride</Delegate.setValue: R|kotlin/Unit|>|(this@R|/Test|, ::R|/Test.start|, R|<local>/start|)
+                this@R|/Test|.D|/Test.start|.R|SubstitutionOverride</Delegate.setValue: R|kotlin/Unit|>|(this@R|/Test|, ::R|/Test.start|, R|<local>/start|)
             }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt
index 3e0eb65efa5..a1eda8acb41 100644
--- a/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt
@@ -38,9 +38,9 @@ FILE: provideDelegate.kt
             super<R|kotlin/Any|>()
         }
 
-        public final val x: R|kotlin/Int|by R|/delegate|<R|kotlin/Int|>(Int(1)).R|FakeOverride</DelegateProvider.provideDelegate: R|Delegate<kotlin/Int>|>|(this@R|/A|, ::R|/A.x|)
+        public final val x: R|kotlin/Int|by R|/delegate|<R|kotlin/Int|>(Int(1)).R|SubstitutionOverride</DelegateProvider.provideDelegate: R|Delegate<kotlin/Int>|>|(this@R|/A|, ::R|/A.x|)
             public get(): R|kotlin/Int| {
-                ^ this@R|/A|.D|/A.x|.R|FakeOverride</Delegate.getValue: R|kotlin/Int|>|(this@R|/A|, ::R|/A.x|)
+                ^ this@R|/A|.D|/A.x|.R|SubstitutionOverride</Delegate.getValue: R|kotlin/Int|>|(this@R|/A|, ::R|/A.x|)
             }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt
index 8c5f49a4850..2c4f21a6b1b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt
@@ -83,31 +83,31 @@ FILE: conflictingProjection.kt
 
     }
     public final fun test1(): R|Outer.Intermediate.Inner<kotlin/Char, kotlin/String, kotlin/Int>| {
-        ^test1 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test1 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final fun test2(): R|Outer.Intermediate.Inner<kotlin/Char, kotlin/String, in kotlin/Int>| {
-        ^test2 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test2 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final fun test3(): R|Outer.Intermediate.Inner<kotlin/Char, kotlin/String, out kotlin/Int>| {
-        ^test3 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test3 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final fun test4(): R|Outer.Intermediate.Inner<kotlin/Char, in kotlin/String, kotlin/Int>| {
-        ^test4 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test4 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final fun test5(): R|Outer.Intermediate.Inner<kotlin/Char, out kotlin/String, kotlin/Int>| {
-        ^test5 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test5 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final fun test6(): R|Outer.Intermediate.Inner<in kotlin/Char, kotlin/String, kotlin/Int>| {
-        ^test6 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test6 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final fun test7(): R|Outer.Intermediate.Inner<out kotlin/Char, kotlin/String, kotlin/Int>| {
-        ^test7 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test7 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final fun test8(): R|Outer.Intermediate.Inner<kotlin/Char, out kotlin/String, in kotlin/Int>| {
-        ^test8 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test8 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final fun test9(): R|Outer.Intermediate.Inner<out kotlin/Char, in kotlin/String, kotlin/Int>| {
-        ^test9 R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Intermediate.Intermediate|<R|kotlin/String|>().R|/Outer.Intermediate.Inner.Inner|<R|kotlin/Char|>()
+        ^test9 R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Intermediate.Intermediate>|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Intermediate.Inner.Inner>|<R|kotlin/Char|>()
     }
     public final class InOuter<in T> : R|kotlin/Any| {
         public constructor<in T>(): R|InOuter<T>| {
@@ -130,29 +130,29 @@ FILE: conflictingProjection.kt
 
     }
     public final fun test10(): R|InOuter.OutIntermediate.InInner<kotlin/Char, kotlin/String, kotlin/Int>| {
-        ^test10 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Char|>()
+        ^test10 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Char|>()
     }
     public final fun test11(): R|InOuter.OutIntermediate.InInner<kotlin/Char, kotlin/String, in kotlin/Int>| {
-        ^test11 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Char|>()
+        ^test11 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Char|>()
     }
     public final fun test12(): R|InOuter.OutIntermediate.InInner<kotlin/Char, kotlin/String, out kotlin/Int>| {
-        ^test12 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Char|>()
+        ^test12 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Char|>()
     }
     public final fun test13(): R|InOuter.OutIntermediate.InInner<kotlin/Char, in kotlin/String, kotlin/Int>| {
-        ^test13 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Char|>()
+        ^test13 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Char|>()
     }
     public final fun test14(): R|InOuter.OutIntermediate.InInner<kotlin/Char, out kotlin/String, kotlin/Int>| {
-        ^test14 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Char|>()
+        ^test14 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Char|>()
     }
     public final fun test15(): R|InOuter.OutIntermediate.InInner<in kotlin/Char, kotlin/String, kotlin/Int>| {
-        ^test15 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Char|>()
+        ^test15 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Char|>()
     }
     public final fun test16(): R|InOuter.OutIntermediate.InInner<out kotlin/Char, kotlin/String, kotlin/Int>| {
-        ^test16 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Any?|>()
+        ^test16 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Any?|>()
     }
     public final fun test17(): R|InOuter.OutIntermediate.InInner<kotlin/Char, out kotlin/String, in kotlin/Int>| {
-        ^test17 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Char|>()
+        ^test17 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Char|>()
     }
     public final fun test18(): R|InOuter.OutIntermediate.InInner<out kotlin/Char, in kotlin/String, kotlin/Int>| {
-        ^test18 R|/InOuter.InOuter|<R|kotlin/Int|>().R|/InOuter.OutIntermediate.OutIntermediate|<R|kotlin/String|>().R|/InOuter.OutIntermediate.InInner.InInner|<R|kotlin/Any?|>()
+        ^test18 R|/InOuter.InOuter|<R|kotlin/Int|>().R|SubstitutionOverride</InOuter.OutIntermediate.OutIntermediate>|<R|kotlin/String|>().R|SubstitutionOverride</InOuter.OutIntermediate.InInner.InInner>|<R|kotlin/Any?|>()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.txt
index 10667bdb45b..0c98a86e75f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.txt
@@ -47,7 +47,7 @@ FILE: propertyTypeMismatchOnOverride.kt
         public final val value: R|T| = R|<local>/value|
             public get(): R|T|
 
-        public final override var test: R|T| = R|<local>/value|
+        public final override var test: R|T| = this@R|/E|.R|/E.value|
             public get(): R|T|
             public set(value: R|T|): R|kotlin/Unit|
 
@@ -60,7 +60,7 @@ FILE: propertyTypeMismatchOnOverride.kt
         public final val value: R|T| = R|<local>/value|
             public get(): R|T|
 
-        public open var rest: R|T| = R|<local>/value|
+        public open var rest: R|T| = this@R|/F|.R|/F.value|
             public get(): R|T|
             public set(value: R|T|): R|kotlin/Unit|
 
@@ -73,7 +73,7 @@ FILE: propertyTypeMismatchOnOverride.kt
         public final val balue: R|E| = R|<local>/balue|
             public get(): R|E|
 
-        public final override var rest: R|E| = R|<local>/balue|
+        public final override var rest: R|E| = this@R|/G|.R|/G.balue|
             public get(): R|E|
             public set(value: R|E|): R|kotlin/Unit|
 
@@ -86,7 +86,7 @@ FILE: propertyTypeMismatchOnOverride.kt
         public final val balue: R|E| = R|<local>/balue|
             public get(): R|E|
 
-        public final override var rest: R|E| = R|<local>/balue|
+        public final override var rest: R|E| = this@R|/H|.R|/H.balue|
             public get(): R|E|
             public set(value: R|E|): R|kotlin/Unit|
 
@@ -99,7 +99,7 @@ FILE: propertyTypeMismatchOnOverride.kt
         public final val balue: R|E| = R|<local>/balue|
             public get(): R|E|
 
-        public final override var rest: R|E| = R|<local>/balue|
+        public final override var rest: R|E| = this@R|/M|.R|/M.balue|
             public get(): R|E|
             public set(value: R|E|): R|kotlin/Unit|
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt
index 8e246a8b308..43eb722de0c 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt
@@ -29,7 +29,7 @@ FILE: repeatedModifier.kt
         }
 
         public final inline fun foo(f: R|(kotlin/Int) -> kotlin/Int|): R|kotlin/Int| {
-            ^foo R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(Int(8))
+            ^foo R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(Int(8))
         }
 
         public final static fun values(): R|kotlin/Array<C>| {
@@ -47,7 +47,7 @@ FILE: repeatedModifier.kt
         private final val int: R|kotlin/Int| = R|<local>/int|
             private get(): R|kotlin/Int|
 
-        protected final var double: R|kotlin/Double| = R|<local>/int|.R|kotlin/Int.plus|(Double(8.0))
+        protected final var double: R|kotlin/Double| = this@R|/E|.R|/E.int|.R|kotlin/Int.plus|(Double(8.0))
             protected get(): R|kotlin/Double|
             protected set(value: R|kotlin/Double|): R|kotlin/Unit|
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt
index 3a1cca555b7..b4fd2d58a74 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt
@@ -41,8 +41,8 @@ fun <K, L : K> rest() {
 class NumColl<T : Collection<Number>>
 typealias NL<K> = NumColl<List<K>>
 val test7 = NL<Int>()
-val test8 = <!UPPER_BOUND_VIOLATED!>NL<String>()<!>
+val test8 = NL<String>()
 
 class NumberPhile<T: Number>(x: T)
 val np1 = NumberPhile(10)
-val np2 = <!INAPPLICABLE_CANDIDATE!>NumberPhile<!>("Test")
\ No newline at end of file
+val np2 = <!INAPPLICABLE_CANDIDATE!>NumberPhile<!>("Test")
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndFlexibleType.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndFlexibleType.txt
index 9e39732060b..2608d92bed6 100644
--- a/compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndFlexibleType.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndFlexibleType.txt
@@ -15,7 +15,7 @@ FILE: main.kt
 
     }
     public final fun test_1(): R|kotlin/Unit| {
-        lval e: R|ft<E, E?>!| = Q|Utils|.R|/Utils.getEnum|()
+        lval e: R|ft<@FlexibleNullability E, E?>!| = Q|Utils|.R|/Utils.getEnum|()
         lval s: R|kotlin/String| = when (R|<local>/e|) {
             ==($subj$, Null(null)) ->  {
                 ^test_1 Unit
@@ -34,7 +34,7 @@ FILE: main.kt
         R|<local>/s|.R|kotlin/String.length|
     }
     public final fun test_2(): R|kotlin/Unit| {
-        lval e: R|ft<E, E?>!| = Q|Utils|.R|/Utils.getEnum|()
+        lval e: R|ft<@FlexibleNullability E, E?>!| = Q|Utils|.R|/Utils.getEnum|()
         lval s: R|kotlin/String| = when (R|<local>/e|) {
             ==($subj$, Q|E|.R|/E.A|) ->  {
                 String()
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt
index 88de595fbbc..25fc8971ece 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt
@@ -29,7 +29,7 @@ FILE: CallBasedInExpressionGenerator.kt
         public final val codegen: R|org/jetbrains/kotlin/codegen/range/inExpression/ExpressionCodegen| = R|<local>/codegen|
             public get(): R|org/jetbrains/kotlin/codegen/range/inExpression/ExpressionCodegen|
 
-        private final val resolvedCall: R|ERROR CLASS: Unresolved name: getResolvedCallWithAssert| = R|<local>/operatorReference|.<Unresolved name: getResolvedCallWithAssert>#(R|<local>/codegen|.<Unresolved name: bindingContext>#)
+        private final val resolvedCall: R|ERROR CLASS: Unresolved name: getResolvedCallWithAssert| = R|<local>/operatorReference|.<Unresolved name: getResolvedCallWithAssert>#(this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.codegen|.<Unresolved name: bindingContext>#)
             private get(): R|ERROR CLASS: Unresolved name: getResolvedCallWithAssert|
 
         private final val isInverted: R|kotlin/Boolean| = ==(R|<local>/operatorReference|.<Unresolved name: getReferencedNameElementType>#(), <Unresolved name: KtTokens>#.<Unresolved name: NOT_IN>#)
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt
index 1e8da670215..d96ef292b3d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt
@@ -20,9 +20,9 @@ FILE: enumValues.kt
     }
     public final fun foo(): R|kotlin/Unit| {
         lval values: R|kotlin/Array<MyEnum>| = Q|MyEnum|.R|/MyEnum.values|()
-        lval <iterator>: R|kotlin/collections/Iterator<MyEnum>| = R|<local>/values|.R|FakeOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<MyEnum>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<MyEnum>| = R|<local>/values|.R|SubstitutionOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<MyEnum>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval value: R|MyEnum| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|MyEnum|>|()
+            lval value: R|MyEnum| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|MyEnum|>|()
             R|<local>/value|.R|/MyEnum.bar|()
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt
index acd41b9fc22..72d2d257345 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt
@@ -11,10 +11,10 @@ FILE: extensionPropertyInLambda.kt
     }
     public final var <T> R|C<T>|.y: R|T|
         public get(): R|T| {
-            ^ this@R|/y|.R|FakeOverride</C.x: R|T|>|
+            ^ this@R|/y|.R|SubstitutionOverride</C.x: R|T|>|
         }
         public set(v: R|T|): R|kotlin/Unit| {
-            this@R|/y|.R|FakeOverride</C.x: R|T|>| = R|<local>/v|
+            this@R|/y|.R|SubstitutionOverride</C.x: R|T|>| = R|<local>/v|
         }
     public final fun use(f: R|() -> kotlin/String|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt
index 4d2c9cb4251..441439f3fca 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt
@@ -12,7 +12,7 @@ FILE: test.kt
 
     }
     public final fun <D : R|Descriptor|> test(call: R|Call<D>|, resolvedCall: R|ResolvedCall<D>|): R|kotlin/Unit| {
-        R|<local>/call|.R|FakeOverride</Call.resultingDescriptor: R|D|>|.R|/name|
+        R|<local>/call|.R|SubstitutionOverride</Call.resultingDescriptor: R|D|>|.R|/name|
         R|<local>/resolvedCall|.R|/ResolvedCall.resultingDescriptor|.R|/name|
         lval resolvedDescriptor: R|D?| = R|<local>/resolvedCall|.R|/ResolvedCall.candidateDescriptor|
         when () {
@@ -24,6 +24,6 @@ FILE: test.kt
         R|<local>/resolvedDescriptor|.R|/foo|()
     }
     public final fun otherTest(call: R|Call<*>|, resolvedCall: R|ResolvedCall<*>|): R|kotlin/Unit| {
-        R|<local>/call|.R|FakeOverride</Call.resultingDescriptor: R|CapturedType(*)|>|.R|/name|
+        R|<local>/call|.R|SubstitutionOverride</Call.resultingDescriptor: R|CapturedType(*)|>|.R|/name|
         R|<local>/resolvedCall|.R|/ResolvedCall.resultingDescriptor|.R|/name|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt
index ec1726a5346..5fbd7f0c474 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt
@@ -16,7 +16,7 @@ FILE: test.kt
     private final val DERIVED_FACTORY: R|DiagnosticFactory0<ft<DerivedElement, DerivedElement?>!>| = R|/DiagnosticFactory0.DiagnosticFactory0|<R|ft<DerivedElement, DerivedElement?>!|>()
         private get(): R|DiagnosticFactory0<ft<DerivedElement, DerivedElement?>!>|
     public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| {
-        lval casted: R|Diagnostic<ft<DerivedElement, DerivedElement?>!>| = R|/DERIVED_FACTORY|.R|FakeOverride</DiagnosticFactory0.cast: R|Diagnostic<ft<DerivedElement, DerivedElement?>!>|>|(R|<local>/d|)
+        lval casted: R|@FlexibleNullability Diagnostic<ft<DerivedElement, DerivedElement?>!>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride</DiagnosticFactory0.cast: R|@FlexibleNullability Diagnostic<ft<DerivedElement, DerivedElement?>!>|>|(R|<local>/d|)
         lval element: R|DerivedElement| = R|<local>/casted|.R|/Diagnostic.element|
         R|/Fix.Fix|(R|<local>/element|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt
index 3d7076022f0..35ebf944b80 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt
@@ -16,7 +16,7 @@ FILE: genericPropertyAccess.kt
         }
 
         public final override fun foo(): R|T| {
-            ^foo this@R|/Derived|.R|FakeOverride</Derived.x: R|T|>|
+            ^foo this@R|/Derived|.R|SubstitutionOverride</Derived.x: R|T|>|
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt
index 284a9885066..35d34368812 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt
@@ -13,7 +13,7 @@ FILE: genericUsedInFunction.kt
 
     }
     public final fun test(arg: R|Generic<kotlin/String>|): R|kotlin/Unit| {
-        lval value: R|kotlin/String| = R|<local>/arg|.R|FakeOverride</Generic.value: R|kotlin/String|>|
-        lval foo: R|kotlin/String| = R|<local>/arg|.R|FakeOverride</Generic.foo: R|kotlin/String|>|()
+        lval value: R|kotlin/String| = R|<local>/arg|.R|SubstitutionOverride</Generic.value: R|kotlin/String|>|
+        lval foo: R|kotlin/String| = R|<local>/arg|.R|SubstitutionOverride</Generic.foo: R|kotlin/String|>|()
         lval length: R|kotlin/Int| = R|<local>/foo|.R|kotlin/String.length|.R|kotlin/Int.plus|(R|<local>/value|.R|kotlin/String.length|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt
index a047d4a4cda..0a2914df604 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt
@@ -31,5 +31,5 @@ FILE: importedReceiver.kt
         Q|My|.R|/My.baz|()
         (Q|My|, Boolean(true)).R|/My.gau|()
         Q|My|.R|/Your.wat|()
-        (Q|My|, Boolean(false)).R|FakeOverride</My.watwat: R|kotlin/Unit|>|<R|kotlin/Boolean|>()
+        (Q|My|, Boolean(false)).R|SubstitutionOverride</My.watwat: R|kotlin/Unit|>|<R|kotlin/Boolean|>()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt
index 0fcd2c6aef3..d064ae533b2 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt
@@ -6,5 +6,5 @@ FILE: doubleBrackets.kt
 
     }
     public final fun test(): R|kotlin/String| {
-        ^test String(hello).R|/k|().R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
+        ^test String(hello).R|/k|().R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt
index e06749e0a33..00ef41fafa9 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt
@@ -11,9 +11,9 @@ FILE: extensionOnObject.kt
         }
 
         public final fun f(op: R|X.() -> kotlin/Unit|): R|kotlin/Unit| {
-            R|<local>/op|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(Q|X|)
+            R|<local>/op|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(Q|X|)
             lval x: R|X| = Q|X|
-            R|<local>/op|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/x|)
+            R|<local>/op|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/x|)
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt
index 0a5eb0499b1..5078d087b98 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt
@@ -1,5 +1,5 @@
 FILE: extensionSafeCall.kt
     public final fun bar(doIt: R|kotlin/Int.() -> kotlin/Int|): R|kotlin/Unit| {
         lval i: R|kotlin/Int?| = Int(1)
-        R|<local>/i|?.{ R|<local>/doIt|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|($subj$) }
+        R|<local>/i|?.{ R|<local>/doIt|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|($subj$) }
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt
index 76ef1884c37..25921aa62b3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt
@@ -1,5 +1,5 @@
 FILE: inBrackets.kt
     public final fun test(e: R|kotlin/Int.() -> kotlin/String|): R|kotlin/Unit| {
-        lval s: R|kotlin/String| = R|<local>/e|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/String|>|(Int(3))
-        lval ss: R|kotlin/String| = R|<local>/e|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/String|>|(Int(3))
+        lval s: R|kotlin/String| = R|<local>/e|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/String|>|(Int(3))
+        lval ss: R|kotlin/String| = R|<local>/e|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/String|>|(Int(3))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt
index a0dbdbf1cf1..b52703252b3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt
@@ -4,7 +4,7 @@ FILE: propertyFromParameter.kt
             super<R|kotlin/Any|>()
         }
 
-        public final val name: R|kotlin/String| = R|<local>/name|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
+        public final val name: R|kotlin/String| = R|<local>/name|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
             public get(): R|kotlin/String|
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt
index 0902da269bd..8cdce0b7980 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt
@@ -15,10 +15,10 @@ FILE: propertyWithExtensionType.kt
         when () {
             !=(R|<local>/a|.R|/A.x|, Null(null)) ->  {
                 lval b: R|kotlin/String.() -> kotlin/Unit| = R|<local>/a|.R|/A.x|
-                R|<local>/b|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(String())
+                R|<local>/b|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(String())
             }
         }
 
         lval c: R|kotlin/String.() -> kotlin/Int| = R|<local>/a|.R|/A.y|
-        lval d: R|kotlin/Int| = R|<local>/c|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(String())
+        lval d: R|kotlin/Int| = R|<local>/c|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(String())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt
index 9de0198e18e..89bb1a4657b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt
@@ -23,18 +23,18 @@ FILE: threeReceiversCorrect.kt
 
     }
     public final fun <T, R> with(arg: R|T|, f: R|T.() -> R|): R|R| {
-        ^with R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|R|>|(R|<local>/arg|)
+        ^with R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|R|>|(R|<local>/arg|)
     }
     public final fun test(a: R|A|, b: R|B|, c: R|C|): R|kotlin/Unit| {
         R|/with|<R|A|, R|kotlin/Unit|>(R|<local>/a|, <L> = with@fun R|A|.<anonymous>(): R|kotlin/Unit| {
             R|/with|<R|C|, R|kotlin/Unit|>(R|<local>/c|, <L> = with@fun R|C|.<anonymous>(): R|kotlin/Unit| {
-                (this@R|special/anonymous|, R|<local>/b|).R|/A.foo|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/c|)
+                (this@R|special/anonymous|, R|<local>/b|).R|/A.foo|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/c|)
             }
             )
             ^ R|/with|<R|B|, R|kotlin/Unit|>(R|<local>/b|, <L> = with@fun R|B|.<anonymous>(): R|kotlin/Unit| {
-                (this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/c|)
+                (this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/c|)
                 ^ R|/with|<R|C|, R|kotlin/Unit|>(R|<local>/c|, <L> = with@fun R|C|.<anonymous>(): R|kotlin/Unit| {
-                    (this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|special/anonymous|)
+                    (this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|special/anonymous|)
                 }
                 )
             }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.txt
index 2ffa96454fd..9245e6a1512 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.txt
@@ -1,5 +1,5 @@
 FILE: test.kt
     public final fun test(): R|kotlin/Unit| {
-        lval staticReference: R|kotlin/reflect/KMutableProperty0<ft<kotlin/String, kotlin/String?>!>| = Q|JavaClass|::R|/JavaClass.staticField|
-        lval nonStaticReference: R|kotlin/reflect/KMutableProperty1<JavaClass, ft<kotlin/String, kotlin/String?>!>| = Q|JavaClass|::R|/JavaClass.nonStaticField|
+        lval staticReference: R|kotlin/reflect/KMutableProperty0<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>| = Q|JavaClass|::R|/JavaClass.staticField|
+        lval nonStaticReference: R|kotlin/reflect/KMutableProperty1<JavaClass, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>| = Q|JavaClass|::R|/JavaClass.nonStaticField|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt
index a250f63d58b..f70f440369d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt
@@ -27,12 +27,12 @@ FILE: lambda.kt
         lval s: R|kotlin/String| = fun <anonymous>(): R|kotlin/String| {
             ^ String(OK)
         }
-        .R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
+        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
         lval f: R|() -> kotlin/String| = fun <anonymous>(): R|kotlin/String| {
             ^ String(OK)
         }
 
-        lval ss: R|kotlin/String| = R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
+        lval ss: R|kotlin/String| = R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
         lval empty: R|() -> kotlin/Unit| = fun <anonymous>(): R|kotlin/Unit| {
             ^ Unit
         }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt
index 7e81775f64d..23237bddc31 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt
@@ -4,10 +4,10 @@ FILE: lambdaWithReceiver.kt
 
     }
     public final fun <T> myWith(receiver: R|T|, block: R|T.() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/receiver|)
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/receiver|)
     }
     public final fun <T> R|T|.myApply(block: R|T.() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/myApply|)
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/myApply|)
     }
     public final fun withA(block: R|A.() -> kotlin/Unit|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt
index 6840cf1e02e..0dcfc0f5422 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt
@@ -37,7 +37,7 @@ FILE: O.kt
                         }
 
                         public final fun local(): R|kotlin/Unit| {
-                            lval y: R|ft<kotlin/String, kotlin/String?>!| = this@R|/O.Derived|.R|/Base.foo|()
+                            lval y: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = this@R|/O.Derived|.R|/Base.foo|()
                         }
 
                         public final val oo: R|<anonymous>| = object : R|kotlin/Any| {
@@ -66,7 +66,7 @@ FILE: O.kt
                     }
 
                     public final fun local(): R|kotlin/Unit| {
-                        lval y: R|ft<kotlin/String, kotlin/String?>!| = this@R|/O.Derived|.R|/Base.foo|()
+                        lval y: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = this@R|/O.Derived|.R|/Base.foo|()
                     }
 
                 }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt
index 8f6ea06016b..f059cc30595 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt
@@ -101,7 +101,7 @@ FILE: protectedVisibility.kt
         }
 
         protected final override fun foo(): R|kotlin/Int| {
-            ^foo this@R|/DerivedGeneric|.super<R|Generic<kotlin/Int>|>.R|FakeOverride</Generic.foo: R|kotlin/Int|>|()
+            ^foo this@R|/DerivedGeneric|.super<R|Generic<kotlin/Int>|>.R|SubstitutionOverride</Generic.foo: R|kotlin/Int|>|()
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt
index cdae761ca29..610f43dbe2d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt
@@ -20,7 +20,7 @@ FILE: test.kt
         R|<local>/x|.R|/AnotherClass.bar|
     }
     public final fun test2(x: R|SomeClass?|): R|kotlin/Unit| {
-        lval bar: R|kotlin/CharSequence| = R|<local>/x|?.{ $subj$.R|/SomeClass.bar| } ?: ^test2 Unit
+        lval bar: R|@FlexibleNullability kotlin/CharSequence| = R|<local>/x|?.{ $subj$.R|/SomeClass.bar| } ?: ^test2 Unit
         R|<local>/x|.R|/SomeClass.bar|
     }
     public final fun test3(x: R|AnotherClass?|): R|kotlin/Unit| {
@@ -33,7 +33,7 @@ FILE: test.kt
 
     }
     public final fun test4(x: R|SomeClass?|): R|kotlin/Unit| {
-        lval bar: R|kotlin/CharSequence?| = R|<local>/x|?.{ $subj$.R|/SomeClass.bar| }
+        lval bar: R|@FlexibleNullability kotlin/CharSequence?| = R|<local>/x|?.{ $subj$.R|/SomeClass.bar| }
         when () {
             !=(R|<local>/bar|, Null(null)) ->  {
                 R|<local>/x|.R|/SomeClass.bar|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): kotlin/CharSequence.length>#
diff --git a/compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.kt b/compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.kt
new file mode 100644
index 00000000000..322705e6cdc
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.kt
@@ -0,0 +1,10 @@
+// FILE: main.kt
+
+fun foo(p: Processor<in CharSequence>, s: String?) {
+    p.process(s)
+}
+
+// FILE: Processor.java
+public interface Processor<T> {
+    boolean process(T t);
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.txt b/compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.txt
new file mode 100644
index 00000000000..d65029f28ca
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.txt
@@ -0,0 +1,4 @@
+FILE: main.kt
+    public final fun foo(p: R|Processor<in kotlin/CharSequence>|, s: R|kotlin/String?|): R|kotlin/Unit| {
+        R|<local>/p|.R|SubstitutionOverride</Processor.process: R|kotlin/Boolean|>|(R|<local>/s|)
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt
index b403c258302..a852210282e 100644
--- a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt
@@ -58,7 +58,7 @@ FILE: enums.kt
 
         }
 
-        public final val g: R|kotlin/Double| = this@R|/Planet.Companion|.R|/Planet.Companion.G|.R|kotlin/Double.times|(R|<local>/m|).R|kotlin/Double.div|(R|<local>/r|.R|kotlin/Double.times|(R|<local>/r|))
+        public final val g: R|kotlin/Double| = this@R|/Planet.Companion|.R|/Planet.Companion.G|.R|kotlin/Double.times|(this@R|/Planet|.R|/Planet.m|).R|kotlin/Double.div|(this@R|/Planet|.R|/Planet.r|.R|kotlin/Double.times|(this@R|/Planet|.R|/Planet.r|))
             public get(): R|kotlin/Double|
 
         public abstract fun sayHello(): R|kotlin/Unit|
diff --git a/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt
index 3e992fd9bde..83fa85a04ab 100644
--- a/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt
@@ -1,7 +1,7 @@
 FILE: functionTypeAlias.kt
     private final typealias A = R|kotlin/String.(kotlin/Int) -> kotlin/Int|
     private final fun b(a: R|A|): R|kotlin/Unit| {
-        R|<local>/a|.R|FakeOverride<kotlin/Function2.invoke: R|kotlin/Int|>|(String(b), Int(1))
+        R|<local>/a|.R|SubstitutionOverride<kotlin/Function2.invoke: R|kotlin/Int|>|(String(b), Int(1))
     }
     public final fun main(): R|kotlin/Unit| {
         R|/b|(<L> = b@fun R|kotlin/String|.<anonymous>(it: R|kotlin/Int|): R|kotlin/Int| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt b/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt
index 78bdd7e25cd..885aecf5230 100644
--- a/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt
@@ -1,11 +1,11 @@
 FILE: functionTypes.kt
     public final fun <T> simpleRun(f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| {
-        ^simpleRun R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(^simpleRun Unit)
+        ^simpleRun R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(^simpleRun Unit)
     }
     public final fun <T, R> R|kotlin/collections/List<T>|.simpleMap(f: R|(T) -> R|): R|R| {
     }
     public final fun <T> simpleWith(t: R|T|, f: R|T.() -> kotlin/Unit|): R|kotlin/Unit| {
-        ^simpleWith R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/t|)
+        ^simpleWith R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/t|)
     }
     public abstract interface KMutableProperty1<T, R> : R|KProperty1<T, R>|, R|KMutableProperty<R>| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt b/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt
index 44984e9ec4d..73d33ac0a74 100644
--- a/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt
@@ -30,7 +30,7 @@ FILE: genericConstructors.kt
         }
 
         public final fun bar(): R|kotlin/Unit| {
-            this@R|/C|.R|FakeOverride</C.a: R|A<kotlin/String>|>|.R|FakeOverride</A.foo: R|kotlin/Unit|>|(String())
+            this@R|/C|.R|SubstitutionOverride</C.a: R|A<kotlin/String>|>|.R|SubstitutionOverride</A.foo: R|kotlin/Unit|>|(String())
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt
index 2364ecf0b80..0866280a334 100644
--- a/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt
@@ -1,6 +1,6 @@
 FILE: implicitTypeInFakeOverride.kt
     public final fun <K> extract(x: R|Out<K>|): R|K| {
-        ^extract R|<local>/x|.R|FakeOverride</Out.get: R|K|>|()
+        ^extract R|<local>/x|.R|SubstitutionOverride</Out.get: R|K|>|()
     }
     public final class Out<out T> : R|kotlin/Any| {
         public constructor<out T>(x: R|T|): R|Out<T>| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt b/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt
index ddfbabd241b..a9624fb2e6a 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt
@@ -4,5 +4,5 @@ FILE: main.kt
     public final fun <D : R|A|> foo(b: R|B<D>|): R|kotlin/Unit| {
     }
     public final fun main(b: R|B<*>|): R|kotlin/Unit| {
-        R|/foo|<R|ft<A, A?>!|>(R|<local>/b|)
+        R|/foo|<R|ft<@FlexibleNullability A, A?>!|>(R|<local>/b|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt
index 2cc62a5cf6e..cbf479d8627 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt
@@ -13,7 +13,7 @@ FILE: lambdaAsReturnStatementOfLambda.kt
 
         }
         )
-        lval alsoA: R|A| = R|<local>/lambda|.R|FakeOverride<kotlin/Function0.invoke: R|A|>|()
+        lval alsoA: R|A| = R|<local>/lambda|.R|SubstitutionOverride<kotlin/Function0.invoke: R|A|>|()
         R|/takeA|(R|<local>/alsoA|)
     }
     public final fun takeA(a: R|A|): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt
index a590d3ccedc..89685979c73 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt
@@ -9,13 +9,13 @@ FILE: lambdaInElvis.kt
     }
     public final fun bar1(w: R|kotlin/collections/List<kotlin/CharSequence>|): R|kotlin/collections/List<kotlin/CharSequence>?| {
         ^bar1 R|/foo|<R|kotlin/CharSequence|>(<L> = foo@fun <anonymous>(container: R|kotlin/collections/MutableList<kotlin/CharSequence>|): R|kotlin/Unit| {
-            R|<local>/container|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
+            R|<local>/container|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
         }
         ) ?: R|<local>/w|
     }
     public final fun bar2(): R|kotlin/collections/List<kotlin/CharSequence>?| {
         ^bar2 R|/foo|<R|kotlin/CharSequence|>(<L> = foo@fun <anonymous>(container: R|kotlin/collections/MutableList<kotlin/CharSequence>|): R|kotlin/Unit| {
-            R|<local>/container|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
+            R|<local>/container|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
         }
         ) ?: R|/listOf|<R|kotlin/CharSequence|>()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt
index 9306a470f7f..19ed267189d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt
@@ -2,21 +2,21 @@ FILE: nestedExtensionFunctionType.kt
     public abstract interface A : R|kotlin/Any| {
     }
     public final fun test_0(a: R|A|, f: R|A.() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/a|)
+        R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/a|)
     }
     public final fun test_1(a: R|A|, ys: R|kotlin/collections/List<@ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>>|): R|kotlin/Unit| {
-        lval <iterator>: R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>>| = R|<local>/ys|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>>| = R|<local>/ys|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval y: R|(A) -> kotlin/Unit| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|(A) -> kotlin/Unit|>|()
-            R|<local>/y|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/a|)
+            lval y: R|(A) -> kotlin/Unit| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|(A) -> kotlin/Unit|>|()
+            R|<local>/y|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/a|)
         }
 
     }
     public final fun test_2(a: R|A|, vararg zs: @R|kotlin/ExtensionFunctionType|() R|kotlin/Array<out @ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>>|): R|kotlin/Unit| {
-        lval <iterator>: R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>>| = R|<local>/zs|.R|FakeOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<CapturedType(out @ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>)>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>>| = R|<local>/zs|.R|SubstitutionOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<CapturedType(out @ExtensionFunctionType kotlin/Function1<A, kotlin/Unit>)>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval z: R|(A) -> kotlin/Unit| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|(A) -> kotlin/Unit|>|()
-            R|<local>/z|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/a|)
+            lval z: R|(A) -> kotlin/Unit| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|(A) -> kotlin/Unit|>|()
+            R|<local>/z|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/a|)
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt
index 5c359a9798e..462119edaac 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt
@@ -11,7 +11,7 @@ FILE: receiverWithCapturedType.kt
         ^getParameterForArgument String()
     }
     public final fun <D : R|CallableDescriptor|> R|ResolvedCall<D>|.updateD(d: R|D|): R|D| {
-        this@R|/updateD|.R|FakeOverride</ResolvedCall.d: R|D|>| = R|<local>/d|
+        this@R|/updateD|.R|SubstitutionOverride</ResolvedCall.d: R|D|>| = R|<local>/d|
         ^updateD R|<local>/d|
     }
     public final fun test_1_1(resolvedCall: R|ResolvedCall<out CallableDescriptor>|): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt b/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt
index c36de9be75a..ecf5def9bd4 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt
@@ -19,9 +19,9 @@ FILE: simpleCapturedTypes.kt
             ^ this@R|/idP|
         }
     private final fun getSetterInfos(kc: R|KC<out Ann>|): R|kotlin/Unit| {
-        R|/id|<R|Ann|>(R|<local>/kc|).R|FakeOverride</KC.x: R|CapturedType(out Ann)|>|.R|/Ann.foo|()
-        R|<local>/kc|.R|/idR|<R|Ann|>().R|FakeOverride</KC.x: R|CapturedType(out Ann)|>|.R|/Ann.foo|()
-        R|<local>/kc|.R|/idP|<R|Ann|>.R|FakeOverride</KC.x: R|CapturedType(out Ann)|>|.R|/Ann.foo|()
+        R|/id|<R|Ann|>(R|<local>/kc|).R|SubstitutionOverride</KC.x: R|CapturedType(out Ann)|>|.R|/Ann.foo|()
+        R|<local>/kc|.R|/idR|<R|Ann|>().R|SubstitutionOverride</KC.x: R|CapturedType(out Ann)|>|.R|/Ann.foo|()
+        R|<local>/kc|.R|/idP|<R|Ann|>.R|SubstitutionOverride</KC.x: R|CapturedType(out Ann)|>|.R|/Ann.foo|()
         lval x1: R|KC<out Ann>| = R|/id|<R|Ann|>(R|<local>/kc|)
         lval x2: R|KC<out Ann>| = R|<local>/kc|.R|/idR|<R|Ann|>()
         lval x3: R|KC<out Ann>| = R|<local>/kc|.R|/idP|<R|Ann|>
diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/inner.kt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nested/inner.kt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt
diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/inner.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nested/inner.txt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt
new file mode 100644
index 00000000000..294bf333902
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt
@@ -0,0 +1,15 @@
+abstract class A<X : CharSequence> {
+    inner class Inner
+    fun foo(x: Inner.() -> Unit) {}
+}
+
+object B : A<String>() {
+
+    fun bar() {
+        val y: Inner.() -> Unit = {}
+        foo(y)
+        baz(y)
+    }
+}
+
+fun baz(x: (A<String>.Inner) -> Unit) {}
diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.txt
new file mode 100644
index 00000000000..2348d9696df
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.txt
@@ -0,0 +1,34 @@
+FILE: innerTypeFromSuperClassInBody.kt
+    public abstract class A<X : R|kotlin/CharSequence|> : R|kotlin/Any| {
+        public constructor<X : R|kotlin/CharSequence|>(): R|A<X>| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final inner class Inner<X : R|kotlin/CharSequence|> : R|kotlin/Any| {
+            public constructor(): R|A.Inner<X>| {
+                super<R|kotlin/Any|>()
+            }
+
+        }
+
+        public final fun foo(x: R|A.Inner<X>.() -> kotlin/Unit|): R|kotlin/Unit| {
+        }
+
+    }
+    public final object B : R|A<kotlin/String>| {
+        private constructor(): R|B| {
+            super<R|A<kotlin/String>|>()
+        }
+
+        public final fun bar(): R|kotlin/Unit| {
+            lval y: R|A.Inner<kotlin/String>.() -> kotlin/Unit| = fun R|A.Inner<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
+                ^ Unit
+            }
+
+            this@R|/B|.R|SubstitutionOverride</B.foo: R|kotlin/Unit|>|(R|<local>/y|)
+            R|/baz|(R|<local>/y|)
+        }
+
+    }
+    public final fun baz(x: R|(A.Inner<kotlin/String>) -> kotlin/Unit|): R|kotlin/Unit| {
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt
diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.txt
similarity index 57%
rename from compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.txt
index 29fb97aca71..39cb646bd3f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.txt
@@ -18,20 +18,20 @@ FILE: innerTypes.kt
         }
 
         public final fun substitute(): R|Outer.Inner<kotlin/Int, Q>| {
-            ^substitute R|/Outer.Outer|<R|Q|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>()
+            ^substitute R|/Outer.Outer|<R|Q|>().R|SubstitutionOverride</Outer.Inner.Inner>|<R|kotlin/Int|>()
         }
 
     }
     public final fun accept(p: R|Outer.Inner<kotlin/Int, kotlin/String>|): R|kotlin/Unit| {
     }
-    public final val rr: R|Outer.Inner<kotlin/Int, kotlin/String>| = R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>()
+    public final val rr: R|Outer.Inner<kotlin/Int, kotlin/String>| = R|/Outer.Outer|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Inner.Inner>|<R|kotlin/Int|>()
         public get(): R|Outer.Inner<kotlin/Int, kotlin/String>|
-    public final val rrq: R|Outer.Inner<kotlin/Int, kotlin/String>| = R|/Boxed.Boxed|<R|kotlin/String|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/String>|>|()
+    public final val rrq: R|Outer.Inner<kotlin/Int, kotlin/String>| = R|/Boxed.Boxed|<R|kotlin/String|>().R|SubstitutionOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/String>|>|()
         public get(): R|Outer.Inner<kotlin/Int, kotlin/String>|
     public final fun check(): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): /accept>#(R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>())
-        <Inapplicable(INAPPLICABLE): /accept>#(R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/String|>())
-        R|/accept|(R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>())
-        <Inapplicable(INAPPLICABLE): /accept>#(R|/Boxed.Boxed|<R|kotlin/Int|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/Int>|>|())
-        R|/accept|(R|/Boxed.Boxed|<R|kotlin/String|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/String>|>|())
+        <Inapplicable(INAPPLICABLE): /accept>#(R|/Outer.Outer|<R|kotlin/Int|>().R|SubstitutionOverride</Outer.Inner.Inner>|<R|kotlin/Int|>())
+        <Inapplicable(INAPPLICABLE): /accept>#(R|/Outer.Outer|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Inner.Inner>|<R|kotlin/String|>())
+        R|/accept|(R|/Outer.Outer|<R|kotlin/String|>().R|SubstitutionOverride</Outer.Inner.Inner>|<R|kotlin/Int|>())
+        <Inapplicable(INAPPLICABLE): /accept>#(R|/Boxed.Boxed|<R|kotlin/Int|>().R|SubstitutionOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/Int>|>|())
+        R|/accept|(R|/Boxed.Boxed|<R|kotlin/String|>().R|SubstitutionOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/String>|>|())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/simple.kt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nested/simple.kt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt
diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/simple.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nested/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt b/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt
index 2f43ac33bf6..0f8aea6b542 100644
--- a/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt
@@ -1,4 +1,4 @@
 FILE: invokeInWhenSubjectVariableInitializer.kt
     public final fun test(func: R|() -> kotlin/String?|): R|kotlin/Unit| {
-        lval x: R|kotlin/String| = R|<local>/func|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String?|>|() ?: String()
+        lval x: R|kotlin/String| = R|<local>/func|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String?|>|() ?: String()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt
index 5ca57c3f38d..6d09ea0e37c 100644
--- a/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt
@@ -2,12 +2,12 @@ FILE: invokeOfLambdaWithReceiver.kt
     public abstract interface A : R|kotlin/Any| {
     }
     public final fun test(a: R|A|, block: R|A.() -> kotlin/Int|): R|kotlin/Unit| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(R|<local>/a|)
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(R|<local>/a|)
     }
     public abstract interface B : R|kotlin/Any| {
     }
     public final fun R|B|.otherTest(block: R|B.() -> kotlin/Int|): R|kotlin/Unit| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(this@R|/otherTest|)
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(this@R|/otherTest|)
     }
     public final class C : R|kotlin/Any| {
         public constructor(): R|C| {
@@ -15,7 +15,7 @@ FILE: invokeOfLambdaWithReceiver.kt
         }
 
         public final fun anotherTest(block: R|C.() -> kotlin/Int|): R|kotlin/Unit| {
-            R|<local>/block|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(this@R|/C|)
+            R|<local>/block|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(this@R|/C|)
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.txt b/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.txt
index 261a6dbb0d6..6482843e933 100644
--- a/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.txt
@@ -1,5 +1,5 @@
 FILE: main.kt
     public final fun test(a: R|A|): R|kotlin/Unit| {
         lval int: R|kotlin/Int| = R|<local>/a|.R|/A.x|
-        lval string: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/a|.R|/A.getX|()
+        lval string: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/a|.R|/A.getX|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.txt b/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.txt
index 242b737e00b..5d6b59f7be2 100644
--- a/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        lval b: R|ft<B, B?>!| = Q|B|.R|/B.VALUE|
+        lval b: R|ft<@FlexibleNullability B, B?>!| = Q|B|.R|/B.VALUE|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/kt41984.txt b/compiler/fir/analysis-tests/testData/resolve/kt41984.txt
index bc0de1d73c0..0de2d198e4f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/kt41984.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/kt41984.txt
@@ -20,7 +20,7 @@ FILE: main.kt
 
     }
     public final fun test_1(b: R|B<kotlin/Int>|, x: R|kotlin/Int|, inv: R|Inv<kotlin/Int>|): R|kotlin/Unit| {
-        R|<local>/b|.R|FakeOverride</B.take: R|kotlin/String|>|(R|<local>/x|)
+        R|<local>/b|.R|SubstitutionOverride</B.take: R|kotlin/String|>|(R|<local>/x|)
         R|<local>/b|.<Inapplicable(INAPPLICABLE): /B.take>#(Null(null))
-        R|<local>/b|.R|FakeOverride</B.takeInv: R|kotlin/String|>|(R|<local>/inv|)
+        R|<local>/b|.R|SubstitutionOverride</B.takeInv: R|kotlin/String|>|(R|<local>/inv|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/kt41990.txt b/compiler/fir/analysis-tests/testData/resolve/kt41990.txt
index dd7c870819b..8f305e5dbd8 100644
--- a/compiler/fir/analysis-tests/testData/resolve/kt41990.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/kt41990.txt
@@ -3,6 +3,6 @@ FILE: kt41990.kt
         ^getLambda Null(null)!!
     }
     public final fun R|kotlin/String|.test_1(s: R|kotlin/String|): R|kotlin/Unit| {
-        R|/getLambda|().R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/test_1|)
-        R|/getLambda|().R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/s|)
+        R|/getLambda|().R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/test_1|)
+        R|/getLambda|().R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/s|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt
index d33d7c1bece..a3013d57256 100644
--- a/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt
@@ -17,8 +17,8 @@ FILE: lambdaArgInScopeFunction.kt
             ^ R|<local>/it|
         }
         ) }
-        R|<local>/value|.R|tests/_checkType/checkType|<R|KotlinClass?|>(<L> = checkType@fun R|tests/_checkType/Inv<KotlinClass?>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|KotlinClass?|>()
+        R|<local>/value|.R|/checkType|<R|KotlinClass?|>(<L> = checkType@fun R|CheckTypeInv<KotlinClass?>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|KotlinClass?|>()
         }
         )
         lval lambda: R|() -> KotlinClass| = R|<local>/kotlinClass|?.{ $subj$.R|kotlin/let|<R|KotlinClass|, R|() -> KotlinClass|>(<L> = let@fun <anonymous>(it: R|KotlinClass|): R|() -> KotlinClass| <kind=EXACTLY_ONCE>  {
@@ -28,8 +28,8 @@ FILE: lambdaArgInScopeFunction.kt
 
         }
         ) }
-        R|<local>/lambda|.R|tests/_checkType/checkType|<R|() -> KotlinClass|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function0<KotlinClass>?>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Unit) -> KotlinClass?|>()
+        R|<local>/lambda|.R|/checkType|<R|() -> KotlinClass|>(<L> = checkType@fun R|CheckTypeInv<kotlin/Function0<KotlinClass>?>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): /_>#<R|(kotlin/Unit) -> KotlinClass?|>()
         }
         )
     }
@@ -38,8 +38,8 @@ FILE: lambdaArgInScopeFunction.kt
             ^ R|<local>/it|
         }
         )
-        R|<local>/value|.R|tests/_checkType/checkType|<R|KotlinClass|>(<L> = checkType@fun R|tests/_checkType/Inv<KotlinClass>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|KotlinClass|>()
+        R|<local>/value|.R|/checkType|<R|KotlinClass|>(<L> = checkType@fun R|CheckTypeInv<KotlinClass>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|KotlinClass|>()
         }
         )
         lval lambda: R|() -> KotlinClass| = R|<local>/kotlinClass|.R|kotlin/let|<R|KotlinClass|, R|() -> KotlinClass|>(<L> = let@fun <anonymous>(it: R|KotlinClass|): R|() -> KotlinClass| <kind=EXACTLY_ONCE>  {
@@ -49,8 +49,8 @@ FILE: lambdaArgInScopeFunction.kt
 
         }
         )
-        R|<local>/lambda|.R|tests/_checkType/checkType|<R|() -> KotlinClass|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function0<KotlinClass>>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Unit) -> KotlinClass?|>()
+        R|<local>/lambda|.R|/checkType|<R|() -> KotlinClass|>(<L> = checkType@fun R|CheckTypeInv<kotlin/Function0<KotlinClass>>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): /_>#<R|(kotlin/Unit) -> KotlinClass?|>()
         }
         )
     }
@@ -58,13 +58,13 @@ FILE: CHECK_TYPE.kt
     public final fun <T> checkSubtype(t: R|T|): R|T| {
         ^checkSubtype R|<local>/t|
     }
-    public final class Inv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|tests/_checkType/Inv<T>| {
+    public final class CheckTypeInv<T> : R|kotlin/Any| {
+        public constructor<T>(): R|CheckTypeInv<T>| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public final fun <E> R|tests/_checkType/Inv<E>|._(): R|kotlin/Unit| {
+    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
     }
-    public final infix fun <T> R|T|.checkType(f: R|tests/_checkType/Inv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
+    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt
index c0604b85fca..cdbe4d22f72 100644
--- a/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt
@@ -3,7 +3,7 @@ FILE: lambdaInLhsOfTypeOperatorCall.kt
     }
     public final fun test_1(b: R|B<kotlin/String, kotlin/Number>|): R|kotlin/Unit| {
         R|/foo|((R|<local>/b|.R|/myMap|<R|kotlin/String|, R|kotlin/Int|, R|kotlin/Number|>(<L> = myMap@fun <anonymous>(it: R|B<kotlin/String, kotlin/Number>|): R|kotlin/Int| {
-            ^ R|<local>/it|.R|FakeOverride</B.k: R|kotlin/String|>|.R|kotlin/String.length|
+            ^ R|<local>/it|.R|SubstitutionOverride</B.k: R|kotlin/String|>|.R|kotlin/String.length|
         }
         ) as R|B<kotlin/Int, kotlin/Int>|))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
index 5b1c6449801..38bcc13dff5 100644
--- a/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
@@ -24,16 +24,16 @@ FILE: KotlinClass.kt
             }
         }
 
-        R|<local>/validType|.R|tests/_checkType/checkType|<R|(JavaClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<JavaClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|(JavaClass) -> kotlin/Boolean|>()
+        R|<local>/validType|.R|/checkType|<R|(JavaClass) -> kotlin/Boolean|>(<L> = checkType@fun R|CheckTypeInv<kotlin/Function1<JavaClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|(JavaClass) -> kotlin/Boolean|>()
         }
         )
-        R|<local>/invalidType|.R|tests/_checkType/checkType|<R|(JavaClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<JavaClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
+        R|<local>/invalidType|.R|/checkType|<R|(JavaClass) -> kotlin/Boolean|>(<L> = checkType@fun R|CheckTypeInv<kotlin/Function1<JavaClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): /_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
         }
         )
-        R|/Case1.Case1|(R|<local>/javaClass|).R|/Case1.x|.R|tests/_checkType/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
+        R|/Case1.Case1|(R|<local>/javaClass|).R|/Case1.x|.R|/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|CheckTypeInv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): /_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
         }
         )
     }
@@ -46,9 +46,9 @@ FILE: KotlinClass.kt
             public get(): R|JavaClass?|
 
         public final val x: R|(KotlinClass) -> kotlin/Boolean| = when () {
-            !=(R|<local>/javaClass|, Null(null)) ->  {
+            !=(this@R|/Case1|.R|/Case1.javaClass|, Null(null)) ->  {
                 fun <anonymous>(it: R|KotlinClass|): R|kotlin/Boolean| {
-                    ^ ==(R|<local>/it|, R|<local>/javaClass|)
+                    ^ ==(R|<local>/it|, this@R|/Case1|.R|/Case1.javaClass|)
                 }
 
             }
@@ -117,16 +117,16 @@ FILE: KotlinClass.kt
             }
         }
 
-        R|<local>/validType|.R|tests/_checkType/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|(KotlinClass) -> kotlin/Boolean|>()
+        R|<local>/validType|.R|/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|CheckTypeInv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|(KotlinClass) -> kotlin/Boolean|>()
         }
         )
-        R|<local>/invalidType|.R|tests/_checkType/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
+        R|<local>/invalidType|.R|/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|CheckTypeInv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): /_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
         }
         )
-        R|/Case2.Case2|(R|<local>/kotlinClass|).R|/Case2.x|.R|tests/_checkType/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
+        R|/Case2.Case2|(R|<local>/kotlinClass|).R|/Case2.x|.R|/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|CheckTypeInv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE_WRONG_RECEIVER): /_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
         }
         )
     }
@@ -139,9 +139,9 @@ FILE: KotlinClass.kt
             public get(): R|KotlinClass?|
 
         public final val x: R|(KotlinClass) -> kotlin/Boolean| = when () {
-            !=(R|<local>/kotlinClass|, Null(null)) ->  {
+            !=(this@R|/Case2|.R|/Case2.kotlinClass|, Null(null)) ->  {
                 fun <anonymous>(it: R|KotlinClass|): R|kotlin/Boolean| {
-                    ^ ==(R|<local>/it|, R|<local>/kotlinClass|)
+                    ^ ==(R|<local>/it|, this@R|/Case2|.R|/Case2.kotlinClass|)
                 }
 
             }
@@ -176,13 +176,13 @@ FILE: CHECK_TYPE.kt
     public final fun <T> checkSubtype(t: R|T|): R|T| {
         ^checkSubtype R|<local>/t|
     }
-    public final class Inv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|tests/_checkType/Inv<T>| {
+    public final class CheckTypeInv<T> : R|kotlin/Any| {
+        public constructor<T>(): R|CheckTypeInv<T>| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public final fun <E> R|tests/_checkType/Inv<E>|._(): R|kotlin/Unit| {
+    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
     }
-    public final infix fun <T> R|T|.checkType(f: R|tests/_checkType/Inv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
+    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/localObject.txt b/compiler/fir/analysis-tests/testData/resolve/localObject.txt
index 3411e16853f..798dfe4fb1b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/localObject.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/localObject.txt
@@ -1,6 +1,6 @@
 FILE: localObject.kt
     public final fun <T> run(block: R|() -> T|): R|T| {
-        ^run R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()
+        ^run R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()
     }
     public abstract interface Foo : R|kotlin/Any| {
         public abstract fun foo(): R|kotlin/Int|
diff --git a/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt b/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt
index de2e3414f51..b16c64244ce 100644
--- a/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt
@@ -201,13 +201,13 @@ FILE: CHECK_TYPE.kt
     public final fun <T> checkSubtype(t: R|T|): R|T| {
         ^checkSubtype R|<local>/t|
     }
-    public final class Inv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|tests/_checkType/Inv<T>| {
+    public final class CheckTypeInv<T> : R|kotlin/Any| {
+        public constructor<T>(): R|CheckTypeInv<T>| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public final fun <E> R|tests/_checkType/Inv<E>|._(): R|kotlin/Unit| {
+    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
     }
-    public final infix fun <T> R|T|.checkType(f: R|tests/_checkType/Inv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
+    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt
index cc30caa9158..763c233114c 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt
@@ -18,9 +18,9 @@ FILE: protobufExt.kt
 
     }
     public final fun <M : R|Message<M>|, T> R|Message<M>|.extF(e: R|Ext<M, T>|): R|T| {
-        ^extF this@R|/extF|.R|FakeOverride</Message.ext: R|T|>|<R|T|>(R|<local>/e|)
+        ^extF this@R|/extF|.R|SubstitutionOverride</Message.ext: R|T|>|<R|T|>(R|<local>/e|)
     }
     public final fun foo(m: R|MyMessage|, e: R|MyExt|): R|kotlin/Unit| {
-        R|<local>/m|.R|FakeOverride</MyMessage.ext: R|T|>|<R|kotlin/String|>(R|<local>/e|)
+        R|<local>/m|.R|SubstitutionOverride</MyMessage.ext: R|T|>|<R|kotlin/String|>(R|<local>/e|)
         R|<local>/m|.R|/extF|<R|MyMessage|, R|kotlin/String|>(R|<local>/e|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt
index 1b09bc74cfa..f0dc19b8bac 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt
@@ -21,7 +21,7 @@ FILE: simpleFakeOverride.kt
         }
 
         public final fun test(): R|kotlin/Unit| {
-            this@R|/B|.R|FakeOverride</B.foo: R|Some|>|(R|/Some.Some|())
+            this@R|/B|.R|SubstitutionOverride</B.foo: R|Some|>|(R|/Some.Some|())
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.txt
index 977db279c78..d24df0ce59d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.txt
@@ -30,43 +30,43 @@ FILE: simpleMostSpecific.kt
     public abstract interface D3 : R|A|, R|C| {
     }
     public final fun main(d1: R|D1|, d2: R|D2|, d3: R|D3|): R|kotlin/Unit| {
-        R|<local>/d1|.R|/B.x|.R|tests/_checkType/checkType|<R|kotlin/String|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String|>()
+        R|<local>/d1|.R|/B.x|.R|/checkType|<R|kotlin/String|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String|>()
         }
         )
         R|<local>/d1|.R|/B.x| = String()
-        R|<local>/d1|.R|/B.foo|().R|tests/_checkType/checkType|<R|kotlin/String|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String|>()
+        R|<local>/d1|.R|/B.foo|().R|/checkType|<R|kotlin/String|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String|>()
         }
         )
-        R|<local>/d1|.R|/B.bar|<R|kotlin/Int|, R|kotlin/String|>(Int(1), String()).R|tests/_checkType/checkType|<R|kotlin/String|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String|>()
+        R|<local>/d1|.R|/B.bar|<R|kotlin/Int|, R|kotlin/String|>(Int(1), String()).R|/checkType|<R|kotlin/String|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String|>()
         }
         )
-        R|<local>/d2|.R|/B.x|.R|tests/_checkType/checkType|<R|kotlin/String|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String|>()
+        R|<local>/d2|.R|/B.x|.R|/checkType|<R|kotlin/String|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String|>()
         }
         )
         R|<local>/d2|.R|/B.x| = String()
-        R|<local>/d2|.R|/B.foo|().R|tests/_checkType/checkType|<R|kotlin/String|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String|>()
+        R|<local>/d2|.R|/B.foo|().R|/checkType|<R|kotlin/String|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String|>()
         }
         )
-        R|<local>/d2|.R|/B.bar|<R|kotlin/Int|, R|kotlin/String|>(Int(1), String()).R|tests/_checkType/checkType|<R|kotlin/String|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String|>()
+        R|<local>/d2|.R|/B.bar|<R|kotlin/Int|, R|kotlin/String|>(Int(1), String()).R|/checkType|<R|kotlin/String|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String|>()
         }
         )
-        R|<local>/d3|.R|/C.x|.R|tests/_checkType/checkType|<R|kotlin/String|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String|>()
+        R|<local>/d3|.R|/C.x|.R|/checkType|<R|kotlin/String|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String|>()
         }
         )
         R|<local>/d3|.R|/C.x| = String()
-        R|<local>/d3|.R|/A.foo|().R|tests/_checkType/checkType|<R|kotlin/String?|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String?>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String?|>()
+        R|<local>/d3|.R|/A.foo|().R|/checkType|<R|kotlin/String?|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String?>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String?|>()
         }
         )
-        R|<local>/d3|.R|/A.bar|<R|kotlin/Int|, R|kotlin/String|>(Int(1), String()).R|tests/_checkType/checkType|<R|kotlin/String?|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/String?>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/String?|>()
+        R|<local>/d3|.R|/A.bar|<R|kotlin/Int|, R|kotlin/String|>(Int(1), String()).R|/checkType|<R|kotlin/String?|>(<L> = checkType@fun R|CheckTypeInv<kotlin/String?>|.<anonymous>(): R|kotlin/Unit| {
+            this@R|special/anonymous|.R|/_|<R|kotlin/String?|>()
         }
         )
     }
@@ -74,13 +74,13 @@ FILE: CHECK_TYPE.kt
     public final fun <T> checkSubtype(t: R|T|): R|T| {
         ^checkSubtype R|<local>/t|
     }
-    public final class Inv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|tests/_checkType/Inv<T>| {
+    public final class CheckTypeInv<T> : R|kotlin/Any| {
+        public constructor<T>(): R|CheckTypeInv<T>| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public final fun <E> R|tests/_checkType/Inv<E>|._(): R|kotlin/Unit| {
+    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
     }
-    public final infix fun <T> R|T|.checkType(f: R|tests/_checkType/Inv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
+    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt
index d149a8ce125..968b92edd2b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt
@@ -19,5 +19,5 @@ FILE: supertypeGenerics.kt
 
     }
     public final fun f(list: R|kotlin/collections/List<kotlin/Int>|, s: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit| {
-        R|/C.C|().R|FakeOverride</C.f: R|kotlin/Unit|>|<R|kotlin/Int|>(R|<local>/list|, R|<local>/s|)
+        R|/C.C|().R|/C.f|<R|kotlin/Int|>(R|<local>/list|, R|<local>/s|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt
index 36cb9664b7a..01055594087 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt
@@ -23,6 +23,6 @@ FILE: supertypeGenericsComplex.kt
 
     }
     public final fun f(list: R|kotlin/collections/MutableList<X>|, s: R|kotlin/collections/MutableList<kotlin/CharSequence>|): R|kotlin/Unit| {
-        R|/C.C|().R|FakeOverride</C.f: R|kotlin/Unit|>|<R|X|>(R|<local>/list|, R|<local>/s|)
+        R|/C.C|().R|SubstitutionOverride</C.f: R|kotlin/Unit|>|<R|X|>(R|<local>/list|, R|<local>/s|)
         R|/C.C|().<Inapplicable(INAPPLICABLE): /C.f>#<R|kotlin/CharSequence|>(R|<local>/s|, R|<local>/list|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt
index 550b1164784..f816262f368 100644
--- a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        R|/JavaClass.JavaClass|<R|ft<kotlin/String, kotlin/String?>!|>(Null(null)).R|FakeOverride</JavaClass.foo: R|ft<kotlin/String, kotlin/String?>!|>|().R|kotlin/String.length|
+        R|/JavaClass.JavaClass|<R|ft<kotlin/String, kotlin/String?>!|>(Null(null)).R|SubstitutionOverride</JavaClass.foo: R|ft<kotlin/String, kotlin/String?>!|>|().R|kotlin/String.length|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt b/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt
index f9064f2d6aa..897c6475ab9 100644
--- a/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt
@@ -24,6 +24,6 @@ FILE: safeCallInvoke.kt
 
     }
     public final fun main(b: R|B?|): R|kotlin/Unit| {
-        R|<local>/b|?.{ $subj$.R|/B.bar|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|() }
+        R|<local>/b|?.{ $subj$.R|/B.bar|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|() }
         R|<local>/b|?.{ $subj$.R|/B.foo|.R|/A.invoke|() }
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.txt b/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.txt
index 74283bc868c..30060d84ced 100644
--- a/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.txt
@@ -1,10 +1,10 @@
 FILE: main.kt
     public final fun test_1(x: R|A|): R|kotlin/Unit| {
-        lval str1: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/x|.R|/A.vmParameters|
+        lval str1: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/x|.R|/A.vmParameters|
         lval str2: R|ERROR CLASS: Unresolved name: vMParameters| = R|<local>/x|.<Unresolved name: vMParameters>#
     }
     public final fun test_2(x: R|B|): R|kotlin/Unit| {
-        lval int: R|ft<kotlin/Int, kotlin/Int?>!| = R|<local>/x|.R|/B.vmParameters|
+        lval int: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| = R|<local>/x|.R|/B.vmParameters|
         lval error: R|ERROR CLASS: Unresolved name: vMParameters| = R|<local>/x|.<Unresolved name: vMParameters>#
     }
     public final fun test_3(x: R|C|): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.kt b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.kt
new file mode 100644
index 00000000000..9b38b48514e
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.kt
@@ -0,0 +1,17 @@
+// FILE: main.kt
+
+fun foo() {
+    RawType.bar {
+        it.length > 0
+    }
+}
+
+// FILE: Processor.java
+public interface Processor<T extends CharSequence> {
+    boolean process(T t);
+}
+
+// FILE: RawType.java
+public class RawType {
+    public static void bar(Processor x) {}
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.txt b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.txt
new file mode 100644
index 00000000000..3f45b125029
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.txt
@@ -0,0 +1,7 @@
+FILE: main.kt
+    public final fun foo(): R|kotlin/Unit| {
+        Q|RawType|.R|/RawType.bar|(<L> = bar@fun <anonymous>(it: R|ft<@FlexibleNullability kotlin/CharSequence, @FlexibleNullability kotlin/CharSequence?>!|): R|kotlin/Boolean| {
+            ^ CMP(>, R|<local>/it|.R|kotlin/CharSequence.length|.R|kotlin/Int.compareTo|(Int(0)))
+        }
+        )
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt b/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt
index 8af5f079e5e..35ec125e8b5 100644
--- a/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt
@@ -33,7 +33,7 @@ FILE: recursiveCallOnWhenWithSealedClass.kt
                     throw R|java/lang/Exception.Exception|(String())
                 }
                 ($subj$ is R|Maybe.Yeah<T>|) ->  {
-                    this@R|/Maybe|.R|FakeOverride</Maybe.Yeah.meat: R|T|>|
+                    this@R|/Maybe|.R|SubstitutionOverride</Maybe.Yeah.meat: R|T|>|
                 }
             }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.kt b/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.kt
index f5853d4520e..721dae462a6 100644
--- a/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.kt
@@ -36,12 +36,12 @@ class NoGenericTest {
     fun B.extensionFun(): A = A()
 
     fun test_1() {
-        val extensionValRef = <!UNRESOLVED_REFERENCE!>B::extensionVal<!>
-        val extensionFunRef = <!UNRESOLVED_REFERENCE!>B::extensionFun<!>
+        val extensionValRef = B::extensionVal
+        val extensionFunRef = B::extensionFun
     }
 
     fun test_2() {
         val memberValRef = B::memberVal
         val memberFunRef = B::memberFun
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt b/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt
index 87e94295229..7245b85dce5 100644
--- a/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt
@@ -16,27 +16,27 @@ FILE: referenceToExtension.kt
                 super<R|kotlin/Any|>()
             }
 
-            public final val memberVal: R|GenericTest.A<T>| = R|/GenericTest.A.A|<R|T|>()
+            public final val memberVal: R|GenericTest.A<T>| = R|SubstitutionOverride</GenericTest.A.A>|<R|T|>()
                 public get(): R|GenericTest.A<T>|
 
             public final fun memberFun(): R|GenericTest.A<T>| {
-                ^memberFun R|/GenericTest.A.A|<R|T|>()
+                ^memberFun R|SubstitutionOverride</GenericTest.A.A>|<R|T|>()
             }
 
         }
 
         public final val <T> R|GenericTest.B<T>|.extensionVal: R|GenericTest.A<T>|
             public get(): R|GenericTest.A<T>| {
-                ^ R|/GenericTest.A.A|<R|T|>()
+                ^ R|SubstitutionOverride</GenericTest.A.A>|<R|T|>()
             }
 
         public final fun <T> R|GenericTest.B<T>|.extensionFun(): R|GenericTest.A<T>| {
-            ^extensionFun R|/GenericTest.A.A|<R|T|>()
+            ^extensionFun R|SubstitutionOverride</GenericTest.A.A>|<R|T|>()
         }
 
         public final fun test_1(): R|kotlin/Unit| {
-            lval memberValRef: R|kotlin/reflect/KProperty1<GenericTest.B<*>, GenericTest.A<CapturedType(*)>>| = Q|GenericTest.B|::R|FakeOverride</GenericTest.B.memberVal: R|GenericTest.A<CapturedType(*)>|>|
-            lval memberFunRef: R|kotlin/reflect/KFunction1<GenericTest.B<*>, GenericTest.A<CapturedType(*)>>| = Q|GenericTest.B|::R|FakeOverride</GenericTest.B.memberFun: R|GenericTest.A<CapturedType(*)>|>|
+            lval memberValRef: R|kotlin/reflect/KProperty1<GenericTest.B<*>, GenericTest.A<CapturedType(*)>>| = Q|GenericTest.B|::R|SubstitutionOverride</GenericTest.B.memberVal: R|GenericTest.A<CapturedType(*)>|>|
+            lval memberFunRef: R|kotlin/reflect/KFunction1<GenericTest.B<*>, GenericTest.A<CapturedType(*)>>| = Q|GenericTest.B|::R|SubstitutionOverride</GenericTest.B.memberFun: R|GenericTest.A<CapturedType(*)>|>|
         }
 
         public final fun test_2(): R|kotlin/Unit| {
@@ -81,8 +81,8 @@ FILE: referenceToExtension.kt
         }
 
         public final fun test_1(): R|kotlin/Unit| {
-            lval extensionValRef: <ERROR TYPE REF: No result type for initializer> = Q|NoGenericTest.B|::<Unresolved name: extensionVal>#
-            lval extensionFunRef: <ERROR TYPE REF: No result type for initializer> = Q|NoGenericTest.B|::<Unresolved name: extensionFun>#
+            lval extensionValRef: R|kotlin/reflect/KProperty1<NoGenericTest.B, NoGenericTest.A>| = Q|NoGenericTest.B|::R|/NoGenericTest.extensionVal|
+            lval extensionFunRef: R|kotlin/reflect/KFunction1<NoGenericTest.B, NoGenericTest.A>| = Q|NoGenericTest.B|::R|/NoGenericTest.extensionFun|
         }
 
         public final fun test_2(): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt
index f6758085a0f..7df65bfaa24 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt
@@ -1,14 +1,14 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaUsage|.R|/JavaUsage.foo1|(<L> = foo1@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>!|): R|ft<kotlin/String, kotlin/String?>!| {
+        Q|JavaUsage|.R|/JavaUsage.foo1|(<L> = foo1@fun <anonymous>(x: R|ft<@FlexibleNullability kotlin/Int, @FlexibleNullability kotlin/Int?>!|): R|ft<@FlexibleNullability kotlin/String, @FlexibleNullability kotlin/String?>!| {
             ^ R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Any.toString|()
         }
         )
-        Q|JavaUsage|.R|/JavaUsage.foo2|(<L> = foo2@fun <anonymous>(x: R|ft<kotlin/Number, kotlin/Number?>!|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>!| {
+        Q|JavaUsage|.R|/JavaUsage.foo2|(<L> = foo2@fun <anonymous>(x: R|ft<@FlexibleNullability kotlin/Number, @FlexibleNullability kotlin/Number?>!|): R|ft<@FlexibleNullability kotlin/CharSequence, @FlexibleNullability kotlin/CharSequence?>!| {
             ^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|()
         }
         )
-        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo2>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>!| {
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo2>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|ft<@FlexibleNullability kotlin/CharSequence, @FlexibleNullability kotlin/CharSequence?>!| {
             ^ R|<local>/x|.R|kotlin/Any.toString|()
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.txt
index b3cda246e11..2cfa6ec3e37 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.txt
@@ -2,11 +2,11 @@ FILE: main.kt
     public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaUsage|.R|/JavaUsage.foo|(<L> = foo@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/Boolean, kotlin/Boolean?>!| {
+        Q|JavaUsage|.R|/JavaUsage.foo|(<L> = foo@fun <anonymous>(x: R|kotlin/Int|): R|ft<@FlexibleNullability kotlin/Boolean, kotlin/Boolean?>!| {
             ^ CMP(>, R|<local>/x|.R|kotlin/Int.compareTo|(Int(1)))
         }
         )
-        Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun <anonymous>(it: R|kotlin/Int|): R|ft<kotlin/Boolean, kotlin/Boolean?>!| {
+        Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun <anonymous>(it: R|kotlin/Int|): R|ft<@FlexibleNullability kotlin/Boolean, kotlin/Boolean?>!| {
             ^ CMP(>, R|<local>/it|.R|kotlin/Int.compareTo|(Int(1)))
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.txt
index a6d69638131..3cd01d2b6ea 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.txt
@@ -5,7 +5,7 @@ FILE: main.kt
 
     }
     public final fun main(): R|kotlin/Unit| {
-        Q|OverridingUtil|.R|/OverridingUtil.createWithEqualityAxioms|(<L> = l1@fun <anonymous>(c1: R|ft<TypeConstructor, TypeConstructor?>!|, c2: R|ft<TypeConstructor, TypeConstructor?>!|): R|kotlin/Boolean| {
+        Q|OverridingUtil|.R|/OverridingUtil.createWithEqualityAxioms|(<L> = l1@fun <anonymous>(c1: R|ft<@FlexibleNullability TypeConstructor, TypeConstructor?>!|, c2: R|ft<@FlexibleNullability TypeConstructor, TypeConstructor?>!|): R|kotlin/Boolean| {
             when () {
                 ==(R|<local>/c1|.R|/TypeConstructor.x|, R|<local>/c2|.R|/TypeConstructor.x|) ->  {
                     ^@l1 Boolean(true)
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot
index da3fec98d59..cc5243f14e3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot
@@ -49,7 +49,7 @@ digraph boundSmartcastsInBranches_kt {
             13 [label="Const: Null(null)"];
             14 [label="Variable declaration: lvar goodA: R|A?|"];
             15 [label="Access variable R|<local>/list|"];
-            16 [label="Function call: R|<local>/list|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<A>|>|()"];
+            16 [label="Function call: R|<local>/list|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<A>|>|()"];
             17 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<A>|"];
             subgraph cluster_6 {
                 color=blue
@@ -68,7 +68,7 @@ digraph boundSmartcastsInBranches_kt {
                         color=blue
                         24 [label="Enter block"];
                         25 [label="Access variable R|<local>/<iterator>|"];
-                        26 [label="Function call: R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|A|>|()"];
+                        26 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|A|>|()"];
                         27 [label="Variable declaration: lval a: R|A|"];
                         subgraph cluster_10 {
                             color=blue
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt
index e9006007d22..789fa0ae7b8 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt
@@ -10,9 +10,9 @@ FILE: boundSmartcastsInBranches.kt
     }
     public final fun test_0(list: R|kotlin/collections/List<A>|): R|kotlin/Unit| {
         lvar goodA: R|A?| = Null(null)
-        lval <iterator>: R|kotlin/collections/Iterator<A>| = R|<local>/list|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<A>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<A>| = R|<local>/list|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<A>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval a: R|A| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|A|>|()
+            lval a: R|A| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|A|>|()
             when () {
                 ==(R|<local>/goodA|, Null(null)) ->  {
                     R|<local>/goodA| = R|<local>/a|
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot
index 84480f9d0b6..b4be8d08174 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot
@@ -389,8 +389,8 @@ digraph returns_kt {
         subgraph cluster_37 {
             color=blue
             136 [label="Enter block"];
-            137 [label="Function call: R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
-            138 [label="Jump: ^runHigherOrder R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
+            137 [label="Function call: R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
+            138 [label="Jump: ^runHigherOrder R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
             139 [label="Stub" style="filled" fillcolor=gray];
             140 [label="Exit block" style="filled" fillcolor=gray];
         }
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt
index cedc017b569..aae0e4a5854 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt
@@ -66,7 +66,7 @@ FILE: returns.kt
         R|<local>/x|.<Unresolved name: baz>#()
     }
     public final fun <T> runHigherOrder(f: R|() -> T|): R|T| {
-        ^runHigherOrder R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()
+        ^runHigherOrder R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()
     }
     public final val R|kotlin/String|.ext: R|kotlin/Int|
         public get(): R|kotlin/Int| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt
index ecdf1185447..82fa888bc7c 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt
@@ -16,7 +16,7 @@ FILE: kt10240.kt
         ^a R|<local>/c|
     }
     public final fun myRun(f: R|() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun println(arg: R|kotlin/Int|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.dot
index 24b748b1a0c..0683e33e164 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.dot
@@ -25,7 +25,7 @@ digraph smartcastOnLambda_kt {
                 subgraph cluster_4 {
                     color=blue
                     10 [label="Enter block"];
-                    11 [label="Function call: R|<local>/func|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    11 [label="Function call: R|<local>/func|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     12 [label="Exit block"];
                 }
                 13 [label="Exit when branch result"];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt
index 882102eccd7..7dcfd77ab23 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt
@@ -2,7 +2,7 @@ FILE: smartcastOnLambda.kt
     public final fun test(func: R|() -> kotlin/Unit|): R|kotlin/Unit| {
         when () {
             !=(R|<local>/func|, Null(null)) ->  {
-                R|<local>/func|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/func|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt
index abe72bc3c04..535c6b51223 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt
@@ -2,11 +2,11 @@ FILE: invoke.kt
     public final fun R|kotlin/Any|.withInvoke(f: R|kotlin/String.() -> kotlin/Unit|): R|kotlin/Unit| {
         when () {
             (this@R|/withInvoke| is R|kotlin/String|) ->  {
-                R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/withInvoke|)
+                R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/withInvoke|)
             }
         }
 
     }
     public final fun R|kotlin/String|.withInvoke(f: R|kotlin/String.() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/withInvoke|)
+        R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/withInvoke|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot
index 63def262b91..b99487dfc0d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot
@@ -181,7 +181,7 @@ digraph smartcastToNothing_kt {
             57 [label="Const: Null(null)"];
             58 [label="Variable declaration: lvar s: R|A?|"];
             59 [label="Access variable R|<local>/results|"];
-            60 [label="Function call: R|<local>/results|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Nothing>|>|()"];
+            60 [label="Function call: R|<local>/results|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Nothing>|>|()"];
             61 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Nothing>|"];
             subgraph cluster_18 {
                 color=blue
@@ -200,7 +200,7 @@ digraph smartcastToNothing_kt {
                         color=blue
                         68 [label="Enter block"];
                         69 [label="Access variable R|<local>/<iterator>|"];
-                        70 [label="Function call: R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/Nothing|>|()"];
+                        70 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Nothing|>|()"];
                         71 [label="Stub" style="filled" fillcolor=gray];
                         72 [label="Variable declaration: lval result: R|kotlin/Nothing|" style="filled" fillcolor=gray];
                         73 [label="Access variable R|<local>/result|" style="filled" fillcolor=gray];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt
index 5e0fbe3650a..bc8f2ab08ec 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt
@@ -30,9 +30,9 @@ FILE: smartcastToNothing.kt
     }
     public final fun test_0(results: R|kotlin/collections/List<kotlin/Nothing>|): R|kotlin/Unit| {
         lvar s: R|A?| = Null(null)
-        lval <iterator>: R|kotlin/collections/Iterator<kotlin/Nothing>| = R|<local>/results|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Nothing>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<kotlin/Nothing>| = R|<local>/results|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Nothing>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval result: R|kotlin/Nothing| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/Nothing|>|()
+            lval result: R|kotlin/Nothing| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Nothing|>|()
             R|<local>/s| = R|<local>/result|
             when () {
                 R|<local>/result|.<Unresolved name: b># ->  {
diff --git a/compiler/fir/analysis-tests/testData/resolve/spreadOperator.txt b/compiler/fir/analysis-tests/testData/resolve/spreadOperator.txt
index 196fc39dbae..307f214df0d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/spreadOperator.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/spreadOperator.txt
@@ -16,7 +16,7 @@ FILE: Main.kt
         R|/takeStrings|(R|<local>/list|)
     }
     public final fun testFromJava(): R|kotlin/Unit| {
-        lval values: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!| = Q|Utils|.R|/Utils.getStrings|()
-        lval list: R|kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>| = R|/myListOf|<R|ft<kotlin/String, kotlin/String?>!|>(vararg(*R|<local>/values|))
+        lval values: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!| = Q|Utils|.R|/Utils.getStrings|()
+        lval list: R|kotlin/collections/List<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>| = R|/myListOf|<R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>(vararg(*R|<local>/values|))
         R|/takeStrings|(R|<local>/list|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt
index 399fa0e7a81..f18dc2a03e0 100644
--- a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt
@@ -1,5 +1,5 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        Q|Keys|.R|/Keys.getData|<R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|>(Q|Keys|.R|/Keys.X|).R|FakeOverride<kotlin/Array.get: R|ft<kotlin/String, kotlin/String?>!|>|(Int(0)).R|kotlin/String.length|
-        Q|Keys|.R|/Keys.getData|<R|ft<kotlin/String, kotlin/String?>!|>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length|
+        Q|Keys|.R|/Keys.getData|<R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|>(Q|Keys|.R|/Keys.X|).R|SubstitutionOverride<kotlin/Array.get: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>|(Int(0)).R|kotlin/String.length|
+        Q|Keys|.R|/Keys.getData|<R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt
index cd59407f376..d2149970776 100644
--- a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt
@@ -1,5 +1,5 @@
 FILE: main.kt
     public final fun main(x: R|kotlin/collections/MutableCollection<kotlin/collections/Set<kotlin/String>>|): R|kotlin/Unit| {
-        lval y: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!| = Q|ContainerUtil|.R|/ContainerUtil.flatten|<R|ft<kotlin/String, kotlin/String?>!|>(R|<local>/x|)
-        R|<local>/y|.R|FakeOverride<kotlin/collections/MutableList.get: R|ft<kotlin/String, kotlin/String?>!|>|(Int(0)).R|kotlin/String.length|
+        lval y: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!| = Q|ContainerUtil|.R|/ContainerUtil.flatten|<R|ft<kotlin/String, kotlin/String?>!|>(R|<local>/x|)
+        R|<local>/y|.R|SubstitutionOverride<kotlin/collections/MutableList.get: R|ft<kotlin/String, kotlin/String?>!|>|(Int(0)).R|kotlin/String.length|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt b/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt
index 791e4be26b4..150abf3b79f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt
@@ -22,31 +22,31 @@ FILE: typeAliasWithTypeArguments.kt
     public final typealias Inv2<X, Y> = R|Inv<X, Y>|
     public final typealias Inv3<X, Y, Z> = R|Inv<X, Z>|
     public final fun testBase(inv: R|Inv<A, B>|): R|kotlin/Unit| {
-        R|<local>/inv|.R|FakeOverride</Inv.k: R|A|>|()
-        R|<local>/inv|.R|FakeOverride</Inv.t: R|B|>|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.k: R|A|>|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.t: R|B|>|()
     }
     public final fun test_0(inv: R|Inv0|): R|kotlin/Unit| {
-        R|<local>/inv|.R|FakeOverride</Inv.k: R|A|>|().R|/A.foo|()
-        R|<local>/inv|.R|FakeOverride</Inv.t: R|B|>|().R|/B.bar|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.k: R|A|>|().R|/A.foo|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.t: R|B|>|().R|/B.bar|()
     }
     public final fun test_1(inv: R|Inv1<B>|): R|kotlin/Unit| {
-        R|<local>/inv|.R|FakeOverride</Inv.k: R|A|>|().R|/A.foo|()
-        R|<local>/inv|.R|FakeOverride</Inv.t: R|B|>|().R|/B.bar|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.k: R|A|>|().R|/A.foo|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.t: R|B|>|().R|/B.bar|()
     }
     public final fun test_2(inv: R|Inv2<A, B>|): R|kotlin/Unit| {
-        R|<local>/inv|.R|FakeOverride</Inv.k: R|A|>|().R|/A.foo|()
-        R|<local>/inv|.R|FakeOverride</Inv.t: R|B|>|().R|/B.bar|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.k: R|A|>|().R|/A.foo|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.t: R|B|>|().R|/B.bar|()
     }
     public final fun test_3(inv: R|Inv3<A, B, C>|): R|kotlin/Unit| {
-        R|<local>/inv|.R|FakeOverride</Inv.k: R|A|>|().R|/A.foo|()
-        R|<local>/inv|.R|FakeOverride</Inv.t: R|C|>|().<Unresolved name: bar>#()
-        R|<local>/inv|.R|FakeOverride</Inv.t: R|C|>|().R|/C.baz|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.k: R|A|>|().R|/A.foo|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.t: R|C|>|().<Unresolved name: bar>#()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.t: R|C|>|().R|/C.baz|()
     }
     public final typealias Inv02<A1, B1, C1> = R|Inv<Inv<A1, B1>, C1>|
     public final fun test_4(inv: R|Inv02<A, B, C>|): R|kotlin/Unit| {
-        R|<local>/inv|.R|FakeOverride</Inv.k: R|Inv<A, B>|>|().R|FakeOverride</Inv.k: R|A|>|().R|/A.foo|()
-        R|<local>/inv|.R|FakeOverride</Inv.k: R|Inv<A, B>|>|().R|FakeOverride</Inv.t: R|B|>|().R|/B.bar|()
-        R|<local>/inv|.R|FakeOverride</Inv.t: R|C|>|().R|/C.baz|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.k: R|Inv<A, B>|>|().R|SubstitutionOverride</Inv.k: R|A|>|().R|/A.foo|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.k: R|Inv<A, B>|>|().R|SubstitutionOverride</Inv.t: R|B|>|().R|/B.bar|()
+        R|<local>/inv|.R|SubstitutionOverride</Inv.t: R|C|>|().R|/C.baz|()
     }
     public abstract interface In<in T> : R|kotlin/Any| {
         public abstract fun take(x: R|T|): R|kotlin/Unit|
@@ -66,20 +66,20 @@ FILE: typeAliasWithTypeArguments.kt
     public final typealias Out1<X> = R|Out<X>|
     public final typealias Invariant1<X> = R|Invariant<X>|
     public final fun test_5(a: R|A|, in1: R|In1<A>|, in2: R|In1<in A>|, in3: R|In1<out A>|): R|kotlin/Unit| {
-        R|<local>/in1|.R|FakeOverride</In.take: R|kotlin/Unit|>|(R|<local>/a|)
-        R|<local>/in2|.R|FakeOverride</In.take: R|kotlin/Unit|>|(R|<local>/a|)
+        R|<local>/in1|.R|SubstitutionOverride</In.take: R|kotlin/Unit|>|(R|<local>/a|)
+        R|<local>/in2|.R|SubstitutionOverride</In.take: R|kotlin/Unit|>|(R|<local>/a|)
         R|<local>/in3|.<Unresolved name: take>#(R|<local>/a|)
     }
     public final fun test_6(a: R|A|, out1: R|Out1<A>|, out2: R|Out1<in A>|, out3: R|Out1<out A>|): R|kotlin/Unit| {
-        R|<local>/out1|.R|FakeOverride</Out.value: R|A|>|().R|/A.foo|()
+        R|<local>/out1|.R|SubstitutionOverride</Out.value: R|A|>|().R|/A.foo|()
         R|<local>/out2|.<Unresolved name: value>#().<Unresolved name: foo>#()
-        R|<local>/out3|.R|FakeOverride</Out.value: R|CapturedType(out A)|>|().R|/A.foo|()
+        R|<local>/out3|.R|SubstitutionOverride</Out.value: R|CapturedType(out A)|>|().R|/A.foo|()
     }
     public final fun test_7(a: R|A|, inv1: R|Invariant1<A>|, inv2: R|Invariant1<in A>|, inv3: R|Invariant1<out A>|): R|kotlin/Unit| {
-        R|<local>/inv1|.R|FakeOverride</Invariant.value: R|A|>|().R|/A.foo|()
-        R|<local>/inv2|.R|FakeOverride</Invariant.value: R|CapturedType(in A)|>|().<Unresolved name: foo>#()
-        R|<local>/inv3|.R|FakeOverride</Invariant.value: R|CapturedType(out A)|>|().R|/A.foo|()
-        R|<local>/inv1|.R|FakeOverride</Invariant.take: R|kotlin/Unit|>|(R|<local>/a|)
-        R|<local>/inv2|.R|FakeOverride</Invariant.take: R|kotlin/Unit|>|(R|<local>/a|)
+        R|<local>/inv1|.R|SubstitutionOverride</Invariant.value: R|A|>|().R|/A.foo|()
+        R|<local>/inv2|.R|SubstitutionOverride</Invariant.value: R|CapturedType(in A)|>|().<Unresolved name: foo>#()
+        R|<local>/inv3|.R|SubstitutionOverride</Invariant.value: R|CapturedType(out A)|>|().R|/A.foo|()
+        R|<local>/inv1|.R|SubstitutionOverride</Invariant.take: R|kotlin/Unit|>|(R|<local>/a|)
+        R|<local>/inv2|.R|SubstitutionOverride</Invariant.take: R|kotlin/Unit|>|(R|<local>/a|)
         R|<local>/inv3|.<Inapplicable(INAPPLICABLE): /Invariant.take>#(R|<local>/a|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt
index 4d524ea9d11..8b9a7d06ea7 100644
--- a/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt
@@ -32,7 +32,7 @@ FILE: bareWithSubjectTypeAlias.kt
     public final fun foo(): R|kotlin/Unit| {
         when (lval a: R|TA| = R|/bar|()) {
             ($subj$ is R|A.B<kotlin/CharSequence>|) ->  {
-                R|<local>/a|.R|FakeOverride</A.B.x: R|kotlin/CharSequence|>|.R|kotlin/CharSequence.length|
+                R|<local>/a|.R|SubstitutionOverride</A.B.x: R|kotlin/CharSequence|>|.R|kotlin/CharSequence.length|
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt
index 6507993c4bc..d8259c694dd 100644
--- a/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt
@@ -9,17 +9,17 @@ FILE: varargInPrimaryConstructor.kt
 
     }
     public final fun test_1(foo: R|Foo|): R|kotlin/Unit| {
-        lval <iterator>: R|kotlin/collections/Iterator<kotlin/String>| = R|<local>/foo|.R|/Foo.strings|.R|FakeOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<CapturedType(out kotlin/String)>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<kotlin/String>| = R|<local>/foo|.R|/Foo.strings|.R|SubstitutionOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<CapturedType(out kotlin/String)>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval s: R|kotlin/String| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/String|>|()
+            lval s: R|kotlin/String| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/String|>|()
             R|<local>/s|.R|kotlin/String.length|
         }
 
     }
     public final fun test_2(vararg strings: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit| {
-        lval <iterator>: R|kotlin/collections/Iterator<kotlin/String>| = R|<local>/strings|.R|FakeOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<CapturedType(out kotlin/String)>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<kotlin/String>| = R|<local>/strings|.R|SubstitutionOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<CapturedType(out kotlin/String)>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval s: R|kotlin/String| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/String|>|()
+            lval s: R|kotlin/String| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/String|>|()
             R|<local>/s|.R|kotlin/String.length|
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt
index ed2a56aa8bd..0c879152486 100644
--- a/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt
@@ -21,7 +21,7 @@ FILE: intersectionOverrideWithImplicitTypes.kt
     }
     public abstract interface B : R|Common| {
         public open override fun <T, R> foo(value: R|T|, producer: R|(T) -> R|): R|R| {
-            ^foo R|<local>/producer|.R|FakeOverride<kotlin/Function1.invoke: R|R|>|(R|<local>/value|)
+            ^foo R|<local>/producer|.R|SubstitutionOverride<kotlin/Function1.invoke: R|R|>|(R|<local>/value|)
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt
index 15e3d9ce8e1..898b85fe9ca 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt
@@ -2,10 +2,10 @@ FILE: addAllOnJavaCollection.kt
     public final fun foo(): R|kotlin/Unit| {
         lval y: R|kotlin/collections/List<kotlin/String>| = R|kotlin/collections/listOf|<R|kotlin/String|>(vararg(String(Alpha), String(Beta)))
         lval x: R|java/util/LinkedHashSet<kotlin/String>| = R|java/util/LinkedHashSet.LinkedHashSet|<R|kotlin/String|>().R|kotlin/apply|<R|java/util/LinkedHashSet<kotlin/String>|>(<L> = apply@fun R|java/util/LinkedHashSet<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
-            this@R|special/anonymous|.R|FakeOverride<java/util/LinkedHashSet.addAll: R|kotlin/Boolean|>|(R|<local>/y|)
+            this@R|special/anonymous|.R|SubstitutionOverride<java/util/LinkedHashSet.addAll: R|kotlin/Boolean|>|(R|<local>/y|)
         }
         )
         lval z: R|java/util/ArrayList<kotlin/String>| = R|java/util/ArrayList.ArrayList|<R|kotlin/String|>()
-        R|<local>/z|.R|FakeOverride<java/util/ArrayList.addAll: R|kotlin/Boolean|>|(R|<local>/y|)
-        R|<local>/z|.R|FakeOverride<java/util/ArrayList.add: R|kotlin/Boolean|>|(String(Omega))
+        R|<local>/z|.R|SubstitutionOverride<java/util/ArrayList.addAll: R|kotlin/Boolean|>|(R|<local>/y|)
+        R|<local>/z|.R|SubstitutionOverride<java/util/ArrayList.add: R|kotlin/Boolean|>|(String(Omega))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt
index 12e7d7aee09..2d1e1e2c22d 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt
@@ -13,7 +13,7 @@ FILE: arrayFirstOrNull.kt
                 Null(null)
             }
             else ->  {
-                this@R|/firstOrNullX|.R|FakeOverride<kotlin/Array.get: R|CapturedType(out T)|>|(Int(0))
+                this@R|/firstOrNullX|.R|SubstitutionOverride<kotlin/Array.get: R|CapturedType(out T)|>|(Int(0))
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt
index 842ad8c1c1e..7c529c5e443 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt
@@ -1,6 +1,6 @@
 FILE: withGenericFun.kt
     public final fun <T, R> apply(x: R|T|, f: R|(T) -> R|): R|R| {
-        ^apply R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|R|>|(R|<local>/x|)
+        ^apply R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|R|>|(R|<local>/x|)
     }
     public final fun foo(i: R|kotlin/Int|): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt
index 5abb5b7265c..66181de3e8f 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt
@@ -19,5 +19,5 @@ FILE: ifWithCR.kt
             }
         }
 
-        R|<local>/x|.R|FakeOverride<kotlin/reflect/KMutableProperty0.get: R|kotlin/CharSequence?|>|()
+        R|<local>/x|.R|SubstitutionOverride<kotlin/reflect/KMutableProperty0.get: R|kotlin/CharSequence?|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt
index 0f6092958e2..80f0d45d8cd 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt
@@ -1,6 +1,6 @@
 FILE: cloneArray.kt
     public final fun test_1(array: R|kotlin/Array<kotlin/String>|): R|kotlin/Unit| {
-        R|<local>/array|.R|FakeOverride<kotlin/Array.clone: R|kotlin/Array<kotlin/String>|>|()
+        R|<local>/array|.R|SubstitutionOverride<kotlin/Array.clone: R|kotlin/Array<kotlin/String>|>|()
     }
     public final fun test_2(array: R|kotlin/IntArray|): R|kotlin/Unit| {
         R|<local>/array|.R|kotlin/IntArray.clone|()
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot
index 79adab4b991..bdb4b3cb219 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot
@@ -41,7 +41,7 @@ digraph complexPostponedCfg_kt {
                             color=blue
                             27 [label="Enter block"];
                             28 [label="Access variable this@R|special/anonymous|"];
-                            29 [label="Function call: this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)"];
+                            29 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)"];
                             30 [label="Access variable R|<local>/arguments|"];
                             31 [label="Function call: R|<local>/arguments|.R|kotlin/collections/last|<R|FirBase|>()"];
                             32 [label="Type operator: (R|<local>/arguments|.R|kotlin/collections/last|<R|FirBase|>() as R|FirFunctionCall|)"];
@@ -53,10 +53,10 @@ digraph complexPostponedCfg_kt {
                                     color=blue
                                     40 [label="Enter block"];
                                     41 [label="Access variable this@R|special/anonymous|"];
-                                    42 [label="Function call: this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)"];
+                                    42 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)"];
                                     43 [label="Access variable R|<local>/explicitReceiver|"];
                                     44 [label="Type operator: (R|<local>/explicitReceiver| as R|FirFunctionCall|)"];
-                                    45 [label="Function call: this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)"];
+                                    45 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)"];
                                     46 [label="Exit block"];
                                 }
                                 47 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt
index 76bfdd64ae8..9ece8fb6153 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt
@@ -6,10 +6,10 @@ FILE: complexPostponedCfg.kt
     public final fun foo(statements: R|kotlin/collections/List<FirBase>|, arguments: R|kotlin/collections/List<FirBase>|, explicitReceiver: R|FirBase|): R|kotlin/collections/List<FirFunctionCall>| {
         lval firstCalls: R|kotlin/collections/List<FirFunctionCall>| = R|kotlin/with|<R|FirFunctionCall|, R|kotlin/collections/List<FirFunctionCall>|>((R|<local>/statements|.R|kotlin/collections/last|<R|FirBase|>() as R|FirFunctionCall|), <L> = setCall@fun R|FirFunctionCall|.<anonymous>(): R|kotlin/collections/List<FirFunctionCall>| <kind=EXACTLY_ONCE>  {
             ^ R|kotlin/collections/buildList|<R|FirFunctionCall|>(<L> = buildList@fun R|kotlin/collections/MutableList<FirFunctionCall>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
-                this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(this@R|special/anonymous|)
+                this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(this@R|special/anonymous|)
                 R|kotlin/with|<R|FirFunctionCall|, R|kotlin/Boolean|>((R|<local>/arguments|.R|kotlin/collections/last|<R|FirBase|>() as R|FirFunctionCall|), <L> = plusCall@fun R|FirFunctionCall|.<anonymous>(): R|kotlin/Boolean| <kind=EXACTLY_ONCE>  {
-                    this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(this@R|special/anonymous|)
-                    this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|((R|<local>/explicitReceiver| as R|FirFunctionCall|))
+                    this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(this@R|special/anonymous|)
+                    this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|((R|<local>/explicitReceiver| as R|FirFunctionCall|))
                 }
                 )
             }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt
index c8415232c5e..beb03d83f97 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt
@@ -18,9 +18,9 @@ FILE: components.kt
 
     }
     public final fun foo(list: R|kotlin/collections/List<D>|): R|kotlin/Unit| {
-        lval <iterator>: R|kotlin/collections/Iterator<D>| = R|<local>/list|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<D>|>|()
+        lval <iterator>: R|kotlin/collections/Iterator<D>| = R|<local>/list|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<D>|>|()
         while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-            lval <destruct>: R|D| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|D|>|()
+            lval <destruct>: R|D| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|D|>|()
             lval x: R|kotlin/Int| = R|<local>/<destruct>|.R|/D.component1|()
             lval y: R|kotlin/String| = R|<local>/<destruct>|.R|/D.component2|()
         }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt
index 5b463950d0a..e26e679dc4a 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt
@@ -9,7 +9,7 @@ FILE: concurrentMapOfAliases.kt
             private get(): R|java/util/concurrent/ConcurrentHashMap<ft<kotlin/String, kotlin/String?>!, ft<kotlin/CharSequence, kotlin/CharSequence?>!>|
 
         private final fun bar(): R|kotlin/Unit| {
-            this@R|/A|.R|/A.foo|.R|FakeOverride<java/util/concurrent/ConcurrentHashMap.get: R|kotlin/CharSequence?|>|(String(dd))?.{ (this@R|/A|, $subj$).R|/A.baz|() }
+            this@R|/A|.R|/A.foo|.R|SubstitutionOverride<java/util/concurrent/ConcurrentHashMap.get: R|kotlin/CharSequence?|>|(String(dd))?.{ (this@R|/A|, $subj$).R|/A.baz|() }
         }
 
         private final fun R|MyAlias|.baz(): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot
index 0d37c8f05bb..08da0bfb74f 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot
@@ -242,8 +242,8 @@ digraph callsInPlace_kt {
         subgraph cluster_21 {
             color=blue
             80 [label="Enter block"];
-            81 [label="Function call: R|<local>/block1|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
-            82 [label="Function call: R|<local>/block2|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            81 [label="Function call: R|<local>/block1|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            82 [label="Function call: R|<local>/block2|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             83 [label="Exit block"];
         }
         84 [label="Exit function myRun" style="filled" fillcolor=red];
@@ -384,7 +384,7 @@ digraph callsInPlace_kt {
         subgraph cluster_35 {
             color=blue
             124 [label="Enter block"];
-            125 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            125 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             126 [label="Exit block"];
         }
         127 [label="Exit function myDummyRun" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt
index c006792858e..cf9196e0f33 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt
@@ -34,8 +34,8 @@ FILE: callsInPlace.kt
         )
     }
     public final inline fun myRun(block1: R|() -> kotlin/Unit|, block2: R|() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/block1|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
-        R|<local>/block2|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block1|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block2|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test_6(): R|kotlin/Unit| {
         R|/myRun|(myRun@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
@@ -56,7 +56,7 @@ FILE: callsInPlace.kt
         )
     }
     public final fun myDummyRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit| {
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test_8(): R|kotlin/Unit| {
         R|/myDummyRun|(<L> = myDummyRun@fun <anonymous>(): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot
index 4cef5af97aa..430d833bf8e 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot
@@ -13,7 +13,7 @@ digraph inAnonymousObject_kt {
             3 [label="Variable declaration: lval obj: R|<anonymous>|"];
             4 [label="Access variable R|<local>/obj|"];
             5 [label="Function call: R|<local>/obj|.R|/<anonymous>.run|()"];
-            6 [label="Function call: R|<local>/d|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            6 [label="Function call: R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             7 [label="Exit block"];
         }
         8 [label="Exit function foo" style="filled" fillcolor=red];
@@ -102,7 +102,7 @@ digraph inAnonymousObject_kt {
         subgraph cluster_10 {
             color=blue
             30 [label="Enter block"];
-            31 [label="Function call: R|<local>/c|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            31 [label="Function call: R|<local>/c|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             32 [label="Exit block"];
         }
         33 [label="Exit function run" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt
index 8052815637e..088e438a102 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt
@@ -25,11 +25,11 @@ FILE: inAnonymousObject.kt
             }
 
             public final override fun run(): R|kotlin/Unit| {
-                R|<local>/c|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/c|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
 
         }
 
         R|<local>/obj|.R|/<anonymous>.run|()
-        R|<local>/d|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot
index a353567b619..4f0ab306c9d 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot
@@ -12,7 +12,7 @@ digraph inLocalClass_kt {
             2 [label="Exit local class foo"];
             3 [label="Function call: R|/LocalClass.LocalClass|()"];
             4 [label="Function call: R|/LocalClass.LocalClass|().R|/LocalClass.run|()"];
-            5 [label="Function call: R|<local>/e|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            5 [label="Function call: R|<local>/e|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             6 [label="Exit block"];
         }
         7 [label="Exit function foo" style="filled" fillcolor=red];
@@ -73,7 +73,7 @@ digraph inLocalClass_kt {
         subgraph cluster_7 {
             color=blue
             21 [label="Enter block"];
-            22 [label="Function call: R|<local>/b|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            22 [label="Function call: R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             23 [label="Exit block"];
         }
         24 [label="Exit function <init>" style="filled" fillcolor=red];
@@ -109,7 +109,7 @@ digraph inLocalClass_kt {
         subgraph cluster_11 {
             color=blue
             32 [label="Enter block"];
-            33 [label="Function call: R|<local>/d|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            33 [label="Function call: R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             34 [label="Exit block"];
         }
         35 [label="Exit function run" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt
index e84229b8218..73f4a36d2e9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt
@@ -19,7 +19,7 @@ FILE: inLocalClass.kt
 
             public constructor(): R|LocalClass| {
                 super<R|kotlin/Any|>()
-                R|<local>/b|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
 
             init {
@@ -27,11 +27,11 @@ FILE: inLocalClass.kt
             }
 
             public final fun run(): R|kotlin/Unit| {
-                R|<local>/d|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
 
         }
 
         R|/LocalClass.LocalClass|().R|/LocalClass.run|()
-        R|<local>/e|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/e|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot
index 483b886e397..44fb044e50b 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot
@@ -11,7 +11,7 @@ digraph inLocalFunction_kt {
             1 [label="Enter block"];
             2 [label="Local function declaration foo"];
             3 [label="Function call: R|<local>/localFun|()"];
-            4 [label="Function call: R|<local>/b|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            4 [label="Function call: R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             5 [label="Exit block"];
         }
         6 [label="Exit function foo" style="filled" fillcolor=red];
@@ -23,8 +23,8 @@ digraph inLocalFunction_kt {
             color=blue
             8 [label="Enter block"];
             9 [label="Access variable R|<local>/a|"];
-            10 [label="Function call: R|<local>/a|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
-            11 [label="Function call: R|<local>/a|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            10 [label="Function call: R|<local>/a|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            11 [label="Function call: R|<local>/a|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             12 [label="Exit block"];
         }
         13 [label="Exit function localFun" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt
index b3d7ae3b1ae..d1067512066 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt
@@ -7,10 +7,10 @@ FILE: inLocalFunction.kt
      {
         [StubStatement]
         local final fun localFun(): R|kotlin/Unit| {
-            R|<local>/a|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
-            R|<local>/a|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            R|<local>/a|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            R|<local>/a|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
         }
 
         R|<local>/localFun|()
-        R|<local>/b|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot
index 3318bfd1a0c..bd9ad0da288 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot
@@ -43,7 +43,7 @@ digraph toLocalVariables_kt {
                     13 [label="Enter block"];
                     14 [label="Access variable R|<local>/y|"];
                     15 [label="Variable declaration: lval yCopy: R|() -> kotlin/Unit|"];
-                    16 [label="Function call: R|<local>/yCopy|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    16 [label="Function call: R|<local>/yCopy|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     17 [label="Exit block"];
                 }
                 18 [label="Exit when branch result"];
@@ -61,7 +61,7 @@ digraph toLocalVariables_kt {
             26 [label="Variable declaration: lval zCopy: R|() -> kotlin/Unit|"];
             27 [label="Access variable R|<local>/z|"];
             28 [label="Assignment: R|<local>/zCopy|"];
-            29 [label="Function call: R|<local>/zCopy|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            29 [label="Function call: R|<local>/zCopy|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             30 [label="Exit block"];
         }
         31 [label="Exit function foo" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt
index 94cedab85a2..eb64ce50bb3 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt
@@ -16,11 +16,11 @@ FILE: toLocalVariables.kt
             }
             else ->  {
                 lval yCopy: R|() -> kotlin/Unit| = R|<local>/y|
-                R|<local>/yCopy|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/yCopy|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
         }
 
         lval zCopy: R|() -> kotlin/Unit|
         R|<local>/zCopy| = R|<local>/z|
-        R|<local>/zCopy|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/zCopy|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot
index d435bda7efa..32afa2fc851 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot
@@ -9,7 +9,7 @@ digraph atLeastOnce_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter block"];
-            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            2 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             3 [label="Exit block"];
         }
         4 [label="Exit function inlineRun" style="filled" fillcolor=red];
@@ -25,7 +25,7 @@ digraph atLeastOnce_kt {
         subgraph cluster_3 {
             color=blue
             6 [label="Enter block"];
-            7 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            7 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             8 [label="Exit block"];
         }
         9 [label="Exit function myRun" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt
index a081a88afda..dccac9a8706 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt
@@ -6,7 +6,7 @@ FILE: atLeastOnce.kt
         >
      {
         [StubStatement]
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun myRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit|
         [R|Contract description]
@@ -15,7 +15,7 @@ FILE: atLeastOnce.kt
         >
      {
         [StubStatement]
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test_1(): R|kotlin/Unit| {
         lval x: R|kotlin/Int|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot
index dadc62125ea..6432d38eaf5 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot
@@ -9,7 +9,7 @@ digraph atMostOnce_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter block"];
-            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            2 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             3 [label="Exit block"];
         }
         4 [label="Exit function inlineRun" style="filled" fillcolor=red];
@@ -25,7 +25,7 @@ digraph atMostOnce_kt {
         subgraph cluster_3 {
             color=blue
             6 [label="Enter block"];
-            7 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            7 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             8 [label="Exit block"];
         }
         9 [label="Exit function myRun" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt
index fe7c93827c6..b3ce1c12487 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt
@@ -6,7 +6,7 @@ FILE: atMostOnce.kt
         >
      {
         [StubStatement]
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun myRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit|
         [R|Contract description]
@@ -15,7 +15,7 @@ FILE: atMostOnce.kt
         >
      {
         [StubStatement]
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test_1(): R|kotlin/Unit| {
         lval x: R|kotlin/Int|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot
index b99490105ea..d624bd2311f 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot
@@ -10,7 +10,7 @@ digraph contractsUsage_kt {
             color=blue
             1 [label="Enter block"];
             2 [label="Access variable R|<local>/x|"];
-            3 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            3 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             4 [label="Exit block"];
         }
         5 [label="Exit function bar" style="filled" fillcolor=red];
@@ -42,7 +42,7 @@ digraph contractsUsage_kt {
                     color=blue
                     14 [label="Enter block"];
                     15 [label="Access variable this@R|/baz|"];
-                    16 [label="Function call: this@R|/baz|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    16 [label="Function call: this@R|/baz|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     17 [label="Exit block"];
                 }
                 18 [label="Exit when branch result"];
@@ -89,7 +89,7 @@ digraph contractsUsage_kt {
                     color=blue
                     30 [label="Enter block"];
                     31 [label="Access variable R|<local>/x|"];
-                    32 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    32 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     33 [label="Access variable R|<local>/y|"];
                     34 [label="Function call: R|<local>/y|.R|/baz|()"];
                     35 [label="Jump: ^foo Unit"];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt
index ccf03330779..16f4ea50de9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt
@@ -6,7 +6,7 @@ FILE: contractsUsage.kt
         >
      {
         [StubStatement]
-        R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     @R|kotlin/contracts/ExperimentalContracts|() public final fun R|() -> kotlin/Unit|.baz(): R|kotlin/Unit|
         [R|Contract description]
@@ -17,7 +17,7 @@ FILE: contractsUsage.kt
         [StubStatement]
         when () {
             Boolean(true) ->  {
-                this@R|/baz|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                this@R|/baz|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
         }
 
@@ -32,7 +32,7 @@ FILE: contractsUsage.kt
         [StubStatement]
         when () {
             Boolean(true) ->  {
-                R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
                 R|<local>/y|.R|/baz|()
                 ^foo Unit
             }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot
index b8c8e5b902b..a9dc2fbf5ea 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot
@@ -9,7 +9,7 @@ digraph exactlyOnce_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter block"];
-            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            2 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             3 [label="Exit block"];
         }
         4 [label="Exit function inlineRun" style="filled" fillcolor=red];
@@ -25,7 +25,7 @@ digraph exactlyOnce_kt {
         subgraph cluster_3 {
             color=blue
             6 [label="Enter block"];
-            7 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            7 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             8 [label="Exit block"];
         }
         9 [label="Exit function myRun" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt
index 62d096cabec..12063c44928 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt
@@ -6,7 +6,7 @@ FILE: exactlyOnce.kt
         >
      {
         [StubStatement]
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun myRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit|
         [R|Contract description]
@@ -15,7 +15,7 @@ FILE: exactlyOnce.kt
         >
      {
         [StubStatement]
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test_1(): R|kotlin/Unit| {
         lval x: R|kotlin/Int|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot
index 3fc4a56ec6f..3554770866a 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot
@@ -24,7 +24,7 @@ digraph flow_kt {
                     color=blue
                     8 [label="Enter block"];
                     9 [label="Access variable R|<local>/x|"];
-                    10 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    10 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     11 [label="Jump: ^bar Unit"];
                     12 [label="Stub" style="filled" fillcolor=gray];
                     13 [label="Exit block" style="filled" fillcolor=gray];
@@ -102,9 +102,9 @@ digraph flow_kt {
                             color=blue
                             37 [label="Enter block"];
                             38 [label="Access variable R|<local>/y|"];
-                            39 [label="Function call: R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                            39 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                             40 [label="Access variable R|<local>/z|"];
-                            41 [label="Function call: R|<local>/z|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                            41 [label="Function call: R|<local>/z|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                             42 [label="Jump: ^foo Unit"];
                             43 [label="Stub" style="filled" fillcolor=gray];
                             44 [label="Exit block" style="filled" fillcolor=gray];
@@ -115,7 +115,7 @@ digraph flow_kt {
                             color=blue
                             47 [label="Enter block"];
                             48 [label="Access variable R|<local>/y|"];
-                            49 [label="Function call: R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                            49 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                             50 [label="Exit block"];
                         }
                         51 [label="Exit when branch result"];
@@ -153,7 +153,7 @@ digraph flow_kt {
                                 70 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()"];
                                 71 [label="Variable declaration: lval i: R|kotlin/Int|"];
                                 72 [label="Access variable R|<local>/x|"];
-                                73 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                                73 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                                 74 [label="Exit block"];
                             }
                             75 [label="Exit loop block"];
@@ -161,7 +161,7 @@ digraph flow_kt {
                         76 [label="Exit whileloop"];
                     }
                     77 [label="Access variable R|<local>/y|"];
-                    78 [label="Function call: R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    78 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     79 [label="Exit block"];
                 }
                 80 [label="Exit when branch result"];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt
index b5e89c4f767..53a24a6592c 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt
@@ -8,7 +8,7 @@ FILE: flow.kt
         [StubStatement]
         when () {
             Boolean(true) ->  {
-                R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
                 ^bar Unit
             }
         }
@@ -29,19 +29,19 @@ FILE: flow.kt
                 lval <iterator>: R|kotlin/collections/IntIterator| = Int(0).R|kotlin/Int.rangeTo|(Int(0)).R|kotlin/ranges/IntProgression.iterator|()
                 while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
                     lval i: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
-                    R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                    R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
                 }
 
-                R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
             else ->  {
                 when () {
                     Boolean(false) ->  {
-                        R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                        R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
                     }
                     else ->  {
-                        R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
-                        R|<local>/z|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                        R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                        R|<local>/z|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
                         ^foo Unit
                     }
                 }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot
index d43bfb9c90f..b056092cbd5 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot
@@ -23,7 +23,7 @@ digraph inPlaceLambda_kt {
                 subgraph cluster_4 {
                     color=blue
                     8 [label="Enter block"];
-                    9 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    9 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     10 [label="Exit block"];
                 }
                 11 [label="Exit when branch result"];
@@ -54,7 +54,7 @@ digraph inPlaceLambda_kt {
         subgraph cluster_6 {
             color=blue
             16 [label="Enter block"];
-            17 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            17 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             18 [label="Postponed enter to lambda"];
             subgraph cluster_7 {
                 color=blue
@@ -62,7 +62,7 @@ digraph inPlaceLambda_kt {
                 subgraph cluster_8 {
                     color=blue
                     24 [label="Enter block"];
-                    25 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    25 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     26 [label="Exit block"];
                 }
                 27 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt
index 202bb77399b..affbd7d7270 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt
@@ -8,7 +8,7 @@ FILE: inPlaceLambda.kt
         [StubStatement]
         when () {
             Boolean(true) ->  {
-                R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
         }
 
@@ -20,9 +20,9 @@ FILE: inPlaceLambda.kt
         >
      {
         [StubStatement]
-        R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
         R|/bar|(<L> = bar@fun <anonymous>(): R|kotlin/Unit| <kind=AT_MOST_ONCE>  {
-            R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
         }
         )
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot
index c9929329de1..77a296fd0a4 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot
@@ -10,7 +10,7 @@ digraph simple_kt {
             color=blue
             1 [label="Enter block"];
             2 [label="Access variable R|<local>/x|"];
-            3 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            3 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             4 [label="Exit block"];
         }
         5 [label="Exit function bar" style="filled" fillcolor=red];
@@ -28,7 +28,7 @@ digraph simple_kt {
             color=blue
             7 [label="Enter block"];
             8 [label="Access variable R|<local>/x|"];
-            9 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            9 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             subgraph cluster_4 {
                 color=blue
                 10 [label="Enter when"];
@@ -43,7 +43,7 @@ digraph simple_kt {
                 subgraph cluster_6 {
                     color=blue
                     16 [label="Enter block"];
-                    17 [label="Function call: R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+                    17 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
                     18 [label="Exit block"];
                 }
                 19 [label="Exit when branch result"];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt
index 7e2313cfffd..684edfb566b 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt
@@ -6,7 +6,7 @@ FILE: simple.kt
         >
      {
         [StubStatement]
-        R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     @R|kotlin/contracts/ExperimentalContracts|() public final fun foo(x: R|() -> kotlin/Unit|, y: R|() -> kotlin/Unit|, z: R|() -> kotlin/Unit|): R|kotlin/Unit|
         [R|Contract description]
@@ -17,10 +17,10 @@ FILE: simple.kt
         >
      {
         [StubStatement]
-        R|<local>/x|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
         when () {
             Boolean(true) ->  {
-                R|<local>/y|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+                R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot
index f2323c89cb8..31ffbff44d9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot
@@ -9,7 +9,7 @@ digraph unknown_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter block"];
-            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            2 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             3 [label="Exit block"];
         }
         4 [label="Exit function inlineRun" style="filled" fillcolor=red];
@@ -25,7 +25,7 @@ digraph unknown_kt {
         subgraph cluster_3 {
             color=blue
             6 [label="Enter block"];
-            7 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            7 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             8 [label="Exit block"];
         }
         9 [label="Exit function myRun" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt
index 26392791b5b..02f8d7ffaee 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt
@@ -6,7 +6,7 @@ FILE: unknown.kt
         >
      {
         [StubStatement]
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun myRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit|
         [R|Contract description]
@@ -15,7 +15,7 @@ FILE: unknown.kt
         >
      {
         [StubStatement]
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test_1(): R|kotlin/Unit| {
         lval x: R|kotlin/Int|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt
index 87527bceba0..c546a1adf53 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt
@@ -15,7 +15,7 @@ FILE: functionsWithContract.kt
         >
      {
         R|kotlin/require|(!=(R|<local>/s|, Null(null)))
-        R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+        R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
     }
     public final fun test3(arg: R|kotlin/Any?|): R|kotlin/Boolean|
         [R|Contract description]
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt
index 7fb7ecf5fea..72599548ac1 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt
@@ -35,10 +35,10 @@ FILE: delegateTypeMismatch.kt
 
         public final var classifierNamePolicy: R|ClassifierNamePolicy|by this@R|/A|.R|/A.property|<R|ClassifierNamePolicy|>(Q|ClassifierNamePolicy.SOURCE_CODE_QUALIFIED|)
             public get(): R|ClassifierNamePolicy| {
-                ^ this@R|/A|.D|/A.classifierNamePolicy|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|ClassifierNamePolicy|>|(this@R|/A|, ::R|/A.classifierNamePolicy|)
+                ^ this@R|/A|.D|/A.classifierNamePolicy|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|ClassifierNamePolicy|>|(this@R|/A|, ::R|/A.classifierNamePolicy|)
             }
             public set(<set-?>: R|ClassifierNamePolicy|): R|kotlin/Unit| {
-                this@R|/A|.D|/A.classifierNamePolicy|.R|FakeOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/A|, ::R|/A.classifierNamePolicy|, R|<local>/classifierNamePolicy|)
+                this@R|/A|.D|/A.classifierNamePolicy|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/A|, ::R|/A.classifierNamePolicy|, R|<local>/classifierNamePolicy|)
             }
 
         public final var typeNormalizer: R|(KotlinType) -> KotlinType|by this@R|/A|.R|/A.property|<R|(KotlinType) -> KotlinType|>(property@fun <anonymous>(it: R|KotlinType|): R|KotlinType| {
@@ -46,10 +46,10 @@ FILE: delegateTypeMismatch.kt
         }
         )
             public get(): R|(KotlinType) -> KotlinType| {
-                ^ this@R|/A|.D|/A.typeNormalizer|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|(KotlinType) -> KotlinType|>|(this@R|/A|, ::R|/A.typeNormalizer|)
+                ^ this@R|/A|.D|/A.typeNormalizer|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|(KotlinType) -> KotlinType|>|(this@R|/A|, ::R|/A.typeNormalizer|)
             }
             public set(<set-?>: R|(KotlinType) -> KotlinType|): R|kotlin/Unit| {
-                this@R|/A|.D|/A.typeNormalizer|.R|FakeOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/A|, ::R|/A.typeNormalizer|, R|<local>/typeNormalizer|)
+                this@R|/A|.D|/A.typeNormalizer|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/A|, ::R|/A.typeNormalizer|, R|<local>/typeNormalizer|)
             }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot
index f34ce65fbcc..84f6eb6028c 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot
@@ -155,8 +155,8 @@ digraph delegateWithAnonymousObject_kt {
             55 [label="Enter block"];
             56 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
             57 [label="Access variable this@R|/IssuesListUserProfile|"];
-            58 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(...)"];
-            59 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
+            58 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(...)"];
+            59 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
             60 [label="Stub" style="filled" fillcolor=gray];
             61 [label="Exit block" style="filled" fillcolor=gray];
         }
@@ -181,7 +181,7 @@ digraph delegateWithAnonymousObject_kt {
             65 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
             66 [label="Access variable this@R|/IssuesListUserProfile|"];
             67 [label="Access variable R|<local>/issueListView|"];
-            68 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)"];
+            68 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)"];
             69 [label="Exit block"];
         }
         70 [label="Exit function setter" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt
index 3937029ee7d..8b12a49fb46 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt
@@ -41,10 +41,10 @@ FILE: delegateWithAnonymousObject.kt
         }
         )
             public get(): R|IssueListView| {
-                ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)
+                ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)
             }
             public set(<set-?>: R|IssueListView|): R|kotlin/Unit| {
-                this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|, R|<local>/issueListView|)
+                this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|, R|<local>/issueListView|)
             }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt
index 29b661977dc..f0c5fdf3d63 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt
@@ -15,10 +15,10 @@ FILE: propertyWithFunctionalType.kt
         }
         )
             public get(): R|(B) -> B| {
-                ^ this@R|/A|.D|/A.conventer|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|(B) -> B|>|(this@R|/A|, ::R|/A.conventer|)
+                ^ this@R|/A|.D|/A.conventer|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|(B) -> B|>|(this@R|/A|, ::R|/A.conventer|)
             }
             public set(<set-?>: R|(B) -> B|): R|kotlin/Unit| {
-                this@R|/A|.D|/A.conventer|.R|FakeOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/A|, ::R|/A.conventer|, R|<local>/conventer|)
+                this@R|/A|.D|/A.conventer|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/A|, ::R|/A.conventer|, R|<local>/conventer|)
             }
 
         public final var conventerWithExpectedType: R|(B) -> B|by this@R|/A|.R|/A.property|<R|(B) -> B|>(property@fun <anonymous>(it: R|B|): R|B| {
@@ -26,10 +26,10 @@ FILE: propertyWithFunctionalType.kt
         }
         )
             public get(): R|(B) -> B| {
-                ^ this@R|/A|.D|/A.conventerWithExpectedType|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|(B) -> B|>|(this@R|/A|, ::R|/A.conventerWithExpectedType|)
+                ^ this@R|/A|.D|/A.conventerWithExpectedType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|(B) -> B|>|(this@R|/A|, ::R|/A.conventerWithExpectedType|)
             }
             public set(<set-?>: R|(B) -> B|): R|kotlin/Unit| {
-                this@R|/A|.D|/A.conventerWithExpectedType|.R|FakeOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/A|, ::R|/A.conventerWithExpectedType|, R|<local>/conventerWithExpectedType|)
+                this@R|/A|.D|/A.conventerWithExpectedType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/A|, ::R|/A.conventerWithExpectedType|, R|<local>/conventerWithExpectedType|)
             }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.txt
index fa5999da2ab..f8be70de077 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.txt
@@ -7,7 +7,7 @@ FILE: simpleDelegatedToMap.kt
         public final val map: R|kotlin/collections/MutableMap<kotlin/String, kotlin/Any>| = R|<local>/map|
             public get(): R|kotlin/collections/MutableMap<kotlin/String, kotlin/Any>|
 
-        public final var foo: R|kotlin/Any|by R|<local>/map|
+        public final var foo: R|kotlin/Any|by this@R|/C|.R|/C.map|
             public get(): R|kotlin/Any| {
                 ^ this@R|/C|.D|/C.foo|.R|kotlin/collections/getValue|<R|kotlin/Any|, R|kotlin/Any|>(this@R|/C|, ::R|/C.foo|)
             }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt
index 6a5db54549b..91fed8d97c0 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt
@@ -5,6 +5,6 @@ FILE: getOnKProperty.kt
         }
     public final fun test(): R|kotlin/Unit| {
         lval f: R|kotlin/reflect/KProperty1<kotlin/Any?, kotlin/Int>| = Q|kotlin/Any?|::R|/meaning|
-        R|<local>/f|.R|FakeOverride<kotlin/reflect/KProperty1.get: R|kotlin/Int|>|(Null(null))
-        R|<local>/f|.R|FakeOverride<kotlin/reflect/KProperty1.get: R|kotlin/Int|>|(String())
+        R|<local>/f|.R|SubstitutionOverride<kotlin/reflect/KProperty1.get: R|kotlin/Int|>|(Null(null))
+        R|<local>/f|.R|SubstitutionOverride<kotlin/reflect/KProperty1.get: R|kotlin/Int|>|(String())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt
index 160e05c30c9..c655e1d2a89 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt
@@ -15,7 +15,7 @@ FILE: hashTableWithForEach.kt
                     R|/DEBUG| ->  {
                         ^ Q|java/util/Collections|.R|java/util/Collections.unmodifiableSet|<R|ft<kotlin/collections/MutableMap.MutableEntry<K, V>, kotlin/collections/MutableMap.MutableEntry<K, V>?>!|>(R|kotlin/collections/mutableSetOf|<R|kotlin/collections/MutableMap.MutableEntry<K, V>|>().R|kotlin/apply|<R|kotlin/collections/MutableSet<kotlin/collections/MutableMap.MutableEntry<K, V>>|>(<L> = apply@fun R|kotlin/collections/MutableSet<kotlin/collections/MutableMap.MutableEntry<K, V>>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
                             this@R|/SomeHashTable|.R|/SomeHashTable.forEach|(<L> = forEach@fun <anonymous>(key: R|K|, value: R|V|): R|kotlin/Unit| {
-                                this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableSet.add: R|kotlin/Boolean|>|(R|/SomeHashTable.Entry.Entry|<R|K|, R|V|>(R|<local>/key|, R|<local>/value|))
+                                this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableSet.add: R|kotlin/Boolean|>|(R|SubstitutionOverride</SomeHashTable.Entry.Entry>|<R|K|, R|V|>(R|<local>/key|, R|<local>/value|))
                             }
                             )
                         }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt
index 51d244e4873..826f6fab14b 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt
@@ -6,7 +6,7 @@ FILE: builderInference.kt
     }
     public final fun test(): R|kotlin/Unit| {
         lval s: R|kotlin/String| = R|/foo|<R|kotlin/String|>(<L> = foo@fun R|kotlin/collections/MutableList<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
         }
         )
         R|/takeString|(R|<local>/s|)
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt
index ca56573ca80..9f20cb518cb 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt
@@ -10,7 +10,7 @@ FILE: builderInferenceAndCoercionToUnit.kt
     }
     public final fun test(strings: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit| {
         lval dropDown: R|DropDownComponent<kotlin/String>| = R|/DropDownComponent.DropDownComponent|<R|kotlin/String|>(initialValues = R|kotlin/collections/buildList|<R|kotlin/String|>(<L> = buildList@fun R|kotlin/collections/MutableList<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
-            this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.addAll: R|kotlin/Boolean|>|(R|<local>/strings|)
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.addAll: R|kotlin/Boolean|>|(R|<local>/strings|)
         }
         ))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt
index 8b6b2b8e15d..03d82157f11 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt
@@ -1,14 +1,14 @@
 FILE: builderInferenceFromStdlib.kt
     public final fun test_1(): R|kotlin/Unit| {
         lval list: R|kotlin/collections/List<kotlin/String>| = R|kotlin/collections/buildList|<R|kotlin/String|>(<L> = buildList@fun R|kotlin/collections/MutableList<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
-            this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
         }
         )
         R|/takeList|(R|<local>/list|)
     }
     public final fun test_2(): R|kotlin/Unit| {
         lval list: R|kotlin/collections/List<kotlin/String>| = R|/myBuildList|<R|kotlin/String|>(<L> = myBuildList@fun R|kotlin/collections/MutableList<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
-            this@R|special/anonymous|.R|FakeOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(String())
         }
         )
         R|/takeList|(R|<local>/list|)
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt
index 51a30e0bcf4..022b0871aa9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt
@@ -20,5 +20,5 @@ FILE: complexConstraintSystem.kt
             }
 
         }
-        ).R|kotlin/collections/first|<R|Inv<kotlin/Int>|>().R|FakeOverride</Inv.x: R|kotlin/Int|>|
+        ).R|kotlin/collections/first|<R|Inv<kotlin/Int>|>().R|SubstitutionOverride</Inv.x: R|kotlin/Int|>|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.txt
index 2e77b232377..c7e4f338927 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.txt
@@ -1,3 +1,3 @@
 FILE: main.kt
-    public final val enumMap: R|java/util/EnumMap<ft<JavaEnum, JavaEnum?>!, ft<kotlin/String, kotlin/String?>!>| = R|java/util/EnumMap.EnumMap|<R|ft<JavaEnum, JavaEnum?>!|, R|ft<kotlin/String, kotlin/String?>!|>(R|kotlin/collections/mapOf|<R|ft<JavaEnum, JavaEnum?>!|, R|kotlin/String|>(Q|JavaEnum|.R|/JavaEnum.A|.R|kotlin/to|<R|JavaEnum|, R|kotlin/String|>(String(A))))
-        public get(): R|java/util/EnumMap<ft<JavaEnum, JavaEnum?>!, ft<kotlin/String, kotlin/String?>!>|
+    public final val enumMap: R|java/util/EnumMap<ft<@FlexibleNullability JavaEnum, JavaEnum?>!, ft<kotlin/String, kotlin/String?>!>| = R|java/util/EnumMap.EnumMap|<R|ft<@FlexibleNullability JavaEnum, JavaEnum?>!|, R|ft<kotlin/String, kotlin/String?>!|>(R|kotlin/collections/mapOf|<R|ft<@FlexibleNullability JavaEnum, JavaEnum?>!|, R|kotlin/String|>(Q|JavaEnum|.R|/JavaEnum.A|.R|kotlin/to|<R|@FlexibleNullability JavaEnum|, R|kotlin/String|>(String(A))))
+        public get(): R|java/util/EnumMap<ft<@FlexibleNullability JavaEnum, JavaEnum?>!, ft<kotlin/String, kotlin/String?>!>|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot
index a767f58a989..8bb516ef204 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot
@@ -110,8 +110,8 @@ digraph plusAssignWithLambdaInRhs_kt {
                         subgraph cluster_13 {
                             color=blue
                             47 [label="Enter block"];
-                            48 [label="Function call: R|<local>/computation|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
-                            49 [label="Function call: R|<local>/resolve|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(...)"];
+                            48 [label="Function call: R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
+                            49 [label="Function call: R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(...)"];
                             50 [label="Exit block"];
                         }
                         51 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
@@ -126,7 +126,7 @@ digraph plusAssignWithLambdaInRhs_kt {
             33 [label="Function call: R|/A.A|<R|T|>(...)"];
             34 [label="Jump: ^postpone R|/A.A|<R|T|>(<L> = A@fun <anonymous>(resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| {
     R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(A@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
-        R|<local>/resolve|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/computation|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|())
+        R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
     }
     )
 }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt
index 16863a33082..b56f0fc167c 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt
@@ -19,7 +19,7 @@ FILE: plusAssignWithLambdaInRhs.kt
         lval queue: R|kotlin/collections/MutableList<kotlin/Function0<kotlin/Unit>>| = R|kotlin/collections/mutableListOf|<R|() -> kotlin/Unit|>()
         ^postpone R|/A.A|<R|T|>(<L> = A@fun <anonymous>(resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| {
             R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(A@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
-                R|<local>/resolve|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/computation|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|())
+                R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
             }
             )
         }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.txt
index ffdcc724784..8eac1f59fba 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.txt
@@ -5,8 +5,8 @@ FILE: jvm.kt
         }
 
         public final fun test(): R|kotlin/Unit| {
-            lval x: R|@EnhancedNullability kotlin/String| = this@R|/User|.R|/Annotated.foo|(String(123))
-            lval y: R|@EnhancedNullability kotlin/String| = this@R|/User|.R|/Annotated.foo|(Null(null))
+            lval x: R|kotlin/String| = this@R|/User|.R|/Annotated.foo|(String(123))
+            lval y: R|kotlin/String| = this@R|/User|.R|/Annotated.foo|(Null(null))
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.txt
index fd3000d39f7..a4c1c4407b2 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.txt
@@ -5,8 +5,8 @@ FILE: jvm.kt
         }
 
         public final fun test(): R|kotlin/Unit| {
-            lval x: R|kotlin/String| = this@R|/User|.R|/AnnotatedDerived.foo|(String(123))
-            lval y: R|kotlin/String| = this@R|/User|.R|/AnnotatedDerived.foo|(Null(null))
+            lval x: R|@FlexibleNullability kotlin/String| = this@R|/User|.R|/AnnotatedDerived.foo|(String(123))
+            lval y: R|@FlexibleNullability kotlin/String| = this@R|/User|.R|/AnnotatedDerived.foo|(Null(null))
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt
index 9c6d945fc17..400879460b9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt
@@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt
         }
 
         public final fun test(): R|kotlin/Unit| {
-            this@R|/B|.R|FakeOverride</B.foo: R|ft<Some, Some?>!|>|(R|/Some.Some|())
+            this@R|/B|.R|SubstitutionOverride</B.foo: R|ft<Some, Some?>!|>|(R|/Some.Some|())
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.txt
index ed62ac94baf..fc3cb28c590 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.txt
@@ -7,7 +7,7 @@ FILE: jvm.kt
         public final fun test(): R|kotlin/Unit| {
             lval res1: R|kotlin/Boolean| = this@R|/A|.R|/Some.foo|(Int(1))
             lval res2: R|kotlin/Boolean| = this@R|/A|.R|/Some.foo|(Int(-1))
-            lval res3: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!| = this@R|/A|.R|/Some.bar|(R|kotlin/intArrayOf|(vararg(Int(0), Int(2), Int(-2))))
+            lval res3: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!| = this@R|/A|.R|/Some.bar|(R|kotlin/intArrayOf|(vararg(Int(0), Int(2), Int(-2))))
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt
index 16a7fa363df..b601185f78d 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt
@@ -5,7 +5,7 @@ FILE: Derived.kt
         }
 
         public final fun test(): R|kotlin/Unit| {
-            this@R|/Derived|.R|/Derived.myHost|.R|kotlin/String.length|
+            this@R|/Derived|.R|SubstitutionOverride</Derived.myHost>|.R|kotlin/String.length|
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.txt
index a9aed2b659c..51ffabae66e 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.txt
@@ -1,14 +1,14 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaClass|.R|/JavaClass.foo1|(<L> = foo1@fun <anonymous>(): R|ft<kotlin/Int, kotlin/Int?>!| {
+        Q|JavaClass|.R|/JavaClass.foo1|(<L> = foo1@fun <anonymous>(): R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!| {
             ^ Int(123)
         }
         )
-        Q|JavaClass|.R|/JavaClass.foo2|(<L> = foo2@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>!|): R|ft<kotlin/String, kotlin/String?>!| {
+        Q|JavaClass|.R|/JavaClass.foo2|(<L> = foo2@fun <anonymous>(it: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| {
             ^ R|<local>/it|.R|kotlin/Int.plus|(Int(2)).R|kotlin/Any.toString|()
         }
         )
-        Q|JavaClass|.R|/JavaClass.foo2|(foo2@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>!|): R|ft<kotlin/String, kotlin/String?>!| {
+        Q|JavaClass|.R|/JavaClass.foo2|(foo2@fun <anonymous>(it: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| {
             ^ R|<local>/it|.R|kotlin/Int.plus|(Int(3)).R|kotlin/Any.toString|()
         }
         )
@@ -17,7 +17,7 @@ FILE: main.kt
         }
 
         Q|JavaClass|.R|/JavaClass.foo2|(R|<local>/y|)
-        Q|JavaClass|.R|/JavaClass.foo3|<R|ft<kotlin/Int, kotlin/Int?>!|>(foo3@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>!|): R|ft<kotlin/String, kotlin/String?>!| {
+        Q|JavaClass|.R|/JavaClass.foo3|<R|ft<kotlin/Int, kotlin/Int?>!|>(foo3@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| {
             ^ R|<local>/it|.R|kotlin/Int.plus|(Int(4)).R|kotlin/Any.toString|()
         }
         , Int(5))
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.txt
index 3ed448a15ad..0328ae65888 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.txt
@@ -1,8 +1,8 @@
 FILE: Test.kt
     public final fun test(): R|kotlin/Unit| {
         lval jc: R|JavaClass| = R|/JavaClass.JavaClass|()
-        lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
+        lval result: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
     }
     public final fun otherTest(jc: R|JavaClass|): R|kotlin/Unit| {
-        lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
+        lval result: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt
index a751a98a432..bd1f495d347 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt
@@ -1,3 +1,3 @@
 FILE: test.kt
-    public final val x: R|ft<kotlin/String, kotlin/String?>!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
-        public get(): R|ft<kotlin/String, kotlin/String?>!|
+    public final val x: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
+        public get(): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
index 8f176ab3c65..db63047f8c3 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
@@ -6,9 +6,9 @@ FILE: K1.kt
 
     }
     public final fun main(k: R|KSub|, vString: R|SuperClass.NestedInSuperClass<kotlin/String>|, vInt: R|SuperClass.NestedInSuperClass<kotlin/Int>|): R|kotlin/Unit| {
-        R|<local>/k|.R|/J1.getImpl|().R|FakeOverride</J1.NestedIImpl.nestedI: R|kotlin/Unit|>|(R|<local>/vString|)
+        R|<local>/k|.R|/J1.getImpl|().R|SubstitutionOverride</J1.NestedIImpl.nestedI: R|kotlin/Unit|>|(R|<local>/vString|)
         R|<local>/k|.R|/J1.getImpl|().<Inapplicable(INAPPLICABLE): /J1.NestedIImpl.nestedI>#(R|<local>/vInt|)
-        R|<local>/k|.R|/J1.getNestedSubClass|().R|FakeOverride</J1.NestedSubClass.nested: R|kotlin/Unit|>|(String())
+        R|<local>/k|.R|/J1.getNestedSubClass|().R|SubstitutionOverride</J1.NestedSubClass.nested: R|kotlin/Unit|>|(String())
         R|<local>/k|.R|/J1.getNestedSubClass|().<Inapplicable(INAPPLICABLE): /J1.NestedSubClass.nested>#(Int(1))
     }
 FILE: K2.kt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt
index e7f0f8b4c93..a605f4c656b 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt
@@ -16,7 +16,7 @@ FILE: K2.kt
         }
 
         public final fun bar(): R|kotlin/Unit| {
-            this@R|/K2|.R|FakeOverride</J1.foo: R|ft<kotlin/Int, kotlin/Int?>!|>|(Int(1))
+            this@R|/K2|.R|SubstitutionOverride</J1.foo: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|>|(Int(1))
             this@R|/K2|.R|/J1.baz|()
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
index f14d31a1cfa..3e84bb2e8f9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
@@ -7,7 +7,7 @@ FILE: K1.kt
     }
 FILE: K2.kt
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|<R|ft<kotlin/Int, kotlin/Int?>!|>())
+        Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|<R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|>())
         Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|<R|kotlin/Int|>())
         Q|JavaClass|.<Inapplicable(INAPPLICABLE): /JavaClass.baz>#(R|/KotlinClass.KotlinClass|<R|kotlin/String|>())
         Q|JavaClass|.<Inapplicable(INAPPLICABLE): /JavaClass.baz>#(String())
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.txt
index 5ee849464da..9a4cf367e7b 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.txt
@@ -1,6 +1,6 @@
 FILE: test.kt
     public final fun test(): R|kotlin/Unit| {
-        lval logger: R|ft<Logger, Logger?>!| = Q|Logger|.R|/Logger.getInstance|(String(test))
+        lval logger: R|ft<@FlexibleNullability Logger, Logger?>!| = Q|Logger|.R|/Logger.getInstance|(String(test))
     }
     public final class MyTest : R|kotlin/Any| {
         public constructor(): R|MyTest| {
@@ -10,7 +10,7 @@ FILE: test.kt
         private final val klass: R|java/lang/Class<MyTest>| = <getClass>(this@R|/MyTest|).R|kotlin/jvm/java|<R|MyTest|>
             private get(): R|java/lang/Class<MyTest>|
 
-        private final val logger: R|ft<Logger, Logger?>!| = Q|Logger|.R|/Logger.getInstance|(this@R|/MyTest|.R|/MyTest.klass|)
-            private get(): R|ft<Logger, Logger?>!|
+        private final val logger: R|ft<@FlexibleNullability Logger, Logger?>!| = Q|Logger|.R|/Logger.getInstance|(this@R|/MyTest|.R|/MyTest.klass|)
+            private get(): R|ft<@FlexibleNullability Logger, Logger?>!|
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt
index c72dbf9a3f5..b54366370df 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt
@@ -1,8 +1,8 @@
 FILE: MapCompute.kt
     public final fun <D> R|kotlin/collections/MutableMap<kotlin/String, kotlin/collections/MutableSet<D>>|.initAndAdd(key: R|kotlin/String|, value: R|D|): R|kotlin/Unit| {
-        this@R|/initAndAdd|.R|FakeOverride<kotlin/collections/MutableMap.compute: R|kotlin/collections/MutableSet<D>?|>|(R|<local>/key|, <L> = compute@fun <anonymous>(_: R|ft<kotlin/String, kotlin/String?>!|, maybeValues: R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!|): R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!| {
+        this@R|/initAndAdd|.R|SubstitutionOverride<kotlin/collections/MutableMap.compute: R|kotlin/collections/MutableSet<D>?|>|(R|<local>/key|, <L> = compute@fun <anonymous>(_: R|ft<kotlin/String, kotlin/String?>!|, maybeValues: R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!|): R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!| {
             lval setOfValues: R|kotlin/collections/MutableSet<D>| = R|<local>/maybeValues| ?: R|kotlin/collections/mutableSetOf|<R|D|>()
-            R|<local>/setOfValues|.R|FakeOverride<kotlin/collections/MutableSet.add: R|kotlin/Boolean|>|(R|<local>/value|)
+            R|<local>/setOfValues|.R|SubstitutionOverride<kotlin/collections/MutableSet.add: R|kotlin/Boolean|>|(R|<local>/value|)
             ^ R|<local>/setOfValues|
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.txt
index 51d578095bb..65ec39f0290 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.txt
@@ -7,7 +7,7 @@ FILE: main.kt
     }
     public final fun test(): R|kotlin/Unit| {
         lval b: R|MyMapEntry| = R|/MyMapEntry.MyMapEntry|()
-        lval key: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/b|.R|/Test.MapEntryImpl.key|
-        lval value: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/b|.R|/Test.MapEntryImpl.value|
+        lval key: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/b|.R|/Test.MapEntryImpl.key|
+        lval value: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/b|.R|/Test.MapEntryImpl.value|
         R|<local>/b|.R|/Test.MapEntryImpl.setValue|(Null(null))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.txt
index 9851d0be53c..0acf4385041 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.txt
@@ -8,15 +8,15 @@ FILE: test.kt
     public final fun test(e: R|MyException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|java/lang/Throwable.printStackTrace|()
         R|<local>/e|.R|java/lang/Throwable.printStackTrace|(R|<local>/stream|)
-        lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/e|.R|java/lang/Throwable.getLocalizedMessage|()
+        lval result: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/e|.R|java/lang/Throwable.getLocalizedMessage|()
     }
     public final fun test(e: R|YourException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|java/lang/Throwable.printStackTrace|()
         R|<local>/e|.R|java/lang/Throwable.printStackTrace|(R|<local>/stream|)
-        lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/e|.R|java/lang/Throwable.getLocalizedMessage|()
+        lval result: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/e|.R|java/lang/Throwable.getLocalizedMessage|()
     }
     public final fun test(e: R|kotlin/Exception|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|java/lang/Throwable.printStackTrace|()
         R|<local>/e|.R|java/lang/Throwable.printStackTrace|(R|<local>/stream|)
-        lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/e|.R|java/lang/Throwable.getLocalizedMessage|()
+        lval result: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/e|.R|java/lang/Throwable.getLocalizedMessage|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt
index 3cc75fc0a34..ce966796c07 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt
@@ -1,12 +1,12 @@
 FILE: test.kt
     public abstract interface UseIterable : R|MyIterable<kotlin/String>| {
         public open fun test(): R|kotlin/Unit| {
-            lval it: R|kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>!>| = this@R|/UseIterable|.R|FakeOverride</UseIterable.iterator: R|kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>!>|>|()
-            lval split: R|java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>| = this@R|/UseIterable|.R|FakeOverride</UseIterable.spliterator: R|java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>|>|()
+            lval it: R|kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>!>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.iterator: R|kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>!>|>|()
+            lval split: R|@FlexibleNullability java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.spliterator: R|@FlexibleNullability java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>|>|()
         }
 
     }
     public final fun test(some: R|kotlin/collections/Iterable<kotlin/String>|): R|kotlin/Unit| {
-        lval it: R|kotlin/collections/Iterator<kotlin/String>| = R|<local>/some|.R|FakeOverride<kotlin/collections/Iterable.iterator: R|kotlin/collections/Iterator<kotlin/String>|>|()
-        lval split: R|java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>| = R|<local>/some|.R|FakeOverride<kotlin/collections/Iterable.spliterator: R|java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>|>|()
+        lval it: R|kotlin/collections/Iterator<kotlin/String>| = R|<local>/some|.R|SubstitutionOverride<kotlin/collections/Iterable.iterator: R|kotlin/collections/Iterator<kotlin/String>|>|()
+        lval split: R|@FlexibleNullability java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>| = R|<local>/some|.R|SubstitutionOverride<kotlin/collections/Iterable.spliterator: R|@FlexibleNullability java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt
index 7ba11f34937..5b1e9a42bf7 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt
@@ -1,20 +1,20 @@
 FILE: test.kt
     public final fun test(map: R|MyMap|): R|kotlin/Unit| {
-        lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/map|.R|kotlin/collections/getOrPut|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<kotlin/String, kotlin/String?>!|>(String(key), <L> = getOrPut@fun <anonymous>(): R|kotlin/String| <kind=UNKNOWN>  {
+        lval result: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/map|.R|kotlin/collections/getOrPut|<R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>(String(key), <L> = getOrPut@fun <anonymous>(): R|kotlin/String| <kind=UNKNOWN>  {
             ^ String(value)
         }
         )
-        lval otherResult: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/map|.R|FakeOverride</MyMap.getOrDefault: R|ft<kotlin/String, kotlin/String?>!|>|(String(key), String(value))
-        lval anotherResult: R|kotlin/String?| = R|<local>/map|.R|FakeOverride</MyMap.replace: R|kotlin/String?|>|(String(key), String(value))
-        R|<local>/map|.R|FakeOverride</MyMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit| {
+        lval otherResult: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/map|.R|SubstitutionOverride</MyMap.getOrDefault: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>|(String(key), String(value))
+        lval anotherResult: R|@FlexibleNullability kotlin/String?| = R|<local>/map|.R|SubstitutionOverride</MyMap.replace: R|@FlexibleNullability kotlin/String?|>|(String(key), String(value))
+        R|<local>/map|.R|SubstitutionOverride</MyMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<@FlexibleNullability kotlin/String, @FlexibleNullability kotlin/String?>!|, value: R|ft<@FlexibleNullability kotlin/String, @FlexibleNullability kotlin/String?>!|): R|kotlin/Unit| {
             R|kotlin/io/println|(<strcat>(R|<local>/key|.R|kotlin/Any.toString|(), String(: ), R|<local>/value|.R|kotlin/Any.toString|()))
             R|<local>/key|.R|kotlin/String.length|
             R|<local>/value|.R|kotlin/String.length|
         }
         )
-        R|<local>/map|.R|kotlin/collections/forEach|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<kotlin/String, kotlin/String?>!|>(<L> = forEach@fun <anonymous>(<destruct>: R|kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit| <kind=UNKNOWN>  {
-            lval key: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/<destruct>|.R|kotlin/collections/component1|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<kotlin/String, kotlin/String?>!|>()
-            lval value: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/<destruct>|.R|kotlin/collections/component2|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<kotlin/String, kotlin/String?>!|>()
+        R|<local>/map|.R|kotlin/collections/forEach|<R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>(<L> = forEach@fun <anonymous>(<destruct>: R|kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>|): R|kotlin/Unit| <kind=UNKNOWN>  {
+            lval key: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/<destruct>|.R|kotlin/collections/component1|<R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>()
+            lval value: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|<local>/<destruct>|.R|kotlin/collections/component2|<R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>()
             R|kotlin/io/println|(<strcat>(R|<local>/key|.R|kotlin/Any.toString|(), String(: ), R|<local>/value|.R|kotlin/Any.toString|()))
             R|<local>/key|.R|kotlin/String.length|
             R|<local>/value|.R|kotlin/String.length|
@@ -26,9 +26,9 @@ FILE: test.kt
             ^ String(value)
         }
         )
-        lval otherResult: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/map|.R|FakeOverride<kotlin/collections/MutableMap.getOrDefault: R|ft<kotlin/String, kotlin/String?>!|>|(String(key), String(value))
-        lval anotherResult: R|kotlin/String?| = R|<local>/map|.R|FakeOverride<kotlin/collections/MutableMap.replace: R|kotlin/String?|>|(String(key), String(value))
-        R|<local>/map|.R|FakeOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit| {
+        lval otherResult: R|kotlin/String| = R|<local>/map|.R|SubstitutionOverride<kotlin/collections/MutableMap.getOrDefault: R|kotlin/String|>|(String(key), String(value))
+        lval anotherResult: R|kotlin/String?| = R|<local>/map|.R|SubstitutionOverride<kotlin/collections/MutableMap.replace: R|kotlin/String?|>|(String(key), String(value))
+        R|<local>/map|.R|SubstitutionOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit| {
             R|kotlin/io/println|(<strcat>(R|<local>/key|.R|kotlin/Any.toString|(), String(: ), R|<local>/value|.R|kotlin/Any.toString|()))
             R|<local>/key|.R|kotlin/String.length|
             R|<local>/value|.R|kotlin/String.length|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.txt
index 4f5ef00241c..5a22a85ba88 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.txt
@@ -1,5 +1,5 @@
 FILE: main.kt
     public final fun test(): R|kotlin/Unit| {
-        lval project: R|ft<kotlin/String, kotlin/String?>!| = Q|PlatformDataKeys|.R|/CommonDataKeys.PROJECT|
-        lval member: R|ft<kotlin/String, kotlin/String?>!| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER|
+        lval project: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = Q|PlatformDataKeys|.R|/CommonDataKeys.PROJECT|
+        lval member: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
index 301a91e87af..ff3a816c2b6 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
@@ -1,13 +1,13 @@
 FILE: test.kt
     public final fun <D : R|kotlin/Any|> R|Call<D>|.testForEach(): R|kotlin/Unit| {
-        this@R|/testForEach|.R|/Call.arguments|.R|FakeOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit| {
+        this@R|/testForEach|.R|/Call.arguments|.R|SubstitutionOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<@FlexibleNullability kotlin/String, @FlexibleNullability kotlin/String?>!|, value: R|ft<@FlexibleNullability kotlin/String, @FlexibleNullability kotlin/String?>!|): R|kotlin/Unit| {
             R|<local>/key|.R|kotlin/String.length|
             R|<local>/value|.R|kotlin/String.length|
         }
         )
-        this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<kotlin/String, kotlin/String?>!|>(<L> = forEach@fun <anonymous>(it: R|kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit| <kind=UNKNOWN>  {
-            R|<local>/it|.R|FakeOverride<kotlin/collections/Map.Entry.key: R|ft<kotlin/String, kotlin/String?>!|>|.R|kotlin/String.length|
-            R|<local>/it|.R|FakeOverride<kotlin/collections/Map.Entry.value: R|ft<kotlin/String, kotlin/String?>!|>|.R|kotlin/String.length|
+        this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach|<R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>(<L> = forEach@fun <anonymous>(it: R|kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>|): R|kotlin/Unit| <kind=UNKNOWN>  {
+            R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.key: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>|.R|kotlin/String.length|
+            R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.value: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>|.R|kotlin/String.length|
         }
         )
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.txt
index a287c0292f3..21a5bd6ed63 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.txt
@@ -1,4 +1,4 @@
 FILE: capturedFlexible.kt
     public final fun foo(z: R|java/util/zip/ZipFile|): R|kotlin/Unit| {
-        R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|ft<java/util/zip/ZipEntry, java/util/zip/ZipEntry?>!|>()
+        R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|ft<@FlexibleNullability java/util/zip/ZipEntry, java/util/zip/ZipEntry?>!|>()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.txt
index 66ee2e62e45..5d370cbd9af 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun bar(bindingContext: R|BindingContext|): R|kotlin/Unit| {
-        R|<local>/bindingContext|.R|/BindingContext.get|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<kotlin/Double, kotlin/Double?>!|>(Q|Slices|.R|/Slices.X|, R|<local>/bindingContext|.R|/BindingContext.get|<R|ft<kotlin/Int, kotlin/Int?>!|, R|ft<kotlin/String, kotlin/String?>!|>(Q|Slices|.R|/Slices.Y|, Int(1)))
+        R|<local>/bindingContext|.R|/BindingContext.get|<R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, R|ft<@FlexibleNullability kotlin/Double, kotlin/Double?>!|>(Q|Slices|.R|/Slices.X|, R|<local>/bindingContext|.R|/BindingContext.get|<R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|, R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|>(Q|Slices|.R|/Slices.Y|, Int(1)))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt
index a7273d97f81..d1b7da1b13e 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt
@@ -4,5 +4,5 @@ FILE: main.kt
     public final typealias ImmutableLinkedHashSet<E> = R|imm/LinkedHashSet<E>|
     private final typealias ImmutableMultimap<K, V> = R|ImmutableMap<K, ImmutableSet<V>>|
     private final fun <K, V> R|ImmutableMultimap<K, V>|.put(key: R|K|, value: R|V|): R|kotlin/Unit| {
-        this@R|/put|.R|FakeOverride<imm/Map.get: R|ft<imm/Option<ft<ImmutableSet<V>, ImmutableSet<V>?>!>, imm/Option<ft<ImmutableSet<V>, ImmutableSet<V>?>!>?>!|>|(R|<local>/key|).R|FakeOverride<imm/Option.getOrElse: R|ft<ImmutableSet<V>, ImmutableSet<V>?>!|>|(Q|ImmutableLinkedHashSet|.R|imm/LinkedHashSet.empty|<R|ft<V, V?>!|>())
+        this@R|/put|.R|SubstitutionOverride<imm/Map.get: R|ft<@FlexibleNullability imm/Option<ft<ImmutableSet<V>, ImmutableSet<V>?>!>, imm/Option<ft<ImmutableSet<V>, ImmutableSet<V>?>!>?>!|>|(R|<local>/key|).R|SubstitutionOverride<imm/Option.getOrElse: R|ft<ImmutableSet<V>, ImmutableSet<V>?>!|>|(Q|ImmutableLinkedHashSet|.R|imm/LinkedHashSet.empty|<R|ft<V, V?>!|>())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt
index 951b61fe151..781baa70375 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt
@@ -1,6 +1,6 @@
 FILE: mapMerge.kt
     public final fun foo(x: R|kotlin/collections/MutableMap<kotlin/String, kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit| {
-        R|<local>/x|.R|FakeOverride<kotlin/collections/MutableMap.merge: R|kotlin/collections/List<kotlin/String>?|>|(String(), R|kotlin/collections/listOf|<R|kotlin/String|>(String()), <L> = merge@fun <anonymous>(a: R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!|, b: R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!|): R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!| {
+        R|<local>/x|.R|SubstitutionOverride<kotlin/collections/MutableMap.merge: R|kotlin/collections/List<kotlin/String>?|>|(String(), R|kotlin/collections/listOf|<R|kotlin/String|>(String()), <L> = merge@fun <anonymous>(a: R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!|, b: R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!|): R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!| {
             ^ R|<local>/a|.R|kotlin/collections/plus|<R|kotlin/String|>(R|<local>/b|)
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt
index f531b95e267..1b862b6d507 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt
@@ -26,5 +26,5 @@ FILE: smartSet.kt
     }
     public final fun foo(x: R|kotlin/Any|): R|kotlin/Unit| {
         lval s: R|SmartSet<kotlin/Any>| = R|/SmartSet.SmartSet|<R|kotlin/Any|>()
-        R|<local>/s|.R|FakeOverride</SmartSet.add: R|kotlin/Boolean|>|(R|<local>/x|)
+        R|<local>/s|.R|SubstitutionOverride</SmartSet.add: R|kotlin/Boolean|>|(R|<local>/x|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt
index 5c4dfee8732..9e94c1f750f 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt
@@ -6,8 +6,8 @@ FILE: kotlinComparatorAlias.kt
         )
     }
     public final fun test_3(comparator: R|java/util/Comparator<kotlin/Int>|): R|kotlin/Unit| {
-        R|<local>/comparator|.R|FakeOverride<java/util/Comparator.compare: R|kotlin/Int|>|(Int(1), Int(2))
+        R|<local>/comparator|.R|SubstitutionOverride<java/util/Comparator.compare: R|kotlin/Int|>|(Int(1), Int(2))
     }
     public final fun test_4(comparator: R|kotlin/Comparator<kotlin/Int>|): R|kotlin/Unit| {
-        R|<local>/comparator|.R|FakeOverride<java/util/Comparator.compare: R|kotlin/Int|>|(Int(1), Int(2))
+        R|<local>/comparator|.R|SubstitutionOverride<java/util/Comparator.compare: R|kotlin/Int|>|(Int(1), Int(2))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt
index 81603d6f6f5..bfd9ded5db9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt
@@ -6,8 +6,8 @@ FILE: mapList.kt
         }
         )
         R|<local>/u|.R|/applyX|<R|kotlin/collections/List<kotlin/Int>|>(<L> = applyX@fun R|kotlin/collections/List<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
-            this@R|special/anonymous|.R|FakeOverride<kotlin/collections/List.contains: R|kotlin/Boolean|>|(Int(1))
-            this@R|special/anonymous|.R|FakeOverride<kotlin/collections/List.contains: R|kotlin/Boolean|>|(Int(1))
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/List.contains: R|kotlin/Boolean|>|(Int(1))
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/List.contains: R|kotlin/Boolean|>|(Int(1))
         }
         )
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt
index c6791a68568..c22424c4793 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt
@@ -51,9 +51,9 @@ FILE: jvm.kt
         }
 
         public final fun test(): R|kotlin/Unit| {
-            this@R|/D|.R|FakeOverride</B.foo: R|kotlin/Unit|>|(String())
+            this@R|/D|.R|SubstitutionOverride</B.foo: R|kotlin/Unit|>|(String())
             this@R|/D|.R|/C.bar|(String())
-            this@R|/D|.R|FakeOverride</B.baz: R|kotlin/String|>|(String())
+            this@R|/D|.R|SubstitutionOverride</B.baz: R|kotlin/String|>|(String())
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt
index 4ebcc56e213..3a2d20e21f1 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt
@@ -10,8 +10,8 @@ FILE: noneWithForEach.kt
             ^ R|<local>/it|.R|/Diagnostic.name|
         }
         ).R|kotlin/collections/forEach|<R|kotlin/String|, R|kotlin/collections/List<Diagnostic>|>(<L> = forEach@fun <anonymous>(it: R|kotlin/collections/Map.Entry<kotlin/String, kotlin/collections/List<Diagnostic>>|): R|kotlin/Unit| <kind=UNKNOWN>  {
-            lval diagnostics: R|kotlin/collections/List<Diagnostic>| = R|<local>/it|.R|FakeOverride<kotlin/collections/Map.Entry.value: R|kotlin/collections/List<Diagnostic>|>|
-            R|<local>/filtered|.R|FakeOverride<java/util/ArrayList.addAll: R|kotlin/Boolean|>|(R|<local>/diagnostics|.R|kotlin/collections/filter|<R|Diagnostic|>(<L> = filter@fun <anonymous>(me: R|Diagnostic|): R|kotlin/Boolean| <kind=UNKNOWN>  {
+            lval diagnostics: R|kotlin/collections/List<Diagnostic>| = R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.value: R|kotlin/collections/List<Diagnostic>|>|
+            R|<local>/filtered|.R|SubstitutionOverride<java/util/ArrayList.addAll: R|kotlin/Boolean|>|(R|<local>/diagnostics|.R|kotlin/collections/filter|<R|Diagnostic|>(<L> = filter@fun <anonymous>(me: R|Diagnostic|): R|kotlin/Boolean| <kind=UNKNOWN>  {
                 ^ R|<local>/diagnostics|.R|kotlin/collections/none|<R|Diagnostic|>(<L> = none@fun <anonymous>(other: R|Diagnostic|): R|kotlin/Boolean| <kind=UNKNOWN>  {
                     ^ !=(R|<local>/me|, R|<local>/other|)
                 }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.kt
new file mode 100644
index 00000000000..2228508ca51
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.kt
@@ -0,0 +1,16 @@
+interface A {
+    val list: List<String>
+}
+
+interface B {
+    val list: MutableList<String>
+}
+
+fun B.foo(a: A?) {
+    list.plusAssign(mutableListOf(""))
+    with(a) {
+        list.plusAssign(mutableListOf(""))
+        list += mutableListOf("")
+    }
+}
+
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.txt
new file mode 100644
index 00000000000..fe4da4544ed
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.txt
@@ -0,0 +1,19 @@
+FILE: plusAssignNullable.kt
+    public abstract interface A : R|kotlin/Any| {
+        public abstract val list: R|kotlin/collections/List<kotlin/String>|
+            public get(): R|kotlin/collections/List<kotlin/String>|
+
+    }
+    public abstract interface B : R|kotlin/Any| {
+        public abstract val list: R|kotlin/collections/MutableList<kotlin/String>|
+            public get(): R|kotlin/collections/MutableList<kotlin/String>|
+
+    }
+    public final fun R|B|.foo(a: R|A?|): R|kotlin/Unit| {
+        this@R|/foo|.R|/B.list|.R|kotlin/collections/plusAssign|<R|kotlin/String|>(R|kotlin/collections/mutableListOf|<R|kotlin/String|>(vararg(String())))
+        R|kotlin/with|<R|A?|, R|kotlin/Unit|>(R|<local>/a|, <L> = with@fun R|A?|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
+            this@R|/foo|.R|/B.list|.R|kotlin/collections/plusAssign|<R|kotlin/String|>(R|kotlin/collections/mutableListOf|<R|kotlin/String|>(vararg(String())))
+            this@R|/foo|.R|/B.list|.R|kotlin/collections/plusAssign|<R|kotlin/String|>(R|kotlin/collections/mutableListOf|<R|kotlin/String|>(vararg(String())))
+        }
+        )
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt
index 72605020353..d6832dbdd69 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt
@@ -53,7 +53,7 @@ FILE: problems.kt
         }
 
     }
-    public final val xx: R|kotlin/Int| = R|/Derived.Derived|().R|FakeOverride</Derived.x: R|kotlin/Int|>|.R|kotlin/Int.plus|(Int(1))
+    public final val xx: R|kotlin/Int| = R|/Derived.Derived|().R|SubstitutionOverride</Derived.x: R|kotlin/Int|>|.R|kotlin/Int.plus|(Int(1))
         public get(): R|kotlin/Int|
     public final val t: R|kotlin/Nothing| = throw R|java/lang/AssertionError.AssertionError|(String())
         public get(): R|kotlin/Nothing|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt
index 010089f66d6..6167084b7c8 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt
@@ -42,11 +42,11 @@ FILE: DeepCopyIrTree.kt
             }
             )
             this@R|/DeepCopyIrTreeWithSymbols|.R|/DeepCopyIrTreeWithSymbols.typeRemapper|.R|/withinScope|<R|kotlin/Unit|>(this@R|/DeepCopyIrTreeWithSymbols.copyTypeParametersFrom|, <L> = withinScope@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
-                lval <iterator>: R|kotlin/collections/Iterator<kotlin/Pair<IrTypeParameter, IrTypeParameter>>| = this@R|/DeepCopyIrTreeWithSymbols.copyTypeParametersFrom|.R|/IrTypeParametersContainer.typeParameters|.R|kotlin/collections/zip|<R|IrTypeParameter|, R|IrTypeParameter|>(R|<local>/other|.R|/IrTypeParametersContainer.typeParameters|).R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Pair<IrTypeParameter, IrTypeParameter>>|>|()
+                lval <iterator>: R|kotlin/collections/Iterator<kotlin/Pair<IrTypeParameter, IrTypeParameter>>| = this@R|/DeepCopyIrTreeWithSymbols.copyTypeParametersFrom|.R|/IrTypeParametersContainer.typeParameters|.R|kotlin/collections/zip|<R|IrTypeParameter|, R|IrTypeParameter|>(R|<local>/other|.R|/IrTypeParametersContainer.typeParameters|).R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Pair<IrTypeParameter, IrTypeParameter>>|>|()
                 while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
-                    lval <destruct>: R|kotlin/Pair<IrTypeParameter, IrTypeParameter>| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/Pair<IrTypeParameter, IrTypeParameter>|>|()
-                    lval thisTypeParameter: R|IrTypeParameter| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component1: R|IrTypeParameter|>|()
-                    lval otherTypeParameter: R|IrTypeParameter| = R|<local>/<destruct>|.R|FakeOverride<kotlin/Pair.component2: R|IrTypeParameter|>|()
+                    lval <destruct>: R|kotlin/Pair<IrTypeParameter, IrTypeParameter>| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Pair<IrTypeParameter, IrTypeParameter>|>|()
+                    lval thisTypeParameter: R|IrTypeParameter| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|IrTypeParameter|>|()
+                    lval otherTypeParameter: R|IrTypeParameter| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component2: R|IrTypeParameter|>|()
                     R|<local>/otherTypeParameter|.R|/IrTypeParameter.superTypes|.R|kotlin/collections/mapTo|<R|IrType|, R|IrType|, R|kotlin/collections/MutableList<IrType>|>(R|<local>/thisTypeParameter|.R|/IrTypeParameter.superTypes|, <L> = mapTo@fun <anonymous>(it: R|IrType|): R|IrType| <kind=UNKNOWN>  {
                         ^ this@R|/DeepCopyIrTreeWithSymbols|.R|/DeepCopyIrTreeWithSymbols.typeRemapper|.R|/TypeRemapper.remapType|(R|<local>/it|)
                     }
@@ -60,7 +60,7 @@ FILE: DeepCopyIrTree.kt
     }
     public final inline fun <T> R|TypeRemapper|.withinScope(irTypeParametersContainer: R|IrTypeParametersContainer|, fn: R|() -> T|): R|T| {
         this@R|/withinScope|.R|/TypeRemapper.enterScope|(R|<local>/irTypeParametersContainer|)
-        lval result: R|T| = R|<local>/fn|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()
+        lval result: R|T| = R|<local>/fn|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()
         this@R|/withinScope|.R|/TypeRemapper.leaveScope|()
         ^withinScope R|<local>/result|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt
index 87c0213999f..eff15d6dd58 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt
@@ -1,5 +1,5 @@
 FILE: EnumMapGet.kt
     public final typealias SomeEnumMap = R|java/util/EnumMap<kotlin/String, kotlin/String?>|
     public final fun test(map: R|SomeEnumMap|, qualifier: R|kotlin/String?|): R|kotlin/Unit| {
-        lval result: R|kotlin/String?| = R|<local>/map|.R|FakeOverride<java/util/EnumMap.get: R|kotlin/String?|>|(R|<local>/qualifier|)
+        lval result: R|kotlin/String?| = R|<local>/map|.R|SubstitutionOverride<java/util/EnumMap.get: R|kotlin/String?|>|(R|<local>/qualifier|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt
index c78245b775f..8c5edf1996f 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt
@@ -7,11 +7,11 @@ FILE: receiverResolutionInLambda.kt
         public final fun foo(): R|kotlin/Unit| {
             lval x: R|kotlin/sequences/Sequence<kotlin/String>| = R|kotlin/sequences/sequence|<R|kotlin/String|>(<L> = sequence@fun R|kotlin/sequences/SequenceScope<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
                 lval y: R|kotlin/sequences/SequenceScope<kotlin/String>| = this@R|special/anonymous|
-                this@R|special/anonymous|.R|FakeOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
-                this@R|special/anonymous|.R|FakeOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
+                this@R|special/anonymous|.R|SubstitutionOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
+                this@R|special/anonymous|.R|SubstitutionOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
                 (this@R|special/anonymous| as R|kotlin/sequences/SequenceScope<kotlin/String>|)
-                this@R|special/anonymous|.R|FakeOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
-                this@R|special/anonymous|.R|FakeOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
+                this@R|special/anonymous|.R|SubstitutionOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
+                this@R|special/anonymous|.R|SubstitutionOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
             }
             )
         }
@@ -20,11 +20,11 @@ FILE: receiverResolutionInLambda.kt
     public final fun case2(): R|kotlin/Unit| {
         lval x: R|kotlin/sequences/Sequence<kotlin/String>| = R|kotlin/sequences/sequence|<R|kotlin/String|>(<L> = sequence@fun R|kotlin/sequences/SequenceScope<kotlin/String>|.<anonymous>(): R|kotlin/Unit| {
             lval y: R|kotlin/sequences/SequenceScope<kotlin/String>| = this@R|special/anonymous|
-            this@R|special/anonymous|.R|FakeOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
-            this@R|special/anonymous|.R|FakeOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
             (this@R|special/anonymous| as R|kotlin/sequences/SequenceScope<kotlin/String>|)
-            this@R|special/anonymous|.R|FakeOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
-            this@R|special/anonymous|.R|FakeOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
+            this@R|special/anonymous|.R|SubstitutionOverride<kotlin/sequences/SequenceScope.yield: R|kotlin/Unit|>|(String())
         }
         )
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt
index 48fa23a8b7f..4ca2a2eec04 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt
@@ -2,5 +2,5 @@ FILE: weakHashMap.kt
     public final val someMap: R|java/util/WeakHashMap<ft<kotlin/Any, kotlin/Any?>!, ft<kotlin/Any, kotlin/Any?>!>| = R|java/util/WeakHashMap.WeakHashMap|<R|ft<kotlin/Any, kotlin/Any?>!|, R|ft<kotlin/Any, kotlin/Any?>!|>()
         public get(): R|java/util/WeakHashMap<ft<kotlin/Any, kotlin/Any?>!, ft<kotlin/Any, kotlin/Any?>!>|
     public final fun foo(): R|kotlin/Unit| {
-        R|/someMap|.R|FakeOverride<java/util/WeakHashMap.get: R|kotlin/Any?|>|(String())
+        R|/someMap|.R|SubstitutionOverride<java/util/WeakHashMap.get: R|kotlin/Any?|>|(String())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt
index 0d0e7705f30..f30097bfb48 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt
@@ -5,7 +5,7 @@ FILE: recursiveBug.kt
         }
 
         public final val result: R|kotlin/String| = this@R|/Foo|.R|kotlin/run|<R|Foo|, R|kotlin/String|>(<L> = run@fun R|Foo|.<anonymous>(): R|kotlin/String| <kind=EXACTLY_ONCE>  {
-            ^ R|<local>/name|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
+            ^ R|<local>/name|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
         }
         )
             public get(): R|kotlin/String|
@@ -16,7 +16,7 @@ FILE: recursiveBug.kt
     }
     public final fun bar(name: R|() -> kotlin/String|): R|kotlin/Unit| {
         lval result: R|kotlin/String| = R|kotlin/run|<R|kotlin/String|>(<L> = run@fun <anonymous>(): R|kotlin/String| <kind=EXACTLY_ONCE>  {
-            ^ R|<local>/name|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
+            ^ R|<local>/name|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
         }
         )
         lval name: R|kotlin/Int| = R|<local>/result|.R|kotlin/String.length|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.kt
new file mode 100644
index 00000000000..3d4e5944d22
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.kt
@@ -0,0 +1,16 @@
+class Some(var foo: Int) {
+    init {
+        if (foo < 0) {
+            foo = 0
+        }
+    }
+
+    val y = run {
+        foo = 1
+        foo
+    }
+
+    constructor(): this(-1) {
+        foo = 2
+    }
+}
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.txt
new file mode 100644
index 00000000000..05d357b1494
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.txt
@@ -0,0 +1,32 @@
+FILE: constructorVarWrite.kt
+    public final class Some : R|kotlin/Any| {
+        public constructor(foo: R|kotlin/Int|): R|Some| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final var foo: R|kotlin/Int| = R|<local>/foo|
+            public get(): R|kotlin/Int|
+            public set(value: R|kotlin/Int|): R|kotlin/Unit|
+
+        init {
+            when () {
+                CMP(<, this@R|/Some|.R|/Some.foo|.R|kotlin/Int.compareTo|(Int(0))) ->  {
+                    this@R|/Some|.R|/Some.foo| = Int(0)
+                }
+            }
+
+        }
+
+        public final val y: R|kotlin/Int| = this@R|/Some|.R|kotlin/run|<R|Some|, R|kotlin/Int|>(<L> = run@fun R|Some|.<anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
+            this@R|special/anonymous|.R|/Some.foo| = Int(1)
+            ^ this@R|special/anonymous|.R|/Some.foo|
+        }
+        )
+            public get(): R|kotlin/Int|
+
+        public constructor(): R|Some| {
+            this<R|Some|>(Int(-1))
+            this@R|/Some|.R|/Some.foo| = Int(2)
+        }
+
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt
index 106649ff9d6..0b335d855d9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt
@@ -1,6 +1,6 @@
 FILE: removeIf.kt
     public final fun test(collection: R|kotlin/collections/MutableCollection<kotlin/Boolean>|): R|kotlin/Unit| {
-        R|<local>/collection|.R|FakeOverride<kotlin/collections/MutableCollection.removeIf: R|kotlin/Boolean|>|(<L> = removeIf@fun <anonymous>(it: R|ft<kotlin/Boolean, kotlin/Boolean?>!|): R|kotlin/Boolean| {
+        R|<local>/collection|.R|SubstitutionOverride<kotlin/collections/MutableCollection.removeIf: R|kotlin/Boolean|>|(<L> = removeIf@fun <anonymous>(it: R|ft<kotlin/Boolean, kotlin/Boolean?>!|): R|kotlin/Boolean| {
             ^ R|<local>/it|
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt
index 07d7aa4ba2d..588fa693822 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt
@@ -1,5 +1,5 @@
 FILE: removeOnAbstractMap.kt
     public final fun test(map: R|java/util/AbstractMap<kotlin/String, kotlin/Int>|): R|kotlin/Unit| {
-        R|<local>/map|.R|FakeOverride<java/util/AbstractMap.remove: R|kotlin/Boolean|>|(String(), Null(null))
-        R|<local>/map|.R|FakeOverride<java/util/AbstractMap.remove: R|kotlin/Int?|>|(Null(null))
+        R|<local>/map|.R|SubstitutionOverride<java/util/AbstractMap.remove: R|kotlin/Boolean|>|(String(), Null(null))
+        R|<local>/map|.R|SubstitutionOverride<java/util/AbstractMap.remove: R|kotlin/Int?|>|(Null(null))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.kt
new file mode 100644
index 00000000000..60f68f3ce1b
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.kt
@@ -0,0 +1,10 @@
+// FULL_JDK
+
+fun foo(x: Comparator<in CharSequence>) {}
+
+
+fun main() {
+    foo { x, y ->
+        x.length - y.length
+    }
+}
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.txt
new file mode 100644
index 00000000000..716965de6a4
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.txt
@@ -0,0 +1,9 @@
+FILE: samForComparator.kt
+    public final fun foo(x: R|kotlin/Comparator<in kotlin/CharSequence>|): R|kotlin/Unit| {
+    }
+    public final fun main(): R|kotlin/Unit| {
+        R|/foo|(<L> = foo@fun <anonymous>(x: R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|, y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|): R|kotlin/Int| {
+            ^ R|<local>/x|.R|kotlin/CharSequence.length|.R|kotlin/Int.minus|(R|<local>/y|.R|kotlin/CharSequence.length|)
+        }
+        )
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot
index ad83926c52b..7bcdf3ccd03 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot
@@ -101,8 +101,8 @@ finally {
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {30 15};
-    14 -> {22}    [label=onUncaughtException];
+    13 -> {22}    [label=onUncaughtException];
+    14 -> {15};
     15 -> {16};
     16 -> {17};
     17 -> {31};
@@ -192,8 +192,8 @@ finally {
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {55 40};
-    39 -> {47}    [label=onUncaughtException];
+    38 -> {47}    [label=onUncaughtException];
+    39 -> {40};
     40 -> {41};
     41 -> {42};
     42 -> {43 56};
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt
index 898662073e3..9788fc3d8d8 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt
@@ -1,5 +1,5 @@
 FILE: typeAliasDeserialization.kt
     public final fun main(): R|kotlin/Unit| {
         lval a: R|java/util/LinkedHashSet<kotlin/String>| = R|java/util/LinkedHashSet.LinkedHashSet|<R|kotlin/String|>()
-        R|<local>/a|.R|FakeOverride<java/util/LinkedHashSet.add: R|kotlin/Boolean|>|(String())
+        R|<local>/a|.R|SubstitutionOverride<java/util/LinkedHashSet.add: R|kotlin/Boolean|>|(String())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt
index cd860384fca..3f8196eab3e 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt
@@ -10,7 +10,7 @@ FILE: typeAliasWithForEach.kt
     public final typealias Arguments = R|kotlin/collections/Map<kotlin/String, ArgsInfo>|
     public final fun R|Arguments|.deepCopy(): R|Arguments| {
         lval result: R|java/util/HashMap<ft<kotlin/String, kotlin/String?>!, ft<ArgsInfo, ArgsInfo?>!>| = R|java/util/HashMap.HashMap|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<ArgsInfo, ArgsInfo?>!|>()
-        this@R|/deepCopy|.R|FakeOverride<kotlin/collections/Map.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<ArgsInfo, ArgsInfo?>!|): R|kotlin/Unit| {
+        this@R|/deepCopy|.R|SubstitutionOverride<kotlin/collections/Map.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<ArgsInfo, ArgsInfo?>!|): R|kotlin/Unit| {
             R|<local>/result|.R|kotlin/collections/set|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<ArgsInfo, ArgsInfo?>!|>(R|<local>/key|, R|/ArgsInfoImpl.ArgsInfoImpl|(R|<local>/value|))
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt
index 822451b2fb9..cd3675e87b9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt
@@ -1,11 +1,11 @@
 FILE: typeParameterDerived.kt
     public final inline fun <K, V, VA : R|V|> R|kotlin/collections/MutableMap<K, V>|.getOrPut(key: R|K|, defaultValue: R|(K) -> VA|, postCompute: R|(VA) -> kotlin/Unit|): R|V| {
-        lval value: R|V?| = this@R|/getOrPut|.R|FakeOverride<kotlin/collections/MutableMap.get: R|V?|>|(R|<local>/key|)
+        lval value: R|V?| = this@R|/getOrPut|.R|SubstitutionOverride<kotlin/collections/MutableMap.get: R|V?|>|(R|<local>/key|)
         ^getOrPut when () {
             ==(R|<local>/value|, Null(null)) ->  {
-                lval answer: R|VA| = R|<local>/defaultValue|.R|FakeOverride<kotlin/Function1.invoke: R|VA|>|(R|<local>/key|)
-                this@R|/getOrPut|.R|FakeOverride<kotlin/collections/MutableMap.put: R|V?|>|(R|<local>/key|, R|<local>/answer|)
-                R|<local>/postCompute|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/answer|)
+                lval answer: R|VA| = R|<local>/defaultValue|.R|SubstitutionOverride<kotlin/Function1.invoke: R|VA|>|(R|<local>/key|)
+                this@R|/getOrPut|.R|SubstitutionOverride<kotlin/collections/MutableMap.put: R|V?|>|(R|<local>/key|, R|<local>/answer|)
+                R|<local>/postCompute|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/answer|)
                 R|<local>/answer|
             }
             else ->  {
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
index f27a0c6195d..87b998865de 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
@@ -48,6 +48,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/analysis-tests/testData/resolve/companion.kt");
     }
 
+    @TestMetadata("companionAccessInEnum.kt")
+    public void testCompanionAccessInEnum() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.kt");
+    }
+
     @TestMetadata("companionObjectCall.kt")
     public void testCompanionObjectCall() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/companionObjectCall.kt");
@@ -78,6 +83,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.kt");
     }
 
+    @TestMetadata("defaultParametersInheritedToJava.kt")
+    public void testDefaultParametersInheritedToJava() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.kt");
+    }
+
     @TestMetadata("definitelyNotNullAmbiguity.kt")
     public void testDefinitelyNotNullAmbiguity() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/definitelyNotNullAmbiguity.kt");
@@ -178,6 +188,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/analysis-tests/testData/resolve/fib.kt");
     }
 
+    @TestMetadata("flexibleCapturedType.kt")
+    public void testFlexibleCapturedType() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.kt");
+    }
+
     @TestMetadata("ft.kt")
     public void testFt() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/ft.kt");
@@ -348,6 +363,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.kt");
     }
 
+    @TestMetadata("rawTypeSam.kt")
+    public void testRawTypeSam() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/rawTypeSam.kt");
+    }
+
     @TestMetadata("recursiveCallOnWhenWithSealedClass.kt")
     public void testRecursiveCallOnWhenWithSealedClass() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.kt");
@@ -704,6 +724,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.kt");
         }
 
+        @TestMetadata("lambdaAsReceiver.kt")
+        public void testLambdaAsReceiver() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.kt");
+        }
+
         @TestMetadata("objectInvoke.kt")
         public void testObjectInvoke() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.kt");
@@ -1805,6 +1830,39 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         }
     }
 
+    @TestMetadata("compiler/fir/analysis-tests/testData/resolve/innerClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class InnerClasses extends AbstractFirDiagnosticsTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInnerClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/innerClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("inner.kt")
+        public void testInner() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt");
+        }
+
+        @TestMetadata("innerTypeFromSuperClassInBody.kt")
+        public void testInnerTypeFromSuperClassInBody() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt");
+        }
+
+        @TestMetadata("innerTypes.kt")
+        public void testInnerTypes() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt");
+        }
+    }
+
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/localClasses")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1901,34 +1959,6 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         }
     }
 
-    @TestMetadata("compiler/fir/analysis-tests/testData/resolve/nested")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Nested extends AbstractFirDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInNested() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/nested"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("inner.kt")
-        public void testInner() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/inner.kt");
-        }
-
-        @TestMetadata("innerTypes.kt")
-        public void testInnerTypes() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/simple.kt");
-        }
-    }
-
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/overrides")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
index 85ff23a849a..c974f775714 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
@@ -48,6 +48,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/analysis-tests/testData/resolve/companion.kt");
     }
 
+    @TestMetadata("companionAccessInEnum.kt")
+    public void testCompanionAccessInEnum() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.kt");
+    }
+
     @TestMetadata("companionObjectCall.kt")
     public void testCompanionObjectCall() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/companionObjectCall.kt");
@@ -78,6 +83,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.kt");
     }
 
+    @TestMetadata("defaultParametersInheritedToJava.kt")
+    public void testDefaultParametersInheritedToJava() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.kt");
+    }
+
     @TestMetadata("definitelyNotNullAmbiguity.kt")
     public void testDefinitelyNotNullAmbiguity() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/definitelyNotNullAmbiguity.kt");
@@ -178,6 +188,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/analysis-tests/testData/resolve/fib.kt");
     }
 
+    @TestMetadata("flexibleCapturedType.kt")
+    public void testFlexibleCapturedType() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.kt");
+    }
+
     @TestMetadata("ft.kt")
     public void testFt() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/ft.kt");
@@ -348,6 +363,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.kt");
     }
 
+    @TestMetadata("rawTypeSam.kt")
+    public void testRawTypeSam() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/rawTypeSam.kt");
+    }
+
     @TestMetadata("recursiveCallOnWhenWithSealedClass.kt")
     public void testRecursiveCallOnWhenWithSealedClass() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.kt");
@@ -704,6 +724,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
             runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.kt");
         }
 
+        @TestMetadata("lambdaAsReceiver.kt")
+        public void testLambdaAsReceiver() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.kt");
+        }
+
         @TestMetadata("objectInvoke.kt")
         public void testObjectInvoke() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.kt");
@@ -1805,6 +1830,39 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         }
     }
 
+    @TestMetadata("compiler/fir/analysis-tests/testData/resolve/innerClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class InnerClasses extends AbstractFirDiagnosticsWithLightTreeTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInnerClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/innerClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("inner.kt")
+        public void testInner() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt");
+        }
+
+        @TestMetadata("innerTypeFromSuperClassInBody.kt")
+        public void testInnerTypeFromSuperClassInBody() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt");
+        }
+
+        @TestMetadata("innerTypes.kt")
+        public void testInnerTypes() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt");
+        }
+    }
+
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/localClasses")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1901,34 +1959,6 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         }
     }
 
-    @TestMetadata("compiler/fir/analysis-tests/testData/resolve/nested")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Nested extends AbstractFirDiagnosticsWithLightTreeTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInNested() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/nested"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("inner.kt")
-        public void testInner() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/inner.kt");
-        }
-
-        @TestMetadata("innerTypes.kt")
-        public void testInnerTypes() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/simple.kt");
-        }
-    }
-
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/overrides")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
index 4c9b3b770bd..75a1c08b174 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
@@ -208,6 +208,11 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/nullableTypeParameter.kt");
     }
 
+    @TestMetadata("plusAssignNullable.kt")
+    public void testPlusAssignNullable() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.kt");
+    }
+
     @TestMetadata("problems.kt")
     public void testProblems() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.kt");
@@ -243,6 +248,11 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/runOnIntegerLiteral.kt");
     }
 
+    @TestMetadata("samForComparator.kt")
+    public void testSamForComparator() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.kt");
+    }
+
     @TestMetadata("simpleLazy.kt")
     public void testSimpleLazy() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/simpleLazy.kt");
@@ -1235,6 +1245,24 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         }
     }
 
+    @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Reinitializations extends AbstractFirDiagnosticsWithStdlibTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInReinitializations() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("constructorVarWrite.kt")
+        public void testConstructorVarWrite() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.kt");
+        }
+    }
+
     @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
index 7cad9d0b1ba..e2694f20f07 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
@@ -920,6 +920,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
             runTest("compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.kt");
         }
 
+        @TestMetadata("dontReportWarningAboutChangingExecutionOrderForVararg.kt")
+        public void testDontReportWarningAboutChangingExecutionOrderForVararg() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.kt");
+        }
+
         @TestMetadata("extensionFunctionType.kt")
         public void testExtensionFunctionType() throws Exception {
             runTest("compiler/testData/diagnostics/tests/annotations/extensionFunctionType.kt");
@@ -12386,6 +12391,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
             runTest("compiler/testData/diagnostics/tests/inline/kt19679.kt");
         }
 
+        @TestMetadata("kt21177.kt")
+        public void testKt21177() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/inline/kt21177.kt");
+        }
+
         @TestMetadata("kt4869.kt")
         public void testKt4869() throws Exception {
             runTest("compiler/testData/diagnostics/tests/inline/kt4869.kt");
@@ -12827,6 +12837,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
             runTest("compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.kt");
         }
 
+        @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
+        public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
+        }
+
         @TestMetadata("constructorsJvmSignaturesClash.kt")
         public void testConstructorsJvmSignaturesClash() throws Exception {
             runTest("compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt");
@@ -14546,6 +14561,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
             runTest("compiler/testData/diagnostics/tests/modifiers/NoLocalVisibility.kt");
         }
 
+        @TestMetadata("openInExpectInterface.kt")
+        public void testOpenInExpectInterface() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.kt");
+        }
+
         @TestMetadata("openInInterface.kt")
         public void testOpenInInterface() throws Exception {
             runTest("compiler/testData/diagnostics/tests/modifiers/openInInterface.kt");
@@ -15005,6 +15025,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
         }
 
+        @TestMetadata("expectInterfaceApplicability.kt")
+        public void testExpectInterfaceApplicability() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt");
+        }
+
         @TestMetadata("headerFunInNonHeaderClass.kt")
         public void testHeaderFunInNonHeaderClass() throws Exception {
             runTest("compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt");
@@ -21910,6 +21935,16 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
                 runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/basicOn.kt");
             }
 
+            @TestMetadata("castInTryWithCatch.kt")
+            public void testCastInTryWithCatch() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.kt");
+            }
+
+            @TestMetadata("castInTryWithoutCatch.kt")
+            public void testCastInTryWithoutCatch() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.kt");
+            }
+
             @TestMetadata("impossible.kt")
             public void testImpossible() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/impossible.kt");
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java
index ab24fdbca0a..9198d789c27 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java
+++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java
@@ -39,6 +39,11 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi
         runTest("compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt");
     }
 
+    @TestMetadata("assignedInSynchronized.kt")
+    public void testAssignedInSynchronized() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.kt");
+    }
+
     @TestMetadata("CallCompanionProtectedNonStatic.kt")
     public void testCallCompanionProtectedNonStatic() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.kt");
@@ -3357,6 +3362,11 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi
             public void testDontInferToNullableNothingInDelegates() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontInferToNullableNothingInDelegates.kt");
             }
+
+            @TestMetadata("dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt")
+            public void testDontSpreadWarningToNotReturningNothingSubResolvedAtoms() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt");
+            }
         }
     }
 
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
index 77229a68ec6..0e32f18e276 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
@@ -48,6 +48,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
         runTest("compiler/fir/analysis-tests/testData/resolve/companion.kt");
     }
 
+    @TestMetadata("companionAccessInEnum.kt")
+    public void testCompanionAccessInEnum() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.kt");
+    }
+
     @TestMetadata("companionObjectCall.kt")
     public void testCompanionObjectCall() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/companionObjectCall.kt");
@@ -78,6 +83,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
         runTest("compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.kt");
     }
 
+    @TestMetadata("defaultParametersInheritedToJava.kt")
+    public void testDefaultParametersInheritedToJava() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.kt");
+    }
+
     @TestMetadata("definitelyNotNullAmbiguity.kt")
     public void testDefinitelyNotNullAmbiguity() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/definitelyNotNullAmbiguity.kt");
@@ -178,6 +188,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
         runTest("compiler/fir/analysis-tests/testData/resolve/fib.kt");
     }
 
+    @TestMetadata("flexibleCapturedType.kt")
+    public void testFlexibleCapturedType() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.kt");
+    }
+
     @TestMetadata("ft.kt")
     public void testFt() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/ft.kt");
@@ -348,6 +363,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
         runTest("compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.kt");
     }
 
+    @TestMetadata("rawTypeSam.kt")
+    public void testRawTypeSam() throws Exception {
+        runTest("compiler/fir/analysis-tests/testData/resolve/rawTypeSam.kt");
+    }
+
     @TestMetadata("recursiveCallOnWhenWithSealedClass.kt")
     public void testRecursiveCallOnWhenWithSealedClass() throws Exception {
         runTest("compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.kt");
@@ -704,6 +724,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
             runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.kt");
         }
 
+        @TestMetadata("lambdaAsReceiver.kt")
+        public void testLambdaAsReceiver() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.kt");
+        }
+
         @TestMetadata("objectInvoke.kt")
         public void testObjectInvoke() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.kt");
@@ -1805,6 +1830,39 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
         }
     }
 
+    @TestMetadata("compiler/fir/analysis-tests/testData/resolve/innerClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class InnerClasses extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInnerClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/innerClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("inner.kt")
+        public void testInner() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.kt");
+        }
+
+        @TestMetadata("innerTypeFromSuperClassInBody.kt")
+        public void testInnerTypeFromSuperClassInBody() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.kt");
+        }
+
+        @TestMetadata("innerTypes.kt")
+        public void testInnerTypes() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.kt");
+        }
+    }
+
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/localClasses")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1901,34 +1959,6 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
         }
     }
 
-    @TestMetadata("compiler/fir/analysis-tests/testData/resolve/nested")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Nested extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInNested() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/nested"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("inner.kt")
-        public void testInner() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/inner.kt");
-        }
-
-        @TestMetadata("innerTypes.kt")
-        public void testInnerTypes() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/nested/simple.kt");
-        }
-    }
-
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/overrides")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
index e56d444a223..7c70973ee92 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
@@ -7,11 +7,12 @@ package org.jetbrains.kotlin.fir.analysis.checkers
 
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.FirSymbolOwner
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
+import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.FirSymbolOwner
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
+import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
@@ -23,7 +24,6 @@ import org.jetbrains.kotlin.fir.resolve.transformers.firClassLike
 import org.jetbrains.kotlin.fir.scopes.ProcessorAction
 import org.jetbrains.kotlin.fir.scopes.processOverriddenFunctions
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
-import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
@@ -142,18 +142,8 @@ inline fun <reified T : Any> FirQualifiedAccessExpression.getDeclaration(): T? {
  * Returns the ClassLikeDeclaration where the Fir object has been defined
  * or null if no proper declaration has been found.
  */
-fun FirSymbolOwner<*>.getContainingClass(context: CheckerContext): FirClassLikeDeclaration<*>? {
-    val classId = this.symbol.safeAs<FirCallableSymbol<*>>()
-        ?.callableId
-        ?.classId
-        ?: return null
-
-    if (!classId.isLocal) {
-        return context.session.firSymbolProvider.getClassLikeSymbolByFqName(classId)?.fir
-    }
-
-    return null
-}
+fun FirSymbolOwner<*>.getContainingClass(context: CheckerContext): FirClassLikeDeclaration<*>? =
+    this.safeAs<FirCallableMemberDeclaration<*>>()?.containingClass()?.toSymbol(context.session)?.fir
 
 /**
  * Returns the FirClassLikeDeclaration the type alias is pointing
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSuperclassNotAccessibleFromInterfaceChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSuperclassNotAccessibleFromInterfaceChecker.kt
index 19644efb0c1..5cbdc7c00a5 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSuperclassNotAccessibleFromInterfaceChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSuperclassNotAccessibleFromInterfaceChecker.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.fir.FirSourceElement
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
+import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClass
 import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration
@@ -15,8 +16,6 @@ import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.references.FirSuperReference
-import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
-import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
@@ -45,17 +44,7 @@ object FirSuperclassNotAccessibleFromInterfaceChecker : FirQualifiedAccessChecke
      * or null if no proper declaration has been found.
      */
     private fun getClassLikeDeclaration(functionCall: FirQualifiedAccessExpression, context: CheckerContext): FirClassLikeDeclaration<*>? {
-        val classId = functionCall.calleeReference.safeAs<FirResolvedNamedReference>()
-            ?.resolvedSymbol.safeAs<FirNamedFunctionSymbol>()
-            ?.callableId
-            ?.classId
-            ?: return null
-
-        if (!classId.isLocal) {
-            return context.session.firSymbolProvider.getClassLikeSymbolByFqName(classId)?.fir
-        }
-
-        return null
+        return functionCall.calleeReference.safeAs<FirResolvedNamedReference>()?.resolvedSymbol?.fir?.getContainingClass(context)
     }
 
     private fun DiagnosticReporter.report(source: FirSourceElement?) {
@@ -63,4 +52,4 @@ object FirSuperclassNotAccessibleFromInterfaceChecker : FirQualifiedAccessChecke
             report(FirErrors.SUPERCLASS_NOT_ACCESSIBLE_FROM_INTERFACE.on(it))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUpperBoundViolatedChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUpperBoundViolatedChecker.kt
index 9dec6b1797c..341ef0dff58 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUpperBoundViolatedChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUpperBoundViolatedChecker.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
+import org.jetbrains.kotlin.fir.originalForSubstitutionOverride
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap
@@ -113,8 +114,7 @@ object FirUpperBoundViolatedChecker : FirQualifiedAccessChecker() {
         // substitution here
         val protoConstructor = functionCall.calleeReference.safeAs<FirResolvedNamedReference>()
             ?.resolvedSymbol.safeAs<FirConstructorSymbol>()
-            ?.overriddenSymbol
-            ?.fir.safeAs<FirConstructor>()
+            ?.fir?.originalForSubstitutionOverride
             ?: return
 
         // holds Collection<G> bound.
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt
index bb344b7ceb0..0f28f5e2d70 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt
@@ -9,9 +9,7 @@ import com.intellij.lang.LighterASTNode
 import com.intellij.openapi.util.Ref
 import com.intellij.psi.tree.IElementType
 import org.jetbrains.kotlin.KtNodeTypes
-import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
-import org.jetbrains.kotlin.fir.FirLightSourceElement
-import org.jetbrains.kotlin.fir.FirPsiSourceElement
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
 import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirExpressionChecker
 import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
@@ -20,7 +18,6 @@ import org.jetbrains.kotlin.fir.analysis.getChild
 import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
 import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment
 import org.jetbrains.kotlin.fir.expressions.toResolvedCallableSymbol
-import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.types.classId
@@ -41,7 +38,7 @@ object CanBeReplacedWithOperatorAssignmentChecker : FirExpressionChecker<FirVari
         val rValueClassId = rValue.explicitReceiver?.typeRef?.coneType?.classId
         if (rValueClassId !in StandardClassIds.primitiveTypes) return
         val rValueResolvedSymbol = rValue.toResolvedCallableSymbol() ?: return
-        if (rValueResolvedSymbol.callableId.classId !in StandardClassIds.primitiveTypes) return
+        if (rValueResolvedSymbol.dispatchReceiverClassOrNull()?.classId !in StandardClassIds.primitiveTypes) return
 
         var needToReport = false
         val assignmentSource = expression.source
@@ -144,4 +141,4 @@ object CanBeReplacedWithOperatorAssignmentChecker : FirExpressionChecker<FirVari
     private fun LighterASTNode.canBeAugmented() = this.toString().let {
         it == "+" || it == "*" || it == "-" || it == "/" || it == "%"
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt
index 7e05e497d88..0a75a5fe852 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
 
 object UnusedChecker : FirControlFlowChecker() {
     override fun analyze(graph: ControlFlowGraph, reporter: DiagnosticReporter, checkerContext: CheckerContext) {
-        if ((graph.declaration as? FirSymbolOwner<*>)?.getContainingClass(checkerContext) != null) return
+        if ((graph.declaration as? FirSymbolOwner<*>)?.getContainingClass(checkerContext)?.takeIf { !it.symbol.classId.isLocal }!= null) return
         val properties = LocalPropertyCollector.collect(graph)
         if (properties.isEmpty()) return
 
@@ -203,4 +203,4 @@ object UnusedChecker : FirControlFlowChecker() {
 
     private val FirPropertySymbol.identifierSource: FirSourceElement?
         get() = fir.source?.getChild(KtTokens.IDENTIFIER, 0, 1)
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
index 522612e3483..6c1315998fe 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
@@ -33,7 +33,7 @@ abstract class AbstractDiagnosticCollector(
     override val scopeSession: ScopeSession = ScopeSession(),
     returnTypeCalculator: ReturnTypeCalculator = ReturnTypeCalculatorForFullBodyResolve()
 ) : SessionHolder {
-    fun collectDiagnostics(firFile: FirFile): Iterable<FirDiagnostic<*>> {
+    fun collectDiagnostics(firFile: FirFile): List<FirDiagnostic<*>> {
         if (!componentsInitialized) {
             throw IllegalStateException("Components are not initialized")
         }
@@ -43,7 +43,7 @@ abstract class AbstractDiagnosticCollector(
     }
 
     protected abstract fun initializeCollector()
-    protected abstract fun getCollectedDiagnostics(): Iterable<FirDiagnostic<*>>
+    protected abstract fun getCollectedDiagnostics(): List<FirDiagnostic<*>>
     abstract val reporter: DiagnosticReporter
 
     private val components: MutableList<AbstractDiagnosticCollectorComponent> = mutableListOf()
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt
index 95d4eb50d3c..92e16c75f01 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.collectors
 import org.jetbrains.kotlin.fir.FirSession
 
 object FirDiagnosticsCollector {
-    fun create(session: FirSession): AbstractDiagnosticCollector {
+    fun create(session: FirSession): SimpleDiagnosticsCollector {
         val collector = SimpleDiagnosticsCollector(session)
         collector.registerAllComponents()
         return collector
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt
index 52864444d7e..0f5e62de345 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt
@@ -17,7 +17,7 @@ class SimpleDiagnosticsCollector(session: FirSession) : AbstractDiagnosticCollec
         reporter = SimpleDiagnosticReporter()
     }
 
-    override fun getCollectedDiagnostics(): Iterable<FirDiagnostic<*>> {
+    override fun getCollectedDiagnostics(): List<FirDiagnostic<*>> {
         return reporter.diagnostics
     }
 }
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt
index bd5eeb944cd..4a154518f0c 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt
@@ -93,7 +93,7 @@ class ErrorNodeDiagnosticCollectorComponent(collector: AbstractDiagnosticCollect
     private fun ConeSimpleDiagnostic.getFactory(): FirDiagnosticFactory0<FirSourceElement, *> {
         @Suppress("UNCHECKED_CAST")
         return when (kind) {
-            Syntax -> FirErrors.SYNTAX_ERROR
+            Syntax -> FirErrors.SYNTAX
             ReturnNotAllowed -> FirErrors.RETURN_NOT_ALLOWED
             UnresolvedLabel -> FirErrors.UNRESOLVED_LABEL
             NoThis -> FirErrors.NO_THIS
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
index 9fd4c2d9bb9..3a32d8fd51e 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
@@ -100,7 +100,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPERTYPE_INITIAL
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPER_IS_NOT_AN_EXPRESSION
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPER_NOT_AVAILABLE
-import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SYNTAX_ERROR
+import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SYNTAX
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_ARGUMENTS_NOT_ALLOWED
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_MISMATCH
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETERS_IN_ENUM
@@ -127,13 +127,18 @@ class FirDefaultErrorMessages : DefaultErrorMessages.Extension {
     }
 
     companion object {
+        fun getRendererForDiagnostic(diagnostic: FirDiagnostic<*>): FirDiagnosticRenderer<*> {
+            val factory = diagnostic.factory
+            return MAP[factory] ?: factory.defaultRenderer
+        }
+
         // * - The old FE reports these diagnostics with additional parameters
         // & - New diagnostic that has no analogues in the old FE
         // + - Better message required
         // # - The new diagnostic differs from the old FE's one
         val MAP = FirDiagnosticFactoryToRendererMap("FIR").also { map ->
             // Miscellaneous
-            map.put(SYNTAX_ERROR, "Syntax error")
+            map.put(SYNTAX, "Syntax error")
             map.put(OTHER_ERROR, "Unknown (other) error")
 
             // General syntax
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt
index 57728ae4ac3..9cfdda9721c 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt
@@ -19,6 +19,8 @@ sealed class AbstractFirDiagnosticFactory<out E : FirSourceElement, D : FirDiagn
 ) {
     abstract val psiDiagnosticFactory: DiagnosticFactoryWithPsiElement<*, *>
 
+    abstract val defaultRenderer: FirDiagnosticRenderer<*>
+
     override fun toString(): String {
         return name
     }
@@ -27,6 +29,13 @@ sealed class AbstractFirDiagnosticFactory<out E : FirSourceElement, D : FirDiagn
 class FirDiagnosticFactory0<E : FirSourceElement, P : PsiElement>(
     name: String, severity: Severity, override val psiDiagnosticFactory: DiagnosticFactory0<P>
 ) : AbstractFirDiagnosticFactory<E, FirSimpleDiagnostic<E>>(name, severity) {
+    companion object {
+        private val DefaultRenderer = SimpleFirDiagnosticRenderer("")
+    }
+
+    override val defaultRenderer: FirDiagnosticRenderer<*>
+        get() = DefaultRenderer
+
     fun on(element: E): FirSimpleDiagnostic<E> {
         return when (element) {
             is FirPsiSourceElement<*> -> FirPsiSimpleDiagnostic(
@@ -41,6 +50,16 @@ class FirDiagnosticFactory0<E : FirSourceElement, P : PsiElement>(
 class FirDiagnosticFactory1<E : FirSourceElement, P : PsiElement, A : Any>(
     name: String, severity: Severity, override val psiDiagnosticFactory: DiagnosticFactory1<P, A>
 ) : AbstractFirDiagnosticFactory<E, FirDiagnosticWithParameters1<E, A>>(name, severity) {
+    companion object {
+        private val DefaultRenderer = FirDiagnosticWithParameters1Renderer(
+            "{0}",
+            FirDiagnosticRenderers.TO_STRING
+        )
+    }
+
+    override val defaultRenderer: FirDiagnosticRenderer<*>
+        get() = DefaultRenderer
+
     fun on(element: E, a: A): FirDiagnosticWithParameters1<E, A> {
         return when (element) {
             is FirPsiSourceElement<*> -> FirPsiDiagnosticWithParameters1(
@@ -55,6 +74,17 @@ class FirDiagnosticFactory1<E : FirSourceElement, P : PsiElement, A : Any>(
 class FirDiagnosticFactory2<E : FirSourceElement, P : PsiElement, A : Any, B : Any>(
     name: String, severity: Severity, override val psiDiagnosticFactory: DiagnosticFactory2<P, A, B>
 ) : AbstractFirDiagnosticFactory<E, FirDiagnosticWithParameters2<E, A, B>>(name, severity) {
+    companion object {
+        private val DefaultRenderer = FirDiagnosticWithParameters2Renderer(
+            "{0}, {1}",
+            FirDiagnosticRenderers.TO_STRING,
+            FirDiagnosticRenderers.TO_STRING
+        )
+    }
+
+    override val defaultRenderer: FirDiagnosticRenderer<*>
+        get() = DefaultRenderer
+
     fun on(element: E, a: A, b: B): FirDiagnosticWithParameters2<E, A, B> {
         return when (element) {
             is FirPsiSourceElement<*> -> FirPsiDiagnosticWithParameters2(
@@ -69,6 +99,18 @@ class FirDiagnosticFactory2<E : FirSourceElement, P : PsiElement, A : Any, B : A
 class FirDiagnosticFactory3<E : FirSourceElement, P : PsiElement, A : Any, B : Any, C : Any>(
     name: String, severity: Severity, override val psiDiagnosticFactory: DiagnosticFactory3<P, A, B, C>
 ) : AbstractFirDiagnosticFactory<E, FirDiagnosticWithParameters3<E, A, B, C>>(name, severity) {
+    companion object {
+        private val DefaultRenderer = FirDiagnosticWithParameters3Renderer(
+            "{0}, {1}, {2}",
+            FirDiagnosticRenderers.TO_STRING,
+            FirDiagnosticRenderers.TO_STRING,
+            FirDiagnosticRenderers.TO_STRING
+        )
+    }
+
+    override val defaultRenderer: FirDiagnosticRenderer<*>
+        get() = DefaultRenderer
+
     fun on(element: E, a: A, b: B, c: C): FirDiagnosticWithParameters3<E, A, B, C> {
         return when (element) {
             is FirPsiSourceElement<*> -> FirPsiDiagnosticWithParameters3(
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoryToRendererMap.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoryToRendererMap.kt
index cb7174fb01b..4a845598888 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoryToRendererMap.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoryToRendererMap.kt
@@ -10,15 +10,15 @@ import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticParameterRenderer
 import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticRenderer
 
 class FirDiagnosticFactoryToRendererMap(val name: String) {
-    private val diagnosticsMap: MutableMap<AbstractFirDiagnosticFactory<*, *>, DiagnosticRenderer<*>> = mutableMapOf()
-    val psiDiagnosticMap: DiagnosticFactoryToRendererMap =
-        DiagnosticFactoryToRendererMap()
+    private val classicRenderersMap: MutableMap<AbstractFirDiagnosticFactory<*, *>, DiagnosticRenderer<*>> = mutableMapOf()
+    private val renderersMap: MutableMap<AbstractFirDiagnosticFactory<*, *>, FirDiagnosticRenderer<*>> = mutableMapOf()
+    val psiDiagnosticMap: DiagnosticFactoryToRendererMap = DiagnosticFactoryToRendererMap()
 
-    operator fun get(factory: AbstractFirDiagnosticFactory<*, *>): DiagnosticRenderer<*>? = diagnosticsMap[factory]
+    operator fun get(factory: AbstractFirDiagnosticFactory<*, *>): FirDiagnosticRenderer<*>? = renderersMap[factory]
+    fun getClassicRenderer(factory: AbstractFirDiagnosticFactory<*, *>): DiagnosticRenderer<*>? = classicRenderersMap[factory]
 
     fun put(factory: FirDiagnosticFactory0<*, *>, message: String) {
-        psiDiagnosticMap.put(factory.psiDiagnosticFactory, message)
-        putToFirMap(factory)
+        put(factory, SimpleFirDiagnosticRenderer(message))
     }
 
     fun <A : Any> put(
@@ -26,8 +26,7 @@ class FirDiagnosticFactoryToRendererMap(val name: String) {
         message: String,
         rendererA: DiagnosticParameterRenderer<A>?
     ) {
-        psiDiagnosticMap.put(factory.psiDiagnosticFactory, message, rendererA)
-        putToFirMap(factory)
+        put(factory, FirDiagnosticWithParameters1Renderer(message, rendererA))
     }
 
     fun <A : Any, B : Any> put(
@@ -36,8 +35,7 @@ class FirDiagnosticFactoryToRendererMap(val name: String) {
         rendererA: DiagnosticParameterRenderer<A>?,
         rendererB: DiagnosticParameterRenderer<B>?
     ) {
-        psiDiagnosticMap.put(factory.psiDiagnosticFactory, message, rendererA, rendererB)
-        putToFirMap(factory)
+        put(factory, FirDiagnosticWithParameters2Renderer(message, rendererA, rendererB))
     }
 
     fun <A : Any, B : Any, C : Any> put(
@@ -47,13 +45,13 @@ class FirDiagnosticFactoryToRendererMap(val name: String) {
         rendererB: DiagnosticParameterRenderer<B>?,
         rendererC: DiagnosticParameterRenderer<C>?
     ) {
-        psiDiagnosticMap.put(factory.psiDiagnosticFactory, message, rendererA, rendererB, rendererC)
-        putToFirMap(factory)
+        put(factory, FirDiagnosticWithParameters3Renderer(message, rendererA, rendererB, rendererC))
     }
 
-    private fun putToFirMap(factory: AbstractFirDiagnosticFactory<*, *>) {
-        psiDiagnosticMap[factory.psiDiagnosticFactory]?.let {
-            diagnosticsMap[factory] = it
-        }
+    private fun put(factory: AbstractFirDiagnosticFactory<*, *>, renderer: FirDiagnosticRenderer<*>) {
+        val classicRenderer = renderer.toClassicDiagnosticRenderer()
+        renderersMap[factory] = renderer
+        classicRenderersMap[factory] = classicRenderer
+        psiDiagnosticMap.put(factory.psiDiagnosticFactory, classicRenderer)
     }
 }
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderer.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderer.kt
new file mode 100644
index 00000000000..50e16067e3f
--- /dev/null
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderer.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.analysis.diagnostics
+
+import org.jetbrains.kotlin.diagnostics.rendering.*
+import java.text.MessageFormat
+
+sealed class FirDiagnosticRenderer<D : FirDiagnostic<*>> {
+    abstract fun render(diagnostic: D): String
+
+    abstract fun toClassicDiagnosticRenderer(): DiagnosticRenderer<*>
+}
+
+class SimpleFirDiagnosticRenderer(private val message: String) : FirDiagnosticRenderer<FirSimpleDiagnostic<*>>() {
+    override fun render(diagnostic: FirSimpleDiagnostic<*>): String {
+        return message
+    }
+
+    override fun toClassicDiagnosticRenderer(): DiagnosticRenderer<*> {
+        return SimpleDiagnosticRenderer(message)
+    }
+}
+
+sealed class AbstractFirDiagnosticWithParametersRenderer<D : FirDiagnostic<*>>(
+    protected val message: String
+) : FirDiagnosticRenderer<D>() {
+    private val messageFormat = MessageFormat(message)
+
+    override fun render(diagnostic: D): String {
+        return messageFormat.format(renderParameters(diagnostic))
+    }
+
+    abstract fun renderParameters(diagnostic: D): Array<out Any>
+}
+
+class FirDiagnosticWithParameters1Renderer<A : Any>(
+    message: String,
+    private val rendererForA: DiagnosticParameterRenderer<A>?,
+) : AbstractFirDiagnosticWithParametersRenderer<FirDiagnosticWithParameters1<*, A>>(message) {
+    override fun renderParameters(diagnostic: FirDiagnosticWithParameters1<*, A>): Array<out Any> {
+        val context = RenderingContext.of(diagnostic.a)
+        return arrayOf(renderParameter(diagnostic.a, rendererForA, context),)
+    }
+
+    override fun toClassicDiagnosticRenderer(): DiagnosticRenderer<*> {
+        return DiagnosticWithParameters1Renderer(message, rendererForA)
+    }
+}
+
+class FirDiagnosticWithParameters2Renderer<A : Any, B : Any>(
+    message: String,
+    private val rendererForA: DiagnosticParameterRenderer<A>?,
+    private val rendererForB: DiagnosticParameterRenderer<B>?,
+) : AbstractFirDiagnosticWithParametersRenderer<FirDiagnosticWithParameters2<*, A, B>>(message) {
+    override fun renderParameters(diagnostic: FirDiagnosticWithParameters2<*, A, B>): Array<out Any> {
+        val context = RenderingContext.of(diagnostic.a, diagnostic.b)
+        return arrayOf(
+            renderParameter(diagnostic.a, rendererForA, context),
+            renderParameter(diagnostic.b, rendererForB, context),
+        )
+    }
+
+    override fun toClassicDiagnosticRenderer(): DiagnosticRenderer<*> {
+        return DiagnosticWithParameters2Renderer(message, rendererForA, rendererForB)
+    }
+}
+
+class FirDiagnosticWithParameters3Renderer<A : Any, B : Any, C : Any>(
+    message: String,
+    private val rendererForA: DiagnosticParameterRenderer<A>?,
+    private val rendererForB: DiagnosticParameterRenderer<B>?,
+    private val rendererForC: DiagnosticParameterRenderer<C>?,
+) : AbstractFirDiagnosticWithParametersRenderer<FirDiagnosticWithParameters3<*, A, B, C>>(message) {
+    override fun renderParameters(diagnostic: FirDiagnosticWithParameters3<*, A, B, C>): Array<out Any> {
+        val context = RenderingContext.of(diagnostic.a, diagnostic.b, diagnostic.c)
+        return arrayOf(
+            renderParameter(diagnostic.a, rendererForA, context),
+            renderParameter(diagnostic.b, rendererForB, context),
+            renderParameter(diagnostic.c, rendererForC, context),
+        )
+    }
+
+    override fun toClassicDiagnosticRenderer(): DiagnosticRenderer<*> {
+        return DiagnosticWithParameters3Renderer(message, rendererForA, rendererForB, rendererForC)
+    }
+}
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
index eabe8e6d156..982c1e4608c 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.*
 
 object FirErrors {
     // Miscellaneous
-    val SYNTAX_ERROR by error0<FirSourceElement, PsiElement>()
+    val SYNTAX by error0<FirSourceElement, PsiElement>()
     val OTHER_ERROR by error0<FirSourceElement, PsiElement>()
 
     // General syntax
@@ -171,4 +171,4 @@ object FirErrors {
     val VARIABLE_INITIALIZER_IS_REDUNDANT by warning0<FirSourceElement, PsiElement>()
     val VARIABLE_NEVER_READ by warning0<FirSourceElement, PsiElement>()
     val USELESS_CALL_ON_NOT_NULL by warning0<FirSourceElement, PsiElement>()
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt
index 0ea08f5a9c6..562e8cceb0b 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.name.Name
 object StandardClassIds {
 
     private val BASE_KOTLIN_PACKAGE = FqName("kotlin")
-    private val BASE_REFLECT_PACKAGE = BASE_KOTLIN_PACKAGE.child(Name.identifier("reflect"))
+    val BASE_REFLECT_PACKAGE = BASE_KOTLIN_PACKAGE.child(Name.identifier("reflect"))
     private fun String.baseId() = ClassId(BASE_KOTLIN_PACKAGE, Name.identifier(this))
     private fun ClassId.unsignedId() = ClassId(BASE_KOTLIN_PACKAGE, Name.identifier("U" + shortClassName.identifier))
     private fun String.reflectId() = ClassId(BASE_REFLECT_PACKAGE, Name.identifier(this))
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/CompilerConeAttributes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/CompilerConeAttributes.kt
index d0dfaaaccd5..c58362c2d60 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/CompilerConeAttributes.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/CompilerConeAttributes.kt
@@ -59,6 +59,18 @@ object CompilerConeAttributes {
         override fun toString(): String = "@ExtensionFunctionType"
     }
 
+    object FlexibleNullability : ConeAttribute<FlexibleNullability>() {
+        val ANNOTATION_CLASS_ID = ClassId(FqName("kotlin.internal.ir"), Name.identifier("FlexibleNullability"))
+
+        override fun union(other: FlexibleNullability?): FlexibleNullability? = other
+        override fun intersect(other: FlexibleNullability?): FlexibleNullability? = this
+        override fun isSubtypeOf(other: FlexibleNullability?): Boolean = true
+
+        override val key: KClass<out FlexibleNullability> = FlexibleNullability::class
+
+        override fun toString(): String = "@FlexibleNullability"
+    }
+
     object UnsafeVariance : ConeAttribute<UnsafeVariance>() {
         val ANNOTATION_CLASS_ID = ClassId(FqName("kotlin"), Name.identifier("UnsafeVariance"))
 
@@ -76,6 +88,7 @@ val ConeAttributes.exact: CompilerConeAttributes.Exact? by ConeAttributes.attrib
 val ConeAttributes.noInfer: CompilerConeAttributes.NoInfer? by ConeAttributes.attributeAccessor<CompilerConeAttributes.NoInfer>()
 val ConeAttributes.enhancedNullability: CompilerConeAttributes.EnhancedNullability? by ConeAttributes.attributeAccessor<CompilerConeAttributes.EnhancedNullability>()
 val ConeAttributes.extensionFunctionType: CompilerConeAttributes.ExtensionFunctionType? by ConeAttributes.attributeAccessor<CompilerConeAttributes.ExtensionFunctionType>()
+val ConeAttributes.flexibleNullability: CompilerConeAttributes.FlexibleNullability? by ConeAttributes.attributeAccessor<CompilerConeAttributes.FlexibleNullability>()
 val ConeAttributes.unsafeVarianceType: CompilerConeAttributes.UnsafeVariance? by ConeAttributes.attributeAccessor<CompilerConeAttributes.UnsafeVariance>()
 
 val ConeKotlinType.hasEnhancedNullability: Boolean
@@ -83,3 +96,6 @@ val ConeKotlinType.hasEnhancedNullability: Boolean
 
 val ConeKotlinType.isExtensionFunctionType: Boolean
     get() = attributes.extensionFunctionType != null
+
+val ConeKotlinType.hasFlexibleNullability: Boolean
+    get() = attributes.flexibleNullability != null
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt
index a7b35cc3a42..c8a0341d8d1 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt
@@ -34,6 +34,7 @@ class ConeAttributes private constructor(attributes: List<ConeAttribute<*>>) : A
         }
 
         val Empty: ConeAttributes = ConeAttributes(emptyList())
+        internal val WithFlexibleNullability: ConeAttributes = ConeAttributes(listOf(CompilerConeAttributes.FlexibleNullability))
 
         fun create(attributes: List<ConeAttribute<*>>): ConeAttributes {
             return if (attributes.isEmpty()) {
@@ -48,8 +49,17 @@ class ConeAttributes private constructor(attributes: List<ConeAttribute<*>>) : A
         for (attribute in attributes) {
             registerComponent(attribute.key, attribute)
         }
+        assert(!hasEnhancedNullability || !hasFlexibleNullability) {
+            "It doesn't make sense to have @EnhancedNullability and @FlexibleNullability at the same time."
+        }
     }
 
+    val hasEnhancedNullability: Boolean
+        get() = enhancedNullability != null
+
+    val hasFlexibleNullability: Boolean
+        get() = flexibleNullability != null
+
     fun union(other: ConeAttributes): ConeAttributes {
         return perform(other) { this.union(it) }
     }
@@ -84,3 +94,12 @@ class ConeAttributes private constructor(attributes: List<ConeAttribute<*>>) : A
         return arrayMap.isEmpty()
     }
 }
+
+private fun ConeAttributes.intersectUnless(other: ConeAttributes, predicate: (ConeAttributes) -> Boolean): ConeAttributes =
+    if (predicate.invoke(this)) this else intersect(other)
+
+fun ConeAttributes.withFlexible(): ConeAttributes =
+    intersect(ConeAttributes.WithFlexibleNullability)
+
+fun ConeAttributes.withFlexibleUnless(predicate: (ConeAttributes) -> Boolean): ConeAttributes =
+    intersectUnless(ConeAttributes.WithFlexibleNullability, predicate)
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMap.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMap.kt
index 6d2070d5b61..a66f9366b01 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMap.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMap.kt
@@ -10,6 +10,8 @@ sealed class ArrayMap<T : Any> : Iterable<T> {
 
     abstract operator fun set(index: Int, value: T)
     abstract operator fun get(index: Int): T?
+
+    abstract fun copy(): ArrayMap<T>
 }
 
 fun ArrayMap<*>.isEmpty(): Boolean = size == 0
@@ -27,6 +29,8 @@ internal object EmptyArrayMap : ArrayMap<Nothing>() {
         return null
     }
 
+    override fun copy(): ArrayMap<Nothing> = this
+
     override fun iterator(): Iterator<Nothing> {
         return object : Iterator<Nothing> {
             override fun hasNext(): Boolean = false
@@ -48,6 +52,8 @@ internal class OneElementArrayMap<T : Any>(val value: T, val index: Int) : Array
         return if (index == this.index) value else null
     }
 
+    override fun copy(): ArrayMap<T> = OneElementArrayMap(value, index)
+
     override fun iterator(): Iterator<T> {
         return object : Iterator<T> {
             private var notVisited = true
@@ -68,16 +74,20 @@ internal class OneElementArrayMap<T : Any>(val value: T, val index: Int) : Array
     }
 }
 
-internal class ArrayMapImpl<T : Any> : ArrayMap<T>() {
+internal class ArrayMapImpl<T : Any> private constructor(
+    private var data: Array<Any?>
+) : ArrayMap<T>() {
     companion object {
         private const val DEFAULT_SIZE = 20
         private const val INCREASE_K = 2
     }
 
+    constructor() : this(arrayOfNulls<Any>(DEFAULT_SIZE))
+
     override var size: Int = 0
         private set
 
-    private var data = arrayOfNulls<Any>(DEFAULT_SIZE)
+
     private fun ensureCapacity(index: Int) {
         if (data.size <= index) {
             data = data.copyOf(data.size * INCREASE_K)
@@ -97,6 +107,8 @@ internal class ArrayMapImpl<T : Any> : ArrayMap<T>() {
         return data.getOrNull(index) as T?
     }
 
+    override fun copy(): ArrayMap<T> = ArrayMapImpl(data.copyOf())
+
     override fun iterator(): Iterator<T> {
         return object : AbstractIterator<T>() {
             private var index = -1
@@ -128,4 +140,4 @@ internal class ArrayMapImpl<T : Any> : ArrayMap<T>() {
     }
 
     data class Entry<T>(override val key: Int, override val value: T) : Map.Entry<Int, T>
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/AttributeArrayOwner.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/AttributeArrayOwner.kt
index 1d5b2360fd8..a7bee7edba9 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/AttributeArrayOwner.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/AttributeArrayOwner.kt
@@ -17,11 +17,15 @@ import kotlin.reflect.KClass
  *   from components in [ComponentArrayOwner]
  */
 @OptIn(Protected::class)
-abstract class AttributeArrayOwner<K : Any, T : Any> : AbstractArrayMapOwner<K, T>() {
-    @Suppress("UNCHECKED_CAST")
-    final override var arrayMap: ArrayMap<T> = EmptyArrayMap as ArrayMap<T>
+abstract class AttributeArrayOwner<K : Any, T : Any> protected constructor(
+    arrayMap: ArrayMap<T>
+) : AbstractArrayMapOwner<K, T>() {
+    final override var arrayMap: ArrayMap<T> = arrayMap
         private set
 
+    @Suppress("UNCHECKED_CAST")
+    constructor() : this(EmptyArrayMap as ArrayMap<T>)
+
     final override fun registerComponent(tClass: KClass<out K>, value: T) {
         val id = typeRegistry.getId(tClass)
         when (arrayMap.size) {
@@ -61,4 +65,4 @@ abstract class AttributeArrayOwner<K : Any, T : Any> : AbstractArrayMapOwner<K,
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
index 4ef886d803f..48947d622c5 100644
--- a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
+++ b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
@@ -841,7 +841,7 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver
             is ConeClassErrorType -> error { +type.diagnostic.reason }
             is ConeClassLikeType -> return generate(type)
             is ConeTypeParameterType -> resolved {
-                symbolRef(type.lookupTag.toSymbol()) {
+                symbolRef(type.lookupTag.symbol) {
                     simpleName(type.lookupTag.name)
                 }
             }
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt
index b7712c4dccb..0375bf49fae 100644
--- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt
+++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.analysis.collectors.FirDiagnosticsCollector
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic
 import org.jetbrains.kotlin.fir.backend.Fir2IrConverter
 import org.jetbrains.kotlin.fir.backend.Fir2IrResult
+import org.jetbrains.kotlin.fir.backend.jvm.Fir2IrJvmSpecialAnnotationSymbolProvider
 import org.jetbrains.kotlin.fir.backend.jvm.FirJvmKotlinMangler
 import org.jetbrains.kotlin.fir.backend.jvm.FirJvmVisibilityConverter
 import org.jetbrains.kotlin.fir.builder.RawFirBuilder
@@ -28,7 +29,7 @@ import org.jetbrains.kotlin.psi.KtFile
 class FirAnalyzerFacade(val session: FirSession, val languageVersionSettings: LanguageVersionSettings, val ktFiles: List<KtFile>) {
     private var firFiles: List<FirFile>? = null
     private var scopeSession: ScopeSession? = null
-    private var collectedDiagnostics: List<FirDiagnostic<*>>? = null
+    private var collectedDiagnostics: Map<FirFile, List<FirDiagnostic<*>>>? = null
 
     private fun buildRawFir() {
         if (firFiles != null) return
@@ -51,13 +52,13 @@ class FirAnalyzerFacade(val session: FirSession, val languageVersionSettings: La
     }
 
     @OptIn(ExperimentalStdlibApi::class)
-    fun runCheckers(): List<FirDiagnostic<*>> {
+    fun runCheckers(): Map<FirFile, List<FirDiagnostic<*>>> {
         if (scopeSession == null) runResolution()
         if (collectedDiagnostics != null) return collectedDiagnostics!!
         val collector = FirDiagnosticsCollector.create(session)
-        collectedDiagnostics = buildList {
+        collectedDiagnostics = buildMap {
             for (file in firFiles!!) {
-                addAll(collector.collectDiagnostics(file))
+                put(file, collector.collectDiagnostics(file))
             }
         }
         return collectedDiagnostics!!
@@ -71,7 +72,8 @@ class FirAnalyzerFacade(val session: FirSession, val languageVersionSettings: La
             session, scopeSession!!, firFiles!!,
             languageVersionSettings, signaturer,
             JvmGeneratorExtensions(generateFacades), FirJvmKotlinMangler(session), IrFactoryImpl,
-            FirJvmVisibilityConverter
+            FirJvmVisibilityConverter,
+            Fir2IrJvmSpecialAnnotationSymbolProvider()
         )
     }
 }
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt
index 9990ab94f93..f80acef9c82 100644
--- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt
+++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.session
 
+import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.analysis.CheckersComponent
 import org.jetbrains.kotlin.fir.extensions.FirExtensionService
@@ -26,7 +27,7 @@ import org.jetbrains.kotlin.fir.types.FirCorrespondingSupertypesCache
 // -------------------------- Required components --------------------------
 
 @OptIn(SessionConfiguration::class)
-fun FirSession.registerCommonComponents() {
+fun FirSession.registerCommonComponents(languageVersionSettings: LanguageVersionSettings) {
     register(FirDeclaredMemberScopeProvider::class, FirDeclaredMemberScopeProvider())
     register(FirCorrespondingSupertypesCache::class, FirCorrespondingSupertypesCache(this))
     register(FirDefaultParametersResolver::class, FirDefaultParametersResolver())
@@ -35,7 +36,7 @@ fun FirSession.registerCommonComponents() {
     register(FirRegisteredPluginAnnotations::class, FirRegisteredPluginAnnotations.create(this))
     register(FirPredicateBasedProvider::class, FirPredicateBasedProvider.create(this))
     register(GeneratedClassIndex::class, GeneratedClassIndex.create())
-    register(FirLanguageSettingsComponent::class, FirLanguageSettingsComponent(this))
+    register(FirLanguageSettingsComponent::class, FirLanguageSettingsComponent(languageVersionSettings))
     register(InferenceComponents::class, InferenceComponents(this))
 }
 
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirJvmModuleInfo.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirJvmModuleInfo.kt
new file mode 100644
index 00000000000..82a56fde399
--- /dev/null
+++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirJvmModuleInfo.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.session
+
+import org.jetbrains.kotlin.analyzer.ModuleInfo
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.platform.TargetPlatform
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices
+
+class FirJvmModuleInfo(override val name: Name, val dependencies: List<ModuleInfo>) : ModuleInfo {
+    companion object {
+        val LIBRARIES_MODULE_NAME = Name.special("<dependencies>")
+
+        fun createForLibraries(): FirJvmModuleInfo = FirJvmModuleInfo(LIBRARIES_MODULE_NAME, emptyList())
+    }
+
+    constructor(moduleName: String, dependencies: List<ModuleInfo>) : this(Name.identifier(moduleName), dependencies)
+
+    override val platform: TargetPlatform
+        get() = JvmPlatforms.unspecifiedJvmPlatform
+
+    override val analyzerServices: PlatformDependentAnalyzerServices
+        get() = JvmPlatformAnalyzerServices
+
+    override fun dependencies(): List<ModuleInfo> {
+        return dependencies
+    }
+}
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
index bab7635941b..14e399385b7 100644
--- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
+++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
@@ -10,7 +10,8 @@ import com.intellij.psi.PsiElementFinder
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.analyzer.ModuleInfo
-import org.jetbrains.kotlin.fir.FirModuleBasedSession
+import org.jetbrains.kotlin.config.LanguageVersionSettings
+import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.PrivateSessionConstructor
 import org.jetbrains.kotlin.fir.SessionConfiguration
@@ -61,11 +62,13 @@ object FirSessionFactory {
         moduleInfo: ModuleInfo,
         sessionProvider: FirProjectSessionProvider,
         scope: GlobalSearchScope,
+        project: Project,
         dependenciesProvider: FirSymbolProvider? = null,
+        languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
         init: FirSessionConfigurator.() -> Unit = {}
     ): FirJavaModuleBasedSession {
         return FirJavaModuleBasedSession(moduleInfo, sessionProvider).apply {
-            registerCommonComponents()
+            registerCommonComponents(languageVersionSettings)
             registerResolveComponents()
             registerJavaSpecificResolveComponents()
 
@@ -80,7 +83,7 @@ object FirSessionFactory {
                     this,
                     listOf(
                         firProvider.symbolProvider,
-                        JavaSymbolProvider(this, sessionProvider.project, scope),
+                        JavaSymbolProvider(this, project, scope),
                         dependenciesProvider ?: FirDependenciesSymbolProviderImpl(this)
                     )
                 ) as FirSymbolProvider
@@ -91,8 +94,7 @@ object FirSessionFactory {
                 init()
             }.configure()
 
-            PsiElementFinder.EP.getPoint(sessionProvider.project)
-                .registerExtension(FirJavaElementFinder(this, sessionProvider.project), sessionProvider.project)
+            PsiElementFinder.EP.getPoint(project).registerExtension(FirJavaElementFinder(this, project), project)
         }
     }
 
@@ -101,7 +103,8 @@ object FirSessionFactory {
         sessionProvider: FirProjectSessionProvider,
         scope: GlobalSearchScope,
         project: Project,
-        packagePartProvider: PackagePartProvider
+        packagePartProvider: PackagePartProvider,
+        languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
     ): FirLibrarySession {
         val javaClassFinder = JavaClassFinderImpl().apply {
             this.setProjectInstance(project)
@@ -110,9 +113,9 @@ object FirSessionFactory {
 
         val kotlinClassFinder = VirtualFileFinderFactory.getInstance(project).create(scope)
         return FirLibrarySession(moduleInfo, sessionProvider).apply {
-            registerCommonComponents()
+            registerCommonComponents(languageVersionSettings)
 
-            val javaSymbolProvider = JavaSymbolProvider(this, sessionProvider.project, scope)
+            val javaSymbolProvider = JavaSymbolProvider(this, project, scope)
 
             val kotlinScopeProvider = KotlinScopeProvider(::wrapScopeWithJvmMapped)
 
@@ -122,7 +125,7 @@ object FirSessionFactory {
                     this,
                     listOf(
                         KotlinDeserializedJvmSymbolsProvider(
-                            this, sessionProvider.project,
+                            this, project,
                             packagePartProvider,
                             javaSymbolProvider,
                             kotlinClassFinder,
diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt
index 078f5cf76ba..8f82799bac8 100644
--- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt
+++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt
@@ -8,19 +8,19 @@ package org.jetbrains.kotlin.fir.deserialization
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.declarations.FirConstructor
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.collectEnumEntries
-import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind
 import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic
+import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind
 import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.expressions.builder.*
 import org.jetbrains.kotlin.fir.references.builder.buildErrorNamedReference
 import org.jetbrains.kotlin.fir.references.builder.buildResolvedNamedReference
 import org.jetbrains.kotlin.fir.references.impl.FirReferencePlaceholderForResolvedAnnotations
-import org.jetbrains.kotlin.fir.resolve.constructType
+import org.jetbrains.kotlin.fir.resolve.*
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedSymbolError
-import org.jetbrains.kotlin.fir.resolve.toSymbol
+import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
+import org.jetbrains.kotlin.fir.scopes.getDeclaredConstructors
 import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 import org.jetbrains.kotlin.fir.types.*
@@ -177,19 +177,24 @@ abstract class AbstractAnnotationDeserializer(
 
         var arguments = emptyList<FirExpression>()
         if (proto.argumentCount != 0 && firAnnotationClass?.classKind == ClassKind.ANNOTATION_CLASS) {
-            val constructor = firAnnotationClass.declarations.firstOrNull { it is FirConstructor }
-            if (constructor is FirConstructor) {
-                val parameterByName = constructor.valueParameters.associateBy { it.name }
+            val classScope = firAnnotationClass.defaultType()
+                .scope(session, ScopeSession(), FakeOverrideTypeCalculator.DoNothing)
+                ?: error("Null scope for $classId")
 
-                arguments = proto.argumentList.mapNotNull {
-                    val name = nameResolver.getName(it.nameId)
-                    val parameter = parameterByName[name] ?: return@mapNotNull null
-                    val value = resolveValue(parameter.returnTypeRef.coneType, it.value, nameResolver)
-                    buildNamedArgumentExpression {
-                        expression = value
-                        isSpread = false
-                        this.name = name
-                    }
+            val constructor =
+                classScope.getDeclaredConstructors().singleOrNull()?.fir ?: error("No single constructor found for $classId")
+
+
+            val parameterByName = constructor.valueParameters.associateBy { it.name }
+
+            arguments = proto.argumentList.mapNotNull {
+                val name = nameResolver.getName(it.nameId)
+                val parameter = parameterByName[name] ?: return@mapNotNull null
+                val value = resolveValue(parameter.returnTypeRef.coneType, it.value, nameResolver)
+                buildNamedArgumentExpression {
+                    expression = value
+                    isSpread = false
+                    this.name = name
                 }
             }
         }
diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
index 197b278b588..da46bd7f3a5 100644
--- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
 import org.jetbrains.kotlin.fir.types.ConeAttributes
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
@@ -161,6 +162,8 @@ fun deserializeClassToSymbol(
                         isStatic = true
                     }
                     resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
+                }.apply {
+                    containingClassAttr = context.dispatchReceiver!!.lookupTag
                 }
 
                 property
@@ -168,11 +171,15 @@ fun deserializeClassToSymbol(
         )
 
         if (classKind == ClassKind.ENUM_CLASS) {
-            generateValuesFunction(session, classId.packageFqName, classId.relativeClassName)
+            generateValuesFunction(
+                session,
+                classId.packageFqName,
+                classId.relativeClassName
+            )
             generateValueOfFunction(session, classId.packageFqName, classId.relativeClassName)
         }
 
-        addCloneForArrayIfNeeded(classId)
+        addCloneForArrayIfNeeded(classId, context.dispatchReceiver)
         addSerializableIfNeeded(classId)
 
         declarations.sortWith(object : Comparator<FirDeclaration> {
@@ -224,7 +231,7 @@ private fun FirRegularClassBuilder.addSerializableIfNeeded(classId: ClassId) {
     }
 }
 
-private fun FirRegularClassBuilder.addCloneForArrayIfNeeded(classId: ClassId) {
+private fun FirRegularClassBuilder.addCloneForArrayIfNeeded(classId: ClassId, dispatchReceiver: ConeClassLikeType?) {
     if (classId.packageFqName != StandardNames.BUILT_INS_PACKAGE_FQ_NAME) return
     if (classId.shortClassName !in ARRAY_CLASSES) return
     superTypeRefs += buildResolvedTypeRef {
@@ -259,5 +266,6 @@ private fun FirRegularClassBuilder.addCloneForArrayIfNeeded(classId: ClassId) {
         }
         name = CLONE
         symbol = FirNamedFunctionSymbol(CallableId(classId, CLONE))
+        dispatchReceiverType = dispatchReceiver!!
     }
 }
diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
index be140999d61..ac5d59a33cd 100644
--- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
@@ -7,12 +7,14 @@ package org.jetbrains.kotlin.fir.deserialization
 
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.containingClassAttr
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.builder.*
 import org.jetbrains.kotlin.fir.declarations.impl.*
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub
+import org.jetbrains.kotlin.fir.resolve.defaultType
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.*
@@ -64,6 +66,7 @@ class FirDeserializationContext(
     )
 
     val memberDeserializer: FirMemberDeserializer = FirMemberDeserializer(this)
+    val dispatchReceiver = relativeClassName?.let { ClassId(packageFqName, it, false).defaultType(allTypeParameters) }
 
     companion object {
         fun createForPackage(
@@ -225,6 +228,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
                         isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(getterFlags)
                     }
                     this.symbol = FirPropertyAccessorSymbol()
+                    dispatchReceiverType = c.dispatchReceiver
                 }.apply {
                     versionRequirementsTable = c.versionRequirementTable
                 }
@@ -256,6 +260,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
                         isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(setterFlags)
                     }
                     this.symbol = FirPropertyAccessorSymbol()
+                    dispatchReceiverType = c.dispatchReceiver
                     valueParameters += local.memberDeserializer.valueParameters(
                         listOf(proto.setterValueParameter),
                         proto,
@@ -288,6 +293,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
             name = callableName
             this.isVar = isVar
             this.symbol = symbol
+            dispatchReceiverType = c.dispatchReceiver
             isLocal = false
             status = FirResolvedDeclarationStatusImpl(
                 ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)),
@@ -365,6 +371,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
                 isSuspend = Flags.IS_SUSPEND.get(flags)
             }
             this.symbol = symbol
+            dispatchReceiverType = c.dispatchReceiver
             resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
             typeParameters += local.typeDeserializer.ownTypeParameters.map { it.fir }
             valueParameters += local.memberDeserializer.valueParameters(
@@ -443,6 +450,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
             annotations +=
                 c.annotationDeserializer.loadConstructorAnnotations(c.containerSource, proto, local.nameResolver, local.typeTable)
         }.build().apply {
+            containingClassAttr = c.dispatchReceiver!!.lookupTag
             versionRequirementsTable = c.versionRequirementTable
         }
     }
diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
index 36ba8eb362f..ef1e0e07d38 100644
--- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
+++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.firUnsafe
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag
+import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
@@ -89,9 +90,11 @@ class FirTypeDeserializer(
         }
     }
 
-    private fun computeClassifier(fqNameIndex: Int): ConeClassLikeLookupTag? {
+    private fun computeClassifier(fqNameIndex: Int): ConeClassLikeLookupTag {
         try {
-            val id = nameResolver.getClassId(fqNameIndex)
+            // We can't just load local types as is, because later we will get an exception
+            // while trying to get corresponding FIR class
+            val id = nameResolver.getClassId(fqNameIndex).takeIf { !it.isLocal } ?: StandardClassIds.Any
             return ConeClassLikeLookupTagImpl(id)
         } catch (e: Throwable) {
             throw RuntimeException("Looking up for ${nameResolver.getClassId(fqNameIndex)}", e)
diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt
index 1f92e9c3e8a..2deebf524dd 100644
--- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt
+++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.deserialization.FirBuiltinAnnotationDeserializer
 import org.jetbrains.kotlin.fir.deserialization.FirConstDeserializer
 import org.jetbrains.kotlin.fir.deserialization.FirDeserializationContext
 import org.jetbrains.kotlin.fir.deserialization.deserializeClassToSymbol
+import org.jetbrains.kotlin.fir.resolve.defaultType
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals
 import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
@@ -151,11 +152,6 @@ class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider: Kot
                                 type = ConeTypeParameterTypeImpl(it.symbol.toLookupTag(), false)
                             }
                         }
-                        val superKind: FunctionClassKind? = when (kind) {
-                            FunctionClassKind.KFunction -> FunctionClassKind.Function
-                            FunctionClassKind.KSuspendFunction -> FunctionClassKind.SuspendFunction
-                            else -> null
-                        }
 
                         fun createSuperType(
                             kind: FunctionClassKind,
@@ -205,9 +201,7 @@ class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider: Kot
                                 this.name = name
                                 status = functionStatus
                                 symbol = FirNamedFunctionSymbol(
-                                    CallableId(packageFqName, relativeClassName, name),
-                                    // set overriddenSymbol for "invoke" of KFunction/KSuspendFunction
-                                    superKind != null, superKind?.getInvoke(arity)
+                                    CallableId(packageFqName, relativeClassName, name)
                                 )
                                 resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
                                 valueParameters += typeArguments.dropLast(1).mapIndexed { index, typeArgument ->
@@ -225,6 +219,7 @@ class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider: Kot
                                         isVararg = false
                                     }
                                 }
+                                dispatchReceiverType = classId.defaultType(typeParameters.map { it.symbol })
                             }
                         )
                     }
diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts
index dd3163d91c0..95b0cd77661 100644
--- a/compiler/fir/fir2ir/build.gradle.kts
+++ b/compiler/fir/fir2ir/build.gradle.kts
@@ -30,10 +30,8 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":core:descriptors.runtime"))
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-        testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/Fir2IrJvmSpecialAnnotationSymbolProvider.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/Fir2IrJvmSpecialAnnotationSymbolProvider.kt
new file mode 100644
index 00000000000..e48f20a0e59
--- /dev/null
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/Fir2IrJvmSpecialAnnotationSymbolProvider.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.backend.jvm
+
+import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
+import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.fir.backend.Fir2IrSpecialSymbolProvider
+import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
+import org.jetbrains.kotlin.ir.builders.declarations.buildClass
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
+import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.impl.DescriptorlessExternalPackageFragmentSymbol
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.Name
+
+class Fir2IrJvmSpecialAnnotationSymbolProvider : Fir2IrSpecialSymbolProvider() {
+
+    private val kotlinJvmInternalPackage by lazy {
+        IrExternalPackageFragmentImpl(
+            DescriptorlessExternalPackageFragmentSymbol(),
+            ENHANCED_NULLABILITY_ID.packageFqName
+        )
+    }
+
+    private val kotlinInternalIrPackage by lazy {
+        IrExternalPackageFragmentImpl(
+            DescriptorlessExternalPackageFragmentSymbol(),
+            FLEXIBLE_NULLABILITY_ID.packageFqName
+        )
+    }
+
+    override fun getClassSymbolById(id: ClassId): IrClassSymbol? =
+        when (id) {
+            ENHANCED_NULLABILITY_ID -> id.toIrClass(kotlinJvmInternalPackage).symbol
+            FLEXIBLE_NULLABILITY_ID -> id.toIrClass(kotlinInternalIrPackage).symbol
+            else -> null
+        }
+
+    private fun ClassId.toIrClass(parent: IrDeclarationParent): IrClass =
+        components.irFactory.buildClass {
+            kind = ClassKind.ANNOTATION_CLASS
+            name = shortClassName
+        }.apply {
+            createImplicitParameterDeclarationWithWrappedDescriptor()
+            this.parent = parent
+            addConstructor {
+                isPrimary = true
+            }
+        }
+
+    companion object {
+        private val ENHANCED_NULLABILITY_ID = ClassId.topLevel(JvmAnnotationNames.ENHANCED_NULLABILITY_ANNOTATION)
+        private val FLEXIBLE_NULLABILITY_ID =
+            ClassId.topLevel(IrBuiltIns.KOTLIN_INTERNAL_IR_FQN.child(Name.identifier("FlexibleNullability")))
+    }
+}
\ No newline at end of file
diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt
index 8e3bdf6c496..379af1ea5d0 100644
--- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt
@@ -9,10 +9,8 @@ import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComp
 import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleConstant
 import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode
 import org.jetbrains.kotlin.backend.common.serialization.mangle.collectForMangler
-import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
 import org.jetbrains.kotlin.fir.resolve.toSymbol
@@ -75,7 +73,7 @@ open class FirJvmMangleComputer(
 
     private fun FirDeclaration.visitParent() {
         val (parentPackageFqName, parentClassId) = when (this) {
-            is FirCallableDeclaration<*> -> this.symbol.callableId.let { it.packageName to it.classId }
+            is FirCallableMemberDeclaration<*> -> this.containingClass()?.classId?.let { it.packageFqName to it } ?: return
             is FirClassLikeDeclaration<*> -> this.symbol.classId.let { it.packageFqName to it.outerClassId }
             else -> return
         }
@@ -159,12 +157,9 @@ open class FirJvmMangleComputer(
                 return parent
             }
             if (parent is FirCallableDeclaration<*>) {
-                val overriddenSymbol = parent.symbol.overriddenSymbol
-                if (overriddenSymbol != null) {
-                    val fir = overriddenSymbol.fir
-                    if (fir is FirTypeParametersOwner && this in fir.typeParameters) {
-                        return parent
-                    }
+                val overriddenFir = parent.originalForSubstitutionOverride
+                if (overriddenFir is FirTypeParametersOwner && this in overriddenFir.typeParameters) {
+                    return parent
                 }
             }
         }
@@ -228,6 +223,10 @@ open class FirJvmMangleComputer(
                 if (type.isMarkedNullable) {
                     tBuilder.appendSignature(MangleConstant.Q_MARK)
                 }
+
+                if (type.hasEnhancedNullability) {
+                    tBuilder.appendSignature(MangleConstant.ENHANCED_NULLABILITY_MARK)
+                }
             }
             is ConeFlexibleType -> {
                 // TODO: is that correct way to mangle flexible type?
diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt
index b5fb0c58d17..af4b627c07a 100644
--- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt
@@ -10,8 +10,8 @@ import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.config.JvmDefaultMode
 import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.backend.FirMetadataSource
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.firProvider
@@ -279,7 +279,7 @@ class FirJvmSerializerExtension(
         if (!hasJvmFieldAnnotation) return false
 
         val container =
-            symbol.callableId.classId?.let {
+            dispatchReceiverType?.classId?.let {
                 session.firProvider.getFirClassifierByFqName(it) as? FirRegularClass
             }
         if (container == null || !container.isCompanion) {
diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
index c1690f7fdec..85bc7d30f02 100644
--- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
@@ -5,23 +5,28 @@
 
 package org.jetbrains.kotlin.fir.backend.jvm
 
+import org.jetbrains.kotlin.builtins.functions.BuiltInFunctionArity
+import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
+import org.jetbrains.kotlin.codegen.signature.JvmSignatureWriter
+import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
 import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.FirSessionComponent
+import org.jetbrains.kotlin.fir.*
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.defaultType
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
-import org.jetbrains.kotlin.fir.resolve.inference.isKClassType
-import org.jetbrains.kotlin.fir.resolve.inference.isSuspendFunctionType
+import org.jetbrains.kotlin.fir.resolve.inference.*
+import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
-import org.jetbrains.kotlin.fir.typeContext
+import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
-import org.jetbrains.kotlin.load.kotlin.JvmDescriptorTypeWriter
+import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
+import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.types.AbstractTypeMapper
 import org.jetbrains.kotlin.types.TypeMappingContext
 import org.jetbrains.kotlin.types.TypeSystemCommonBackendContext
@@ -30,13 +35,14 @@ import org.jetbrains.kotlin.types.model.KotlinTypeMarker
 import org.jetbrains.kotlin.types.model.SimpleTypeMarker
 import org.jetbrains.kotlin.types.model.TypeConstructorMarker
 import org.jetbrains.kotlin.types.model.TypeParameterMarker
+import org.jetbrains.kotlin.utils.addToStdlib.runIf
 import org.jetbrains.org.objectweb.asm.Type
 
-class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmDescriptorTypeWriter<Type>>, FirSessionComponent {
+class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatureWriter>, FirSessionComponent {
     override val typeContext = ConeTypeSystemCommonBackendContextForTypeMapping(session.typeContext)
 
-    fun mapType(type: ConeKotlinType, mode: TypeMappingMode = TypeMappingMode.DEFAULT): Type {
-        return AbstractTypeMapper.mapType(this, type, mode)
+    fun mapType(type: ConeKotlinType, mode: TypeMappingMode = TypeMappingMode.DEFAULT, sw: JvmSignatureWriter? = null): Type {
+        return AbstractTypeMapper.mapType(this, type, mode, sw)
     }
 
     override fun getClassInternalName(typeConstructor: TypeConstructorMarker): String {
@@ -44,8 +50,128 @@ class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmDescript
         return typeConstructor.classId.asString().replace(".", "$").replace("/", ".")
     }
 
-    override fun JvmDescriptorTypeWriter<Type>.writeGenericType(type: SimpleTypeMarker, asmType: Type, mode: TypeMappingMode) {
-        error("Should not be called")
+    override fun JvmSignatureWriter.writeGenericType(type: SimpleTypeMarker, asmType: Type, mode: TypeMappingMode) {
+        if (type !is ConeClassLikeType) return
+        if (skipGenericSignature() || hasNothingInNonContravariantPosition(type) || type.typeArguments.isEmpty()) {
+            writeAsmType(asmType)
+            return
+        }
+
+        val possiblyInnerType = type.buildPossiblyInnerType() ?: error("possiblyInnerType with arguments should not be null")
+
+        val innerTypesAsList = possiblyInnerType.segments()
+
+        val indexOfParameterizedType = innerTypesAsList.indexOfFirst { innerPart -> innerPart.arguments.isNotEmpty() }
+        if (indexOfParameterizedType < 0 || innerTypesAsList.size == 1) {
+            writeClassBegin(asmType)
+            writeGenericArguments(this, possiblyInnerType, mode)
+        } else {
+            val outerType = innerTypesAsList[indexOfParameterizedType]
+
+            writeOuterClassBegin(asmType, mapType(outerType.classifier.fir.defaultType()).internalName)
+            writeGenericArguments(this, outerType, mode)
+
+            writeInnerParts(
+                innerTypesAsList,
+                this,
+                mode,
+                indexOfParameterizedType + 1
+            ) // inner parts separated by `.`
+        }
+
+        writeClassEnd()
+    }
+
+    private fun hasNothingInNonContravariantPosition(type: ConeKotlinType): Boolean = with(KotlinTypeMapper) {
+        typeContext.hasNothingInNonContravariantPosition(type)
+    }
+
+    private fun ConeClassLikeType.buildPossiblyInnerType(): PossiblyInnerConeType? =
+        buildPossiblyInnerType(lookupTag.toSymbol(session) as? FirRegularClassSymbol?, 0)
+
+    private fun ConeClassLikeType.parentClassOrNull(): FirRegularClassSymbol? {
+        val parentClassId = classId?.outerClassId ?: return null
+        return session.firSymbolProvider.getClassLikeSymbolByFqName(parentClassId) as? FirRegularClassSymbol?
+    }
+
+    private fun ConeClassLikeType.buildPossiblyInnerType(classifier: FirRegularClassSymbol?, index: Int): PossiblyInnerConeType? {
+        if (classifier == null) return null
+
+        val firClass = classifier.fir
+        val toIndex = firClass.typeParameters.count { it is FirTypeParameter } + index
+        if (!firClass.isInner) {
+            assert(toIndex == typeArguments.size || firClass.isLocal) {
+                "${typeArguments.size - toIndex} trailing arguments were found in this type: ${render()}"
+            }
+            return PossiblyInnerConeType(classifier, typeArguments.toList().subList(index, typeArguments.size), null)
+        }
+
+        val argumentsSubList = typeArguments.toList().subList(index, toIndex)
+        return PossiblyInnerConeType(
+            classifier, argumentsSubList,
+            buildPossiblyInnerType(firClass.defaultType().parentClassOrNull(), toIndex)
+        )
+    }
+
+    private class PossiblyInnerConeType(
+        val classifier: FirRegularClassSymbol,
+        val arguments: List<ConeTypeProjection>,
+        private val outerType: PossiblyInnerConeType?
+    ) {
+        fun segments(): List<PossiblyInnerConeType> = outerType?.segments().orEmpty() + this
+    }
+
+    private fun writeGenericArguments(
+        sw: JvmSignatureWriter,
+        type: PossiblyInnerConeType,
+        mode: TypeMappingMode
+    ) {
+        val classifier = type.classifier.fir
+        val defaultType = classifier.defaultType()
+        val parameters = classifier.typeParameters.map { it.symbol }
+        val arguments = type.arguments
+
+        if ((defaultType.isFunctionalType(session) && arguments.size > BuiltInFunctionArity.BIG_ARITY)
+            || defaultType.isKFunctionType(session)
+        ) {
+            writeGenericArguments(sw, listOf(arguments.last()), listOf(parameters.last()), mode)
+            return
+        }
+
+        writeGenericArguments(sw, arguments, parameters, mode)
+    }
+
+    private fun writeGenericArguments(
+        sw: JvmSignatureWriter,
+        arguments: List<ConeTypeProjection>,
+        parameterSymbols: List<FirTypeParameterSymbol>,
+        mode: TypeMappingMode
+    ) {
+        with(KotlinTypeMapper) {
+            val parameters = parameterSymbols.map { ConeTypeParameterLookupTag(it) }
+            typeContext.writeGenericArguments(sw, arguments, parameters, mode) { type, sw, mode ->
+                mapType(type as ConeKotlinType, mode, sw)
+            }
+        }
+    }
+
+    private fun writeInnerParts(
+        innerTypesAsList: List<PossiblyInnerConeType>,
+        sw: JvmSignatureWriter,
+        mode: TypeMappingMode,
+        index: Int
+    ) {
+        for (innerPart in innerTypesAsList.subList(index, innerTypesAsList.size)) {
+            sw.writeInnerClass(getJvmShortName(innerPart.classifier.fir))
+            writeGenericArguments(sw, innerPart, mode)
+        }
+    }
+
+    internal fun getJvmShortName(klass: FirRegularClass): String {
+        val result = runIf(!klass.isLocal) {
+            klass.classId.asSingleFqName().toUnsafe().let { JavaToKotlinClassMap.mapKotlinToJava(it)?.shortClassName?.asString() }
+        }
+        return result ?: SpecialNames.safeIdentifier(klass.name).identifier
     }
 }
 
diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt
index d615b5c7a50..0337a03af47 100644
--- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt
@@ -11,18 +11,21 @@ import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.backend.FirMetadataSource
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.builder.*
+import org.jetbrains.kotlin.fir.declarations.builder.buildAnonymousFunction
+import org.jetbrains.kotlin.fir.declarations.builder.buildProperty
+import org.jetbrains.kotlin.fir.declarations.builder.buildPropertyAccessor
+import org.jetbrains.kotlin.fir.declarations.builder.buildValueParameterCopy
 import org.jetbrains.kotlin.fir.diagnostics.ConeIntermediateDiagnostic
-import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.serialization.FirElementSerializer
 import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
+import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.MetadataSource
-import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.util.getPackageFragment
 import org.jetbrains.kotlin.metadata.jvm.serialization.JvmStringTable
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.types.AbstractTypeApproximator
@@ -128,6 +131,8 @@ class FirMetadataSerializer(
             isVar = property.isVar
             isLocal = property.isLocal
             status = property.status
+            dispatchReceiverType = property.dispatchReceiverType
+            attributes = property.attributes.copy()
             annotations += property.annotations
             typeParameters += typeParameterSet
         }.apply {
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
index 0a61b28bdcd..bca4d4bdc20 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
@@ -21,8 +21,10 @@ import org.jetbrains.kotlin.fir.references.FirThisReference
 import org.jetbrains.kotlin.fir.references.impl.FirPropertyFromParameterResolvedNamedReference
 import org.jetbrains.kotlin.fir.resolve.*
 import org.jetbrains.kotlin.fir.resolve.calls.SyntheticPropertySymbol
+import org.jetbrains.kotlin.fir.resolve.calls.originalConstructorIfTypeAlias
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
 import org.jetbrains.kotlin.fir.scopes.ProcessorAction
+import org.jetbrains.kotlin.fir.scopes.impl.delegatedWrapperData
 import org.jetbrains.kotlin.fir.scopes.processDirectlyOverriddenFunctions
 import org.jetbrains.kotlin.fir.scopes.processDirectlyOverriddenProperties
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
@@ -31,6 +33,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.builders.declarations.UNDEFINED_PARAMETER_INDEX
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.WrappedReceiverParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConst
@@ -101,7 +104,7 @@ fun FirClassifierSymbol<*>.toSymbol(
     }
 }
 
-fun FirReference.toSymbol(
+fun FirReference.toSymbolForCall(
     session: FirSession,
     classifierStorage: Fir2IrClassifierStorage,
     declarationStorage: Fir2IrDeclarationStorage,
@@ -112,7 +115,7 @@ fun FirReference.toSymbol(
         is FirResolvedNamedReference -> {
             when (val resolvedSymbol = resolvedSymbol) {
                 is FirCallableSymbol<*> -> {
-                    resolvedSymbol.deepestMatchingOverriddenSymbol().toSymbol(declarationStorage, preferGetter)
+                    resolvedSymbol.unwrapCallRepresentative().toSymbolForCall(declarationStorage, preferGetter)
                 }
                 is FirClassifierSymbol<*> -> {
                     resolvedSymbol.toSymbol(session, classifierStorage)
@@ -137,7 +140,7 @@ fun FirReference.toSymbol(
     }
 }
 
-private fun FirCallableSymbol<*>.toSymbol(declarationStorage: Fir2IrDeclarationStorage, preferGetter: Boolean): IrSymbol? = when (this) {
+private fun FirCallableSymbol<*>.toSymbolForCall(declarationStorage: Fir2IrDeclarationStorage, preferGetter: Boolean): IrSymbol? = when (this) {
     is FirFunctionSymbol<*> -> declarationStorage.getIrFunctionSymbol(this)
     is SyntheticPropertySymbol -> {
         (fir as? FirSyntheticProperty)?.let { syntheticProperty ->
@@ -147,7 +150,7 @@ private fun FirCallableSymbol<*>.toSymbol(declarationStorage: Fir2IrDeclarationS
                 syntheticProperty.setter?.delegate?.symbol
                     ?: throw AssertionError("Written synthetic property must have a setter")
             }
-            delegateSymbol.deepestMatchingOverriddenSymbol().toSymbol(declarationStorage, preferGetter)
+            delegateSymbol.unwrapCallRepresentative().toSymbolForCall(declarationStorage, preferGetter)
         } ?: declarationStorage.getIrPropertySymbol(this)
     }
     is FirPropertySymbol -> declarationStorage.getIrPropertySymbol(this)
@@ -211,15 +214,30 @@ private fun FirConstKind<*>.toIrConstKind(): IrConstKind<*> = when (this) {
     FirConstKind.IntegerLiteral, FirConstKind.UnsignedIntegerLiteral -> throw IllegalArgumentException()
 }
 
-internal tailrec fun FirCallableSymbol<*>.deepestOverriddenSymbol(): FirCallableSymbol<*> {
-    val overriddenSymbol = overriddenSymbol ?: return this
-    return overriddenSymbol.deepestOverriddenSymbol()
+
+internal tailrec fun FirCallableSymbol<*>.unwrapSubstitutionAndIntersectionOverrides(): FirCallableSymbol<*> {
+    val originalForSubstitutionOverride = originalForSubstitutionOverride
+    if (originalForSubstitutionOverride != null) return originalForSubstitutionOverride.unwrapSubstitutionAndIntersectionOverrides()
+
+    val baseForIntersectionOverride = baseForIntersectionOverride
+    if (baseForIntersectionOverride != null) return baseForIntersectionOverride.unwrapSubstitutionAndIntersectionOverrides()
+
+    return this
 }
 
-internal tailrec fun FirCallableSymbol<*>.deepestMatchingOverriddenSymbol(root: FirCallableSymbol<*> = this): FirCallableSymbol<*> {
-    if (isIntersectionOverride) return this
-    val overriddenSymbol = overriddenSymbol?.takeIf { it.callableId == root.callableId } ?: return this
-    return overriddenSymbol.deepestMatchingOverriddenSymbol(this)
+internal tailrec fun FirCallableSymbol<*>.unwrapCallRepresentative(root: FirCallableSymbol<*> = this): FirCallableSymbol<*> {
+    val fir = fir
+    if (fir is FirConstructor) {
+        val originalForTypeAlias = fir.originalConstructorIfTypeAlias
+        if (originalForTypeAlias != null) return originalForTypeAlias.symbol.unwrapCallRepresentative(this)
+    }
+    if (fir.isIntersectionOverride) return this
+
+    val overriddenSymbol = fir.originalForSubstitutionOverride?.takeIf {
+        it.containingClass() == root.containingClass()
+    }?.symbol ?: return this
+
+    return overriddenSymbol.unwrapCallRepresentative(this)
 }
 
 internal fun FirSimpleFunction.generateOverriddenFunctionSymbols(
@@ -235,7 +253,8 @@ internal fun FirSimpleFunction.generateOverriddenFunctionSymbols(
         if ((it.fir as FirSimpleFunction).visibility == Visibilities.Private) {
             return@processDirectlyOverriddenFunctions ProcessorAction.NEXT
         }
-        val overridden = declarationStorage.getIrFunctionSymbol(it.unwrapSubstitutionOverrides())
+
+        val overridden = declarationStorage.getIrFunctionSymbol(it.unwrapFakeOverrides())
         overriddenSet += overridden as IrSimpleFunctionSymbol
         ProcessorAction.NEXT
     }
@@ -256,7 +275,11 @@ internal fun FirProperty.generateOverriddenAccessorSymbols(
         if (it is FirAccessorSymbol || it.fir.visibility == Visibilities.Private) {
             return@processDirectlyOverriddenProperties ProcessorAction.NEXT
         }
-        val overriddenProperty = declarationStorage.getIrPropertySymbol(it.unwrapSubstitutionOverrides()) as IrPropertySymbol
+
+        val unwrapped =
+            it.fir.delegatedWrapperData?.takeIf { it.containingClass == containingClass.symbol.toLookupTag() }?.wrapped?.symbol ?: it
+
+        val overriddenProperty = declarationStorage.getIrPropertySymbol(unwrapped.unwrapFakeOverrides()) as IrPropertySymbol
         val overriddenAccessor = if (isGetter) overriddenProperty.owner.getter?.symbol else overriddenProperty.owner.setter?.symbol
         if (overriddenAccessor != null) {
             overriddenSet += overriddenAccessor
@@ -314,7 +337,7 @@ internal fun IrDeclarationParent.declareThisReceiverParameter(
     ) { symbol ->
         symbolTable.irFactory.createValueParameter(
             startOffset, endOffset, thisOrigin, symbol,
-            Name.special("<this>"), -1, thisType,
+            Name.special("<this>"), UNDEFINED_PARAMETER_INDEX, thisType,
             varargElementType = null, isCrossinline = false, isNoinline = false, isAssignable = false
         ).apply {
             this.parent = this@declareThisReceiverParameter
@@ -341,7 +364,6 @@ fun Fir2IrComponents.createSafeCallConstruction(
     receiverVariable: IrVariable,
     receiverVariableSymbol: IrValueSymbol,
     expressionOnNotNull: IrExpression,
-    isReceiverNullable: Boolean
 ): IrExpression {
     val startOffset = expressionOnNotNull.startOffset
     val endOffset = expressionOnNotNull.endOffset
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrBuiltIns.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrBuiltIns.kt
index e1354d046ed..a9cd66793e4 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrBuiltIns.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrBuiltIns.kt
@@ -5,27 +5,50 @@
 
 package org.jetbrains.kotlin.fir.backend
 
-import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.types.CompilerConeAttributes
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.types.defaultType
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
 
 class Fir2IrBuiltIns(
     private val components: Fir2IrComponents,
-    session: FirSession
+    private val provider: Fir2IrSpecialSymbolProvider?
 ) : Fir2IrComponents by components {
-    private val extensionFunctionTypeAnnotationSymbol by lazy {
-        session.firSymbolProvider.getClassLikeSymbolByFqName(CompilerConeAttributes.ExtensionFunctionType.ANNOTATION_CLASS_ID)!!
-            .toSymbol(session, classifierStorage, ConversionTypeContext.DEFAULT) as IrClassSymbol
+    init {
+        provider?.initComponents(components)
     }
 
-    internal fun extensionFunctionTypeAnnotationConstructorCall() =
-        IrConstructorCallImpl.fromSymbolOwner(
-            extensionFunctionTypeAnnotationSymbol.defaultType,
-            extensionFunctionTypeAnnotationSymbol.owner.declarations.firstIsInstance<IrConstructor>().symbol
-        )
+    private val extensionFunctionTypeAnnotationSymbol by lazy {
+        annotationSymbolById(CompilerConeAttributes.ExtensionFunctionType.ANNOTATION_CLASS_ID)
+    }
+
+    internal fun extensionFunctionTypeAnnotationConstructorCall(): IrConstructorCall =
+        extensionFunctionTypeAnnotationSymbol!!.toConstructorCall()
+
+    private val enhancedNullabilityAnnotationSymbol by lazy {
+        annotationSymbolById(CompilerConeAttributes.EnhancedNullability.ANNOTATION_CLASS_ID)
+    }
+
+    internal fun enhancedNullabilityAnnotationConstructorCall(): IrConstructorCall? =
+        enhancedNullabilityAnnotationSymbol?.toConstructorCall()
+
+    private val flexibleNullabilityAnnotationSymbol by lazy {
+        annotationSymbolById(CompilerConeAttributes.FlexibleNullability.ANNOTATION_CLASS_ID)
+    }
+
+    internal fun flexibleNullabilityAnnotationConstructorCall(): IrConstructorCall? =
+        flexibleNullabilityAnnotationSymbol?.toConstructorCall()
+
+    private fun annotationSymbolById(id: ClassId): IrClassSymbol? =
+        provider?.getClassSymbolById(id) ?: session.firSymbolProvider.getClassLikeSymbolByFqName(id)?.toSymbol(
+            session, classifierStorage, ConversionTypeContext.DEFAULT
+        ) as? IrClassSymbol
+
+    private fun IrClassSymbol.toConstructorCall(): IrConstructorCallImpl =
+        IrConstructorCallImpl.fromSymbolOwner(defaultType, owner.declarations.firstIsInstance<IrConstructor>().symbol)
 }
\ No newline at end of file
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
index e56ecaf571b..f979e551b70 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.FirTypeRef
+import org.jetbrains.kotlin.ir.builders.declarations.UNDEFINED_PARAMETER_INDEX
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor
 import org.jetbrains.kotlin.ir.descriptors.WrappedEnumEntryDescriptor
@@ -338,7 +339,7 @@ class Fir2IrClassifierStorage(
 
     internal fun getCachedIrTypeParameter(
         typeParameter: FirTypeParameter,
-        index: Int = -1,
+        index: Int = UNDEFINED_PARAMETER_INDEX,
         typeContext: ConversionTypeContext = ConversionTypeContext.DEFAULT
     ): IrTypeParameter? {
         // Here transformation is a bit difficult because one FIR property type parameter
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConversionScope.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConversionScope.kt
index 302c333b3db..06c56ba98ec 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConversionScope.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConversionScope.kt
@@ -5,9 +5,7 @@
 
 package org.jetbrains.kotlin.fir.backend
 
-import org.jetbrains.kotlin.fir.declarations.FirClass
-import org.jetbrains.kotlin.fir.declarations.FirConstructor
-import org.jetbrains.kotlin.fir.declarations.FirFunction
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.expressions.FirReturnExpression
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.util.parentClassOrNull
@@ -99,10 +97,9 @@ class Fir2IrConversionScope {
     fun returnTarget(expression: FirReturnExpression, declarationStorage: Fir2IrDeclarationStorage): IrFunction {
         val firTarget = expression.target.labeledElement
         val irTarget = (firTarget as? FirFunction)?.let {
-            if (it is FirConstructor) {
-                declarationStorage.getCachedIrConstructor(it)
-            } else {
-                declarationStorage.getCachedIrFunction(it)
+            when (it) {
+                is FirConstructor -> declarationStorage.getCachedIrConstructor(it)
+                else -> declarationStorage.getCachedIrFunction(it)
             }
         }
         for (potentialTarget in functionStack.asReversed()) {
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
index 3516eb22a4d..96143f9d7fd 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
@@ -251,7 +251,8 @@ class Fir2IrConverter(
             generatorExtensions: GeneratorExtensions,
             mangler: FirMangler,
             irFactory: IrFactory,
-            visibilityConverter: Fir2IrVisibilityConverter
+            visibilityConverter: Fir2IrVisibilityConverter,
+            specialSymbolProvider: Fir2IrSpecialSymbolProvider?
         ): Fir2IrResult {
             val moduleDescriptor = FirModuleDescriptor(session)
             val symbolTable = SymbolTable(signaturer, irFactory)
@@ -274,7 +275,7 @@ class Fir2IrConverter(
             val fir2irVisitor = Fir2IrVisitor(converter, components, conversionScope)
             val declarationStorage = Fir2IrDeclarationStorage(components, fir2irVisitor, moduleDescriptor)
             val typeConverter = Fir2IrTypeConverter(components)
-            val builtIns = Fir2IrBuiltIns(components, session)
+            val builtIns = Fir2IrBuiltIns(components, specialSymbolProvider)
             components.declarationStorage = declarationStorage
             components.classifierStorage = classifierStorage
             components.typeConverter = typeConverter
@@ -296,9 +297,7 @@ class Fir2IrConverter(
             // Necessary call to generate built-in IR classes
             externalDependenciesGenerator.generateUnboundSymbolsAsDependencies()
             classifierStorage.preCacheBuiltinClasses()
-            val fakeOverrideGenerator = FakeOverrideGenerator(
-                session, scopeSession, classifierStorage, declarationStorage, conversionScope
-            )
+            val fakeOverrideGenerator = FakeOverrideGenerator(components, conversionScope)
             components.fakeOverrideGenerator = fakeOverrideGenerator
             val callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope)
             components.callGenerator = callGenerator
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
index a07f39fc0d9..8ff7a8d15c2 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.backend
 import org.jetbrains.kotlin.KtNodeTypes
 import org.jetbrains.kotlin.builtins.StandardNames.BUILT_INS_PACKAGE_FQ_NAMES
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.fir.FirAnnotationContainer
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.backend.generators.AnnotationGenerator
 import org.jetbrains.kotlin.fir.backend.generators.DelegatedMemberGenerator
 import org.jetbrains.kotlin.fir.declarations.*
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyClass
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyConstructor
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyProperty
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazySimpleFunction
-import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.firProvider
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.inference.isSuspendFunctionType
@@ -35,6 +34,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.builders.declarations.UNDEFINED_PARAMETER_INDEX
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
 import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyClass
@@ -236,7 +236,7 @@ class Fir2IrDeclarationStorage(
     internal fun findIrParent(callableDeclaration: FirCallableDeclaration<*>): IrDeclarationParent? {
         val firBasedSymbol = callableDeclaration.symbol
         val callableId = firBasedSymbol.callableId
-        return findIrParent(callableId.packageName, callableId.classId, firBasedSymbol)
+        return findIrParent(callableId.packageName, callableDeclaration.containingClass()?.classId, firBasedSymbol)
     }
 
     private fun IrDeclaration.setAndModifyParent(irParent: IrDeclarationParent?) {
@@ -364,11 +364,24 @@ class Fir2IrDeclarationStorage(
         return this
     }
 
-    fun getCachedIrFunction(function: FirFunction<*>): IrSimpleFunction? {
-        return if (function !is FirSimpleFunction || function.visibility == Visibilities.Local) {
+    fun getCachedIrFunction(function: FirFunction<*>): IrSimpleFunction? =
+        if (function is FirSimpleFunction) getCachedIrFunction(function)
+        else localStorage.getLocalFunction(function)
+
+    fun getCachedIrFunction(
+        function: FirSimpleFunction,
+        signatureCalculator: (FirSimpleFunction) -> IdSignature? = { null }
+    ): IrSimpleFunction? {
+        return if (function.visibility == Visibilities.Local) {
             localStorage.getLocalFunction(function)
         } else {
-            functionCache[function]
+            functionCache[function] ?: signatureCalculator(function)?.let { signature ->
+                symbolTable.referenceSimpleFunctionIfAny(signature)?.let { irFunctionSymbol ->
+                    val irFunction = irFunctionSymbol.owner
+                    functionCache[function] = irFunction
+                    irFunction
+                }
+            }
         }
     }
 
@@ -394,7 +407,7 @@ class Fir2IrDeclarationStorage(
     }
 
     fun getOrCreateIrFunction(
-        function: FirFunction<*>,
+        function: FirSimpleFunction,
         irParent: IrDeclarationParent?,
         isLocal: Boolean = false,
     ): IrSimpleFunction {
@@ -461,7 +474,7 @@ class Fir2IrDeclarationStorage(
             return created
         }
         if (function.symbol.callableId.isKFunctionInvoke()) {
-            (function.symbol.overriddenSymbol as? FirNamedFunctionSymbol)?.let {
+            (function.symbol.originalForSubstitutionOverride as? FirNamedFunctionSymbol)?.let {
                 created.overriddenSymbols += getIrFunctionSymbol(it) as IrSimpleFunctionSymbol
             }
         }
@@ -484,7 +497,18 @@ class Fir2IrDeclarationStorage(
         }
     }
 
-    fun getCachedIrConstructor(constructor: FirConstructor): IrConstructor? = constructorCache[constructor]
+    fun getCachedIrConstructor(
+        constructor: FirConstructor,
+        signatureCalculator: (FirConstructor) -> IdSignature? = { null }
+    ): IrConstructor? {
+        return constructorCache[constructor] ?: signatureCalculator(constructor)?.let { signature ->
+            symbolTable.referenceConstructorIfAny(signature)?.let { irConstructorSymbol ->
+                val irConstructor = irConstructorSymbol.owner
+                constructorCache[constructor] = irConstructor
+                irConstructor
+            }
+        }
+    }
 
     private fun declareIrConstructor(signature: IdSignature?, factory: (IrConstructorSymbol) -> IrConstructor): IrConstructor {
         if (signature == null) {
@@ -589,12 +613,14 @@ class Fir2IrDeclarationStorage(
                         )
                     )
                 }
+                // NB: we should enter accessor' scope before declaring its parameters
+                // (both setter default and receiver ones, if any)
+                enterScope(this)
                 if (propertyAccessor == null && isSetter) {
                     declareDefaultSetterParameter(
                         property.returnTypeRef.toIrType(ConversionTypeContext.DEFAULT.inSetter())
                     )
                 }
-                enterScope(this)
                 bindAndDeclareParameters(
                     propertyAccessor, irParent,
                     thisReceiverOwner, isStatic = irParent !is IrClass, parentPropertyReceiverType = property.receiverTypeRef
@@ -792,7 +818,18 @@ class Fir2IrDeclarationStorage(
         }
     }
 
-    fun getCachedIrProperty(property: FirProperty): IrProperty? = propertyCache[property]
+    fun getCachedIrProperty(
+        property: FirProperty,
+        signatureCalculator: (FirProperty) -> IdSignature? = { null }
+    ): IrProperty? {
+        return propertyCache[property] ?: signatureCalculator(property)?.let { signature ->
+            symbolTable.referencePropertyIfAny(signature)?.let { irPropertySymbol ->
+                val irProperty = irPropertySymbol.owner
+                propertyCache[property] = irProperty
+                irProperty
+            }
+        }
+    }
 
     internal fun cacheDelegatedProperty(property: FirProperty, irProperty: IrProperty) {
         propertyCache[property] = irProperty
@@ -808,11 +845,6 @@ class Fir2IrDeclarationStorage(
         return irField
     }
 
-    private fun getFirClassByFqName(classId: ClassId): FirClass<*>? {
-        val declaration = firSymbolProvider.getClassLikeSymbolByFqName(classId)
-        return declaration?.fir as? FirClass<*>
-    }
-
     private fun createIrField(
         field: FirField,
         origin: IrDeclarationOrigin = IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
@@ -845,7 +877,7 @@ class Fir2IrDeclarationStorage(
 
     internal fun createIrParameter(
         valueParameter: FirValueParameter,
-        index: Int = -1,
+        index: Int = UNDEFINED_PARAMETER_INDEX,
         useStubForDefaultValueStub: Boolean = true,
         typeContext: ConversionTypeContext = ConversionTypeContext.DEFAULT
     ): IrValueParameter {
@@ -974,97 +1006,147 @@ class Fir2IrDeclarationStorage(
     }
 
     fun getIrConstructorSymbol(firConstructorSymbol: FirConstructorSymbol): IrConstructorSymbol {
-        val firConstructor = firConstructorSymbol.fir
-        getCachedIrConstructor(firConstructor)?.let { return it.symbol }
-        val signature = signatureComposer.composeSignature(firConstructor)
-        val irParent = findIrParent(firConstructor) as IrClass
-        val parentOrigin = irParent.origin
-        if (signature != null) {
-            symbolTable.referenceConstructorIfAny(signature)?.let { irConstructorSymbol ->
-                val irFunction = irConstructorSymbol.owner
-                constructorCache[firConstructor] = irFunction
-                return irConstructorSymbol
-            }
-            assert(parentOrigin != IrDeclarationOrigin.DEFINED) {
-                "Should not have reference to public API uncached constructor from source code"
-            }
-            val symbol = Fir2IrConstructorSymbol(signature)
-            val irConstructor = firConstructor.convertWithOffsets { startOffset, endOffset ->
-                symbolTable.declareConstructor(signature, { symbol }) {
-                    Fir2IrLazyConstructor(
-                        components, startOffset, endOffset, parentOrigin, firConstructor, symbol
-                    ).apply {
-                        parent = irParent
+        val fir = firConstructorSymbol.fir
+        return getIrCallableSymbol(
+            firConstructorSymbol,
+            getCachedIrDeclaration = ::getCachedIrConstructor,
+            createIrDeclaration = { parent, origin -> createIrConstructor(fir, parent as IrClass, origin = origin) },
+            createIrLazyDeclaration = { signature, lazyParent, declarationOrigin ->
+                val symbol = Fir2IrConstructorSymbol(signature)
+                val irConstructor = fir.convertWithOffsets { startOffset, endOffset ->
+                    symbolTable.declareConstructor(signature, { symbol }) {
+                        Fir2IrLazyConstructor(
+                            components, startOffset, endOffset, declarationOrigin, fir, symbol
+                        ).apply {
+                            parent = lazyParent
+                        }
                     }
                 }
+                constructorCache[fir] = irConstructor
+                // NB: this is needed to prevent recursions in case of self bounds
+                (irConstructor as Fir2IrLazyConstructor).prepareTypeParameters()
+                irConstructor
             }
-            constructorCache[firConstructor] = irConstructor
-            // NB: this is needed to prevent recursions in case of self bounds
-            (irConstructor as Fir2IrLazyConstructor).prepareTypeParameters()
-            return symbol
-        }
-        val irDeclaration = createIrConstructor(firConstructor, irParent, origin = parentOrigin).apply {
-            setAndModifyParent(irParent)
-        }
-        return irDeclaration.symbol
+        ) as IrConstructorSymbol
     }
 
     fun getIrFunctionSymbol(firFunctionSymbol: FirFunctionSymbol<*>): IrFunctionSymbol {
-        return when (val firDeclaration = firFunctionSymbol.fir) {
-            is FirSimpleFunction, is FirAnonymousFunction -> {
-                getCachedIrFunction(firDeclaration)?.let { return it.symbol }
-                val signature = signatureComposer.composeSignature(firDeclaration)
-                val irParent = findIrParent(firDeclaration)
+        return when (val fir = firFunctionSymbol.fir) {
+            is FirAnonymousFunction -> {
+                getCachedIrFunction(fir)?.let { return it.symbol }
+                val irParent = findIrParent(fir)
                 val parentOrigin = (irParent as? IrDeclaration)?.origin ?: IrDeclarationOrigin.DEFINED
-
-                if (signature != null) {
-                    symbolTable.referenceSimpleFunctionIfAny(signature)?.let { irFunctionSymbol ->
-                        val irFunction = irFunctionSymbol.owner
-                        functionCache[firDeclaration] = irFunction
-                        return irFunctionSymbol
-                    }
-                    // TODO: package fragment members (?)
-                    if (firDeclaration is FirSimpleFunction && irParent is Fir2IrLazyClass) {
-                        assert(parentOrigin != IrDeclarationOrigin.DEFINED) {
-                            "Should not have reference to public API uncached simple function from source code"
-                        }
-                        val symbol = Fir2IrSimpleFunctionSymbol(signature, firDeclaration.containerSource)
-                        val irFunction = firDeclaration.convertWithOffsets { startOffset, endOffset ->
-                            symbolTable.declareSimpleFunction(signature, { symbol }) {
-                                val isFakeOverride =
-                                    firFunctionSymbol is FirNamedFunctionSymbol && firFunctionSymbol.isFakeOverride &&
-                                            firFunctionSymbol.callableId != firFunctionSymbol.overriddenSymbol?.callableId
-                                Fir2IrLazySimpleFunction(
-                                    components, startOffset, endOffset, parentOrigin, firDeclaration, irParent.fir, symbol, isFakeOverride
-                                ).apply {
-                                    parent = irParent
-                                }
-                            }
-                        }
-                        functionCache[firDeclaration] = irFunction
-                        // NB: this is needed to prevent recursions in case of self bounds
-                        (irFunction as Fir2IrLazySimpleFunction).prepareTypeParameters()
-                        return symbol
-                    }
-                }
                 val declarationOrigin = computeDeclarationOrigin(firFunctionSymbol, parentOrigin, irParent)
-                createIrFunction(firDeclaration, irParent, origin = declarationOrigin).apply {
+                createIrFunction(fir, irParent, origin = declarationOrigin).apply {
                     setAndModifyParent(irParent)
                 }.symbol
             }
-            is FirConstructor -> {
-                getIrConstructorSymbol(firDeclaration.symbol)
+            is FirSimpleFunction -> {
+                return getIrCallableSymbol(
+                    firFunctionSymbol,
+                    getCachedIrDeclaration = ::getCachedIrFunction,
+                    createIrDeclaration = { parent, origin -> createIrFunction(fir, parent, origin = origin) },
+                    createIrLazyDeclaration = { signature, lazyParent, declarationOrigin ->
+                        val symbol = Fir2IrSimpleFunctionSymbol(signature, fir.containerSource)
+                        val irFunction = fir.convertWithOffsets { startOffset, endOffset ->
+                            symbolTable.declareSimpleFunction(signature, { symbol }) {
+                                val isFakeOverride =
+                                    firFunctionSymbol is FirNamedFunctionSymbol && fir.isSubstitutionOverride &&
+                                            firFunctionSymbol.dispatchReceiverClassOrNull() !=
+                                            firFunctionSymbol.originalForSubstitutionOverride?.dispatchReceiverClassOrNull()
+                                Fir2IrLazySimpleFunction(
+                                    components, startOffset, endOffset, declarationOrigin,
+                                    fir, lazyParent.fir, symbol, isFakeOverride
+                                ).apply {
+                                    this.parent = lazyParent
+                                }
+                            }
+                        }
+                        functionCache[fir] = irFunction
+                        // NB: this is needed to prevent recursions in case of self bounds
+                        (irFunction as Fir2IrLazySimpleFunction).prepareTypeParameters()
+                        irFunction
+                    }
+                ) as IrFunctionSymbol
             }
-            else -> error("Unknown kind of function: ${firDeclaration::class.java}: ${firDeclaration.render()}")
+            is FirConstructor -> {
+                getIrConstructorSymbol(fir.symbol)
+            }
+            else -> error("Unknown kind of function: ${fir::class.java}: ${fir.render()}")
         }
     }
 
+    fun getIrPropertySymbol(firPropertySymbol: FirPropertySymbol): IrSymbol {
+        val fir = firPropertySymbol.fir
+        if (fir.isLocal) {
+            return localStorage.getDelegatedProperty(fir)?.symbol ?: getIrVariableSymbol(fir)
+        }
+        return getIrCallableSymbol(
+            firPropertySymbol,
+            getCachedIrDeclaration = ::getCachedIrProperty,
+            createIrDeclaration = { parent, origin -> createIrProperty(fir, parent, origin = origin) },
+            createIrLazyDeclaration = { signature, lazyParent, declarationOrigin ->
+                val symbol = Fir2IrPropertySymbol(signature, fir.containerSource)
+                val irProperty = fir.convertWithOffsets { startOffset, endOffset ->
+                    symbolTable.declareProperty(signature, { symbol }) {
+                        val isFakeOverride =
+                            fir.isSubstitutionOverride &&
+                                    firPropertySymbol.dispatchReceiverClassOrNull() !=
+                                    firPropertySymbol.originalForSubstitutionOverride?.dispatchReceiverClassOrNull()
+                        Fir2IrLazyProperty(
+                            components, startOffset, endOffset, declarationOrigin, fir, lazyParent.fir, symbol, isFakeOverride
+                        ).apply {
+                            this.parent = lazyParent
+                        }
+                    }
+                }
+                propertyCache[fir] = irProperty
+                return symbol
+            }
+        )
+    }
+
+    private inline fun <
+            reified FS : FirCallableSymbol<*>,
+            reified F : FirCallableDeclaration<*>,
+            I : IrSymbolOwner,
+            > getIrCallableSymbol(
+        firSymbol: FS,
+        getCachedIrDeclaration: (F, (F) -> IdSignature?) -> I?,
+        createIrDeclaration: (IrDeclarationParent?, IrDeclarationOrigin) -> I,
+        createIrLazyDeclaration: (IdSignature, Fir2IrLazyClass, IrDeclarationOrigin) -> I,
+    ): IrSymbol {
+        val fir = firSymbol.fir as F
+        val irParent by lazy { findIrParent(fir) }
+        val signature by lazy { signatureComposer.composeSignature(fir) }
+        getCachedIrDeclaration(fir) {
+            // Parent calculation provokes declaration calculation for some members from IrBuiltIns
+            @Suppress("UNUSED_EXPRESSION") irParent
+            signature
+        }?.let { return it.symbol }
+        val parentOrigin = (irParent as? IrDeclaration)?.origin ?: IrDeclarationOrigin.DEFINED
+        val declarationOrigin = computeDeclarationOrigin(firSymbol, parentOrigin, irParent)
+        // TODO: package fragment members (?)
+        val parent = irParent
+        if (parent is Fir2IrLazyClass) {
+            assert(parentOrigin != IrDeclarationOrigin.DEFINED) {
+                "Should not have reference to public API uncached property from source code"
+            }
+            signature?.let {
+                return createIrLazyDeclaration(it, parent, declarationOrigin).symbol
+            }
+        }
+        return createIrDeclaration(irParent, declarationOrigin).apply {
+            (this as IrDeclaration).setAndModifyParent(irParent)
+        }.symbol
+    }
+
     private fun computeDeclarationOrigin(
         symbol: FirCallableSymbol<*>,
         parentOrigin: IrDeclarationOrigin,
         irParent: IrDeclarationParent?
     ): IrDeclarationOrigin {
-        return if (irParent.isSourceClass() && symbol.isIntersectionOverride || (symbol.fir.origin as? PossiblyFirFakeOverrideSymbol<*, *>)?.isFakeOverride == true)
+        return if (irParent.isSourceClass() && symbol.fir.isIntersectionOverride)
             IrDeclarationOrigin.FAKE_OVERRIDE
         else
             parentOrigin
@@ -1072,51 +1154,6 @@ class Fir2IrDeclarationStorage(
 
     private fun IrDeclarationParent?.isSourceClass() = this is IrClass && this !is Fir2IrLazyClass && this !is IrLazyClass
 
-    fun getIrPropertySymbol(firPropertySymbol: FirPropertySymbol): IrSymbol {
-        val fir = firPropertySymbol.fir
-        if (fir.isLocal) {
-            return localStorage.getDelegatedProperty(fir)?.symbol ?: getIrVariableSymbol(fir)
-        }
-        propertyCache[fir]?.let { return it.symbol }
-        val signature = signatureComposer.composeSignature(fir)
-        val irParent = findIrParent(fir)
-        val parentOrigin = (irParent as? IrDeclaration)?.origin ?: IrDeclarationOrigin.DEFINED
-        // TODO: Use computeDeclarationOrigin(firPropertySymbol, parentOrigin)
-        // Currently many backend tests are failing
-        val declarationOrigin = parentOrigin
-        if (signature != null) {
-            symbolTable.referencePropertyIfAny(signature)?.let { irPropertySymbol ->
-                val irProperty = irPropertySymbol.owner
-                propertyCache[fir] = irProperty
-                return irPropertySymbol
-            }
-            // TODO: package fragment members (?)
-            if (irParent is Fir2IrLazyClass) {
-                assert(parentOrigin != IrDeclarationOrigin.DEFINED) {
-                    "Should not have reference to public API uncached property from source code"
-                }
-                val symbol = Fir2IrPropertySymbol(signature, fir.containerSource)
-                val irProperty = fir.convertWithOffsets { startOffset, endOffset ->
-                    symbolTable.declareProperty(signature, { symbol }) {
-                        val isFakeOverride =
-                            firPropertySymbol.isFakeOverride &&
-                                    firPropertySymbol.callableId != firPropertySymbol.overriddenSymbol?.callableId
-                        Fir2IrLazyProperty(
-                            components, startOffset, endOffset, declarationOrigin, fir, irParent.fir, symbol, isFakeOverride
-                        ).apply {
-                            parent = irParent
-                        }
-                    }
-                }
-                propertyCache[fir] = irProperty
-                return symbol
-            }
-        }
-        return createIrProperty(fir, irParent, origin = declarationOrigin).apply {
-            setAndModifyParent(irParent)
-        }.symbol
-    }
-
     fun getIrFieldSymbol(firFieldSymbol: FirFieldSymbol): IrSymbol {
         val fir = firFieldSymbol.fir
         val irProperty = fieldCache[fir] ?: createIrField(fir).apply {
@@ -1154,7 +1191,7 @@ class Fir2IrDeclarationStorage(
             is FirEnumEntry -> {
                 classifierStorage.getCachedIrEnumEntry(firDeclaration)?.let { return it.symbol }
                 val containingFile = firProvider.getFirCallableContainerFile(firVariableSymbol)
-                val irParentClass = firVariableSymbol.callableId.classId?.let { findIrClass(it) }
+                val irParentClass = firDeclaration.containingClass()?.classId?.let { findIrClass(it) }
                 classifierStorage.createIrEnumEntry(
                     firDeclaration,
                     irParent = irParentClass,
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt
new file mode 100644
index 00000000000..860d2ae6d02
--- /dev/null
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt
@@ -0,0 +1,364 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.backend
+
+import org.jetbrains.kotlin.fir.FirElement
+import org.jetbrains.kotlin.fir.baseForIntersectionOverride
+import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
+import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject
+import org.jetbrains.kotlin.fir.declarations.FirTypeAlias
+import org.jetbrains.kotlin.fir.expressions.*
+import org.jetbrains.kotlin.fir.expressions.impl.FirStubStatement
+import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression
+import org.jetbrains.kotlin.fir.references.FirReference
+import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
+import org.jetbrains.kotlin.fir.render
+import org.jetbrains.kotlin.fir.resolve.scope
+import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
+import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
+import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.visitors.FirDefaultVisitor
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.expressions.*
+import org.jetbrains.kotlin.ir.expressions.impl.IrTypeOperatorCallImpl
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.removeAnnotations
+import org.jetbrains.kotlin.ir.types.withHasQuestionMark
+import org.jetbrains.kotlin.ir.util.classId
+import org.jetbrains.kotlin.ir.util.coerceToUnitIfNeeded
+import org.jetbrains.kotlin.ir.util.parentAsClass
+import org.jetbrains.kotlin.name.Name
+
+class Fir2IrImplicitCastInserter(
+    private val components: Fir2IrComponents,
+    private val visitor: Fir2IrVisitor
+) : Fir2IrComponents by components, FirDefaultVisitor<IrElement, IrElement>() {
+
+    private fun FirTypeRef.toIrType(): IrType = with(typeConverter) { toIrType() }
+
+    private fun ConeKotlinType.toIrType(): IrType = with(typeConverter) { toIrType() }
+
+    override fun visitElement(element: FirElement, data: IrElement): IrElement {
+        TODO("Should not be here: ${element::class}: ${element.render()}")
+    }
+
+    override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: IrElement): IrElement = data
+
+    override fun visitAnonymousObject(anonymousObject: FirAnonymousObject, data: IrElement): IrElement = data
+
+    override fun visitAnonymousFunction(anonymousFunction: FirAnonymousFunction, data: IrElement): IrElement = data
+
+    override fun visitBinaryLogicExpression(binaryLogicExpression: FirBinaryLogicExpression, data: IrElement): IrElement = data
+
+    // TODO: maybe a place to do coerceIntToAnotherIntegerType?
+    override fun visitComparisonExpression(comparisonExpression: FirComparisonExpression, data: IrElement): IrElement = data
+
+    override fun visitTypeOperatorCall(typeOperatorCall: FirTypeOperatorCall, data: IrElement): IrElement = data
+
+    override fun visitEqualityOperatorCall(equalityOperatorCall: FirEqualityOperatorCall, data: IrElement): IrElement = data
+
+    override fun <T> visitConstExpression(constExpression: FirConstExpression<T>, data: IrElement): IrElement = data
+
+    override fun visitThisReceiverExpression(thisReceiverExpression: FirThisReceiverExpression, data: IrElement): IrElement = data
+
+    override fun visitQualifiedAccessExpression(qualifiedAccessExpression: FirQualifiedAccessExpression, data: IrElement): IrElement = data
+
+    override fun visitResolvedQualifier(resolvedQualifier: FirResolvedQualifier, data: IrElement): IrElement = data
+
+    override fun visitGetClassCall(getClassCall: FirGetClassCall, data: IrElement): IrElement = data
+
+    override fun visitFunctionCall(functionCall: FirFunctionCall, data: IrElement): IrElement = data
+
+    override fun visitCheckNotNullCall(checkNotNullCall: FirCheckNotNullCall, data: IrElement): IrElement = data
+
+    override fun visitCheckedSafeCallSubject(checkedSafeCallSubject: FirCheckedSafeCallSubject, data: IrElement): IrElement = data
+
+    override fun visitSafeCallExpression(safeCallExpression: FirSafeCallExpression, data: IrElement): IrElement = data
+
+    override fun visitStringConcatenationCall(stringConcatenationCall: FirStringConcatenationCall, data: IrElement): IrElement = data
+
+    // TODO: element-wise cast?
+    override fun visitArrayOfCall(arrayOfCall: FirArrayOfCall, data: IrElement): IrElement = data
+
+    // TODO: something to do w.r.t. SAM?
+    override fun visitLambdaArgumentExpression(lambdaArgumentExpression: FirLambdaArgumentExpression, data: IrElement): IrElement = data
+
+    // TODO: element-wise cast?
+    override fun visitNamedArgumentExpression(namedArgumentExpression: FirNamedArgumentExpression, data: IrElement): IrElement = data
+
+    // TODO: element-wise cast?
+    override fun visitVarargArgumentsExpression(varargArgumentsExpression: FirVarargArgumentsExpression, data: IrElement): IrElement = data
+
+    // TODO: element-wise cast?
+    override fun visitSpreadArgumentExpression(spreadArgumentExpression: FirSpreadArgumentExpression, data: IrElement): IrElement = data
+
+    // ==================================================================================
+
+    override fun visitExpression(expression: FirExpression, data: IrElement): IrElement {
+        return when (expression) {
+            is FirBlock -> (data as IrContainerExpression).insertImplicitCasts()
+            is FirUnitExpression -> (data as IrExpression).let { it.coerceToUnitIfNeeded(it.type, irBuiltIns) }
+            else -> data
+        }
+    }
+
+    override fun visitStatement(statement: FirStatement, data: IrElement): IrElement {
+        return when (statement) {
+            is FirTypeAlias -> data
+            FirStubStatement -> data
+            is FirUnitExpression -> (data as IrExpression).let { it.coerceToUnitIfNeeded(it.type, irBuiltIns) }
+            is FirBlock -> (data as IrContainerExpression).insertImplicitCasts()
+            else -> statement.accept(this, data)
+        }
+    }
+
+    // ==================================================================================
+
+    override fun visitWhenExpression(whenExpression: FirWhenExpression, data: IrElement): IrElement {
+        if (data is IrBlock) {
+            return data.insertImplicitCasts()
+        }
+        val irWhen = data as IrWhen
+        if (irWhen.branches.size != whenExpression.branches.size) {
+            return data
+        }
+        val firBranchMap = irWhen.branches.zip(whenExpression.branches).toMap()
+        irWhen.branches.replaceAll {
+            visitWhenBranch(firBranchMap.getValue(it), it)
+        }
+        return data
+    }
+
+    override fun visitWhenSubjectExpression(whenSubjectExpression: FirWhenSubjectExpression, data: IrElement): IrElement = data
+
+    // TODO: cast `condition` expression to boolean?
+    override fun visitWhenBranch(whenBranch: FirWhenBranch, data: IrElement): IrBranch {
+        val irBranch = data as IrBranch
+        (irBranch.result as? IrContainerExpression)?.let {
+            irBranch.result = it.insertImplicitCasts()
+        }
+        return data
+    }
+
+    // TODO: Need to visit lhs/rhs branches?
+    override fun visitElvisExpression(elvisExpression: FirElvisExpression, data: IrElement): IrElement = data
+
+    // ==================================================================================
+
+    // TODO: cast `condition` expression to boolean?
+    override fun visitDoWhileLoop(doWhileLoop: FirDoWhileLoop, data: IrElement): IrElement {
+        val loop = data as IrDoWhileLoop
+        (loop.body as? IrContainerExpression)?.let {
+            loop.body = it.insertImplicitCasts()
+        }
+        return data
+    }
+
+    // TODO: cast `condition` expression to boolean?
+    override fun visitWhileLoop(whileLoop: FirWhileLoop, data: IrElement): IrElement {
+        val loop = data as IrWhileLoop
+        (loop.body as? IrContainerExpression)?.let {
+            loop.body = it.insertImplicitCasts()
+        }
+        return data
+    }
+
+    override fun visitBreakExpression(breakExpression: FirBreakExpression, data: IrElement): IrElement = data
+
+    override fun visitContinueExpression(continueExpression: FirContinueExpression, data: IrElement): IrElement = data
+
+    // ==================================================================================
+
+    override fun visitTryExpression(tryExpression: FirTryExpression, data: IrElement): IrElement {
+        val irTry = data as IrTry
+        (irTry.finallyExpression as? IrContainerExpression)?.let {
+            irTry.finallyExpression = it.insertImplicitCasts()
+        }
+        return data
+    }
+
+    override fun visitThrowExpression(throwExpression: FirThrowExpression, data: IrElement): IrElement =
+        (data as IrThrow).cast(throwExpression, throwExpression.exception.typeRef, throwExpression.typeRef)
+
+    override fun visitBlock(block: FirBlock, data: IrElement): IrElement =
+        (data as? IrContainerExpression)?.insertImplicitCasts() ?: data
+
+    override fun visitReturnExpression(returnExpression: FirReturnExpression, data: IrElement): IrElement {
+        val irReturn = data as IrReturn
+        val expectedType = returnExpression.target.labeledElement.returnTypeRef
+        irReturn.value = irReturn.value.cast(returnExpression.result, returnExpression.result.typeRef, expectedType)
+        return data
+    }
+
+    // ==================================================================================
+
+    internal fun IrExpression.cast(expression: FirExpression, valueType: FirTypeRef, expectedType: FirTypeRef): IrExpression {
+        if (this is IrTypeOperatorCall) {
+            return this
+        }
+        return when {
+            this is IrContainerExpression -> {
+                insertImplicitCasts()
+            }
+            expectedType.isUnit -> {
+                coerceToUnitIfNeeded(type, irBuiltIns)
+            }
+            valueType.isNullabilityFlexible() && valueType.canBeNull && !expectedType.acceptsNullValues() -> {
+                insertImplicitNotNullCastIfNeeded(expression)
+            }
+            valueType.hasEnhancedNullability() && !expectedType.acceptsNullValues() -> {
+                insertImplicitNotNullCastIfNeeded(expression)
+            }
+            // TODO: coerceIntToAnotherIntegerType
+            // TODO: even implicitCast call can be here?
+            else -> this
+        }
+    }
+
+    private fun FirTypeRef.isNullabilityFlexible(): Boolean {
+        if (hasFlexibleNullability()) {
+            return true
+        }
+        val flexibility = coneTypeSafe<ConeFlexibleType>() ?: return false
+        return flexibility.lowerBound.isMarkedNullable != flexibility.upperBound.isMarkedNullable
+    }
+
+    private fun FirTypeRef.acceptsNullValues(): Boolean =
+        canBeNull || hasEnhancedNullability()
+
+    private fun IrExpression.insertImplicitNotNullCastIfNeeded(expression: FirExpression): IrExpression {
+        // [TypeOperatorLowering] will retrieve the source (from start offset to end offset) as an assertion message.
+        // Avoid type casting if we can't determine the source for some reasons, e.g., implicit `this` receiver.
+        if (expression.source == null) {
+            return this
+        }
+        // Cast type massage 1. Remove @EnhancedNullability
+        // Cast type massage 2. Convert it to a non-null variant (in case of @FlexibleNullability)
+        val castType = type.removeAnnotations {
+            it.symbol.owner.parentAsClass.classId == CompilerConeAttributes.EnhancedNullability.ANNOTATION_CLASS_ID
+        }.withHasQuestionMark(false)
+        return IrTypeOperatorCallImpl(
+            this.startOffset,
+            this.endOffset,
+            castType,
+            IrTypeOperator.IMPLICIT_NOTNULL,
+            castType,
+            this
+        )
+    }
+
+    private fun IrContainerExpression.insertImplicitCasts(): IrContainerExpression {
+        if (statements.isEmpty()) return this
+
+        val lastIndex = statements.lastIndex
+        statements.forEachIndexed { i, irStatement ->
+            if (irStatement !is IrErrorCallExpression && irStatement is IrExpression) {
+                if (i != lastIndex) {
+                    statements[i] = irStatement.coerceToUnitIfNeeded(irStatement.type, irBuiltIns)
+                }
+                // TODO: for the last statement, need to cast to the return type if mismatched
+            }
+        }
+
+        return this
+    }
+
+    internal fun IrBlockBody.insertImplicitCasts(): IrBlockBody {
+        if (statements.isEmpty()) return this
+
+        statements.forEachIndexed { i, irStatement ->
+            if (irStatement !is IrErrorCallExpression && irStatement is IrExpression) {
+                statements[i] = irStatement.coerceToUnitIfNeeded(irStatement.type, irBuiltIns)
+            }
+        }
+        return this
+    }
+
+    override fun visitExpressionWithSmartcast(expressionWithSmartcast: FirExpressionWithSmartcast, data: IrElement): IrExpression {
+        return implicitCastOrExpression(data as IrExpression, expressionWithSmartcast.typeRef)
+    }
+
+    internal fun convertToImplicitCastExpression(
+        expressionWithSmartcast: FirExpressionWithSmartcast, calleeReference: FirReference
+    ): IrExpression {
+        val originalExpression = expressionWithSmartcast.originalExpression
+        val value = visitor.convertToIrExpression(originalExpression)
+        val castTypeRef = expressionWithSmartcast.typeRef
+        if (calleeReference !is FirResolvedNamedReference) {
+            return implicitCastOrExpression(value, castTypeRef)
+        }
+        val referencedSymbol = calleeReference.resolvedSymbol
+        if (referencedSymbol !is FirPropertySymbol && referencedSymbol !is FirFunctionSymbol) {
+            return implicitCastOrExpression(value, castTypeRef)
+        }
+
+        val originalTypeRef = expressionWithSmartcast.originalType
+        if (castTypeRef is FirResolvedTypeRef && originalTypeRef is FirResolvedTypeRef) {
+            val castType = castTypeRef.type
+            if (castType is ConeIntersectionType) {
+                val unwrappedSymbol = (referencedSymbol as? FirCallableSymbol)?.baseForIntersectionOverride ?: referencedSymbol
+                castType.intersectedTypes.forEach {
+                    if (it.doesContainReferencedSymbolInScope(unwrappedSymbol, calleeReference.name)) {
+                        return implicitCastOrExpression(value, it)
+                    }
+                }
+            }
+        }
+        return if (originalExpression is FirThisReceiverExpression &&
+            originalExpression.calleeReference.boundSymbol is FirAnonymousFunctionSymbol
+        ) {
+            // If the original is a "this" in a local function and original.type is the same as castType,
+            // we still want to keep the cast. See kt-42517
+            implicitCast(value, castTypeRef.toIrType())
+        } else {
+            implicitCastOrExpression(value, castTypeRef.toIrType())
+        }
+    }
+
+    private fun ConeKotlinType.doesContainReferencedSymbolInScope(
+        referencedSymbol: AbstractFirBasedSymbol<*>, name: Name
+    ): Boolean {
+        val scope = scope(session, components.scopeSession, FakeOverrideTypeCalculator.Forced) ?: return false
+        var result = false
+        val processor = { it: FirCallableSymbol<*> ->
+            if (!result && it == referencedSymbol) {
+                result = true
+            }
+        }
+        when (referencedSymbol) {
+            is FirPropertySymbol -> scope.processPropertiesByName(name, processor)
+            is FirFunctionSymbol -> scope.processFunctionsByName(name, processor)
+        }
+        return result
+    }
+
+    private fun implicitCastOrExpression(original: IrExpression, castType: ConeKotlinType): IrExpression {
+        return implicitCastOrExpression(original, castType.toIrType())
+    }
+
+    private fun implicitCastOrExpression(original: IrExpression, castType: FirTypeRef): IrExpression {
+        return implicitCastOrExpression(original, castType.toIrType())
+    }
+
+    internal fun implicitCastOrExpression(original: IrExpression, castType: IrType): IrExpression {
+        return original.takeIf { it.type == castType } ?: implicitCast(original, castType)
+    }
+
+    private fun implicitCast(original: IrExpression, castType: IrType): IrExpression {
+        return IrTypeOperatorCallImpl(
+            original.startOffset,
+            original.endOffset,
+            castType,
+            IrTypeOperator.IMPLICIT_CAST,
+            castType,
+            original
+        )
+    }
+}
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrSpecialSymbolProvider.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrSpecialSymbolProvider.kt
new file mode 100644
index 00000000000..a4f4f819bf6
--- /dev/null
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrSpecialSymbolProvider.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.backend
+
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.name.ClassId
+
+abstract class Fir2IrSpecialSymbolProvider {
+    protected lateinit var components: Fir2IrComponents
+
+    fun initComponents(components: Fir2IrComponents) {
+        this.components = components
+    }
+
+    abstract fun getClassSymbolById(id: ClassId): IrClassSymbol?
+}
\ No newline at end of file
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt
index 198fb7dc051..9b1b4064bb8 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt
@@ -58,7 +58,11 @@ class Fir2IrTypeConverter(
         StandardClassIds.Char to irBuiltIns.charType
     )
 
+    private val capturedTypeCache = mutableMapOf<ConeCapturedType, IrType>()
+    private val errorTypeForCapturedTypeStub by lazy { createErrorType() }
+
     fun FirTypeRef.toIrType(typeContext: ConversionTypeContext = ConversionTypeContext.DEFAULT): IrType {
+        capturedTypeCache.clear()
         return when (this) {
             !is FirResolvedTypeRef -> createErrorType()
             !is FirImplicitBuiltinTypeRef -> type.toIrType(typeContext, annotations)
@@ -89,8 +93,17 @@ class Fir2IrTypeConverter(
                 val typeAnnotations: MutableList<IrConstructorCall> =
                     if (!isExtensionFunctionType) mutableListOf()
                     else mutableListOf(builtIns.extensionFunctionTypeAnnotationConstructorCall())
-                // TODO: Need to convert @EnhancedNullability ?
                 typeAnnotations += with(annotationGenerator) { annotations.toIrAnnotations() }
+                if (hasEnhancedNullability) {
+                    builtIns.enhancedNullabilityAnnotationConstructorCall()?.let {
+                        typeAnnotations += it
+                    }
+                }
+                if (hasFlexibleNullability) {
+                    builtIns.flexibleNullabilityAnnotationConstructorCall()?.let {
+                        typeAnnotations += it
+                    }
+                }
                 IrSimpleTypeImpl(
                     irSymbol, !typeContext.definitelyNotNull && this.isMarkedNullable,
                     fullyExpandedType(session).typeArguments.map { it.toIrTypeArgument(typeContext) },
@@ -102,7 +115,20 @@ class Fir2IrTypeConverter(
                 upperBound.toIrType(typeContext)
             }
             is ConeCapturedType -> {
-                lowerType?.toIrType(typeContext) ?: constructor.supertypes!!.first().toIrType(typeContext)
+                val cached = capturedTypeCache[this]
+                if (cached == null) {
+                    val irType = lowerType?.toIrType(typeContext) ?: run {
+                        capturedTypeCache[this] = errorTypeForCapturedTypeStub
+                        constructor.supertypes!!.first().toIrType(typeContext)
+                    }
+                    capturedTypeCache[this] = irType
+                    irType
+                } else {
+                    // Potentially recursive captured type, e.g., Recursive<R> where R : Recursive<R>, ...
+                    // That should have been handled during type argument conversion, though.
+                    // Or, simply repeated captured type, e.g., FunctionN<..., *, ..., *>, literally same captured types.
+                    cached
+                }
             }
             is ConeDefinitelyNotNullType -> {
                 original.toIrType(typeContext.definitelyNotNull())
@@ -128,12 +154,48 @@ class Fir2IrTypeConverter(
                 makeTypeProjection(irType, Variance.OUT_VARIANCE)
             }
             is ConeKotlinType -> {
-                val irType = toIrType(typeContext)
-                makeTypeProjection(irType, Variance.INVARIANT)
+                if (this is ConeCapturedType && this in capturedTypeCache && this.isRecursive(mutableSetOf())) {
+                    // Recursive captured type, e.g., Recursive<R> where R : Recursive<R>, ...
+                    // We can return * early here to avoid recursive type conversions.
+                    IrStarProjectionImpl
+                } else {
+                    val irType = toIrType(typeContext)
+                    makeTypeProjection(irType, Variance.INVARIANT)
+                }
             }
         }
     }
 
+    private fun ConeKotlinType.isRecursive(visited: MutableSet<ConeCapturedType>): Boolean =
+        when (this) {
+            is ConeLookupTagBasedType -> {
+                typeArguments.any {
+                    when (it) {
+                        is ConeKotlinType -> it.isRecursive(visited)
+                        is ConeKotlinTypeProjectionIn -> it.type.isRecursive(visited)
+                        is ConeKotlinTypeProjectionOut -> it.type.isRecursive(visited)
+                        else -> false
+                    }
+                }
+            }
+            is ConeFlexibleType -> {
+                lowerBound.isRecursive(visited) || upperBound.isRecursive(visited)
+            }
+            is ConeCapturedType -> {
+                if (visited.add(this)) {
+                    constructor.supertypes?.any { it.isRecursive(visited) } == true
+                } else
+                    true
+            }
+            is ConeDefinitelyNotNullType -> {
+                original.isRecursive(visited)
+            }
+            is ConeIntersectionType -> {
+                intersectedTypes.any { it.isRecursive(visited) }
+            }
+            else -> false
+        }
+
     private fun getArrayClassSymbol(classId: ClassId?): IrClassSymbol? {
         val primitiveId = StandardClassIds.elementTypeByPrimitiveArrayType[classId] ?: return null
         val irType = classIdToTypeMap[primitiveId]
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
index 5d36652269d..7168c9f3653 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
@@ -23,10 +23,7 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression
 import org.jetbrains.kotlin.fir.references.FirReference
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.resolve.isIteratorNext
-import org.jetbrains.kotlin.fir.resolve.scope
 import org.jetbrains.kotlin.fir.resolve.toSymbol
-import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
-import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.visitors.FirDefaultVisitor
@@ -39,7 +36,6 @@ import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.types.*
-import org.jetbrains.kotlin.ir.util.coerceToUnitIfNeeded
 import org.jetbrains.kotlin.ir.util.constructors
 import org.jetbrains.kotlin.ir.util.defaultType
 import org.jetbrains.kotlin.ir.util.parentClassOrNull
@@ -57,18 +53,18 @@ class Fir2IrVisitor(
 
     private val annotationGenerator = AnnotationGenerator(this)
 
+    internal val implicitCastInserter = Fir2IrImplicitCastInserter(components, this)
+
     private val memberGenerator = ClassMemberGenerator(components, this, conversionScope)
 
     private val operatorGenerator = OperatorExpressionGenerator(components, this, conversionScope)
 
     private fun FirTypeRef.toIrType(): IrType = with(typeConverter) { toIrType() }
 
-    private fun ConeKotlinType.toIrType(): IrType = with(typeConverter) { toIrType() }
-
     private fun <T : IrDeclaration> applyParentFromStackTo(declaration: T): T = conversionScope.applyParentFromStackTo(declaration)
 
     override fun visitElement(element: FirElement, data: Any?): IrElement {
-        TODO("Should not be here: ${element.render()}")
+        TODO("Should not be here: ${element::class} ${element.render()}")
     }
 
     override fun visitField(field: FirField, data: Any?): IrField {
@@ -84,11 +80,7 @@ class Fir2IrVisitor(
             file.declarations.forEach {
                 it.toIrDeclaration()
             }
-
-            annotations = file.annotations.mapNotNull {
-                it.accept(this@Fir2IrVisitor, data) as? IrConstructorCall
-            }
-
+            annotationGenerator.generate(this, file)
             metadata = FirMetadataSource.File(file)
         }
     }
@@ -268,7 +260,10 @@ class Fir2IrVisitor(
             variable, conversionScope.parentFromStack(), if (isNextVariable) IrDeclarationOrigin.FOR_LOOP_VARIABLE else null
         )
         if (initializer != null) {
-            irVariable.initializer = convertToIrExpression(initializer)
+            irVariable.initializer =
+                with(implicitCastInserter) {
+                    convertToIrExpression(initializer).cast(initializer, initializer.typeRef, variable.returnTypeRef)
+                }
         }
         return irVariable
     }
@@ -296,6 +291,8 @@ class Fir2IrVisitor(
                 },
                 convertToIrExpression(result)
             )
+        }.let {
+            returnExpression.accept(implicitCastInserter, it)
         }
     }
 
@@ -346,14 +343,7 @@ class Fir2IrVisitor(
 
         return conversionScope.withSafeCallSubject(receiverVariable) {
             val afterNotNullCheck = safeCallExpression.regularQualifiedAccess.accept(this, data) as IrExpression
-
-            val isReceiverNullable = with(components.session.typeContext) {
-                safeCallExpression.receiver.typeRef.coneType.isNullableType()
-            }
-
-            components.createSafeCallConstruction(
-                receiverVariable, variableSymbol, afterNotNullCheck, isReceiverNullable
-            )
+            components.createSafeCallConstruction(receiverVariable, variableSymbol, afterNotNullCheck)
         }
     }
 
@@ -411,7 +401,7 @@ class Fir2IrVisitor(
                 }
             }
         } else if (boundSymbol is FirCallableSymbol) {
-            val receiverSymbol = calleeReference.toSymbol(session, classifierStorage, declarationStorage, conversionScope)
+            val receiverSymbol = calleeReference.toSymbolForCall(session, classifierStorage, declarationStorage, conversionScope)
             val receiver = (receiverSymbol?.owner as? IrSimpleFunction)?.extensionReceiverParameter
             if (receiver != null) {
                 return thisReceiverExpression.convertWithOffsets { startOffset, endOffset ->
@@ -423,87 +413,10 @@ class Fir2IrVisitor(
         return visitQualifiedAccessExpression(thisReceiverExpression, data)
     }
 
-    private fun implicitCastOrExpression(original: IrExpression, castType: ConeKotlinType): IrExpression {
-        return implicitCastOrExpression(original, castType.toIrType())
-    }
-
-    private fun implicitCastOrExpression(original: IrExpression, castType: FirTypeRef): IrExpression {
-        return implicitCastOrExpression(original, castType.toIrType())
-    }
-
-    private fun implicitCastOrExpression(original: IrExpression, castType: IrType): IrExpression {
-        return original.takeIf { it.type == castType } ?: implicitCast(original, castType)
-    }
-
-    private fun implicitCast(original: IrExpression, castType: IrType): IrExpression {
-        return IrTypeOperatorCallImpl(
-            original.startOffset,
-            original.endOffset,
-            castType,
-            IrTypeOperator.IMPLICIT_CAST,
-            castType,
-            original
-        )
-    }
-
-    private fun ConeKotlinType.doesContainReferencedSymbolInScope(
-        referencedSymbol: AbstractFirBasedSymbol<*>, name: Name
-    ): Boolean {
-        val scope = scope(session, components.scopeSession, FakeOverrideTypeCalculator.Forced) ?: return false
-        var result = false
-        val processor = { it: FirCallableSymbol<*> ->
-            if (!result && it == referencedSymbol) {
-                result = true
-            }
-        }
-        when (referencedSymbol) {
-            is FirPropertySymbol -> scope.processPropertiesByName(name, processor)
-            is FirFunctionSymbol -> scope.processFunctionsByName(name, processor)
-        }
-        return result
-    }
-
-    private fun convertToImplicitCastExpression(
-        expressionWithSmartcast: FirExpressionWithSmartcast, calleeReference: FirReference
-    ): IrExpression {
-        val originalExpression = expressionWithSmartcast.originalExpression
-        val value = convertToIrExpression(originalExpression)
-        val castTypeRef = expressionWithSmartcast.typeRef
-        if (calleeReference !is FirResolvedNamedReference) {
-            return implicitCastOrExpression(value, castTypeRef)
-        }
-        val referencedSymbol = calleeReference.resolvedSymbol
-        if (referencedSymbol !is FirPropertySymbol && referencedSymbol !is FirFunctionSymbol) {
-            return implicitCastOrExpression(value, castTypeRef)
-        }
-
-        val originalTypeRef = expressionWithSmartcast.originalType
-        if (castTypeRef is FirResolvedTypeRef && originalTypeRef is FirResolvedTypeRef) {
-            val castType = castTypeRef.type
-            if (castType is ConeIntersectionType) {
-                val unwrappedSymbol = (referencedSymbol as? FirCallableSymbol)?.overriddenSymbol ?: referencedSymbol
-                castType.intersectedTypes.forEach {
-                    if (it.doesContainReferencedSymbolInScope(unwrappedSymbol, calleeReference.name)) {
-                        return implicitCastOrExpression(value, it)
-                    }
-                }
-            }
-        }
-        return if (originalExpression is FirThisReceiverExpression &&
-            originalExpression.calleeReference.boundSymbol is FirAnonymousFunctionSymbol
-        ) {
-            // If the original is a "this" in a local function and original.type is the same as castType,
-            // we still want to keep the cast. See kt-42517
-            implicitCast(value, castTypeRef.toIrType())
-        } else {
-            implicitCastOrExpression(value, castTypeRef.toIrType())
-        }
-    }
-
     override fun visitExpressionWithSmartcast(expressionWithSmartcast: FirExpressionWithSmartcast, data: Any?): IrElement {
         // Generate the expression with the original type and then cast it to the smart cast type.
         val value = convertToIrExpression(expressionWithSmartcast.originalExpression)
-        return implicitCastOrExpression(value, expressionWithSmartcast.typeRef)
+        return implicitCastInserter.visitExpressionWithSmartcast(expressionWithSmartcast, value)
     }
 
     override fun visitCallableReferenceAccess(callableReferenceAccess: FirCallableReferenceAccess, data: Any?): IrElement {
@@ -554,29 +467,9 @@ class Fir2IrVisitor(
                     expression.accept(this, null) as IrExpression
                 }
             }
-        }.insertImplicitNotNullCastIfNeeded(expression)
-    }
-
-    private fun IrExpression.insertImplicitNotNullCastIfNeeded(expression: FirExpression): IrExpression {
-        if (this is IrTypeOperatorCall && this.operator == IrTypeOperator.IMPLICIT_NOTNULL) {
-            return this
+        }.let {
+            expression.accept(implicitCastInserter, it) as IrExpression
         }
-        // TODO: Other conditions to check?
-        // [TypeOperatorLowering] will retrieve the source (from start offset to end offset) as an assertion message.
-        // Avoid type casting if we can't determine the source for some reasons, e.g., implicit `this` receiver.
-        if (expression.source == null ||
-            expression.typeRef.coneTypeSafe<ConeKotlinType>()?.hasEnhancedNullability != true
-        ) {
-            return this
-        }
-        return IrTypeOperatorCallImpl(
-            this.startOffset,
-            this.endOffset,
-            this.type,
-            IrTypeOperator.IMPLICIT_NOTNULL,
-            this.type,
-            this
-        )
     }
 
     private fun convertToIrReceiverExpression(
@@ -587,7 +480,7 @@ class Fir2IrVisitor(
         return when (expression) {
             null -> null
             is FirResolvedQualifier -> callGenerator.convertToGetObject(expression, callableReferenceAccess)
-            is FirExpressionWithSmartcast -> convertToImplicitCastExpression(expression, calleeReference)
+            is FirExpressionWithSmartcast -> implicitCastInserter.convertToImplicitCastExpression(expression, calleeReference)
             is FirFunctionCall, is FirThisReceiverExpression, is FirCallableReferenceAccess -> convertToIrExpression(expression)
             else -> if (expression is FirQualifiedAccessExpression && expression.explicitReceiver == null) {
                 val variableAsFunctionMode = calleeReference is FirResolvedNamedReference &&
@@ -637,7 +530,11 @@ class Fir2IrVisitor(
                 } else {
                     emptyList()
                 }
-            ).insertImplicitCasts()
+            ).also {
+                with(implicitCastInserter) {
+                    it.insertImplicitCasts()
+                }
+            }
         }
     }
 
@@ -655,44 +552,16 @@ class Fir2IrVisitor(
                 IrCompositeImpl(
                     startOffset, endOffset, type, origin,
                     mapToIrStatements().filterNotNull()
-                ).insertImplicitCasts()
+                )
             } else {
                 IrBlockImpl(
                     startOffset, endOffset, type, origin,
                     mapToIrStatements().filterNotNull()
-                ).insertImplicitCasts()
+                )
             }
         }
     }
 
-    private fun IrBlockBody.insertImplicitCasts(): IrBlockBody {
-        if (statements.isEmpty()) return this
-
-        statements.forEachIndexed { i, irStatement ->
-            if (irStatement !is IrErrorCallExpression && irStatement is IrExpression) {
-                statements[i] = irStatement.coerceToUnitIfNeeded(irStatement.type, irBuiltIns)
-            }
-        }
-        return this
-    }
-
-    private fun IrContainerExpression.insertImplicitCasts(): IrContainerExpression {
-        if (statements.isEmpty()) return this
-
-        val lastIndex = statements.lastIndex
-        statements.forEachIndexed { i, irStatement ->
-            if (irStatement !is IrErrorCallExpression && irStatement is IrExpression) {
-                if (i != lastIndex) {
-                    statements[i] = irStatement.coerceToUnitIfNeeded(irStatement.type, irBuiltIns)
-                } else {
-                    // TODO: for the last statement, need to cast to the return type if mismatched
-                }
-            }
-        }
-
-        return this
-    }
-
     override fun visitErrorExpression(errorExpression: FirErrorExpression, data: Any?): IrElement {
         return errorExpression.convertWithOffsets { startOffset, endOffset ->
             IrErrorExpressionImpl(
@@ -739,7 +608,7 @@ class Fir2IrVisitor(
                     if (notNullType == originalType) {
                         irGetLhsValue()
                     } else {
-                        implicitCastOrExpression(
+                        implicitCastInserter.implicitCastOrExpression(
                             irGetLhsValue(),
                             firLhsVariable.returnTypeRef.resolvedTypeFromPrototype(notNullType).toIrType()
                         )
@@ -776,7 +645,7 @@ class Fir2IrVisitor(
                 val irBranches = whenExpression.branches.mapNotNullTo(mutableListOf()) { branch ->
                     branch.takeIf {
                         it.condition !is FirElseIfTrueCondition || it.result.statements.isNotEmpty()
-                    }?.toIrWhenBranch()
+                    }?.toIrWhenBranch(whenExpression.typeRef)
                 }
                 if (whenExpression.isExhaustive && whenExpression.branches.none { it.condition is FirElseIfTrueCondition }) {
                     val irResult = IrCallImpl(
@@ -798,6 +667,8 @@ class Fir2IrVisitor(
                     ) whenExpression.typeRef.toIrType() else irBuiltIns.unitType
                 )
             }
+        }.also {
+            whenExpression.accept(implicitCastInserter, it)
         }
     }
 
@@ -829,10 +700,12 @@ class Fir2IrVisitor(
         }
     }
 
-    private fun FirWhenBranch.toIrWhenBranch(): IrBranch {
+    private fun FirWhenBranch.toIrWhenBranch(whenExpressionType: FirTypeRef): IrBranch {
         return convertWithOffsets { startOffset, endOffset ->
             val condition = condition
-            val irResult = convertToIrExpression(result)
+            val irResult = with(implicitCastInserter) {
+                convertToIrExpression(result).cast(result, result.typeRef, whenExpressionType)
+            }
             if (condition is FirElseIfTrueCondition) {
                 IrElseBranchImpl(IrConstImpl.boolean(irResult.startOffset, irResult.endOffset, irBuiltIns.booleanType, true), irResult)
             } else {
@@ -862,6 +735,8 @@ class Fir2IrVisitor(
                 condition = convertToIrExpression(doWhileLoop.condition)
                 loopMap.remove(doWhileLoop)
             }
+        }.also {
+            doWhileLoop.accept(implicitCastInserter, it)
         }
     }
 
@@ -873,9 +748,12 @@ class Fir2IrVisitor(
                 loopMap[whileLoop] = this
                 label = whileLoop.label?.name
                 condition = convertToIrExpression(whileLoop.condition)
-                body = whileLoop.block.convertToIrExpressionOrBlock(origin)
+                // NB: here we have strange origin logic, made to be compatible with FE 1.0
+                body = whileLoop.block.convertToIrExpressionOrBlock(origin.takeIf { it != IrStatementOrigin.WHILE_LOOP })
                 loopMap.remove(whileLoop)
             }
+        }.also {
+            whileLoop.accept(implicitCastInserter, it)
         }
     }
 
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirMetadataSource.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirMetadataSource.kt
index 8ab522514da..55a27c9ae95 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirMetadataSource.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirMetadataSource.kt
@@ -31,5 +31,7 @@ sealed class FirMetadataSource : MetadataSource {
 
     class Function(override val fir: FirFunction<*>) : FirMetadataSource(), MetadataSource.Function
 
-    class Property(override val fir: FirProperty) : FirMetadataSource(), MetadataSource.Property
-}
\ No newline at end of file
+    class Property(override val fir: FirProperty) : FirMetadataSource(), MetadataSource.Property {
+        override val isConst: Boolean get() = fir.isConst
+    }
+}
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
index 721a1134bf1..cb59bea9a29 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.ir.builders.declarations.UNDEFINED_PARAMETER_INDEX
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
@@ -221,7 +222,7 @@ internal class AdapterGenerator(
                             createAdapterParameter(
                                 irAdapterFunction,
                                 Name.identifier("receiver"),
-                                index = -1,
+                                index = UNDEFINED_PARAMETER_INDEX,
                                 boundReceiver.type,
                                 IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE
                             )
@@ -474,7 +475,7 @@ internal class AdapterGenerator(
                 irAdapterFunction.extensionReceiverParameter = createAdapterParameter(
                     irAdapterFunction,
                     Name.identifier("callee"),
-                    -1,
+                    UNDEFINED_PARAMETER_INDEX,
                     argumentType,
                     IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION
                 )
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
index 73f63c70351..e647039c01f 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.backend.generators
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.backend.*
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
 import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
 import org.jetbrains.kotlin.fir.psi
@@ -20,11 +21,14 @@ import org.jetbrains.kotlin.fir.resolve.calls.getExpectedTypeForSAMConversion
 import org.jetbrains.kotlin.fir.resolve.calls.isFunctional
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
 import org.jetbrains.kotlin.fir.resolve.inference.isBuiltinFunctionalType
+import org.jetbrains.kotlin.fir.resolve.inference.isKMutableProperty
 import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.builders.declarations.UNDEFINED_PARAMETER_INDEX
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
@@ -52,7 +56,8 @@ class CallAndReferenceGenerator(
         callableReferenceAccess: FirCallableReferenceAccess,
         explicitReceiverExpression: IrExpression?
     ): IrExpression {
-        val symbol = callableReferenceAccess.calleeReference.toSymbol(session, classifierStorage, declarationStorage, conversionScope)
+        val symbol =
+            callableReferenceAccess.calleeReference.toSymbolForCall(session, classifierStorage, declarationStorage, conversionScope)
         val type = callableReferenceAccess.typeRef.toIrType()
         fun propertyOrigin(): IrStatementOrigin? =
             when (callableReferenceAccess.source?.psi?.parent) {
@@ -64,6 +69,9 @@ class CallAndReferenceGenerator(
                 is IrPropertySymbol -> {
                     val referencedProperty = symbol.owner
                     val referencedPropertyGetter = referencedProperty.getter
+                    val referencedPropertySetterSymbol =
+                        if (callableReferenceAccess.typeRef.coneType.isKMutableProperty(session)) referencedProperty.setter?.symbol
+                        else null
                     val backingFieldSymbol = when {
                         referencedPropertyGetter != null -> null
                         else -> referencedProperty.backingField?.symbol
@@ -71,18 +79,18 @@ class CallAndReferenceGenerator(
                     IrPropertyReferenceImpl(
                         startOffset, endOffset, type, symbol,
                         typeArgumentsCount = referencedPropertyGetter?.typeParameters?.size ?: 0,
-                        backingFieldSymbol,
-                        referencedPropertyGetter?.symbol,
-                        referencedProperty.setter?.symbol,
+                        field = backingFieldSymbol,
+                        getter = referencedPropertyGetter?.symbol,
+                        setter = referencedPropertySetterSymbol,
                         propertyOrigin()
                     )
                 }
                 is IrLocalDelegatedPropertySymbol -> {
                     IrLocalDelegatedPropertyReferenceImpl(
                         startOffset, endOffset, type, symbol,
-                        symbol.owner.delegate.symbol,
-                        symbol.owner.getter.symbol as IrSimpleFunctionSymbol,
-                        symbol.owner.setter?.symbol as IrSimpleFunctionSymbol?,
+                        delegate = symbol.owner.delegate.symbol,
+                        getter = symbol.owner.getter.symbol,
+                        setter = symbol.owner.setter?.symbol,
                         IrStatementOrigin.PROPERTY_REFERENCE_FOR_DELEGATE
                     )
                 }
@@ -100,7 +108,7 @@ class CallAndReferenceGenerator(
                         startOffset, endOffset, type,
                         propertySymbol,
                         typeArgumentsCount = (type as? IrSimpleType)?.arguments?.size ?: 0,
-                        symbol,
+                        field = symbol,
                         getter = if (referencedField.isStatic) null else propertySymbol.owner.getter?.symbol,
                         setter = if (referencedField.isStatic) null else propertySymbol.owner.setter?.symbol,
                         propertyOrigin()
@@ -167,17 +175,10 @@ class CallAndReferenceGenerator(
             return null
         }
         val superTypeRef = dispatchReceiverReference.superTypeRef
-        val coneSuperType = superTypeRef.coneTypeSafe<ConeClassLikeType>()
-        if (coneSuperType != null) {
-            val firClassSymbol = coneSuperType.fullyExpandedType(session).lookupTag.toSymbol(session) as? FirClassSymbol<*>
-            if (firClassSymbol != null) {
-                return classifierStorage.getIrClassSymbol(firClassSymbol)
-            }
-        } else if (superTypeRef is FirComposedSuperTypeRef) {
-            val owner = callSymbol?.owner
-            if (owner != null && owner is IrDeclaration) {
-                return owner.parentClassOrNull?.symbol
-            }
+        val coneSuperType = superTypeRef.coneTypeSafe<ConeClassLikeType>() ?: return null
+        val firClassSymbol = coneSuperType.fullyExpandedType(session).lookupTag.toSymbol(session) as? FirClassSymbol<*>
+        if (firClassSymbol != null) {
+            return classifierStorage.getIrClassSymbol(firClassSymbol)
         }
         return null
     }
@@ -194,7 +195,7 @@ class CallAndReferenceGenerator(
             val samConstructorCall = qualifiedAccess.tryConvertToSamConstructorCall(type)
             if (samConstructorCall != null) return samConstructorCall
 
-            val symbol = qualifiedAccess.calleeReference.toSymbol(
+            val symbol = qualifiedAccess.calleeReference.toSymbolForCall(
                 session,
                 classifierStorage,
                 declarationStorage,
@@ -220,7 +221,7 @@ class CallAndReferenceGenerator(
                     }
                     is IrLocalDelegatedPropertySymbol -> {
                         IrCallImpl(
-                            startOffset, endOffset, type, symbol.owner.getter.symbol as IrSimpleFunctionSymbol,
+                            startOffset, endOffset, type, symbol.owner.getter.symbol,
                             typeArgumentsCount = symbol.owner.getter.typeParameters.size,
                             valueArgumentsCount = 0,
                             origin = IrStatementOrigin.GET_LOCAL_PROPERTY,
@@ -272,69 +273,77 @@ class CallAndReferenceGenerator(
     }
 
     fun convertToIrSetCall(variableAssignment: FirVariableAssignment, explicitReceiverExpression: IrExpression?): IrExpression {
-        val type = irBuiltIns.unitType
-        val calleeReference = variableAssignment.calleeReference
-        val symbol = calleeReference.toSymbol(session, classifierStorage, declarationStorage, conversionScope, preferGetter = false)
-        val origin = IrStatementOrigin.EQ
-        return variableAssignment.convertWithOffsets { startOffset, endOffset ->
-            val assignedValue = visitor.convertToIrExpression(variableAssignment.rValue)
-            when (symbol) {
-                is IrFieldSymbol -> IrSetFieldImpl(startOffset, endOffset, symbol, type, origin).apply {
-                    value = assignedValue
-                }
-                is IrLocalDelegatedPropertySymbol -> {
-                    val setter = symbol.owner.setter
-                    when {
-                        setter != null -> IrCallImpl(
-                            startOffset, endOffset, type, setter.symbol as IrSimpleFunctionSymbol,
-                            typeArgumentsCount = setter.typeParameters.size,
+        try {
+            val type = irBuiltIns.unitType
+            val calleeReference = variableAssignment.calleeReference
+            val symbol =
+                calleeReference.toSymbolForCall(session, classifierStorage, declarationStorage, conversionScope, preferGetter = false)
+            val origin = IrStatementOrigin.EQ
+            return variableAssignment.convertWithOffsets { startOffset, endOffset ->
+                val assignedValue = visitor.convertToIrExpression(variableAssignment.rValue)
+                when (symbol) {
+                    is IrFieldSymbol -> IrSetFieldImpl(startOffset, endOffset, symbol, type, origin).apply {
+                        value = assignedValue
+                    }
+                    is IrLocalDelegatedPropertySymbol -> {
+                        val setter = symbol.owner.setter
+                        when {
+                            setter != null -> IrCallImpl(
+                                startOffset, endOffset, type, setter.symbol,
+                                typeArgumentsCount = setter.typeParameters.size,
+                                valueArgumentsCount = 1,
+                                origin = origin,
+                                superQualifierSymbol = variableAssignment.dispatchReceiver.superQualifierSymbol(symbol)
+                            ).apply {
+                                putValueArgument(0, assignedValue)
+                            }
+                            else -> generateErrorCallExpression(startOffset, endOffset, calleeReference)
+                        }
+                    }
+                    is IrPropertySymbol -> {
+                        val irProperty = symbol.owner
+                        val setter = irProperty.setter
+                        val backingField = irProperty.backingField
+                        when {
+                            setter != null -> IrCallImpl(
+                                startOffset, endOffset, type, setter.symbol,
+                                typeArgumentsCount = setter.typeParameters.size,
+                                valueArgumentsCount = 1,
+                                origin = origin,
+                                superQualifierSymbol = variableAssignment.dispatchReceiver.superQualifierSymbol(symbol)
+                            ).apply {
+                                putValueArgument(0, assignedValue)
+                            }
+                            backingField != null -> IrSetFieldImpl(
+                                startOffset, endOffset, backingField.symbol, type,
+                                origin = null, // NB: to be consistent with PSI2IR, origin should be null here
+                                superQualifierSymbol = variableAssignment.dispatchReceiver.superQualifierSymbol(symbol)
+                            ).apply {
+                                value = assignedValue
+                            }
+                            else -> generateErrorCallExpression(startOffset, endOffset, calleeReference)
+                        }
+                    }
+                    is IrSimpleFunctionSymbol -> {
+                        IrCallImpl(
+                            startOffset, endOffset, type, symbol,
+                            typeArgumentsCount = symbol.owner.typeParameters.size,
                             valueArgumentsCount = 1,
-                            origin = origin,
-                            superQualifierSymbol = variableAssignment.dispatchReceiver.superQualifierSymbol(symbol)
+                            origin = origin
                         ).apply {
                             putValueArgument(0, assignedValue)
                         }
-                        else -> generateErrorCallExpression(startOffset, endOffset, calleeReference)
                     }
+                    is IrVariableSymbol -> IrSetValueImpl(startOffset, endOffset, type, symbol, assignedValue, origin)
+                    else -> generateErrorCallExpression(startOffset, endOffset, calleeReference)
                 }
-                is IrPropertySymbol -> {
-                    val irProperty = symbol.owner
-                    val setter = irProperty.setter
-                    val backingField = irProperty.backingField
-                    when {
-                        setter != null -> IrCallImpl(
-                            startOffset, endOffset, type, setter.symbol,
-                            typeArgumentsCount = setter.typeParameters.size,
-                            valueArgumentsCount = 1,
-                            origin = origin,
-                            superQualifierSymbol = variableAssignment.dispatchReceiver.superQualifierSymbol(symbol)
-                        ).apply {
-                            putValueArgument(0, assignedValue)
-                        }
-                        backingField != null -> IrSetFieldImpl(
-                            startOffset, endOffset, backingField.symbol, type,
-                            origin = null, // NB: to be consistent with PSI2IR, origin should be null here
-                            superQualifierSymbol = variableAssignment.dispatchReceiver.superQualifierSymbol(symbol)
-                        ).apply {
-                            value = assignedValue
-                        }
-                        else -> generateErrorCallExpression(startOffset, endOffset, calleeReference)
-                    }
-                }
-                is IrSimpleFunctionSymbol -> {
-                    IrCallImpl(
-                        startOffset, endOffset, type, symbol,
-                        typeArgumentsCount = symbol.owner.typeParameters.size,
-                        valueArgumentsCount = 1,
-                        origin = origin
-                    ).apply {
-                        putValueArgument(0, assignedValue)
-                    }
-                }
-                is IrVariableSymbol -> IrSetValueImpl(startOffset, endOffset, type, symbol, assignedValue, origin)
-                else -> generateErrorCallExpression(startOffset, endOffset, calleeReference)
-            }
-        }.applyTypeArguments(variableAssignment).applyReceivers(variableAssignment, explicitReceiverExpression)
+            }.applyTypeArguments(variableAssignment).applyReceivers(variableAssignment, explicitReceiverExpression)
+        } catch (e: Throwable) {
+            throw IllegalStateException(
+                "Error while translating ${variableAssignment.render()} " +
+                        "from file ${conversionScope.containingFileIfAny()?.name ?: "???"} to BE IR", e
+            )
+        }
     }
 
     fun convertToIrConstructorCall(annotationCall: FirAnnotationCall): IrExpression {
@@ -401,9 +410,9 @@ class CallAndReferenceGenerator(
                     return null
                 }
                 val resolvedReference = callableReferenceAccess.calleeReference as FirResolvedNamedReference
-                val callableId = (resolvedReference.resolvedSymbol as FirCallableSymbol<*>).callableId
+                val firCallableSymbol = resolvedReference.resolvedSymbol as FirCallableSymbol<*>
                 // Make sure the reference indeed refers to a member of that companion
-                if (callableId.classId != classSymbol.classId) {
+                if (firCallableSymbol.dispatchReceiverClassOrNull() != classSymbol.toLookupTag()) {
                     return null
                 }
             }
@@ -447,13 +456,7 @@ class CallAndReferenceGenerator(
                         }
                         for ((index, argument) in call.arguments.withIndex()) {
                             val valueParameter = valueParameters?.get(index)
-                            val argumentExpression =
-                                with(adapterGenerator) {
-                                    visitor.convertToIrExpression(argument)
-                                        .applySamConversionIfNeeded(argument, valueParameter)
-                                        .applySuspendConversionIfNeeded(argument, valueParameter)
-                                        .applyAssigningArrayElementsToVarargInNamedForm(argument, valueParameter)
-                                }
+                            val argumentExpression = convertArgument(argument, valueParameter)
                             putValueArgument(index, argumentExpression)
                         }
                     }
@@ -491,13 +494,7 @@ class CallAndReferenceGenerator(
             return IrBlockImpl(startOffset, endOffset, type, IrStatementOrigin.ARGUMENTS_REORDERING_FOR_CALL).apply {
                 for ((argument, parameter) in argumentMapping) {
                     val parameterIndex = valueParameters.indexOf(parameter)
-                    val irArgument =
-                        with(adapterGenerator) {
-                            visitor.convertToIrExpression(argument)
-                                .applySamConversionIfNeeded(argument, parameter)
-                                .applySuspendConversionIfNeeded(argument, parameter)
-                                .applyAssigningArrayElementsToVarargInNamedForm(argument, parameter)
-                        }
+                    val irArgument = convertArgument(argument, parameter)
                     if (irArgument.hasNoSideEffects()) {
                         putValueArgument(parameterIndex, irArgument)
                     } else {
@@ -512,13 +509,7 @@ class CallAndReferenceGenerator(
             }
         } else {
             for ((argument, parameter) in argumentMapping) {
-                val argumentExpression =
-                    with(adapterGenerator) {
-                        visitor.convertToIrExpression(argument, annotationMode)
-                            .applySamConversionIfNeeded(argument, parameter)
-                            .applySuspendConversionIfNeeded(argument, parameter)
-                            .applyAssigningArrayElementsToVarargInNamedForm(argument, parameter)
-                    }
+                val argumentExpression = convertArgument(argument, parameter, annotationMode)
                 putValueArgument(valueParameters.indexOf(parameter), argumentExpression)
             }
             if (annotationMode) {
@@ -526,7 +517,13 @@ class CallAndReferenceGenerator(
                     if (parameter.isVararg && !argumentMapping.containsValue(parameter)) {
                         val elementType = parameter.returnTypeRef.toIrType()
                         putValueArgument(
-                            index, IrVarargImpl(-1, -1, elementType, elementType.toArrayOrPrimitiveArrayType(irBuiltIns))
+                            index,
+                            IrVarargImpl(
+                                UNDEFINED_OFFSET,
+                                UNDEFINED_OFFSET,
+                                elementType,
+                                elementType.toArrayOrPrimitiveArrayType(irBuiltIns)
+                            )
                         )
                     }
                 }
@@ -539,7 +536,7 @@ class CallAndReferenceGenerator(
         parametersInActualOrder: Collection<FirValueParameter>,
         valueParameters: List<FirValueParameter>
     ): Boolean {
-        var lastValueParameterIndex = -1
+        var lastValueParameterIndex = UNDEFINED_PARAMETER_INDEX
         for (parameter in parametersInActualOrder) {
             val index = valueParameters.indexOf(parameter)
             if (index < lastValueParameterIndex) {
@@ -550,6 +547,25 @@ class CallAndReferenceGenerator(
         return false
     }
 
+    private fun convertArgument(
+        argument: FirExpression,
+        parameter: FirValueParameter?,
+        annotationMode: Boolean = false
+    ): IrExpression {
+        var irArgument = visitor.convertToIrExpression(argument, annotationMode)
+        if (parameter != null) {
+            with(visitor.implicitCastInserter) {
+                irArgument = irArgument.cast(argument, argument.typeRef, parameter.returnTypeRef)
+            }
+        }
+        with(adapterGenerator) {
+            irArgument = irArgument.applySuspendConversionIfNeeded(argument, parameter)
+        }
+        return irArgument
+            .applySamConversionIfNeeded(argument, parameter)
+            .applyAssigningArrayElementsToVarargInNamedForm(argument, parameter)
+    }
+
     private fun IrExpression.applySamConversionIfNeeded(
         argument: FirExpression,
         parameter: FirValueParameter?,
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
index 915e7249a8f..d589327bcbc 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.backend.*
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter
 import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter
+import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
@@ -124,14 +125,14 @@ internal class ClassMemberGenerator(
                         irFunction.body = IrSyntheticBodyImpl(startOffset, endOffset, kind)
                     }
                     irFunction.parent is IrClass && irFunction.parentAsClass.isData -> {
-                        val classId = firFunction?.symbol?.callableId?.classId
+                        val lookupTag = firFunction?.symbol?.dispatchReceiverClassOrNull()
                         when {
                             DataClassMembersGenerator.isComponentN(irFunction) ->
                                 firFunction?.body?.let { irFunction.body = visitor.convertToIrBlockBody(it) }
-                                    ?: DataClassMembersGenerator(components).generateDataClassComponentBody(irFunction, classId!!)
+                                    ?: DataClassMembersGenerator(components).generateDataClassComponentBody(irFunction, lookupTag!!)
                             DataClassMembersGenerator.isCopy(irFunction) ->
                                 firFunction?.body?.let { irFunction.body = visitor.convertToIrBlockBody(it) }
-                                    ?: DataClassMembersGenerator(components).generateDataClassCopyBody(irFunction, classId!!)
+                                    ?: DataClassMembersGenerator(components).generateDataClassCopyBody(irFunction, lookupTag!!)
                             else ->
                                 irFunction.body = firFunction?.body?.let { visitor.convertToIrBlockBody(it) }
                         }
@@ -186,7 +187,18 @@ internal class ClassMemberGenerator(
             declarationStorage.enterScope(this@initializeBackingField)
             // NB: initializer can be already converted
             if (initializer == null && initializerExpression != null) {
-                initializer = irFactory.createExpressionBody(visitor.convertToIrExpression(initializerExpression))
+                initializer = irFactory.createExpressionBody(
+                    run {
+                        val irExpression = visitor.convertToIrExpression(initializerExpression)
+                        if (property.delegate == null) {
+                            with(visitor.implicitCastInserter) {
+                                irExpression.cast(initializerExpression, initializerExpression.typeRef, property.returnTypeRef)
+                            }
+                        } else {
+                            irExpression
+                        }
+                    }
+                )
             }
             declarationStorage.leaveScope(this@initializeBackingField)
         }
@@ -260,7 +272,7 @@ internal class ClassMemberGenerator(
                     startOffset, endOffset, constructedIrType, "Cannot find delegated constructor call"
                 )
             }
-        val constructorSymbol = referencedSymbol.deepestMatchingOverriddenSymbol() as FirConstructorSymbol
+        val constructorSymbol = referencedSymbol.unwrapCallRepresentative() as FirConstructorSymbol
         val firDispatchReceiver = dispatchReceiver
         return convertWithOffsets { startOffset, endOffset ->
             val irConstructorSymbol = declarationStorage.getIrFunctionSymbol(constructorSymbol) as IrConstructorSymbol
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt
index ac1e6109934..c5e3a584bc6 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt
@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.fir.backend.generators
 
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.backend.Fir2IrComponents
 import org.jetbrains.kotlin.fir.backend.FirMetadataSource
 import org.jetbrains.kotlin.fir.backend.declareThisReceiverParameter
@@ -17,8 +16,13 @@ import org.jetbrains.kotlin.fir.declarations.builder.buildValueParameter
 import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
 import org.jetbrains.kotlin.fir.symbols.CallableId
+import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
+import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
+import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.types.ConeStarProjection
+import org.jetbrains.kotlin.fir.types.constructType
 import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef
 import org.jetbrains.kotlin.fir.types.impl.FirImplicitIntTypeRef
 import org.jetbrains.kotlin.fir.types.impl.FirImplicitNullableAnyTypeRef
@@ -35,7 +39,6 @@ import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.util.DataClassMembersGenerator
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 
 /**
  * A generator that generates synthetic members of data class as well as part of inline class.
@@ -49,20 +52,24 @@ import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 class DataClassMembersGenerator(val components: Fir2IrComponents) {
 
     fun generateInlineClassMembers(klass: FirClass<*>, irClass: IrClass): List<FirDeclaration> =
-        MyDataClassMethodsGenerator(irClass, klass.symbol.classId, IrDeclarationOrigin.GENERATED_INLINE_CLASS_MEMBER).generate(klass)
+        MyDataClassMethodsGenerator(irClass, klass.symbol.toLookupTag(), IrDeclarationOrigin.GENERATED_INLINE_CLASS_MEMBER).generate(klass)
 
     fun generateDataClassMembers(klass: FirClass<*>, irClass: IrClass): List<FirDeclaration> =
-        MyDataClassMethodsGenerator(irClass, klass.symbol.classId, IrDeclarationOrigin.GENERATED_DATA_CLASS_MEMBER).generate(klass)
+        MyDataClassMethodsGenerator(irClass, klass.symbol.toLookupTag(), IrDeclarationOrigin.GENERATED_DATA_CLASS_MEMBER).generate(klass)
 
-    fun generateDataClassComponentBody(irFunction: IrFunction, classId: ClassId) =
-        MyDataClassMethodsGenerator(irFunction.parentAsClass, classId, IrDeclarationOrigin.GENERATED_DATA_CLASS_MEMBER)
+    fun generateDataClassComponentBody(irFunction: IrFunction, lookupTag: ConeClassLikeLookupTag) =
+        MyDataClassMethodsGenerator(irFunction.parentAsClass, lookupTag, IrDeclarationOrigin.GENERATED_DATA_CLASS_MEMBER)
             .generateComponentBody(irFunction)
 
-    fun generateDataClassCopyBody(irFunction: IrFunction, classId: ClassId) =
-        MyDataClassMethodsGenerator(irFunction.parentAsClass, classId, IrDeclarationOrigin.GENERATED_DATA_CLASS_MEMBER)
+    fun generateDataClassCopyBody(irFunction: IrFunction, lookupTag: ConeClassLikeLookupTag) =
+        MyDataClassMethodsGenerator(irFunction.parentAsClass, lookupTag, IrDeclarationOrigin.GENERATED_DATA_CLASS_MEMBER)
             .generateCopyBody(irFunction)
 
-    private inner class MyDataClassMethodsGenerator(val irClass: IrClass, val classId: ClassId, val origin: IrDeclarationOrigin) {
+    private inner class MyDataClassMethodsGenerator(
+        val irClass: IrClass,
+        val lookupTag: ConeClassLikeLookupTag,
+        val origin: IrDeclarationOrigin
+    ) {
         private val irDataClassMembersGenerator = object : DataClassMembersGenerator(
             IrGeneratorContextBase(components.irBuiltIns),
             components.symbolTable,
@@ -225,7 +232,7 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) {
             val firFunction = buildSimpleFunction {
                 origin = FirDeclarationOrigin.Synthetic
                 this.name = name
-                this.symbol = FirNamedFunctionSymbol(CallableId(classId, name))
+                this.symbol = FirNamedFunctionSymbol(CallableId(lookupTag.classId, name))
                 this.status = FirDeclarationStatusImpl(Visibilities.Public, Modality.FINAL)
                 this.session = components.session
                 this.returnTypeRef = when (returnType) {
@@ -248,8 +255,11 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) {
                         }
                     )
                 }
+                dispatchReceiverType = lookupTag.constructType(
+                    (1..irClass.typeParameters.size).map { ConeStarProjection }.toTypedArray(), isNullable = false
+                )
             }
-            val signature = if (classId.isLocal) null else components.signatureComposer.composeSignature(firFunction)
+            val signature = if (lookupTag.classId.isLocal) null else components.signatureComposer.composeSignature(firFunction)
             return components.declarationStorage.declareIrSimpleFunction(signature, null) { symbol ->
                 components.irFactory.createFunction(
                     UNDEFINED_OFFSET, UNDEFINED_OFFSET, origin, symbol, name, DescriptorVisibilities.PUBLIC, Modality.OPEN, returnType,
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt
index bcae521cba9..b6731e79305 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt
@@ -7,13 +7,16 @@ package org.jetbrains.kotlin.fir.backend.generators
 
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.backend.*
+import org.jetbrains.kotlin.fir.baseForIntersectionOverride
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.isIntersectionOverride
+import org.jetbrains.kotlin.fir.isSubstitutionOverride
+import org.jetbrains.kotlin.fir.originalForSubstitutionOverride
 import org.jetbrains.kotlin.fir.scopes.*
 import org.jetbrains.kotlin.fir.scopes.impl.delegatedWrapperData
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
-import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
-import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.*
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrBlockBody
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
@@ -53,9 +56,6 @@ internal class DelegatedMemberGenerator(
             if (isJavaDefault(unwrapped)) {
                 return@processAllFunctions
             }
-            if (firSubClass is FirRegularClass && firSubClass.isData && unwrapped.symbol.callableId.classId == StandardClassIds.Any) {
-                return@processAllFunctions
-            }
 
             val irSubFunction = generateDelegatedFunction(
                 subClass, firSubClass, irField, member, functionSymbol.fir
@@ -84,12 +84,12 @@ internal class DelegatedMemberGenerator(
         }
     }
 
-    private inline fun <reified S, reified D : FirCallableDeclaration<D>> S.unwrapDelegateTarget(
+    private inline fun <reified S : FirCallableSymbol<D>, reified D : FirCallableMemberDeclaration<D>> S.unwrapDelegateTarget(
         subClassLookupTag: ConeClassLikeLookupTag,
         noinline directOverridden: S.() -> List<S>,
         firField: FirField,
         firSubClass: FirClass<*>,
-    ): D? where S : FirCallableSymbol<D>, S : PossiblyFirFakeOverrideSymbol<D, S> {
+    ): D? {
         val unwrappedIntersectionSymbol =
             this.unwrapIntersectionOverride(directOverridden) ?: return null
 
@@ -103,20 +103,20 @@ internal class DelegatedMemberGenerator(
         val wrappedSymbol = wrapped.symbol as? S ?: return null
 
         return when {
-            wrappedSymbol.isFakeOverride && wrappedSymbol.callableId.classId == firSubClass.classId ->
-                wrapped.symbol.overriddenSymbol!!.fir
+            wrappedSymbol.fir.isSubstitutionOverride &&
+                    (wrappedSymbol.fir.dispatchReceiverType as? ConeClassLikeType)?.lookupTag == firSubClass.symbol.toLookupTag() ->
+                wrapped.originalForSubstitutionOverride
             else -> wrapped
         }
     }
 
     private fun isJavaDefault(function: FirSimpleFunction): Boolean {
-        if (function.symbol.isIntersectionOverride) return isJavaDefault(function.symbol.overriddenSymbol!!.fir)
+        if (function.isIntersectionOverride) return isJavaDefault(function.baseForIntersectionOverride!!)
         return function.origin == FirDeclarationOrigin.Enhancement && function.modality == Modality.OPEN
     }
 
     private fun <S : FirCallableSymbol<*>> S.unwrapIntersectionOverride(directOverridden: S.() -> List<S>): S? {
-        if (this !is PossiblyFirFakeOverrideSymbol<*, *>) return this
-        if (this.isIntersectionOverride) return directOverridden().firstOrNull { it.fir.delegatedWrapperData != null }
+        if (this.fir.isIntersectionOverride) return directOverridden().firstOrNull { it.fir.delegatedWrapperData != null }
         return this
     }
 
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
index 1187a7a5820..aeafa184aad 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
@@ -6,22 +6,20 @@
 package org.jetbrains.kotlin.fir.backend.generators
 
 import org.jetbrains.kotlin.descriptors.Visibilities
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.FirSymbolOwner
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.backend.*
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
+import org.jetbrains.kotlin.fir.resolve.defaultType
 import org.jetbrains.kotlin.fir.scopes.FirTypeScope
 import org.jetbrains.kotlin.fir.scopes.getDirectOverriddenFunctions
 import org.jetbrains.kotlin.fir.scopes.getDirectOverriddenProperties
 import org.jetbrains.kotlin.fir.scopes.impl.FirFakeOverrideGenerator
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
 import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
-import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
+import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
-import org.jetbrains.kotlin.fir.symbols.impl.unwrapSubstitutionOverrides
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
@@ -29,16 +27,13 @@ import org.jetbrains.kotlin.ir.types.IrErrorType
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.IrTypeProjection
+import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
-import org.jetbrains.kotlin.name.ClassId
 
 class FakeOverrideGenerator(
-    private val session: FirSession,
-    private val scopeSession: ScopeSession,
-    private val classifierStorage: Fir2IrClassifierStorage,
-    private val declarationStorage: Fir2IrDeclarationStorage,
+    private val components: Fir2IrComponents,
     private val conversionScope: Fir2IrConversionScope
-) {
+) : Fir2IrComponents by components {
 
     private val baseFunctionSymbols = mutableMapOf<IrFunction, List<FirNamedFunctionSymbol>>()
     private val basePropertySymbols = mutableMapOf<IrProperty, List<FirPropertySymbol>>()
@@ -85,8 +80,9 @@ class FakeOverrideGenerator(
                     declarationStorage::getCachedIrFunction,
                     declarationStorage::createIrFunction,
                     createFakeOverrideSymbol = { firFunction, callableSymbol ->
-                        FirFakeOverrideGenerator.createFakeOverrideFunction(
+                        FirFakeOverrideGenerator.createSubstitutionOverrideFunction(
                             session, firFunction, callableSymbol,
+                            newDispatchReceiverType = klass.defaultType(),
                             derivedClassId = klass.symbol.classId,
                             isExpect = (klass as? FirRegularClass)?.isExpect == true
                         )
@@ -108,8 +104,9 @@ class FakeOverrideGenerator(
                     declarationStorage::getCachedIrProperty,
                     declarationStorage::createIrProperty,
                     createFakeOverrideSymbol = { firProperty, callableSymbol ->
-                        FirFakeOverrideGenerator.createFakeOverrideProperty(
+                        FirFakeOverrideGenerator.createSubstitutionOverrideProperty(
                             session, firProperty, callableSymbol,
+                            newDispatchReceiverType = klass.defaultType(),
                             derivedClassId = klass.symbol.classId,
                             isExpect = (klass as? FirRegularClass)?.isExpect == true
                         )
@@ -129,12 +126,12 @@ class FakeOverrideGenerator(
         return result
     }
 
-    private inline fun <reified D : FirCallableMemberDeclaration<D>, reified S, reified I : IrDeclaration> createFakeOverriddenIfNeeded(
+    private inline fun <reified D : FirCallableMemberDeclaration<D>, reified S : FirCallableSymbol<D>, reified I : IrDeclaration> createFakeOverriddenIfNeeded(
         klass: FirClass<*>,
         irClass: IrClass,
         isLocal: Boolean,
         originalSymbol: FirCallableSymbol<*>,
-        cachedIrDeclaration: (D) -> I?,
+        cachedIrDeclaration: (D, (D) -> IdSignature?) -> I?,
         createIrDeclaration: (D, irParent: IrClass, thisReceiverOwner: IrClass?, origin: IrDeclarationOrigin, isLocal: Boolean) -> I,
         createFakeOverrideSymbol: (D, S) -> S,
         baseSymbols: MutableMap<I, List<S>>,
@@ -143,22 +140,26 @@ class FakeOverrideGenerator(
         realDeclarationSymbols: Set<AbstractFirBasedSymbol<*>>,
         computeDirectOverridden: FirTypeScope.(S) -> List<S>,
         scope: FirTypeScope,
-    ) where S : FirCallableSymbol<D>, S : PossiblyFirFakeOverrideSymbol<D, S> {
+    ) {
         if (originalSymbol !is S || originalSymbol in realDeclarationSymbols) return
-        val classId = klass.symbol.classId
+        val classLookupTag = klass.symbol.toLookupTag()
         val originalDeclaration = originalSymbol.fir
-        if (originalSymbol.callableId.classId == classId && !originalDeclaration.origin.fromSupertypes) return
+        if (originalSymbol.dispatchReceiverClassOrNull() == classLookupTag && !originalDeclaration.origin.fromSupertypes) return
         if (originalDeclaration.visibility == Visibilities.Private) return
 
         val origin = IrDeclarationOrigin.FAKE_OVERRIDE
-        val baseSymbol = originalSymbol.deepestOverriddenSymbol() as S
+        val baseSymbol = originalSymbol.unwrapSubstitutionAndIntersectionOverrides() as S
 
-        if ((originalSymbol.isFakeOverride || originalSymbol.isIntersectionOverride) &&
-            originalSymbol.callableId.classId == classId
-        ) {
+        if (originalSymbol.fir.origin.fromSupertypes && originalSymbol.dispatchReceiverClassOrNull() == classLookupTag) {
             // Substitution case
             // NB: see comment above about substituted function' parent
-            val irDeclaration = cachedIrDeclaration(originalDeclaration)?.takeIf { it.parent == irClass }
+            val irDeclaration = cachedIrDeclaration(originalDeclaration) {
+                // Sometimes we can have clashing here when FIR substitution/intersection override
+                // have the same signature.
+                // Now we avoid this problem by signature caching,
+                // so both FIR overrides correspond to one IR fake override
+                signatureComposer.composeSignature(originalDeclaration)
+            }?.takeIf { it.parent == irClass }
                 ?: createIrDeclaration(
                     originalDeclaration, irClass,
                     declarationStorage.findIrParent(baseSymbol.fir) as? IrClass,
@@ -166,7 +167,7 @@ class FakeOverrideGenerator(
                     isLocal
                 )
             irDeclaration.parent = irClass
-            baseSymbols[irDeclaration] = computeBaseSymbols(originalSymbol, baseSymbol, computeDirectOverridden, scope, classId)
+            baseSymbols[irDeclaration] = computeBaseSymbols(originalSymbol, baseSymbol, computeDirectOverridden, scope, classLookupTag)
             result += irDeclaration
         } else if (originalDeclaration.allowsToHaveFakeOverrideIn(klass)) {
             // Trivial fake override case
@@ -185,23 +186,23 @@ class FakeOverrideGenerator(
                 return
             }
             irDeclaration.parent = irClass
-            baseSymbols[irDeclaration] = computeBaseSymbols(originalSymbol, baseSymbol, computeDirectOverridden, scope, classId)
+            baseSymbols[irDeclaration] = computeBaseSymbols(originalSymbol, baseSymbol, computeDirectOverridden, scope, classLookupTag)
             result += irDeclaration
         }
     }
 
-    private inline fun <S : FirCallableSymbol<*>> computeBaseSymbols(
+    private inline fun <reified S : FirCallableSymbol<*>> computeBaseSymbols(
         symbol: S,
         basedSymbol: S,
         directOverridden: FirTypeScope.(S) -> List<S>,
         scope: FirTypeScope,
-        containingClassId: ClassId,
+        containingClass: ConeClassLikeLookupTag,
     ): List<S> {
-        if (!symbol.isIntersectionOverride) return listOf(basedSymbol)
+        if (symbol.fir.origin != FirDeclarationOrigin.IntersectionOverride) return listOf(basedSymbol)
         return scope.directOverridden(symbol).map {
             @Suppress("UNCHECKED_CAST")
-            if (it is PossiblyFirFakeOverrideSymbol<*, *> && it.isFakeOverride && it.callableId.classId == containingClassId)
-                it.overriddenSymbol!! as S
+            if (it.fir.isSubstitutionOverride && it.dispatchReceiverClassOrNull() == containingClass)
+                it.originalForSubstitutionOverride!!
             else
                 it
         }
@@ -231,7 +232,7 @@ class FakeOverrideGenerator(
 
     private fun IrProperty.discardAccessorsAccordingToBaseVisibility(baseSymbols: List<FirPropertySymbol>) {
         for (baseSymbol in baseSymbols) {
-            val unwrapped = baseSymbol.unwrapSubstitutionOverrides()
+            val unwrapped = baseSymbol.unwrapFakeOverrides()
             // Do not create fake overrides for accessors if not allowed to do so, e.g., private lateinit var.
             if (unwrapped.fir.getter?.allowsToHaveFakeOverride != true) {
                 getter = null
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/OperatorExpressionGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/OperatorExpressionGenerator.kt
index 2b414a317bf..150a70daf1a 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/OperatorExpressionGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/OperatorExpressionGenerator.kt
@@ -169,7 +169,7 @@ internal class OperatorExpressionGenerator(
 
             unsafeIrCall.dispatchReceiver = IrGetValueImpl(startOffset, endOffset, receiverVariableSymbol)
 
-            components.createSafeCallConstruction(receiverVariable, receiverVariableSymbol, unsafeIrCall, isReceiverNullable = true)
+            components.createSafeCallConstruction(receiverVariable, receiverVariableSymbol, unsafeIrCall)
         } else {
             unsafeIrCall
         }
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/descriptors/FirModuleDescriptor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/descriptors/FirModuleDescriptor.kt
index 388c4711214..d6a4f8ce3b1 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/descriptors/FirModuleDescriptor.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/descriptors/FirModuleDescriptor.kt
@@ -42,6 +42,8 @@ class FirModuleDescriptor(val session: FirSession) : ModuleDescriptor {
         get() = TODO("not implemented")
     override val expectedByModules: List<ModuleDescriptor>
         get() = TODO("not implemented")
+    override val allExpectedByModules: Set<ModuleDescriptor>
+        get() = TODO("not implemented")
 
     override fun <T> getCapability(capability: ModuleCapability<T>): T? {
         return null
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt
index ce10f5017a9..b7a1418ffd5 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt
@@ -5,14 +5,12 @@
 
 package org.jetbrains.kotlin.fir.lazy
 
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.fir.backend.Fir2IrComponents
 import org.jetbrains.kotlin.fir.backend.declareThisReceiverParameter
 import org.jetbrains.kotlin.fir.backend.toIrType
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
 import org.jetbrains.kotlin.fir.symbols.Fir2IrClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
@@ -26,7 +24,6 @@ import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 
 class Fir2IrLazyClass(
     components: Fir2IrComponents,
@@ -140,7 +137,7 @@ class Fir2IrLazyClass(
                             result += declarationStorage.getIrFunctionSymbol(declaration.symbol).owner
                         } else {
                             scope.processFunctionsByName(declaration.name) {
-                                if (it is FirNamedFunctionSymbol && it.callableId.classId == fir.symbol.classId) {
+                                if (it is FirNamedFunctionSymbol && it.dispatchReceiverClassOrNull() == fir.symbol.toLookupTag()) {
                                     if (it.isAbstractMethodOfAny()) {
                                         return@processFunctionsByName
                                     }
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt
index 10fb4f5abb9..31bce5491f1 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt
@@ -6,16 +6,12 @@
 package org.jetbrains.kotlin.fir.signaturer
 
 import org.jetbrains.kotlin.descriptors.Visibilities
-import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.NoMutableState
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.backend.Fir2IrSignatureComposer
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.render
-import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
 import org.jetbrains.kotlin.ir.util.IdSignature
-import org.jetbrains.kotlin.name.FqName
 
 @NoMutableState
 class FirBasedSignatureComposer(private val mangler: FirMangler) : Fir2IrSignatureComposer {
@@ -60,14 +56,12 @@ class FirBasedSignatureComposer(private val mangler: FirMangler) : Fir2IrSignatu
         }
     }
 
-    private val CallableId.relativeCallableName: FqName
-        get() = className?.child(callableName) ?: FqName.topLevel(callableName)
-
     override fun composeSignature(declaration: FirDeclaration, containingClass: ConeClassLikeLookupTag?): IdSignature? {
         if (declaration is FirAnonymousObject || declaration is FirAnonymousFunction) return null
         if (declaration is FirRegularClass && declaration.classId.isLocal) return null
         if (declaration is FirCallableMemberDeclaration<*>) {
-            if (declaration.visibility == Visibilities.Local || declaration.symbol.callableId.classId?.isLocal == true || containingClass?.classId?.isLocal == true) return null
+            if (declaration.visibility == Visibilities.Local) return null
+            if (declaration.symbol.dispatchReceiverClassOrNull()?.classId?.isLocal == true || containingClass?.classId?.isLocal == true) return null
         }
         val builder = SignatureBuilder()
         try {
@@ -93,11 +87,15 @@ class FirBasedSignatureComposer(private val mangler: FirMangler) : Fir2IrSignatu
             is FirCallableMemberDeclaration<*> -> {
                 if (declaration.visibility == Visibilities.Private) return null
                 val containingClassId = containingClass?.classId
-                val baseCallableId = declaration.symbol.callableId
-                val callableId =
-                    if (containingClassId != null) CallableId(containingClassId, baseCallableId.callableName) else baseCallableId
+
+                val classId = containingClassId ?: declaration.containingClass()?.classId
+                val packageName = classId?.packageFqName ?: declaration.symbol.callableId.packageName
+                val callableName = declaration.symbol.callableId.callableName
+
                 IdSignature.PublicSignature(
-                    callableId.packageName.asString(), callableId.relativeCallableName.asString(), builder.hashId, builder.mask
+                    packageName.asString(),
+                    classId?.relativeClassName?.child(callableName)?.asString() ?: callableName.asString(),
+                    builder.hashId, builder.mask
                 )
             }
             else -> error("Unsupported FIR declaration in signature composer: ${declaration.render()}")
diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java
index a70fd85ae8c..12e6783ba30 100644
--- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java
+++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java
@@ -158,6 +158,11 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassesOldMangling.kt")
+    public void testInlineClassesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
+    }
+
     @TestMetadata("inlinedConstants.kt")
     public void testInlinedConstants() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlinedConstants.kt");
@@ -405,6 +410,16 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin/fir"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
+        @TestMetadata("AnonymousObjectInProperty.kt")
+        public void testAnonymousObjectInProperty() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt");
+        }
+
+        @TestMetadata("ExistingSymbolInFakeOverride.kt")
+        public void testExistingSymbolInFakeOverride() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt");
+        }
+
         @TestMetadata("LibraryProperty.kt")
         public void testLibraryProperty() throws Exception {
             runTest("compiler/testData/compileKotlinAgainstKotlin/fir/LibraryProperty.kt");
diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxAgainstJavaCodegenTestGenerated.java
index 8b03298d54d..b8e90b35bf7 100644
--- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxAgainstJavaCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxAgainstJavaCodegenTestGenerated.java
@@ -1066,6 +1066,34 @@ public class FirBlackBoxAgainstJavaCodegenTestGenerated extends AbstractFirBlack
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/boxAgainstJava/varargs")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Varargs extends AbstractFirBlackBoxAgainstJavaCodegenTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: ");
+        }
+
+        public void testAllFilesPresentInVarargs() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @TestMetadata("varargsOverride.kt")
+        public void testVarargsOverride() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride.kt");
+        }
+
+        @TestMetadata("varargsOverride2.kt")
+        public void testVarargsOverride2() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride2.kt");
+        }
+
+        @TestMetadata("varargsOverride3.kt")
+        public void testVarargsOverride3() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride3.kt");
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
index 4038fbeb5c4..61ddd00b119 100644
--- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
@@ -1477,6 +1477,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/bridges/genericProperty.kt");
         }
 
+        @TestMetadata("innerClassTypeParameters.kt")
+        public void testInnerClassTypeParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt");
+        }
+
         @TestMetadata("kt12416.kt")
         public void testKt12416() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/kt12416.kt");
@@ -1517,6 +1522,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/bridges/kt318.kt");
         }
 
+        @TestMetadata("kt42137.kt")
+        public void testKt42137() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt42137.kt");
+        }
+
         @TestMetadata("longChainOneBridge.kt")
         public void testLongChainOneBridge() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
@@ -6883,6 +6893,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("nonLocalReturn.kt")
+        public void testNonLocalReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt");
+        }
+
         @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt")
         public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines");
@@ -10023,6 +10038,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/delegatedProperty/extensionPropertyAndExtensionGetValue.kt");
         }
 
+        @TestMetadata("functionRefDelefate.kt")
+        public void testFunctionRefDelefate() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt");
+        }
+
         @TestMetadata("genericDelegate.kt")
         public void testGenericDelegate() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
@@ -12415,6 +12435,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
         }
 
+        @TestMetadata("typeParameterAsUpperBound.kt")
+        public void testTypeParameterAsUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt");
+        }
+
         @TestMetadata("typeParametersInLocalFunction.kt")
         public void testTypeParametersInLocalFunction() throws Exception {
             runTest("compiler/testData/codegen/box/functions/typeParametersInLocalFunction.kt");
@@ -13417,6 +13442,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
         }
 
+        @TestMetadata("boxImplDoesNotExecuteInitBlock.kt")
+        public void testBoxImplDoesNotExecuteInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt");
+        }
+
         @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -13562,6 +13592,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inlineClasses/conformToComparableAndCallInterfaceMethod.kt");
         }
 
+        @TestMetadata("constructorImplVisibility.kt")
+        public void testConstructorImplVisibility() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibility.kt");
+        }
+
         @TestMetadata("correctBoxingForBranchExpressions.kt")
         public void testCorrectBoxingForBranchExpressions() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt");
@@ -13582,6 +13617,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("defaultWithInlineClassArgument.kt")
         public void testDefaultWithInlineClassArgument() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultWithInlineClassArgument.kt");
@@ -13702,6 +13742,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt");
         }
 
+        @TestMetadata("initBlock.kt")
+        public void testInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/initBlock.kt");
+        }
+
         @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
         public void testInlineClassAsLastExpressionInInLambda() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
@@ -14117,6 +14162,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt");
         }
 
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/stringPlus.kt");
+        }
+
         @TestMetadata("toStringCallingPrivateFun.kt")
         public void testToStringCallingPrivateFun() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
@@ -14137,6 +14187,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt");
         }
 
+        @TestMetadata("UIntSafeAsInt.kt")
+        public void testUIntSafeAsInt() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt");
+        }
+
         @TestMetadata("unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testUnboxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -14347,6 +14402,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt");
             }
 
+            @TestMetadata("overrideGenericWithInlineClass.kt")
+            public void testOverrideGenericWithInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt");
+            }
+
             @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt")
             public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");
@@ -15312,6 +15372,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
         }
 
+        @TestMetadata("innerWithDefaultInner.kt")
+        public void testInnerWithDefaultInner() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
+        }
+
         @TestMetadata("kt3132.kt")
         public void testKt3132() throws Exception {
             runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
@@ -15782,6 +15847,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/ir/simple.kt");
         }
 
+        @TestMetadata("suppressConflictingSignatureErrors.kt")
+        public void testSuppressConflictingSignatureErrors() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/suppressConflictingSignatureErrors.kt");
+        }
+
         @TestMetadata("compiler/testData/codegen/box/ir/closureConversion")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -15949,6 +16019,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt");
         }
 
+        @TestMetadata("kt43217.kt")
+        public void testKt43217() throws Exception {
+            runTest("compiler/testData/codegen/box/javaInterop/kt43217.kt");
+        }
+
         @TestMetadata("lambdaInstanceOf.kt")
         public void testLambdaInstanceOf() throws Exception {
             runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");
@@ -16001,6 +16076,16 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/javaInterop/generics/javaNestedSamInterface.kt");
             }
 
+            @TestMetadata("kt42824.kt")
+            public void testKt42824() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42824.kt");
+            }
+
+            @TestMetadata("kt42825.kt")
+            public void testKt42825() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42825.kt");
+            }
+
             @TestMetadata("propertyVarianceConflict.kt")
             public void testPropertyVarianceConflict() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/generics/propertyVarianceConflict.kt");
@@ -16099,6 +16184,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/paramAssertionMessage.kt");
             }
 
+            @TestMetadata("privateOperatorParameterAssertions.kt")
+            public void testPrivateOperatorParameterAssertions() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/privateOperatorParameterAssertions.kt");
+            }
+
             @TestMetadata("staticCallErrorMessage.kt")
             public void testStaticCallErrorMessage() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/staticCallErrorMessage.kt");
@@ -16699,6 +16789,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @TestMetadata("deprecatedDefaultMethod.kt")
+                public void testDeprecatedDefaultMethod() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
+                }
+
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/funInterface.kt");
@@ -16830,6 +16925,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                     runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
                 }
 
+                @TestMetadata("deprecatedDefaultMethod.kt")
+                public void testDeprecatedDefaultMethod() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
+                }
+
                 @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
                 public void testInheritedFunctionWithDefaultParameters() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
@@ -17689,6 +17789,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/jvmStatic/funAccess.kt");
         }
 
+        @TestMetadata("functionReference.kt")
+        public void testFunctionReference() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmStatic/functionReference.kt");
+        }
+
         @TestMetadata("importStaticMemberFromObject.kt")
         public void testImportStaticMemberFromObject() throws Exception {
             runTest("compiler/testData/codegen/box/jvmStatic/importStaticMemberFromObject.kt");
@@ -17724,6 +17829,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/jvmStatic/kt21246a.kt");
         }
 
+        @TestMetadata("kt35716.kt")
+        public void testKt35716() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmStatic/kt35716.kt");
+        }
+
         @TestMetadata("kt9897_static.kt")
         public void testKt9897_static() throws Exception {
             runTest("compiler/testData/codegen/box/jvmStatic/kt9897_static.kt");
@@ -19383,6 +19493,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/objects/kt4086.kt");
         }
 
+        @TestMetadata("kt42758.kt")
+        public void testKt42758() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt42758.kt");
+        }
+
         @TestMetadata("kt535.kt")
         public void testKt535() throws Exception {
             runTest("compiler/testData/codegen/box/objects/kt535.kt");
@@ -20680,6 +20795,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
             }
 
+            @TestMetadata("kt42281.kt")
+            public void testKt42281() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
+            }
+
             @TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
             public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
@@ -22542,6 +22662,16 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             public void testKt13241_Collection() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Collection.kt");
             }
+
+            @TestMetadata("kt43159_ArrayUpperBound.kt")
+            public void testKt43159_ArrayUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt");
+            }
+
+            @TestMetadata("kt43159_GenericArray.kt")
+            public void testKt43159_GenericArray() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/ranges/forInProgressionWithIndex")
@@ -26499,6 +26629,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 public void testProperties() throws Exception {
                     runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/properties.kt");
                 }
+
+                @TestMetadata("suspendFunction.kt")
+                public void testSuspendFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt");
+                }
             }
         }
 
@@ -27397,11 +27532,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/reflection/mapping/functions.kt");
             }
 
-            @TestMetadata("inlineClassPrimaryVal.kt")
-            public void testInlineClassPrimaryVal() throws Exception {
-                runTest("compiler/testData/codegen/box/reflection/mapping/inlineClassPrimaryVal.kt");
-            }
-
             @TestMetadata("inlineReifiedFun.kt")
             public void testInlineReifiedFun() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/mapping/inlineReifiedFun.kt");
@@ -27490,6 +27620,29 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 }
             }
 
+            @TestMetadata("compiler/testData/codegen/box/reflection/mapping/inlineClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class InlineClasses extends AbstractFirBlackBoxCodegenTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: ");
+                }
+
+                public void testAllFilesPresentInInlineClasses() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/mapping/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("inlineClassPrimaryVal.kt")
+                public void testInlineClassPrimaryVal() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/mapping/inlineClasses/inlineClassPrimaryVal.kt");
+                }
+
+                @TestMetadata("suspendFunctionWithInlineClassInSignature.kt")
+                public void testSuspendFunctionWithInlineClassInSignature() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt");
+                }
+            }
+
             @TestMetadata("compiler/testData/codegen/box/reflection/mapping/jvmStatic")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -31231,6 +31384,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/traits/abstractClassInheritsFromInterface.kt");
         }
 
+        @TestMetadata("abstractClassWithFakeOverride.kt")
+        public void testAbstractClassWithFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt");
+        }
+
         public void testAllFilesPresentInTraits() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
@@ -32124,6 +32282,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/when/kt2466.kt");
         }
 
+        @TestMetadata("kt43242.kt")
+        public void testKt43242() throws Exception {
+            runTest("compiler/testData/codegen/box/when/kt43242.kt");
+        }
+
         @TestMetadata("kt5307.kt")
         public void testKt5307() throws Exception {
             runTest("compiler/testData/codegen/box/when/kt5307.kt");
diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java
index 20dc3db9a96..319b6bd6eed 100644
--- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java
@@ -3167,6 +3167,11 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noAssertionsForInlineClassesBasedOnNullableTypes.kt");
         }
 
+        @TestMetadata("noBoxingInMethod.kt")
+        public void testNoBoxingInMethod() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingInMethod.kt");
+        }
+
         @TestMetadata("noBoxingOnCastOperations.kt")
         public void testNoBoxingOnCastOperations() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOnCastOperations.kt");
@@ -4319,6 +4324,11 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperForNullableInitialization.kt");
         }
 
+        @TestMetadata("samWrapperInInlineLambda.kt")
+        public void testSamWrapperInInlineLambda() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperInInlineLambda.kt");
+        }
+
         @TestMetadata("samWrapperOfLambda.kt")
         public void testSamWrapperOfLambda() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperOfLambda.kt");
@@ -4328,6 +4338,11 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
         public void testSamWrapperOfReference() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperOfReference.kt");
         }
+
+        @TestMetadata("samWrapperRawTypes.kt")
+        public void testSamWrapperRawTypes() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperRawTypes.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeText/statements")
diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
index dda0d42f391..478ed5273ab 100644
--- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
@@ -66,6 +66,11 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/classes/classes.kt");
         }
 
+        @TestMetadata("cloneable.kt")
+        public void testCloneable() throws Exception {
+            runTest("compiler/testData/ir/irText/classes/cloneable.kt");
+        }
+
         @TestMetadata("companionObject.kt")
         public void testCompanionObject() throws Exception {
             runTest("compiler/testData/ir/irText/classes/companionObject.kt");
@@ -191,6 +196,11 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/classes/kt31649.kt");
         }
 
+        @TestMetadata("kt43217.kt")
+        public void testKt43217() throws Exception {
+            runTest("compiler/testData/ir/irText/classes/kt43217.kt");
+        }
+
         @TestMetadata("lambdaInDataClassDefaultParameter.kt")
         public void testLambdaInDataClassDefaultParameter() throws Exception {
             runTest("compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt");
@@ -401,6 +411,11 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
                 runTest("compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.kt");
             }
 
+            @TestMetadata("annotationsOnDelegatedMembers.kt")
+            public void testAnnotationsOnDelegatedMembers() throws Exception {
+                runTest("compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt");
+            }
+
             @TestMetadata("annotationsWithDefaultParameterValues.kt")
             public void testAnnotationsWithDefaultParameterValues() throws Exception {
                 runTest("compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt");
@@ -471,6 +486,11 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
                 runTest("compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.kt");
             }
 
+            @TestMetadata("inheritingDeprecation.kt")
+            public void testInheritingDeprecation() throws Exception {
+                runTest("compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt");
+            }
+
             @TestMetadata("javaAnnotation.kt")
             public void testJavaAnnotation() throws Exception {
                 runTest("compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt");
@@ -1172,6 +1192,11 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/expressions/objectAsCallable.kt");
         }
 
+        @TestMetadata("objectByNameInsideObject.kt")
+        public void testObjectByNameInsideObject() throws Exception {
+            runTest("compiler/testData/ir/irText/expressions/objectByNameInsideObject.kt");
+        }
+
         @TestMetadata("objectClassReference.kt")
         public void testObjectClassReference() throws Exception {
             runTest("compiler/testData/ir/irText/expressions/objectClassReference.kt");
@@ -1752,11 +1777,21 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt");
         }
 
+        @TestMetadata("coercionToUnitForNestedWhen.kt")
+        public void testCoercionToUnitForNestedWhen() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt");
+        }
+
         @TestMetadata("DeepCopyIrTree.kt")
         public void testDeepCopyIrTree() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt");
         }
 
+        @TestMetadata("DelegationAndInheritanceFromJava.kt")
+        public void testDelegationAndInheritanceFromJava() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt");
+        }
+
         @TestMetadata("deprecated.kt")
         public void testDeprecated() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/deprecated.kt");
@@ -1772,11 +1807,21 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.kt");
         }
 
+        @TestMetadata("MultiList.kt")
+        public void testMultiList() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/MultiList.kt");
+        }
+
         @TestMetadata("putIfAbsent.kt")
         public void testPutIfAbsent() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/putIfAbsent.kt");
         }
 
+        @TestMetadata("recursiveCapturedTypeInPropertyReference.kt")
+        public void testRecursiveCapturedTypeInPropertyReference() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.kt");
+        }
+
         @TestMetadata("SameJavaFieldReferences.kt")
         public void testSameJavaFieldReferences() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/SameJavaFieldReferences.kt");
@@ -1787,10 +1832,20 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/SignatureClash.kt");
         }
 
+        @TestMetadata("throwableStackTrace.kt")
+        public void testThrowableStackTrace() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/throwableStackTrace.kt");
+        }
+
         @TestMetadata("V8ArrayToList.kt")
         public void testV8ArrayToList() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/V8ArrayToList.kt");
         }
+
+        @TestMetadata("VarInInit.kt")
+        public void testVarInInit() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/VarInInit.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/ir/irText/lambdas")
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
index 86455338e21..c1794f1d393 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
@@ -29,7 +29,7 @@ class FirLibrarySession @PrivateSessionConstructor constructor(
     }
 }
 
-open class FirProjectSessionProvider(override val project: Project) : FirSessionProvider {
+open class FirProjectSessionProvider : FirSessionProvider {
     override fun getSession(moduleInfo: ModuleInfo): FirSession? {
         return sessionCache[moduleInfo]
     }
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaVisibilityChecker.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaVisibilityChecker.kt
index b8caf7d1368..118346cea64 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaVisibilityChecker.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaVisibilityChecker.kt
@@ -12,9 +12,9 @@ import org.jetbrains.kotlin.fir.FirVisibilityChecker
 import org.jetbrains.kotlin.fir.NoMutableState
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirFile
+import org.jetbrains.kotlin.fir.getOwnerId
 import org.jetbrains.kotlin.fir.resolve.calls.Candidate
 import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
-import org.jetbrains.kotlin.name.ClassId
 
 @NoMutableState
 object FirJavaVisibilityChecker : FirVisibilityChecker() {
@@ -22,7 +22,6 @@ object FirJavaVisibilityChecker : FirVisibilityChecker() {
         declarationVisibility: Visibility,
         symbol: AbstractFirBasedSymbol<*>,
         useSiteFile: FirFile,
-        ownerId: ClassId?,
         containingDeclarations: List<FirDeclaration>,
         candidate: Candidate,
         session: FirSession
@@ -32,6 +31,7 @@ object FirJavaVisibilityChecker : FirVisibilityChecker() {
                 if (symbol.packageFqName() == useSiteFile.packageFqName) {
                     true
                 } else {
+                    val ownerId = symbol.getOwnerId()
                     ownerId != null && canSeeProtectedMemberOf(containingDeclarations, candidate.dispatchReceiverValue, ownerId, session)
                 }
             }
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaScopeProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaScopeProvider.kt
index 0cb17a5b9f1..671723f4fe6 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaScopeProvider.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaScopeProvider.kt
@@ -96,7 +96,7 @@ class JavaScopeProvider(
                             val scope = buildJavaEnhancementScope(useSiteSession, symbol, scopeSession, visitedSymbols)
                             visitedSymbols.remove(symbol)
                             useSiteSuperType.wrapSubstitutionScopeIfNeed(
-                                useSiteSession, scope, symbol.fir, scopeSession, regularClass.classId
+                                useSiteSession, scope, symbol.fir, scopeSession, derivedClass = regularClass
                             )
                         } else {
                             null
@@ -112,7 +112,7 @@ class JavaScopeProvider(
                         else JavaTypeParameterStack.EMPTY
                     ),
                     superTypeEnhancementScopes,
-                    regularClass.classId,
+                    regularClass.defaultType(),
                 ), wrappedDeclaredScope
             )
         }
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
index d11f8581b78..16f8fd00103 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
@@ -19,12 +19,14 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.builder.*
 import org.jetbrains.kotlin.fir.java.declarations.*
 import org.jetbrains.kotlin.fir.resolve.constructType
+import org.jetbrains.kotlin.fir.resolve.defaultType
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals
 import org.jetbrains.kotlin.fir.resolve.providers.SymbolProviderCache
 import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.*
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
@@ -187,6 +189,9 @@ class JavaSymbolProvider(
                     buildOuterClassTypeParameterRef { symbol = it.symbol }
                 }
             }
+
+            val dispatchReceiver = classId.defaultType(typeParameters.map { it.symbol } )
+
             status = FirResolvedDeclarationStatusImpl(
                 javaClass.visibility,
                 javaClass.modality
@@ -200,7 +205,7 @@ class JavaSymbolProvider(
             // TODO: may be we can process fields & methods later.
             // However, they should be built up to override resolve stage
             for (javaField in javaClass.fields) {
-                declarations += convertJavaFieldToFir(javaField, classId, javaTypeParameterStack)
+                declarations += convertJavaFieldToFir(javaField, classId, javaTypeParameterStack, dispatchReceiver)
             }
             val valueParametersForAnnotationConstructor = ValueParametersForAnnotationConstructor()
             val classIsAnnotation = classKind == ClassKind.ANNOTATION_CLASS
@@ -212,7 +217,8 @@ class JavaSymbolProvider(
                     classId,
                     javaTypeParameterStack,
                     classIsAnnotation,
-                    valueParametersForAnnotationConstructor
+                    valueParametersForAnnotationConstructor,
+                    dispatchReceiver
                 )
             }
             val javaClassDeclaredConstructors = javaClass.constructors
@@ -243,11 +249,16 @@ class JavaSymbolProvider(
             }
 
             if (classKind == ClassKind.ENUM_CLASS) {
-                generateValuesFunction(session, classId.packageFqName, classId.relativeClassName)
+                generateValuesFunction(
+                    session,
+                    classId.packageFqName,
+                    classId.relativeClassName
+                )
                 generateValueOfFunction(session, classId.packageFqName, classId.relativeClassName)
             }
             if (classIsAnnotation) {
-                declarations += buildConstructorForAnnotationClass(constructorId, this, valueParametersForAnnotationConstructor)
+                declarations +=
+                    buildConstructorForAnnotationClass(constructorId, this, valueParametersForAnnotationConstructor)
             }
             parentClassTypeParameterStackCache.remove(classSymbol)
         }
@@ -265,7 +276,8 @@ class JavaSymbolProvider(
     private fun convertJavaFieldToFir(
         javaField: JavaField,
         classId: ClassId,
-        javaTypeParameterStack: JavaTypeParameterStack
+        javaTypeParameterStack: JavaTypeParameterStack,
+        dispatchReceiver: ConeClassLikeType
     ): FirDeclaration {
         val fieldName = javaField.name
         val fieldId = CallableId(classId.packageFqName, classId.relativeClassName, fieldName)
@@ -289,6 +301,8 @@ class JavaSymbolProvider(
                 resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
                 origin = FirDeclarationOrigin.Java
                 addAnnotationsFrom(this@JavaSymbolProvider.session, javaField, javaTypeParameterStack)
+            }.apply {
+                containingClassAttr = ConeClassLikeLookupTagImpl(classId)
             }
             else -> buildJavaField {
                 source = (javaField as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement()
@@ -311,6 +325,14 @@ class JavaSymbolProvider(
                 isStatic = javaField.isStatic
                 addAnnotationsFrom(this@JavaSymbolProvider.session, javaField, javaTypeParameterStack)
                 initializer = convertJavaInitializerToFir(javaField.initializerValue)
+
+                if (!javaField.isStatic) {
+                    dispatchReceiverType = dispatchReceiver
+                }
+            }.apply {
+                if (javaField.isStatic) {
+                    containingClassAttr = ConeClassLikeLookupTagImpl(classId)
+                }
             }
         }
     }
@@ -325,7 +347,8 @@ class JavaSymbolProvider(
         classId: ClassId,
         javaTypeParameterStack: JavaTypeParameterStack,
         classIsAnnotation: Boolean,
-        valueParametersForAnnotationConstructor: ValueParametersForAnnotationConstructor
+        valueParametersForAnnotationConstructor: ValueParametersForAnnotationConstructor,
+        dispatchReceiver: ConeClassLikeType
     ): FirJavaMethod {
         val methodName = javaMethod.name
         val methodId = CallableId(classId.packageFqName, classId.relativeClassName, methodName)
@@ -364,6 +387,14 @@ class JavaSymbolProvider(
                 isExternal = false
                 isSuspend = false
             }
+
+            if (!javaMethod.isStatic) {
+                dispatchReceiverType = dispatchReceiver
+            }
+        }.apply {
+            if (javaMethod.isStatic) {
+                containingClassAttr = ConeClassLikeLookupTagImpl(classId)
+            }
         }
         if (classIsAnnotation) {
             val parameterForAnnotationConstructor = buildJavaValueParameter {
@@ -425,6 +456,8 @@ class JavaSymbolProvider(
                     )
                 }
             }
+        }.apply {
+            containingClassAttr = ownerClassBuilder.symbol.toLookupTag()
         }
     }
 
@@ -445,6 +478,8 @@ class JavaSymbolProvider(
             visibility = Visibilities.Public
             isInner = false
             isPrimary = true
+        }.apply {
+            containingClassAttr = ownerClassBuilder.symbol.toLookupTag()
         }
     }
 
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
index 6b25f9326f6..fca29119535 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
@@ -197,7 +197,11 @@ private fun ClassId.toConeFlexibleType(
     typeArgumentsForUpper: Array<ConeTypeProjection> = typeArguments,
     attributes: ConeAttributes = ConeAttributes.Empty
 ) = ConeFlexibleType(
-    toConeKotlinType(typeArguments, isNullable = false, attributes),
+    toConeKotlinType(
+        typeArguments,
+        isNullable = false,
+        attributes.withFlexibleUnless { it.hasEnhancedNullability }
+    ),
     toConeKotlinType(typeArgumentsForUpper, isNullable = true, attributes)
 )
 
@@ -233,7 +237,15 @@ private fun JavaClassifierType.toConeKotlinTypeWithoutEnhancement(
             attributes = attributes
         )
 
-    return if (isRaw) ConeRawType(lowerBound, upperBound) else ConeFlexibleType(lowerBound, upperBound)
+    return if (isRaw)
+        ConeRawType(lowerBound, upperBound)
+    else
+        ConeFlexibleType(
+            lowerBound.withAttributes(
+                lowerBound.attributes.withFlexibleUnless { it.hasEnhancedNullability }
+            ),
+            upperBound
+        )
 }
 
 private fun computeRawProjection(
@@ -303,7 +315,9 @@ private fun getErasedVersionOfFirstUpperBound(
             if (firstUpperBound.upperBound is ConeTypeParameterType) {
                 // Avoid exponential complexity
                 ConeFlexibleType(
-                    lowerBound,
+                    lowerBound.withAttributes(
+                        lowerBound.attributes.withFlexibleUnless { it.hasEnhancedNullability }
+                    ),
                     lowerBound.withNullability(ConeNullability.NULLABLE)
                 )
             } else {
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt
index 70712a60cb7..262f4a8f8d7 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt
@@ -5,10 +5,10 @@
 
 package org.jetbrains.kotlin.fir.java.declarations
 
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirImplementationDetail
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
-import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.builder.FirConstructorBuilder
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.FirTransformer
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
@@ -37,6 +38,7 @@ class FirJavaConstructor @FirImplementationDetail constructor(
     override val annotations: MutableList<FirAnnotationCall>,
     override var status: FirDeclarationStatus,
     override var resolvePhase: FirResolvePhase,
+    override val dispatchReceiverType: ConeKotlinType?,
 ) : FirConstructor() {
     override val receiverTypeRef: FirTypeRef? get() = null
 
@@ -154,7 +156,8 @@ class FirJavaConstructorBuilder : FirConstructorBuilder() {
             typeParameters,
             annotations,
             status,
-            resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
+            resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES,
+            dispatchReceiverType
         )
     }
 
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt
index 318321e4287..cc4db634ec7 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt
@@ -6,10 +6,10 @@
 package org.jetbrains.kotlin.fir.java.declarations
 
 import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirImplementationDetail
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
-import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.builder.FirFieldBuilder
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.FirTransformer
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
@@ -42,6 +43,8 @@ class FirJavaField @FirImplementationDetail constructor(
     override val annotations: MutableList<FirAnnotationCall>,
     override val typeParameters: MutableList<FirTypeParameter>,
     override var initializer: FirExpression?,
+    override val dispatchReceiverType: ConeKotlinType?,
+    override val attributes: FirDeclarationAttributes,
 ) : FirField() {
     init {
         symbol.bind(this)
@@ -55,8 +58,6 @@ class FirJavaField @FirImplementationDetail constructor(
     override val origin: FirDeclarationOrigin
         get() = FirDeclarationOrigin.Java
 
-    override val attributes: FirDeclarationAttributes = FirDeclarationAttributes()
-
     override fun <D> transformReturnTypeRef(transformer: FirTransformer<D>, data: D): FirField {
         returnTypeRef = returnTypeRef.transformSingle(transformer, data)
         return this
@@ -163,6 +164,8 @@ internal class FirJavaFieldBuilder : FirFieldBuilder() {
             annotations,
             typeParameters,
             initializer,
+            dispatchReceiverType,
+            attributes,
         )
     }
 
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt
index a0e91d3cbcc..5beda4584f5 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt
@@ -6,10 +6,10 @@
 package org.jetbrains.kotlin.fir.java.declarations
 
 import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirImplementationDetail
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
-import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
 import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription
 import org.jetbrains.kotlin.fir.declarations.*
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirSimpleFunctionImpl
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef
 import org.jetbrains.kotlin.name.Name
@@ -53,6 +54,7 @@ class FirJavaMethod @FirImplementationDetail constructor(
     containerSource: DeserializedContainerSource?,
     symbol: FirFunctionSymbol<FirSimpleFunction>,
     annotations: MutableList<FirAnnotationCall>,
+    dispatchReceiverType: ConeKotlinType?,
 ) : FirSimpleFunctionImpl(
     source,
     session,
@@ -65,6 +67,7 @@ class FirJavaMethod @FirImplementationDetail constructor(
     body,
     status,
     containerSource,
+    dispatchReceiverType = dispatchReceiverType,
     contractDescription = FirEmptyContractDescription,
     name,
     symbol,
@@ -107,6 +110,7 @@ class FirJavaMethodBuilder : FirSimpleFunctionBuilder() {
             containerSource,
             symbol,
             annotations,
+            dispatchReceiverType,
         )
     }
 }
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt
index 2f09829e741..df459b94478 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt
@@ -71,7 +71,7 @@ class FirAnnotationTypeQualifierResolver(private val session: FirSession, privat
         val annotationClassId = annotationCall.classId
         return BUILT_IN_TYPE_QUALIFIER_DEFAULT_ANNOTATION_IDS[annotationClassId]?.let { qualifierForDefaultingAnnotation ->
             val state = resolveJsr305ReportLevel(annotationCall).takeIf { it != ReportLevel.IGNORE } ?: return null
-            return qualifierForDefaultingAnnotation.copy(
+            qualifierForDefaultingAnnotation.copy(
                 nullabilityQualifier = qualifierForDefaultingAnnotation.nullabilityQualifier.copy(isForWarningOnly = state.isWarning)
             )
         }
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
index 751c0639d8f..b671e9e07bb 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
@@ -95,32 +95,45 @@ class FirSignatureEnhancement(
                     session = this@FirSignatureEnhancement.session
                     this.symbol = symbol
                     this.name = name
+                    returnTypeRef = newReturnTypeRef
+
+                    // TODO: Use some kind of copy mechanism
                     visibility = firElement.visibility
                     modality = firElement.modality
-                    returnTypeRef = newReturnTypeRef
                     isVar = firElement.isVar
                     isStatic = firElement.isStatic
                     annotations += firElement.annotations
                     status = firElement.status
                     initializer = firElement.initializer
+                    dispatchReceiverType = firElement.dispatchReceiverType
+                    attributes = firElement.attributes.copy()
                 }
                 return symbol
             }
             is FirSyntheticProperty -> {
                 val accessorSymbol = firElement.symbol
                 val getterDelegate = firElement.getter.delegate
-                val enhancedFunctionSymbol = if (getterDelegate is FirJavaMethod) {
+                val enhancedGetterSymbol = if (getterDelegate is FirJavaMethod) {
                     enhanceMethod(
                         getterDelegate, accessorSymbol.accessorId, accessorSymbol.accessorId.callableName
                     )
                 } else {
                     getterDelegate.symbol
                 }
+                val setterDelegate = firElement.setter?.delegate
+                val enhancedSetterSymbol = if (setterDelegate is FirJavaMethod) {
+                    enhanceMethod(
+                        setterDelegate, accessorSymbol.accessorId, accessorSymbol.accessorId.callableName
+                    )
+                } else {
+                    setterDelegate?.symbol
+                }
                 return buildSyntheticProperty {
                     session = this@FirSignatureEnhancement.session
                     this.name = name
                     symbol = FirAccessorSymbol(accessorSymbol.callableId, accessorSymbol.accessorId)
-                    delegateGetter = enhancedFunctionSymbol.fir as FirSimpleFunction
+                    delegateGetter = enhancedGetterSymbol.fir as FirSimpleFunction
+                    delegateSetter = enhancedSetterSymbol?.fir as FirSimpleFunction?
                 }.symbol
             }
             else -> {
@@ -221,12 +234,16 @@ class FirSignatureEnhancement(
                             isInner = firMethod.isInner
                         }
                         this.symbol = symbol
+                        dispatchReceiverType = firMethod.dispatchReceiverType
+                        attributes = firMethod.attributes.copy()
                     }
                 } else {
                     FirConstructorBuilder().apply {
                         returnTypeRef = newReturnTypeRef
                         status = firMethod.status
                         this.symbol = symbol
+                        dispatchReceiverType = firMethod.dispatchReceiverType
+                        attributes = firMethod.attributes.copy()
                     }
                 }.apply {
                     source = firMethod.source
@@ -250,6 +267,8 @@ class FirSignatureEnhancement(
                     resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
                     valueParameters += newValueParameters
                     typeParameters += firMethod.typeParameters
+                    dispatchReceiverType = firMethod.dispatchReceiverType
+                    attributes = firMethod.attributes.copy()
                 }
             }
             else -> throw AssertionError("Unknown Java method to enhance: ${firMethod.render()}")
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt
index 535431ee6ff..c744a6f7dc7 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt
@@ -88,22 +88,29 @@ private fun ConeKotlinType.enhanceConeKotlinType(
 ): ConeKotlinType {
     return when (this) {
         is ConeFlexibleType -> {
+            val needsFlexibleNullabilityAttribute = lowerBound.nullability != upperBound.nullability && !lowerBound.hasEnhancedNullability
             val lowerResult = lowerBound.enhanceInflexibleType(
-                session, TypeComponentPosition.FLEXIBLE_LOWER, qualifiers, index
+                session, TypeComponentPosition.FLEXIBLE_LOWER, qualifiers, index,
+                attributes = if (needsFlexibleNullabilityAttribute)
+                    lowerBound.attributes.withFlexible()
+                else
+                    lowerBound.attributes
             )
             val upperResult = upperBound.enhanceInflexibleType(
-                session, TypeComponentPosition.FLEXIBLE_UPPER, qualifiers, index
+                session, TypeComponentPosition.FLEXIBLE_UPPER, qualifiers, index, upperBound.attributes
             )
 
             when {
-                lowerResult === lowerBound && upperResult === upperBound -> this
+                !needsFlexibleNullabilityAttribute && lowerResult === lowerBound && upperResult === upperBound -> this
                 this is ConeRawType -> ConeRawType(lowerResult, upperResult)
                 else -> coneFlexibleOrSimpleType(
                     session, lowerResult, upperResult, isNotNullTypeParameter = qualifiers(index).isNotNullTypeParameter
                 )
             }
         }
-        is ConeSimpleKotlinType -> enhanceInflexibleType(session, TypeComponentPosition.INFLEXIBLE, qualifiers, index)
+        is ConeSimpleKotlinType -> enhanceInflexibleType(
+            session, TypeComponentPosition.INFLEXIBLE, qualifiers, index, attributes
+        )
         else -> this
     }
 }
@@ -158,7 +165,8 @@ private fun ConeKotlinType.enhanceInflexibleType(
     session: FirSession,
     position: TypeComponentPosition,
     qualifiers: IndexedJavaTypeQualifiers,
-    index: Int
+    index: Int,
+    attributes: ConeAttributes = this.attributes
 ): ConeKotlinType {
     require(this !is ConeFlexibleType) {
         "$this should not be flexible"
@@ -198,7 +206,7 @@ private fun ConeKotlinType.enhanceInflexibleType(
 
     if (!wereChangesInArgs && originalTag == enhancedTag && enhancedNullability == isNullable) return this
 
-    val enhancedType = enhancedTag.constructType(enhancedArguments, enhancedNullability)
+    val enhancedType = enhancedTag.constructType(enhancedArguments, enhancedNullability, attributes)
 
     // TODO: why all of these is needed
 //    val enhancement = if (effectiveQualifiers.isNotNullTypeParameter) NotNullTypeParameter(enhancedType) else enhancedType
@@ -328,7 +336,11 @@ internal fun List<FirAnnotationCall>.computeTypeAttributesForJavaType(): ConeAtt
     computeTypeAttributes { classId ->
         when (classId) {
             CompilerConeAttributes.EnhancedNullability.ANNOTATION_CLASS_ID -> add(CompilerConeAttributes.EnhancedNullability)
-            // TODO: Need to handle others too? E.g., COMPATQUAL_NONNULL_ANNOTATION_ID
             in NOT_NULL_ANNOTATION_IDS -> add(CompilerConeAttributes.EnhancedNullability)
+            JAVAX_NONNULL_ANNOTATION_ID,
+            JAVAX_CHECKFORNULL_ANNOTATION_ID,
+            COMPATQUAL_NONNULL_ANNOTATION_ID,
+            ANDROIDX_RECENTLY_NON_NULL_ANNOTATION_ID
+            -> add(CompilerConeAttributes.EnhancedNullability)
         }
     }
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt
index 4f42a617130..59d1b235b3a 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt
@@ -83,8 +83,9 @@ private fun FirAnnotationCall.extractNullabilityTypeFromArgument(): NullabilityQ
 
 private val NULLABLE_ANNOTATION_IDS = NULLABLE_ANNOTATIONS.map { ClassId.topLevel(it) }
 val NOT_NULL_ANNOTATION_IDS = NOT_NULL_ANNOTATIONS.map { ClassId.topLevel(it) }
-private val JAVAX_NONNULL_ANNOTATION_ID = ClassId.topLevel(JAVAX_NONNULL_ANNOTATION)
+val JAVAX_NONNULL_ANNOTATION_ID = ClassId.topLevel(JAVAX_NONNULL_ANNOTATION)
+val JAVAX_CHECKFORNULL_ANNOTATION_ID = ClassId.topLevel(JAVAX_CHECKFORNULL_ANNOTATION)
 private val COMPATQUAL_NULLABLE_ANNOTATION_ID = ClassId.topLevel(COMPATQUAL_NULLABLE_ANNOTATION)
-private val COMPATQUAL_NONNULL_ANNOTATION_ID = ClassId.topLevel(COMPATQUAL_NONNULL_ANNOTATION)
-private val ANDROIDX_RECENTLY_NON_NULL_ANNOTATION_ID = ClassId.topLevel(ANDROIDX_RECENTLY_NON_NULL_ANNOTATION)
+val COMPATQUAL_NONNULL_ANNOTATION_ID = ClassId.topLevel(COMPATQUAL_NONNULL_ANNOTATION)
+val ANDROIDX_RECENTLY_NON_NULL_ANNOTATION_ID = ClassId.topLevel(ANDROIDX_RECENTLY_NON_NULL_ANNOTATION)
 private val ANDROIDX_RECENTLY_NULLABLE_ANNOTATION_ID = ClassId.topLevel(ANDROIDX_RECENTLY_NULLABLE_ANNOTATION)
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt
index c83bf00e6af..f66b0687f45 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt
@@ -5,10 +5,12 @@
 
 package org.jetbrains.kotlin.fir.java.scopes
 
+import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
+import org.jetbrains.kotlin.fir.declarations.FirProperty
 import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
 import org.jetbrains.kotlin.fir.java.enhancement.FirSignatureEnhancement
 import org.jetbrains.kotlin.fir.resolve.lookupSuperTypes
@@ -22,6 +24,10 @@ import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.load.java.SpecialGenericSignatures
+import org.jetbrains.kotlin.load.java.SpecialGenericSignatures.Companion.ERASED_COLLECTION_PARAMETER_SIGNATURES
+import org.jetbrains.kotlin.load.java.SpecialGenericSignatures.Companion.ERASED_VALUE_PARAMETERS_SHORT_NAMES
+import org.jetbrains.kotlin.load.java.SpecialGenericSignatures.Companion.ERASED_VALUE_PARAMETERS_SIGNATURES
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
@@ -41,11 +47,11 @@ class JavaClassMembersEnhancementScope(
     override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
         useSiteMemberScope.processPropertiesByName(name) process@{ original ->
             val enhancedPropertySymbol = signatureEnhancement.enhancedProperty(original, name)
-
-            if (enhancedPropertySymbol is FirPropertySymbol) {
+            val originalFir = original.fir
+            if (originalFir is FirProperty && enhancedPropertySymbol is FirPropertySymbol) {
                 val enhancedProperty = enhancedPropertySymbol.fir
                 overriddenProperties[enhancedPropertySymbol] =
-                    enhancedProperty
+                    originalFir
                         .overriddenMembers(enhancedProperty.name)
                         .mapNotNull { it.symbol as? FirPropertySymbol }
             }
@@ -58,55 +64,81 @@ class JavaClassMembersEnhancementScope(
 
     private fun FirSimpleFunction.changeSignatureIfErasedValueParameter(): FirSimpleFunction {
         val typeParameters = owner.fir.typeParameters
-        if (typeParameters.isEmpty() || name !in SpecialGenericSignatures.ERASED_VALUE_PARAMETERS_SHORT_NAMES) {
+        if (typeParameters.isEmpty() || name !in ERASED_VALUE_PARAMETERS_SHORT_NAMES) {
             return this
         }
-        val jvmDescriptor = this.computeJvmDescriptorReplacingKotlinToJava()
-        if (SpecialGenericSignatures.ERASED_VALUE_PARAMETERS_SIGNATURES.none { it.endsWith(jvmDescriptor) }) {
+        val jvmDescriptor = this.computeJvmDescriptorReplacingKotlinToJava().replace(
+            "kotlin/collections/Collection",
+            "java/util/Collection"
+        )
+        if (ERASED_VALUE_PARAMETERS_SIGNATURES.none { it.endsWith(jvmDescriptor) }) {
             return this
         }
         val superClassIds = listOfNotNull(symbol.callableId.classId) +
                 lookupSuperTypes(owner, lookupInterfaces = true, deep = true, useSiteSession = session).map { it.lookupTag.classId }
         for (superClassId in superClassIds) {
             val javaClassId = JavaToKotlinClassMap.mapKotlinToJava(superClassId.asSingleFqName().toUnsafe()) ?: superClassId
-            val fqJvmDescriptor = "${javaClassId.asString()}.$jvmDescriptor"
-            if (fqJvmDescriptor in SpecialGenericSignatures.ERASED_VALUE_PARAMETERS_SIGNATURES) {
-                val specialSignatureInfo = SpecialGenericSignatures.getSpecialSignatureInfo(fqJvmDescriptor)
-                if (!specialSignatureInfo.isObjectReplacedWithTypeParameter) {
-                    return this
-                }
-                val newParameterTypes = valueParameters.mapIndexed { i, valueParameter ->
-                    val classLikeType =
-                        valueParameter.returnTypeRef.coneTypeSafe<ConeKotlinType>()?.lowerBoundIfFlexible().safeAs<ConeClassLikeType>()
-                    if (classLikeType?.lookupTag?.classId == StandardClassIds.Any) {
-                        val typeParameterIndex = if (name.asString() == "containsValue") 1 else i
-                        val typeParameter = typeParameters.getOrNull(typeParameterIndex) ?: typeParameters.first()
-                        val type = ConeTypeParameterLookupTag(typeParameter.symbol).constructType(
-                            emptyArray(), valueParameter.returnTypeRef.isMarkedNullable == true
+            val newParameterTypes: List<ConeKotlinType?> = when (val fqJvmDescriptor = "${javaClassId.asString()}.$jvmDescriptor") {
+                in ERASED_COLLECTION_PARAMETER_SIGNATURES -> {
+                    valueParameters.map {
+                        val typeParameter = typeParameters.first()
+                        ConeClassLikeLookupTagImpl(ClassId.topLevel(StandardNames.FqNames.collection)).constructClassType(
+                            arrayOf(
+                                ConeTypeParameterLookupTag(typeParameter.symbol).constructType(emptyArray(), isNullable = false)
+                            ), isNullable = false
                         )
-                        if (valueParameter.returnTypeRef.coneType is ConeFlexibleType) {
-                            ConeFlexibleType(type, type.withNullability(ConeNullability.NULLABLE))
+                    }
+                }
+                in ERASED_VALUE_PARAMETERS_SIGNATURES -> {
+                    val specialSignatureInfo = SpecialGenericSignatures.getSpecialSignatureInfo(fqJvmDescriptor)
+                    if (!specialSignatureInfo.isObjectReplacedWithTypeParameter) {
+                        return this
+                    }
+                    valueParameters.mapIndexed { i, valueParameter ->
+                        val classLikeType =
+                            valueParameter.returnTypeRef.coneTypeSafe<ConeKotlinType>()?.lowerBoundIfFlexible().safeAs<ConeClassLikeType>()
+                        if (classLikeType?.lookupTag?.classId == StandardClassIds.Any) {
+                            val typeParameterIndex = if (name.asString() == "containsValue") 1 else i
+                            val typeParameter = typeParameters.getOrNull(typeParameterIndex) ?: typeParameters.first()
+                            val type = ConeTypeParameterLookupTag(typeParameter.symbol).constructType(
+                                emptyArray(), valueParameter.returnTypeRef.isMarkedNullable == true
+                            )
+                            if (valueParameter.returnTypeRef.coneType is ConeFlexibleType) {
+                                ConeFlexibleType(
+                                    type.withAttributes(
+                                        type.attributes.withFlexibleUnless {
+                                            it.hasEnhancedNullability
+                                        }
+                                    ),
+                                    type.withNullability(ConeNullability.NULLABLE)
+                                )
+                            } else {
+                                type
+                            }
                         } else {
-                            type
+                            null
                         }
-                    } else {
-                        null
                     }
                 }
-                if (newParameterTypes.none { it != null }) {
-                    return this
+                else -> {
+                    continue
                 }
-
-                return FirFakeOverrideGenerator.createCopyForFirFunction(
-                    FirNamedFunctionSymbol(symbol.callableId),
-                    this,
-                    session,
-                    FirDeclarationOrigin.Enhancement,
-                    newParameterTypes = valueParameters.zip(newParameterTypes).map { (valueParameter, newType) ->
-                        newType ?: valueParameter.returnTypeRef.coneType
-                    }
-                )
             }
+            if (newParameterTypes.none { it != null }) {
+                return this
+            }
+
+            return FirFakeOverrideGenerator.createCopyForFirFunction(
+                FirNamedFunctionSymbol(symbol.callableId),
+                this,
+                session,
+                FirDeclarationOrigin.Enhancement,
+                newParameterTypes = valueParameters.zip(newParameterTypes).map { (valueParameter, newType) ->
+                    newType ?: valueParameter.returnTypeRef.coneType
+                },
+                newDispatchReceiverType = dispatchReceiverType,
+            )
+
         }
         return this
     }
@@ -117,11 +149,15 @@ class JavaClassMembersEnhancementScope(
             val enhancedFunction = (symbol.fir as? FirSimpleFunction)?.changeSignatureIfErasedValueParameter()
             val enhancedFunctionSymbol = enhancedFunction?.symbol ?: symbol
 
+            val originalFunction = original.fir as? FirSimpleFunction
+
             overriddenFunctions[enhancedFunctionSymbol] =
-                enhancedFunction
-                    ?.overriddenMembers(enhancedFunction.name)
-                    ?.mapNotNull { it.symbol as? FirFunctionSymbol<*> }
-                    .orEmpty()
+                if (enhancedFunction != null && originalFunction != null)
+                    originalFunction
+                        .overriddenMembers(enhancedFunction.name)
+                        .mapNotNull { it.symbol as? FirFunctionSymbol<*> }
+                else
+                    emptyList()
 
             processor(enhancedFunctionSymbol)
         }
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
index 85cbb3543fb..dc0aaee3938 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
@@ -5,13 +5,11 @@
 
 package org.jetbrains.kotlin.fir.java.scopes
 
+import com.intellij.lang.jvm.types.JvmPrimitiveTypeKind
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.builder.FirSimpleFunctionBuilder
-import org.jetbrains.kotlin.fir.declarations.builder.FirValueParameterBuilder
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
 import org.jetbrains.kotlin.fir.declarations.synthetic.buildSyntheticProperty
-import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.java.JavaTypeParameterStack
 import org.jetbrains.kotlin.fir.java.declarations.*
 import org.jetbrains.kotlin.fir.resolve.FirJavaSyntheticNamesProvider
@@ -25,6 +23,8 @@ import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.isUnit
 import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef
+import org.jetbrains.kotlin.load.java.structure.JavaPrimitiveType
+import org.jetbrains.kotlin.load.java.structure.impl.JavaPrimitiveTypeImpl
 import org.jetbrains.kotlin.name.Name
 
 class JavaClassUseSiteMemberScope(
@@ -62,7 +62,7 @@ class JavaClassUseSiteMemberScope(
         getterSymbol: FirNamedFunctionSymbol,
         setterSymbol: FirNamedFunctionSymbol?,
         syntheticPropertyName: Name,
-    ): FirAccessorSymbol? {
+    ): FirAccessorSymbol {
         return buildSyntheticProperty {
             session = this@JavaClassUseSiteMemberScope.session
             name = syntheticPropertyName
@@ -105,18 +105,29 @@ class JavaClassUseSiteMemberScope(
                     declaredMemberScope.processFunctionsByName(setterName) { functionSymbol ->
                         if (setterSymbol == null && functionSymbol is FirNamedFunctionSymbol) {
                             val function = functionSymbol.fir
-                            if (!function.isStatic && function.returnTypeRef.isUnit && function.valueParameters.size == 1) {
-                                setterSymbol = functionSymbol
+                            if (!function.isStatic && function.valueParameters.size == 1) {
+                                val returnTypeRef = function.returnTypeRef
+                                if (returnTypeRef.isUnit) {
+                                    // Unit return type
+                                    setterSymbol = functionSymbol
+                                } else if (returnTypeRef is FirJavaTypeRef) {
+                                    // Void/void return type
+                                    when (val returnType = returnTypeRef.type) {
+                                        is JavaPrimitiveTypeImpl ->
+                                            if (returnType.psi.kind == JvmPrimitiveTypeKind.VOID) {
+                                                setterSymbol = functionSymbol
+                                            }
+                                        is JavaPrimitiveType ->
+                                            if (returnType.type == null) {
+                                                setterSymbol = functionSymbol
+                                            }
+                                    }
+                                }
                             }
                         }
                     }
-                    val accessorSymbol = generateAccessorSymbol(
-                        getterSymbol!!, setterSymbol, propertyName
-                    )
-                    if (accessorSymbol != null) {
-                        // NB: accessor should not be processed directly unless we find matching property symbol in supertype
-                        overrideCandidates += accessorSymbol
-                    }
+                    val accessorSymbol = generateAccessorSymbol(getterSymbol!!, setterSymbol, propertyName)
+                    overrideCandidates += accessorSymbol
                 }
             }
         }
@@ -132,32 +143,6 @@ class JavaClassUseSiteMemberScope(
         }
     }
 
-    override fun createFunctionCopy(firSimpleFunction: FirSimpleFunction, newSymbol: FirNamedFunctionSymbol): FirSimpleFunctionBuilder {
-        if (firSimpleFunction !is FirJavaMethod) return super.createFunctionCopy(firSimpleFunction, newSymbol)
-        return FirJavaMethodBuilder().apply {
-            session = firSimpleFunction.session
-            source = firSimpleFunction.source
-            symbol = newSymbol
-            name = firSimpleFunction.name
-            visibility = firSimpleFunction.visibility
-            modality = firSimpleFunction.modality
-            returnTypeRef = firSimpleFunction.returnTypeRef
-            isStatic = firSimpleFunction.status.isStatic
-            status = firSimpleFunction.status
-        }
-    }
-
-    override fun createValueParameterCopy(parameter: FirValueParameter, newDefaultValue: FirExpression?): FirValueParameterBuilder {
-        if (parameter !is FirJavaValueParameter) return super.createValueParameterCopy(parameter, newDefaultValue)
-        return FirJavaValueParameterBuilder().apply {
-            session = parameter.session
-            source = parameter.source
-            name = parameter.name
-            returnTypeRef = parameter.returnTypeRef as FirJavaTypeRef
-            isVararg = parameter.isVararg
-        }
-    }
-
     override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
         // Do not generate accessors at all?
         if (name.isSpecial) {
@@ -171,13 +156,14 @@ class JavaClassUseSiteMemberScope(
         if (symbol.fir !is FirJavaClass) {
             return super.processFunctionsByName(name, processor)
         }
-        val potentialPropertyName = session.syntheticNamesProvider.propertyNameByAccessorName(name)
-            ?: return super.processFunctionsByName(name, processor)
+        val potentialPropertyNames = session.syntheticNamesProvider.possiblePropertyNamesByAccessorName(name)
         val accessors = mutableListOf<FirAccessorSymbol>()
-        val getterName = session.syntheticNamesProvider.getterNameBySetterName(name) ?: name
-        processAccessorFunctionsAndPropertiesByName(potentialPropertyName, listOf(getterName)) {
-            if (it is FirAccessorSymbol) {
-                accessors += it
+        val getterName by lazy { session.syntheticNamesProvider.getterNameBySetterName(name) ?: name }
+        for (potentialPropertyName in potentialPropertyNames) {
+            processAccessorFunctionsAndPropertiesByName(potentialPropertyName, listOf(getterName)) {
+                if (it is FirAccessorSymbol) {
+                    accessors += it
+                }
             }
         }
         if (accessors.isEmpty()) {
diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt
index 04e41b09c7b..f820ac38670 100644
--- a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt
+++ b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt
@@ -51,16 +51,22 @@ object FirJavaSyntheticNamesProvider : FirSyntheticNamesProvider() {
         return Name.identifier(GETTER_PREFIX + identifier.removePrefix(prefix))
     }
 
-    override fun propertyNameByAccessorName(name: Name): Name? {
-        if (name.isSpecial) return null
+    override fun possiblePropertyNamesByAccessorName(name: Name): List<Name> {
+        if (name.isSpecial) return emptyList()
         val identifier = name.identifier
         val prefix = when {
             identifier.startsWith(GETTER_PREFIX) -> GETTER_PREFIX
             identifier.startsWith(IS_PREFIX) -> ""
             identifier.startsWith(SETTER_PREFIX) -> SETTER_PREFIX
-            else -> return null
+            else -> return emptyList()
+        }
+        val withoutPrefix = identifier.removePrefix(prefix)
+        val withoutPrefixName = Name.identifier(withoutPrefix.decapitalize())
+        return if (prefix == SETTER_PREFIX) {
+            listOf(withoutPrefixName, Name.identifier(IS_PREFIX + withoutPrefix))
+        } else {
+            listOf(withoutPrefixName)
         }
-        return Name.identifier(identifier.removePrefix(prefix).decapitalize())
     }
 }
 
diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt
index f5e0481e6fa..d2157e910ad 100644
--- a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt
+++ b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.resolve.calls.jvm
 
+import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.calls.AbstractConeCallConflictResolver
 import org.jetbrains.kotlin.fir.resolve.calls.Candidate
@@ -31,10 +32,10 @@ class ConeEquivalentCallConflictResolver(
         val result = mutableSetOf<Candidate>()
         outerLoop@ for (myCandidate in candidates) {
             val me = myCandidate.symbol.fir
-            if (me is FirCallableMemberDeclaration<*> && me.symbol.callableId.className == null) {
+            if (me is FirCallableMemberDeclaration<*> && me.symbol.containingClass() == null) {
                 for (otherCandidate in result) {
                     val other = otherCandidate.symbol.fir
-                    if (other is FirCallableMemberDeclaration<*> && other.symbol.callableId.className == null) {
+                    if (other is FirCallableMemberDeclaration<*> && other.symbol.containingClass() == null) {
                         if (areEquivalentTopLevelCallables(me, myCandidate, other, otherCandidate)) {
                             continue@outerLoop
                         }
@@ -71,4 +72,4 @@ class ConeEquivalentCallConflictResolver(
             else -> error("Not supported: $declaration")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt
index 14bc65f7aa6..e9d75ab0c29 100644
--- a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt
+++ b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt
@@ -28,12 +28,13 @@ fun wrapScopeWithJvmMapped(
     scopeSession: ScopeSession
 ): FirScope {
     val classId = klass.classId
-    val javaClassId = JavaToKotlinClassMap.mapKotlinToJava(classId.asSingleFqName().toUnsafe())
+    val kotlinUnsafeFqName = classId.asSingleFqName().toUnsafe()
+    val javaClassId = JavaToKotlinClassMap.mapKotlinToJava(kotlinUnsafeFqName)
         ?: return declaredMemberScope
     val symbolProvider = useSiteSession.firSymbolProvider
     val javaClass = symbolProvider.getClassLikeSymbolByFqName(javaClassId)?.fir as? FirRegularClass
         ?: return declaredMemberScope
-    val preparedSignatures = JvmMappedScope.prepareSignatures(javaClass)
+    val preparedSignatures = JvmMappedScope.prepareSignatures(javaClass, JavaToKotlinClassMap.isMutable(kotlinUnsafeFqName))
     return if (preparedSignatures.isNotEmpty()) {
         javaClass.unsubstitutedScope(useSiteSession, scopeSession, withForcedTypeCalculator = false).let { javaClassUseSiteScope ->
             val jvmMappedScope = JvmMappedScope(declaredMemberScope, javaClassUseSiteScope, preparedSignatures)
@@ -45,7 +46,10 @@ fun wrapScopeWithJvmMapped(
                 (klass.symbol.constructType(
                     klass.typeParameters.map { ConeTypeParameterTypeImpl(it.symbol.toLookupTag(), false) }.toTypedArray(),
                     false
-                ) as ConeClassLikeType).wrapSubstitutionScopeIfNeed(useSiteSession, jvmMappedScope, klass, scopeSession, klass.classId)
+                ) as ConeClassLikeType).wrapSubstitutionScopeIfNeed(
+                    useSiteSession, jvmMappedScope, klass, scopeSession,
+                    derivedClass = klass,
+                )
             }
         }
     } else {
diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
index 26b6e783c81..f2f7b8fdc6c 100644
--- a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
+++ b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
@@ -50,6 +50,7 @@ private fun StringBuilder.appendErasedType(typeRef: FirTypeRef) {
         klass.fqName?.let {
             append("L")
             append(it.asString().replace(".", "/"))
+            append(";")
         }
     }
 
@@ -63,14 +64,13 @@ private fun StringBuilder.appendErasedType(typeRef: FirTypeRef) {
                         is JavaTypeParameter -> {
                             val representative = classifier.upperBounds.firstOrNull { it.classifier is JavaClass }
                             if (representative == null) {
-                                append("Ljava/lang/Object")
+                                append("Ljava/lang/Object;")
                             } else {
                                 appendClass(representative.classifier as JavaClass)
                             }
                         }
                         else -> return
                     }
-                    append(";")
                 }
             }
         }
@@ -92,19 +92,31 @@ private fun StringBuilder.appendConeType(coneType: ConeKotlinType) {
     (coneType as? ConeClassLikeType)?.let {
         val classId = it.lookupTag.classId
         if (classId.packageFqName.toString() == "kotlin") {
-            PRIMITIVE_TYPE_SIGNATURE[classId.shortClassName.identifier]?.let {
-                append(it)
+            PRIMITIVE_TYPE_SIGNATURE[classId.shortClassName.identifier]?.let { signature ->
+                append(signature)
                 return
             }
         }
     }
 
     fun appendClassLikeType(type: ConeClassLikeType) {
-        append("L")
         val classId = type.lookupTag.classId
-        append(classId.packageFqName.asString().replace(".", "/"))
-        append("/")
-        append(classId.relativeClassName)
+        if (classId.shortClassName.isSpecial) return
+        if (classId.shortClassName.identifier == "Array") {
+            append("[")
+            type.typeArguments.forEach { typeArg ->
+                when (typeArg) {
+                    ConeStarProjection -> append("*")
+                    is ConeKotlinTypeProjection -> appendConeType(typeArg.type)
+                }
+            }
+        } else {
+            append("L")
+            append(classId.packageFqName.asString().replace(".", "/"))
+            append("/")
+            append(classId.relativeClassName)
+            append(";")
+        }
     }
 
     if (coneType is ConeClassErrorType) return
@@ -117,21 +129,18 @@ private fun StringBuilder.appendConeType(coneType: ConeKotlinType) {
                 it.coneType is ConeClassLikeType
             }
             if (representative == null || representative is FirImplicitNullableAnyTypeRef || representative is FirImplicitAnyTypeRef) {
-                append("Ljava/lang/Object")
+                append("Ljava/lang/Object;")
             } else {
                 appendClassLikeType(representative.coneTypeUnsafe())
             }
         }
         is ConeDefinitelyNotNullType -> {
             appendConeType(coneType.original)
-            return
         }
         is ConeFlexibleType -> {
             appendConeType(coneType.lowerBound)
-            return
         }
     }
-    append(";")
 }
 
 private val unitClassId = ClassId.topLevel(FqName("kotlin.Unit"))
diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt
index f66a9dc8113..b0764383e8b 100644
--- a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt
+++ b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.scopes.*
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.utils.addIfNotNull
 
 class JvmMappedScope(
     private val declaredMemberScope: FirScope,
@@ -21,14 +22,23 @@ class JvmMappedScope(
     override fun processFunctionsByName(name: Name, processor: (FirFunctionSymbol<*>) -> Unit) {
         val visibleMethods = signatures.visibleMethodSignaturesByName[name]
             ?: return declaredMemberScope.processFunctionsByName(name, processor)
+
+        val declared = mutableListOf<FirNamedFunctionSymbol>()
+        declaredMemberScope.processFunctionsByName(name) { symbol ->
+            declared.addIfNotNull(symbol as FirNamedFunctionSymbol)
+            processor(symbol)
+        }
+
+        val declaredSignatures by lazy {
+            declared.mapTo(mutableSetOf()) { it.fir.computeJvmDescriptorReplacingKotlinToJava() }
+        }
+
         javaMappedClassUseSiteScope.processFunctionsByName(name) { symbol ->
             val jvmSignature = symbol.fir.computeJvmDescriptorReplacingKotlinToJava()
-            if (jvmSignature in visibleMethods) {
+            if (jvmSignature in visibleMethods && jvmSignature !in declaredSignatures) {
                 processor(symbol)
             }
         }
-
-        declaredMemberScope.processFunctionsByName(name, processor)
     }
 
     override fun processDirectOverriddenFunctionsWithBaseScope(
@@ -104,12 +114,13 @@ class JvmMappedScope(
             ).mapTo(this) { arguments -> "java/lang/Throwable.<init>($arguments)V" }
         }
 
-        fun prepareSignatures(klass: FirRegularClass): Signatures {
+        fun prepareSignatures(klass: FirRegularClass, isMutable: Boolean): Signatures {
 
             val signaturePrefix = klass.symbol.classId.toString()
             val visibleMethodsByName = mutableMapOf<Name, MutableSet<String>>()
             JvmBuiltInsSignatures.VISIBLE_METHOD_SIGNATURES.filter { signature ->
-                signature.startsWith(signaturePrefix)
+                signature in JvmBuiltInsSignatures.MUTABLE_METHOD_SIGNATURES == isMutable &&
+                        signature.startsWith(signaturePrefix)
             }.map { signature ->
                 // +1 to delete dot before function name
                 signature.substring(signaturePrefix.length + 1)
diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts
index c9da377e9a0..afe0d62cb39 100644
--- a/compiler/fir/modularized-tests/build.gradle.kts
+++ b/compiler/fir/modularized-tests/build.gradle.kts
@@ -17,10 +17,8 @@ dependencies {
         includeJars("extensions", "idea_rt", "util", "asm-all", "platform-util-ex", rootProject = rootProject)
     }
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
+    testRuntimeOnly(intellijPluginDep("java"))
 
     testRuntimeOnly(intellijDep())
 
diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
index 1e8e9182803..bcc7084e362 100644
--- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
+++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
@@ -37,10 +37,8 @@ dependencies {
     implementation("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion)
     implementation("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion)
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-        testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
index e3b97e6c79d..1d8c066ead6 100644
--- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
@@ -415,7 +415,7 @@ class DeclarationsConverter(
                     addCapturedTypeParameters(firTypeParameters)
 
                     val selfType = classNode.toDelegatedSelfType(this)
-
+                    registerSelfType(selfType)
 
                     val delegationSpecifiers = superTypeList?.let { convertDelegationSpecifiers(it, symbol, selfType) }
                     var delegatedSuperTypeRef: FirTypeRef? = delegationSpecifiers?.delegatedSuperTypeRef
@@ -500,8 +500,18 @@ class DeclarationsConverter(
                     }
 
                     if (modifiers.isEnum()) {
-                        generateValuesFunction(baseSession, context.packageFqName, context.className, modifiers.hasExpect())
-                        generateValueOfFunction(baseSession, context.packageFqName, context.className, modifiers.hasExpect())
+                        generateValuesFunction(
+                            baseSession,
+                            context.packageFqName,
+                            context.className,
+                            modifiers.hasExpect()
+                        )
+                        generateValueOfFunction(
+                            baseSession,
+                            context.packageFqName,
+                            context.className,
+                            modifiers.hasExpect()
+                        )
                     }
                 }
             }
@@ -523,6 +533,7 @@ class DeclarationsConverter(
                 symbol = FirAnonymousObjectSymbol()
                 typeParameters += context.capturedTypeParameters.map { buildOuterClassTypeParameterRef { this.symbol = it } }
                 val delegatedSelfType = objectLiteral.toDelegatedSelfType(this)
+                registerSelfType(delegatedSelfType)
 
                 var modifiers = Modifier()
                 var primaryConstructor: LighterASTNode? = null
@@ -637,7 +648,7 @@ class DeclarationsConverter(
                                 emptyArray(),
                                 isNullable = false
                             )
-                        },
+                        }.also { registerSelfType(it) },
                         delegatedSuperTypeRef = classWrapper.delegatedSelfTypeRef,
                         superTypeCallEntry = enumSuperTypeCallEntry
                     )
@@ -743,6 +754,8 @@ class DeclarationsConverter(
                 this.valueParameters += valueParameters.map { it.firValueParameter }
                 delegatedConstructor = firDelegatedCall
                 this.body = body
+            }.apply {
+                containingClassAttr = currentDispatchReceiverType()!!.lookupTag
             }, valueParameters
         )
     }
@@ -814,6 +827,7 @@ class DeclarationsConverter(
             this.body = body
             context.firFunctionTargets.removeLast()
         }.also {
+            it.containingClassAttr = currentDispatchReceiverType()!!.lookupTag
             target.bind(it)
         }
     }
@@ -969,6 +983,7 @@ class DeclarationsConverter(
                 this.isLocal = false
                 receiverTypeRef = receiverType
                 symbol = FirPropertySymbol(callableIdForName(propertyName))
+                dispatchReceiverType = currentDispatchReceiverType()
                 withCapturedTypeParameters {
                     typeParameters += firTypeParameters
                     addCapturedTypeParameters(firTypeParameters)
@@ -984,11 +999,23 @@ class DeclarationsConverter(
 
                     val convertedAccessors = accessors.map { convertGetterOrSetter(it, returnType, propertyVisibility, modifiers) }
                     this.getter = convertedAccessors.find { it.isGetter }
-                        ?: FirDefaultPropertyGetter(null, session, FirDeclarationOrigin.Source, returnType, propertyVisibility)
+                        ?: FirDefaultPropertyGetter(
+                            null, session, FirDeclarationOrigin.Source, returnType, propertyVisibility
+                        ).also {
+                            currentDispatchReceiverType()?.lookupTag?.let { lookupTag ->
+                                it.containingClassAttr = lookupTag
+                            }
+                        }
                     this.setter =
                         if (isVar) {
                             convertedAccessors.find { it.isSetter }
-                                ?: FirDefaultPropertySetter(null, session, FirDeclarationOrigin.Source, returnType, propertyVisibility)
+                                ?: FirDefaultPropertySetter(
+                                    null, session, FirDeclarationOrigin.Source, returnType, propertyVisibility
+                                ).also {
+                                    currentDispatchReceiverType()?.lookupTag?.let { lookupTag ->
+                                        it.containingClassAttr = lookupTag
+                                    }
+                                }
                         } else null
 
                     // Upward propagation of `inline` and `external` modifiers (from accessors to property)
@@ -1158,6 +1185,9 @@ class DeclarationsConverter(
             context.firFunctionTargets.removeLast()
         }.also {
             target.bind(it)
+            currentDispatchReceiverType()?.lookupTag?.let { lookupTag ->
+                it.containingClassAttr = lookupTag
+            }
         }
     }
 
@@ -1292,6 +1322,7 @@ class DeclarationsConverter(
                 }
 
                 symbol = FirNamedFunctionSymbol(callableIdForName(functionName, isLocal))
+                dispatchReceiverType = currentDispatchReceiverType()
             }
         }
 
diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt
index 1671b25d44f..b0e4b430539 100644
--- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt
+++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt
@@ -5,9 +5,7 @@
 
 package org.jetbrains.kotlin.fir.lightTree.fir
 
-import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.copyWithNewSourceKind
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
 import org.jetbrains.kotlin.fir.declarations.FirProperty
 import org.jetbrains.kotlin.fir.declarations.FirValueParameter
@@ -45,7 +43,12 @@ class ValueParameter(
         }
 
         return buildProperty {
-            source = firValueParameter.source
+            val parameterSource = firValueParameter.source as? FirLightSourceElement
+            val parameterNode = parameterSource?.lightNode
+            source = parameterNode?.toFirLightSourceElement(
+                parameterSource.startOffset, parameterSource.endOffset, parameterSource.tree,
+                FirFakeSourceElementKind.PropertyFromParameter
+            )
             this.session = session
             origin = FirDeclarationOrigin.Source
             returnTypeRef = type.copyWithNewSourceKind(FirFakeSourceElementKind.PropertyFromParameter)
diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts
index 975bfb1dd4d..11ff63bdef9 100644
--- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts
+++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts
@@ -27,10 +27,8 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":core:descriptors.runtime"))
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-        testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
index cd7711679b6..9901f5a2481 100644
--- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic
 import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind
 import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.expressions.builder.*
-import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
 import org.jetbrains.kotlin.fir.expressions.impl.FirSingleExpressionBlock
 import org.jetbrains.kotlin.fir.references.builder.*
 import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
@@ -351,6 +350,9 @@ class RawFirBuilder(
                             it.extractAnnotationsFrom(this)
                         }
                         it.status = status
+                        currentDispatchReceiverType()?.lookupTag?.let { lookupTag ->
+                            it.containingClassAttr = lookupTag
+                        }
                     }
             }
             val source = this.toFirSourceElement()
@@ -387,6 +389,9 @@ class RawFirBuilder(
                     this.contractDescription = it
                 }
             }.also {
+                currentDispatchReceiverType()?.lookupTag?.let { lookupTag ->
+                    it.containingClassAttr = lookupTag
+                }
                 accessorTarget.bind(it)
                 this@RawFirBuilder.context.firFunctionTargets.removeLast()
             }
@@ -462,6 +467,8 @@ class RawFirBuilder(
                     visibility
                 ) else null
                 extractAnnotationsTo(this)
+
+                dispatchReceiverType = currentDispatchReceiverType()
             }.apply {
                 isFromVararg = firParameter.isVararg
             }
@@ -687,6 +694,8 @@ class RawFirBuilder(
                 this@toFirConstructor?.extractAnnotationsTo(this)
                 this@toFirConstructor?.extractValueParametersTo(this)
                 this.body = body
+            }.apply {
+                containingClassAttr = currentDispatchReceiverType()!!.lookupTag
             }
         }
 
@@ -750,6 +759,8 @@ class RawFirBuilder(
                         val delegatedEntrySelfType = buildResolvedTypeRef {
                             type = ConeClassLikeTypeImpl(this@buildAnonymousObject.symbol.toLookupTag(), emptyArray(), isNullable = false)
                         }
+                        registerSelfType(delegatedEntrySelfType)
+
                         superTypeRefs += delegatedEnumSelfTypeRef
                         val superTypeCallEntry = superTypeListEntries.firstIsInstanceOrNull<KtSuperTypeCallEntry>()
                         val correctedEnumSelfTypeRef = buildResolvedTypeRef {
@@ -777,6 +788,8 @@ class RawFirBuilder(
                         }
                     }
                 }
+            }.apply {
+                containingClassAttr = currentDispatchReceiverType()!!.lookupTag
             }
         }
 
@@ -827,6 +840,8 @@ class RawFirBuilder(
                         addCapturedTypeParameters(typeParameters.take(classOrObject.typeParameters.size))
 
                         val delegatedSelfType = classOrObject.toDelegatedSelfType(this)
+                        registerSelfType(delegatedSelfType)
+
                         val delegatedSuperType = classOrObject.extractSuperTypeListEntriesTo(
                             this,
                             delegatedSelfType,
@@ -884,10 +899,14 @@ class RawFirBuilder(
 
                         if (classOrObject.hasModifier(ENUM_KEYWORD)) {
                             generateValuesFunction(
-                                baseSession, context.packageFqName, context.className, classOrObject.hasExpectModifier()
+                                baseSession,
+                                context.packageFqName,
+                                context.className,
+                                classOrObject.hasExpectModifier()
                             )
                             generateValueOfFunction(
-                                baseSession, context.packageFqName, context.className, classOrObject.hasExpectModifier()
+                                baseSession, context.packageFqName, context.className,
+                                classOrObject.hasExpectModifier()
                             )
                         }
                     }
@@ -907,6 +926,7 @@ class RawFirBuilder(
                     symbol = FirAnonymousObjectSymbol()
                     typeParameters += context.capturedTypeParameters.map { buildOuterClassTypeParameterRef { symbol = it } }
                     val delegatedSelfType = objectDeclaration.toDelegatedSelfType(this)
+                    registerSelfType(delegatedSelfType)
                     objectDeclaration.extractAnnotationsTo(this)
                     val delegatedSuperType = objectDeclaration.extractSuperTypeListEntriesTo(
                         this,
@@ -975,6 +995,7 @@ class RawFirBuilder(
                     name = function.nameAsSafeName
                     labelName = runIf(!name.isSpecial) { name.identifier }
                     symbol = FirNamedFunctionSymbol(callableIdForName(function.nameAsSafeName, function.isLocal))
+                    dispatchReceiverType = currentDispatchReceiverType()
                     status = FirDeclarationStatusImpl(
                         if (function.isLocal) Visibilities.Local else function.visibility,
                         function.modality,
@@ -1170,6 +1191,7 @@ class RawFirBuilder(
                 this.body = body
                 this@RawFirBuilder.context.firFunctionTargets.removeLast()
             }.also {
+                it.containingClassAttr = currentDispatchReceiverType()!!.lookupTag
                 target.bind(it)
             }
         }
@@ -1244,6 +1266,7 @@ class RawFirBuilder(
                     isLocal = false
                     receiverTypeRef = receiverTypeReference.convertSafe()
                     symbol = FirPropertySymbol(callableIdForName(propertyName))
+                    dispatchReceiverType = currentDispatchReceiverType()
                     extractTypeParametersTo(this)
                     withCapturedTypeParameters {
                         addCapturedTypeParameters(this.typeParameters)
diff --git a/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts b/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts
index 73568a6026e..d06dd37610a 100644
--- a/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts
+++ b/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts
@@ -16,10 +16,8 @@ dependencies {
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-        testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt
index ad90864de3a..5f6d441a0b8 100644
--- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt
+++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.references.builder.*
 import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.*
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
@@ -66,14 +67,27 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
     ): T {
         context.className = context.className.child(name)
         context.localBits.add(isLocal)
+        val dispatchReceiversNumber = context.dispatchReceiverTypesStack.size
         return try {
             l()
         } finally {
+            require(context.dispatchReceiverTypesStack.size <= dispatchReceiversNumber + 1) {
+                "Wrong number of ${context.dispatchReceiverTypesStack.size}"
+            }
+
+            if (context.dispatchReceiverTypesStack.size > dispatchReceiversNumber) {
+                context.dispatchReceiverTypesStack.removeAt(context.dispatchReceiverTypesStack.lastIndex)
+            }
+
             context.className = context.className.parent()
             context.localBits.removeLast()
         }
     }
 
+    fun registerSelfType(selfType: FirResolvedTypeRef) {
+        context.dispatchReceiverTypesStack.add(selfType.type as ConeClassLikeType)
+    }
+
     inline fun <T> withCapturedTypeParameters(block: () -> T): T {
         val previous = context.capturedTypeParameters
         val result = block()
@@ -109,6 +123,8 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
             else -> CallableId(context.packageFqName, context.className, name)
         }
 
+    fun currentDispatchReceiverType(): ConeClassLikeType? = context.dispatchReceiverTypesStack.lastOrNull()
+
     fun callableIdForClassConstructor() =
         if (context.className == FqName.ROOT) CallableId(context.packageFqName, Name.special("<anonymous-init>"))
         else CallableId(context.packageFqName, context.className, context.className.shortName())
@@ -1067,7 +1083,7 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
                     this.name = name
                     status = FirDeclarationStatusImpl(Visibilities.Public, Modality.FINAL)
                     symbol = FirNamedFunctionSymbol(CallableId(packageFqName, classFqName, name))
-
+                    dispatchReceiverType = currentDispatchReceiverType()
                     // Refer to FIR backend ClassMemberGenerator for body generation.
                 }
                 classBuilder.addDeclaration(componentFunction)
@@ -1087,6 +1103,7 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
                     name = copyName
                     status = FirDeclarationStatusImpl(Visibilities.Public, Modality.FINAL)
                     symbol = FirNamedFunctionSymbol(CallableId(packageFqName, classFqName, copyName))
+                    dispatchReceiverType = currentDispatchReceiverType()
                     for ((ktParameter, firProperty) in zippedParameters) {
                         val propertyName = firProperty.name
                         val parameterSource = ktParameter?.toFirSourceElement(FirFakeSourceElementKind.DataClassGeneratedMembers)
diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/Context.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/Context.kt
index 12e146bc4ea..8d35e8bb7b0 100644
--- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/Context.kt
+++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/Context.kt
@@ -6,9 +6,14 @@
 package org.jetbrains.kotlin.fir.builder
 
 import kotlinx.collections.immutable.persistentListOf
-import org.jetbrains.kotlin.fir.*
+import org.jetbrains.kotlin.fir.FirFunctionTarget
+import org.jetbrains.kotlin.fir.FirLabel
+import org.jetbrains.kotlin.fir.FirLoopTarget
+import org.jetbrains.kotlin.fir.FirSourceElementKind
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -27,4 +32,5 @@ class Context<T> {
     val arraySetArgument = mutableMapOf<T, FirExpression>()
 
     var forcedElementSourceKind: FirSourceElementKind? = null
+    val dispatchReceiverTypesStack = mutableListOf<ConeClassLikeType>()
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
index b2055ff62aa..50e01c9e118 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
 import org.jetbrains.kotlin.fir.expressions.*
-import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub
 import org.jetbrains.kotlin.fir.expressions.builder.buildResolvedReifiedParameterReference
 import org.jetbrains.kotlin.fir.references.*
 import org.jetbrains.kotlin.fir.references.builder.buildBackingFieldReference
@@ -25,6 +24,7 @@ import org.jetbrains.kotlin.fir.resolve.inference.inferenceComponents
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.transformers.StoreNameReference
 import org.jetbrains.kotlin.fir.resolve.transformers.StoreReceiver
+import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirAbstractBodyResolveTransformer
 import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirExpressionsResolveTransformer
 import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.resultType
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
@@ -42,10 +42,11 @@ import org.jetbrains.kotlin.resolve.calls.tower.isSuccess
 import org.jetbrains.kotlin.types.Variance
 
 class FirCallResolver(
-    private val components: BodyResolveComponents,
+    private val components: FirAbstractBodyResolveTransformer.BodyResolveTransformerComponents,
     private val qualifiedResolver: FirQualifiedNameResolver,
 ) {
     private val session = components.session
+    private val overloadByLambdaReturnTypeResolver = FirOverloadByLambdaReturnTypeResolver(components)
 
     private lateinit var transformer: FirExpressionsResolveTransformer
 
@@ -57,7 +58,7 @@ class FirCallResolver(
         components, components.resolutionStageRunner,
     )
 
-    private val conflictResolver: ConeCallConflictResolver =
+    val conflictResolver: ConeCallConflictResolver =
         session.callConflictResolverFactory.create(TypeSpecificityComparator.NONE, session.inferenceComponents)
 
     @PrivateForInline
@@ -150,7 +151,7 @@ class FirCallResolver(
         towerResolver.reset()
         val result = towerResolver.runResolver(info, transformer.resolutionContext)
         val bestCandidates = result.bestCandidates()
-        val reducedCandidates = if (!result.currentApplicability.isSuccess) {
+        var reducedCandidates = if (!result.currentApplicability.isSuccess) {
             bestCandidates.toSet()
         } else {
             val onSuperReference = (explicitReceiver as? FirQualifiedAccessExpression)?.calleeReference is FirSuperReference
@@ -159,6 +160,8 @@ class FirCallResolver(
             )
         }
 
+        reducedCandidates = overloadByLambdaReturnTypeResolver.reduceCandidates(qualifiedAccess, bestCandidates, reducedCandidates)
+
         return ResolutionResult(info, result.currentApplicability, reducedCandidates)
     }
 
@@ -396,7 +399,9 @@ class FirCallResolver(
             }
         }
         if (constructorSymbol == null) return null
-        val candidate = CandidateFactory(transformer.resolutionContext, callInfo).createCandidate(
+        val candidateFactory = CandidateFactory(transformer.resolutionContext, callInfo)
+        val candidate = candidateFactory.createCandidate(
+            callInfo,
             constructorSymbol!!,
             ExplicitReceiverKind.NO_EXPLICIT_RECEIVER,
             scope = null
@@ -467,12 +472,6 @@ class FirCallResolver(
             expectedType,
             outerConstraintSystemBuilder,
             lhs,
-            stubReceiver = if (lhs !is DoubleColonLHS.Type) null else buildExpressionStub {
-                source = callableReferenceAccess.source
-                typeRef = buildResolvedTypeRef {
-                    type = lhs.type
-                }
-            },
         )
     }
 
@@ -543,7 +542,7 @@ class FirCallResolver(
         source: FirSourceElement?,
         name: Name
     ): FirErrorReferenceWithCandidate {
-        val candidate = CandidateFactory(transformer.resolutionContext, callInfo).createErrorCandidate(diagnostic)
+        val candidate = CandidateFactory(transformer.resolutionContext, callInfo).createErrorCandidate(callInfo, diagnostic)
         components.resolutionStageRunner.processCandidate(candidate, transformer.resolutionContext, stopOnFirstError = false)
         return FirErrorReferenceWithCandidate(source, name, candidate, diagnostic)
     }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirEffectiveVisibilityResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirEffectiveVisibilityResolverImpl.kt
index 7509a66433e..e9a30612e26 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirEffectiveVisibilityResolverImpl.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirEffectiveVisibilityResolverImpl.kt
@@ -117,13 +117,13 @@ open class FirEffectiveVisibilityResolverImpl(private val session: FirSession) :
     }
 
     private fun FirDeclaration.getParentClassId(): ClassId? = when (this) {
-        is FirCallableMemberDeclaration<*> -> this.symbol.callableId.classId
+        is FirCallableMemberDeclaration<*> -> this.containingClass()?.classId
         is FirClassLikeDeclaration<*> -> this.symbol.classId.outerClassId
         else -> null
     }
 
     private fun FirDeclaration.getClassId(): ClassId? = when (this) {
-        is FirCallableMemberDeclaration<*> -> this.symbol.callableId.classId
+        is FirCallableMemberDeclaration<*> -> this.containingClass()?.classId
         is FirClassLikeDeclaration<*> -> this.symbol.classId
         else -> null
     }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirLanguageSettingsComponent.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirLanguageSettingsComponent.kt
index 413f8fac8c1..9c4b065526b 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirLanguageSettingsComponent.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirLanguageSettingsComponent.kt
@@ -6,15 +6,11 @@
 package org.jetbrains.kotlin.fir
 
 import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 
 @NoMutableState
-class FirLanguageSettingsComponent(val session: FirSession) : FirSessionComponent {
-    val languageVersionSettings: LanguageVersionSettings =
-        LanguageVersionSettingsImpl.DEFAULT // TODO
-}
+class FirLanguageSettingsComponent(val languageVersionSettings: LanguageVersionSettings) : FirSessionComponent
 
-val FirSession.languageSettingsComponent: FirLanguageSettingsComponent by FirSession.sessionComponentAccessor()
+private val FirSession.languageSettingsComponent: FirLanguageSettingsComponent by FirSession.sessionComponentAccessor()
 
 val FirSession.languageVersionSettings: LanguageVersionSettings
     get() = languageSettingsComponent.languageVersionSettings
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirOverloadByLambdaReturnTypeResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirOverloadByLambdaReturnTypeResolver.kt
new file mode 100644
index 00000000000..536f1a9e888
--- /dev/null
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirOverloadByLambdaReturnTypeResolver.kt
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir
+
+import org.jetbrains.kotlin.config.LanguageFeature
+import org.jetbrains.kotlin.fir.expressions.FirResolvable
+import org.jetbrains.kotlin.fir.expressions.FirStatement
+import org.jetbrains.kotlin.fir.resolve.calls.Candidate
+import org.jetbrains.kotlin.fir.resolve.calls.CandidateChosenUsingOverloadResolutionByLambdaAnnotation
+import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate
+import org.jetbrains.kotlin.fir.resolve.inference.FirCallCompleter
+import org.jetbrains.kotlin.fir.resolve.inference.FirInferenceSession
+import org.jetbrains.kotlin.fir.resolve.inference.ResolvedLambdaAtom
+import org.jetbrains.kotlin.fir.resolve.inference.isBuiltinFunctionalType
+import org.jetbrains.kotlin.fir.resolve.initialTypeOfCandidate
+import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
+import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirAbstractBodyResolveTransformer
+import org.jetbrains.kotlin.fir.types.classId
+import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintSystemCompletionMode
+import org.jetbrains.kotlin.resolve.descriptorUtil.OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION_CLASS_ID
+import org.jetbrains.kotlin.utils.addToStdlib.same
+
+class FirOverloadByLambdaReturnTypeResolver(
+    val components: FirAbstractBodyResolveTransformer.BodyResolveTransformerComponents
+) {
+    private val session = components.session
+    private val callCompleter: FirCallCompleter
+        get() = components.callCompleter
+    private val inferenceSession: FirInferenceSession
+        get() = components.transformer.context.inferenceSession
+
+    fun <T> reduceCandidates(
+        qualifiedAccess: T,
+        allCandidates: Collection<Candidate>,
+        bestCandidates: Set<Candidate>
+    ): Set<Candidate> where T : FirStatement, T : FirResolvable {
+        if (
+            bestCandidates.size <= 1 ||
+            !session.languageVersionSettings.supportsFeature(LanguageFeature.OverloadResolutionByLambdaReturnType)
+        ) return bestCandidates
+
+        /*
+         * Inference session may look into candidate of call, and for that it uses callee reference.
+         * So we need replace reference with proper candidate before calling inference session
+         */
+        val shouldRunCompletion = if (inferenceSession != FirInferenceSession.DEFAULT) {
+            var shouldRunCompletion = true
+            val originalReference = qualifiedAccess.calleeReference
+            for (candidate in bestCandidates) {
+                qualifiedAccess.replaceCalleeReference(FirNamedReferenceWithCandidate(null, candidate.callInfo.name, candidate))
+                shouldRunCompletion = shouldRunCompletion && inferenceSession.shouldRunCompletion(qualifiedAccess)
+                if (!shouldRunCompletion) break
+            }
+            qualifiedAccess.replaceCalleeReference(originalReference)
+            shouldRunCompletion
+        } else {
+            true
+        }
+
+        if (!shouldRunCompletion) return bestCandidates
+
+        return reduceCandidatesImpl(
+            qualifiedAccess,
+            bestCandidates,
+            allCandidates
+        ) ?: bestCandidates
+    }
+
+    private fun <T> reduceCandidatesImpl(
+        call: T,
+        reducedCandidates: Set<Candidate>,
+        allCandidates: Collection<Candidate>
+    ): Set<Candidate>? where T : FirResolvable, T : FirStatement {
+        val candidatesWithAnnotation = allCandidates.filter { candidate ->
+            (candidate.symbol.fir as FirAnnotationContainer).annotations.any {
+                it.annotationTypeRef.coneType.classId == OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION_CLASS_ID
+            }
+        }
+        if (candidatesWithAnnotation.isEmpty()) return null
+        val candidatesWithoutAnnotation = reducedCandidates - candidatesWithAnnotation
+        val newCandidates = analyzeLambdaAndReduceNumberOfCandidatesRegardingOverloadResolutionByLambdaReturnType(call, reducedCandidates) ?: return null
+        var maximallySpecificCandidates = components.callResolver.conflictResolver.chooseMaximallySpecificCandidates(
+            newCandidates,
+            discriminateGenerics = true,
+            discriminateAbstracts = false
+        )
+        if (maximallySpecificCandidates.size > 1 && candidatesWithoutAnnotation.any { it in maximallySpecificCandidates }) {
+            maximallySpecificCandidates = maximallySpecificCandidates.toMutableSet().apply { removeAll(candidatesWithAnnotation) }
+            maximallySpecificCandidates.singleOrNull()?.addDiagnostic(CandidateChosenUsingOverloadResolutionByLambdaAnnotation)
+        }
+        return maximallySpecificCandidates
+    }
+
+    private fun <T> analyzeLambdaAndReduceNumberOfCandidatesRegardingOverloadResolutionByLambdaReturnType(
+        call: T,
+        candidates: Set<Candidate>,
+    ): Set<Candidate>? where T : FirResolvable, T : FirStatement {
+        val lambdas = candidates.flatMap { candidate ->
+            candidate.postponedAtoms
+                .filter { it is ResolvedLambdaAtom && !it.analyzed }
+                .map { candidate to it as ResolvedLambdaAtom }
+        }.groupBy { (_, atom) -> atom.atom }
+            .values.singleOrNull()?.toMap() ?: return null
+
+        if (!lambdas.values.same { it.parameters.size }) return null
+        if (!lambdas.values.all { it.expectedType?.isBuiltinFunctionalType(session) == true }) return null
+
+        val originalCalleeReference = call.calleeReference
+
+        for (candidate in lambdas.keys) {
+            call.replaceCalleeReference(FirNamedReferenceWithCandidate(null, candidate.callInfo.name, candidate))
+            callCompleter.runCompletionForCall(
+                candidate,
+                ConstraintSystemCompletionMode.UNTIL_FIRST_LAMBDA,
+                call,
+                components.initialTypeOfCandidate(candidate)
+            )
+        }
+
+        try {
+            val inputTypesAreSame = lambdas.entries.same { (candidate, lambda) ->
+                val substitutor = candidate.system.buildCurrentSubstitutor() as ConeSubstitutor
+                lambda.inputTypes.map { substitutor.substituteOrSelf(it) }
+            }
+            if (!inputTypesAreSame) return null
+            lambdas.entries.forEach { (candidate, atom) ->
+                callCompleter.prepareLambdaAtomForFactoryPattern(atom, candidate)
+            }
+            val iterator = lambdas.entries.iterator()
+            val (firstCandidate, firstAtom) = iterator.next()
+
+            val postponedArgumentsAnalyzer = callCompleter.createPostponedArgumentsAnalyzer(
+                components.transformer.resolutionContext
+            )
+
+            call.replaceCalleeReference(FirNamedReferenceWithCandidate(null, firstCandidate.callInfo.name, firstCandidate))
+            val results = postponedArgumentsAnalyzer.analyzeLambda(
+                firstCandidate.system.asPostponedArgumentsAnalyzerContext(),
+                firstAtom,
+                firstCandidate
+            )
+            while (iterator.hasNext()) {
+                val (candidate, atom) = iterator.next()
+                call.replaceCalleeReference(FirNamedReferenceWithCandidate(null, candidate.callInfo.name, candidate))
+                postponedArgumentsAnalyzer.applyResultsOfAnalyzedLambdaToCandidateSystem(
+                    candidate.system.asPostponedArgumentsAnalyzerContext(),
+                    atom,
+                    candidate,
+                    results
+                )
+            }
+
+            val errorCandidates = mutableSetOf<Candidate>()
+            val successfulCandidates = mutableSetOf<Candidate>()
+
+            for (candidate in candidates) {
+                if (candidate.isSuccessful) {
+                    successfulCandidates += candidate
+                } else {
+                    errorCandidates += candidate
+                }
+            }
+            return when {
+                successfulCandidates.isNotEmpty() -> successfulCandidates
+                else -> errorCandidates
+            }
+        } finally {
+            call.replaceCalleeReference(originalCalleeReference)
+        }
+    }
+}
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt
index 83a199e2707..542cb938d3d 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt
@@ -29,7 +29,6 @@ abstract class FirVisibilityChecker : FirSessionComponent {
             declarationVisibility: Visibility,
             symbol: AbstractFirBasedSymbol<*>,
             useSiteFile: FirFile,
-            ownerId: ClassId?,
             containingDeclarations: List<FirDeclaration>,
             candidate: Candidate,
             session: FirSession
@@ -38,23 +37,30 @@ abstract class FirVisibilityChecker : FirSessionComponent {
         }
     }
 
-    fun isVisible(
-        declaration: FirMemberDeclaration,
-        symbol: AbstractFirBasedSymbol<*>,
+    fun <T> isVisible(
+        declaration: T,
         candidate: Candidate
-    ): Boolean {
+    ): Boolean where T : FirMemberDeclaration, T : FirSymbolOwner<*> {
+        val symbol = declaration.symbol
+
+        if (declaration is FirCallableDeclaration<*> && (declaration.isIntersectionOverride || declaration.isSubstitutionOverride)) {
+            @Suppress("UNCHECKED_CAST")
+            return isVisible(declaration.originalIfFakeOverride() as T, candidate)
+        }
+
         val callInfo = candidate.callInfo
         val useSiteFile = callInfo.containingFile
         val containingDeclarations = callInfo.containingDeclarations
         val session = callInfo.session
         val provider = session.firProvider
-        val ownerId = symbol.getOwnerId()
+
 
         return when (declaration.visibility) {
             Visibilities.Internal -> {
                 declaration.session == callInfo.session
             }
             Visibilities.Private, Visibilities.PrivateToThis -> {
+                val ownerId = symbol.getOwnerId()
                 if (declaration.session == callInfo.session) {
                     if (ownerId == null || declaration is FirConstructor && declaration.isFromSealedClass) {
                         val candidateFile = when (symbol) {
@@ -74,6 +80,7 @@ abstract class FirVisibilityChecker : FirSessionComponent {
             }
 
             Visibilities.Protected -> {
+                val ownerId = symbol.getOwnerId()
                 ownerId != null && canSeeProtectedMemberOf(containingDeclarations, candidate.dispatchReceiverValue, ownerId, session)
             }
 
@@ -81,7 +88,6 @@ abstract class FirVisibilityChecker : FirSessionComponent {
                 declaration.visibility,
                 symbol,
                 useSiteFile,
-                ownerId,
                 containingDeclarations,
                 candidate,
                 session
@@ -93,7 +99,6 @@ abstract class FirVisibilityChecker : FirSessionComponent {
         declarationVisibility: Visibility,
         symbol: AbstractFirBasedSymbol<*>,
         useSiteFile: FirFile,
-        ownerId: ClassId?,
         containingDeclarations: List<FirDeclaration>,
         candidate: Candidate,
         session: FirSession
@@ -164,23 +169,6 @@ abstract class FirVisibilityChecker : FirSessionComponent {
                 (name == "monitorEnter" || name == "monitorExit")
     }
 
-    private fun AbstractFirBasedSymbol<*>.getOwnerId(): ClassId? {
-        return when (this) {
-            is FirClassLikeSymbol<*> -> {
-                val ownerId = classId.outerClassId
-                if (classId.isLocal) {
-                    ownerId?.asLocal() ?: classId
-                } else {
-                    ownerId
-                }
-            }
-            is FirCallableSymbol<*> -> callableId.classId
-            else -> error("Unsupported owner search for ${fir.javaClass}: ${fir.render()}")
-        }
-    }
-
-    private fun ClassId.asLocal(): ClassId = ClassId(packageFqName, relativeClassName, true)
-
     protected fun canSeeProtectedMemberOf(
         containingDeclarationOfUseSite: List<FirDeclaration>,
         dispatchReceiver: ReceiverValue?,
@@ -207,3 +195,20 @@ abstract class FirVisibilityChecker : FirSessionComponent {
 }
 
 val FirSession.visibilityChecker: FirVisibilityChecker by FirSession.sessionComponentAccessor()
+
+fun AbstractFirBasedSymbol<*>.getOwnerId(): ClassId? {
+    return when (this) {
+        is FirClassLikeSymbol<*> -> {
+            val ownerId = classId.outerClassId
+            if (classId.isLocal) {
+                ownerId?.asLocal() ?: classId
+            } else {
+                ownerId
+            }
+        }
+        is FirCallableSymbol<*> -> containingClass()?.classId
+        else -> error("Unsupported owner search for ${fir.javaClass}: ${fir.render()}")
+    }
+}
+
+private fun ClassId.asLocal(): ClassId = ClassId(packageFqName, relativeClassName, true)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt
index 266d0c8b5bf..886de9e44da 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.FirSyntheticCallGenerator
 import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator
 import org.jetbrains.kotlin.fir.scopes.FirScope
 import org.jetbrains.kotlin.fir.scopes.impl.FirLocalScope
+import org.jetbrains.kotlin.fir.scopes.impl.wrapNestedClassifierScopeWithSubstitutionForSuperType
 import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
@@ -143,7 +144,8 @@ typealias TowerDataContextForAnonymousFunctions = Map<FirAnonymousFunctionSymbol
 class FirTowerDataContextsForClassParts(
     val forNestedClasses: FirTowerDataContext,
     val forConstructorHeaders: FirTowerDataContext,
-    val primaryConstructorParametersScope: FirLocalScope?,
+    val primaryConstructorPureParametersScope: FirLocalScope?,
+    val primaryConstructorAllParametersScope: FirLocalScope?,
 )
 
 // --------------------------------------- Utils ---------------------------------------
@@ -193,9 +195,13 @@ fun SessionHolder.collectTowerDataElementsForClass(owner: FirClass<*>, defaultTy
 
     val superClassesStaticsAndCompanionReceivers = mutableListOf<FirTowerDataElement>()
     for (superType in lookupSuperTypes(owner, lookupInterfaces = false, deep = true, useSiteSession = session)) {
-        val superClass = superType.fullyExpandedType(session).lookupTag.toSymbol(session)?.fir as? FirRegularClass ?: continue
+        val expandedType = superType.fullyExpandedType(session)
+        val superClass = expandedType.lookupTag.toSymbol(session)?.fir as? FirRegularClass ?: continue
 
-        superClass.staticScope(this)?.asTowerDataElement(isLocal = false)?.let(superClassesStaticsAndCompanionReceivers::add)
+        superClass.staticScope(this)
+            ?.wrapNestedClassifierScopeWithSubstitutionForSuperType(expandedType, session)
+            ?.asTowerDataElement(isLocal = false)
+            ?.let(superClassesStaticsAndCompanionReceivers::add)
 
         (superClass as? FirRegularClass)?.companionObject?.let { companion ->
             val superCompanionReceiver = ImplicitDispatchReceiverValue(
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt
index 76cd5712a5f..3ed79836a58 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTagWithFixedSymbol
-import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag
 import org.jetbrains.kotlin.fir.symbols.impl.*
 
 fun ConeClassifierLookupTag.toSymbol(useSiteSession: FirSession): FirClassifierSymbol<*>? =
@@ -33,8 +32,6 @@ fun ConeClassLikeLookupTag.toSymbol(useSiteSession: FirSession): FirClassLikeSym
     }
 }
 
-fun ConeTypeParameterLookupTag.toSymbol(): FirTypeParameterSymbol = this.symbol as FirTypeParameterSymbol
-
 @OptIn(LookupTagInternals::class)
 fun ConeClassLikeLookupTagImpl.bindSymbolToLookupTag(session: FirSession, symbol: FirClassLikeSymbol<*>?) {
     boundSymbol = OneElementWeakMap(session, symbol)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt
index a199374273d..fe2be9fac2b 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.references.FirSuperReference
 import org.jetbrains.kotlin.fir.references.FirThisReference
+import org.jetbrains.kotlin.fir.resolve.calls.Candidate
 import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate
 import org.jetbrains.kotlin.fir.resolve.calls.ImplicitDispatchReceiverValue
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedNameError
@@ -324,3 +325,19 @@ fun FirAnnotationCall.getCorrespondingClassSymbolOrNull(session: FirSession): Fi
         }
     }
 }
+
+fun <T> BodyResolveComponents.initialTypeOfCandidate(
+    candidate: Candidate,
+    call: T
+): ConeKotlinType where T : FirResolvable, T : FirStatement {
+    return initialTypeOfCandidate(candidate, typeFromCallee(call))
+}
+
+fun BodyResolveComponents.initialTypeOfCandidate(candidate: Candidate): ConeKotlinType {
+    val typeRef = typeFromSymbol(candidate.symbol, makeNullable = false)
+    return initialTypeOfCandidate(candidate, typeRef)
+}
+
+private fun initialTypeOfCandidate(candidate: Candidate, typeRef: FirResolvedTypeRef): ConeKotlinType {
+    return candidate.substitutor.substituteOrSelf(typeRef.type)
+}
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
index 31482813a43..71cf35fa1d5 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.resolve
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.containingClassAttr
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParameterBuilder
 import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunction
@@ -16,6 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
 import org.jetbrains.kotlin.fir.diagnostics.ConeIntermediateDiagnostic
 import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticFunctionSymbol
 import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap
+import org.jetbrains.kotlin.fir.scopes.impl.hasTypeOf
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
@@ -28,7 +30,6 @@ import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
-import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.Variance
 
@@ -44,6 +45,7 @@ val SAM_PARAMETER_NAME = Name.identifier("block")
 class FirSamResolverImpl(
     private val firSession: FirSession,
     private val scopeSession: ScopeSession,
+    private val outerClassManager: FirOuterClassManager,
 ) : FirSamResolver() {
 
     private val resolvedFunctionType: MutableMap<FirRegularClass, Any> = mutableMapOf()
@@ -51,7 +53,7 @@ class FirSamResolverImpl(
 
     override fun getFunctionTypeForPossibleSamType(type: ConeKotlinType): ConeKotlinType? {
         return when (type) {
-            is ConeClassLikeType -> getFunctionTypeForPossibleSamType(type)
+            is ConeClassLikeType -> getFunctionTypeForPossibleSamType(type.fullyExpandedType(firSession))
             is ConeFlexibleType -> ConeFlexibleType(
                 getFunctionTypeForPossibleSamType(type.lowerBound) ?: return null,
                 getFunctionTypeForPossibleSamType(type.upperBound) ?: return null,
@@ -75,17 +77,26 @@ class FirSamResolverImpl(
                 ?: return null
 
         val unsubstitutedFunctionType = resolveFunctionTypeIfSamInterface(firRegularClass) ?: return null
+
+        if (firRegularClass.typeParameters.isEmpty()) {
+            return unsubstitutedFunctionType.withNullability(ConeNullability.create(type.isMarkedNullable), firSession.typeContext)
+        }
+
         val substitutor =
             substitutorByMap(
                 firRegularClass.typeParameters
                     .map { it.symbol }
                     .zip(
-                        type.typeArguments.map {
-                            (it as? ConeKotlinTypeProjection)?.type
+                        type.typeArguments,
+                    ).map { (parameterSymbol, projection) ->
+                        val typeArgument =
+                            (projection as? ConeKotlinTypeProjection)?.type
+                            // TODO: Consider using `parameterSymbol.fir.bounds.first().coneType` once sure that it won't fail with exception
+                                ?: parameterSymbol.fir.bounds.firstOrNull()?.coneTypeSafe()
                                 ?: firSession.builtinTypes.nullableAnyType.type
-                            //ConeClassLikeTypeImpl(ConeClassLikeLookupTagImpl(StandardClassIds.Any), emptyArray(), isNullable = true)
-                        },
-                    )
+
+                        Pair(parameterSymbol, typeArgument)
+                    }
                     .toMap(),
             )
 
@@ -145,7 +156,7 @@ class FirSamResolverImpl(
 
         for ((newTypeParameter, oldTypeParameter) in newTypeParameters.zip(firRegularClass.typeParameters)) {
             val declared = oldTypeParameter.symbol.fir // TODO: or really declared?
-            newTypeParameter.bounds += declared.bounds.mapNotNull { typeRef ->
+            newTypeParameter.bounds += declared.bounds.map { typeRef ->
                 buildResolvedTypeRef {
                     source = typeRef.source
                     type = substitutor.substituteOrSelf(typeRef.coneType)
@@ -197,17 +208,19 @@ class FirSamResolverImpl(
             }
 
             resolvePhase = FirResolvePhase.BODY_RESOLVE
+        }.apply {
+            containingClassAttr = outerClassManager.outerClass(firRegularClass.symbol)?.toLookupTag()
         }
     }
 
-    private fun resolveFunctionTypeIfSamInterface(firRegularClass: FirRegularClass): ConeKotlinType? {
+    private fun resolveFunctionTypeIfSamInterface(firRegularClass: FirRegularClass): ConeLookupTagBasedType? {
         return resolvedFunctionType.getOrPut(firRegularClass) {
             if (!firRegularClass.status.isFun) return@getOrPut NULL_STUB
             val abstractMethod = firRegularClass.getSingleAbstractMethodOrNull(firSession, scopeSession) ?: return@getOrPut NULL_STUB
             // TODO: val shouldConvertFirstParameterToDescriptor = samWithReceiverResolvers.any { it.shouldConvertFirstSamParameterToReceiver(abstractMethod) }
 
             abstractMethod.getFunctionTypeForAbstractMethod()
-        } as? ConeKotlinType
+        } as? ConeLookupTagBasedType
     }
 
     override fun shouldRunSamConversionForFunction(firFunction: FirFunction<*>): Boolean {
@@ -333,17 +346,6 @@ fun FirSimpleFunction.isPublicInObject(checkOnlyName: Boolean): Boolean {
     }
 }
 
-private fun FirValueParameter.hasTypeOf(classId: ClassId, allowNullable: Boolean): Boolean {
-    val classLike = when (val type = returnTypeRef.coneType) {
-        is ConeClassLikeType -> type
-        is ConeFlexibleType -> type.upperBound as? ConeClassLikeType ?: return false
-        else -> return false
-    }
-
-    if (classLike.isMarkedNullable && !allowNullable) return false
-    return classLike.lookupTag.classId == classId
-}
-
 private val PUBLIC_METHOD_NAMES_IN_OBJECT = setOf("equals", "hashCode", "getClass", "wait", "notify", "notifyAll", "toString")
 
 private fun FirSimpleFunction.getFunctionTypeForAbstractMethod(): ConeLookupTagBasedType {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt
index 08c565eb236..309365352b6 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt
@@ -18,11 +18,13 @@ import org.jetbrains.kotlin.fir.scopes.impl.FirScopeWithFakeOverrideTypeCalculat
 import org.jetbrains.kotlin.fir.scopes.impl.FirStandardOverrideChecker
 import org.jetbrains.kotlin.fir.scopes.impl.FirTypeIntersectionScope
 import org.jetbrains.kotlin.fir.scopes.scopeForClass
+import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
+import org.jetbrains.kotlin.name.ClassId
 
 fun ConeKotlinType.scope(
     useSiteSession: FirSession,
@@ -48,7 +50,7 @@ private fun ConeKotlinType.scope(useSiteSession: FirSession, scopeSession: Scope
             fir.scopeForClass(substitutorByMap(substitution), useSiteSession, scopeSession)
         }
         is ConeTypeParameterType -> {
-            val symbol = lookupTag.toSymbol()
+            val symbol = lookupTag.symbol
             scopeSession.getOrBuild(symbol, TYPE_PARAMETER_SCOPE_KEY) {
                 val intersectionType = ConeTypeIntersector.intersectTypes(
                     useSiteSession.typeContext,
@@ -64,7 +66,8 @@ private fun ConeKotlinType.scope(useSiteSession: FirSession, scopeSession: Scope
             FirStandardOverrideChecker(useSiteSession),
             intersectedTypes.mapNotNullTo(mutableListOf()) {
                 it.scope(useSiteSession, scopeSession, requiredPhase)
-            }
+            },
+            type
         )
         is ConeDefinitelyNotNullType -> original.scope(useSiteSession, scopeSession, requiredPhase)
         is ConeIntegerLiteralType -> error("ILT should not be in receiver position")
@@ -72,6 +75,14 @@ private fun ConeKotlinType.scope(useSiteSession: FirSession, scopeSession: Scope
     }
 }
 
+
+fun FirClass<*>.defaultType(): ConeClassLikeType =
+    when (this) {
+        is FirRegularClass -> defaultType()
+        is FirAnonymousObject -> defaultType()
+        else -> error("Unknown class ${this::class}")
+    }
+
 fun FirRegularClass.defaultType(): ConeClassLikeTypeImpl {
     return ConeClassLikeTypeImpl(
         symbol.toLookupTag(),
@@ -93,4 +104,16 @@ fun FirAnonymousObject.defaultType(): ConeClassLikeType {
     )
 }
 
+fun ClassId.defaultType(parameters: List<FirTypeParameterSymbol>): ConeClassLikeType =
+    ConeClassLikeTypeImpl(
+        ConeClassLikeLookupTagImpl(this),
+        parameters.map {
+            ConeTypeParameterTypeImpl(
+                it.toLookupTag(),
+                isNullable = false
+            )
+        }.toTypedArray(),
+        isNullable = false,
+    )
+
 val TYPE_PARAMETER_SCOPE_KEY = scopeSessionKey<FirTypeParameterSymbol, FirTypeScope>()
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SupertypeUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SupertypeUtils.kt
index 13c7335b386..50098901189 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SupertypeUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SupertypeUtils.kt
@@ -60,7 +60,11 @@ inline fun <reified ID : Any, reified FS : FirScope> scopeSessionKey(): ScopeSes
 
 val USE_SITE = scopeSessionKey<FirClassSymbol<*>, FirTypeScope>()
 
-data class SubstitutionScopeKey(val type: ConeClassLikeType) : ScopeSessionKey<FirClassLikeSymbol<*>, FirClassSubstitutionScope>()
+data class SubstitutionScopeKey(
+    val type: ConeClassLikeType,
+    // This property is necessary. Otherwise we may have accidental matching when two classes have the same supertype
+    val derivedClassId: ClassId
+) : ScopeSessionKey<FirClassLikeSymbol<*>, FirClassSubstitutionScope>()
 
 /* TODO REMOVE */
 fun createSubstitution(
@@ -91,10 +95,10 @@ fun ConeClassLikeType.wrapSubstitutionScopeIfNeed(
     useSiteMemberScope: FirTypeScope,
     declaration: FirClassLikeDeclaration<*>,
     builder: ScopeSession,
-    derivedClassId: ClassId?
+    derivedClass: FirRegularClass
 ): FirTypeScope {
     if (this.typeArguments.isEmpty()) return useSiteMemberScope
-    return builder.getOrBuild(declaration.symbol, SubstitutionScopeKey(this)) {
+    return builder.getOrBuild(declaration.symbol, SubstitutionScopeKey(this, derivedClass.symbol.classId)) {
         val typeParameters = (declaration as? FirTypeParameterRefsOwner)?.typeParameters.orEmpty()
         val originalSubstitution = createSubstitution(typeParameters, this, session)
         val platformClass = session.platformClassMapper.getCorrespondingPlatformClass(declaration)
@@ -110,7 +114,8 @@ fun ConeClassLikeType.wrapSubstitutionScopeIfNeed(
         }
         FirClassSubstitutionScope(
             session, useSiteMemberScope, substitutor,
-            skipPrivateMembers = true, derivedClassId = derivedClassId
+            dispatchReceiverTypeForSubstitutedMembers = derivedClass.defaultType(),
+            skipPrivateMembers = true,
         )
     }
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/TypeExpansionUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/TypeExpansionUtils.kt
index 7f8cd218a8c..2dcf6d80e52 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/TypeExpansionUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/TypeExpansionUtils.kt
@@ -83,7 +83,7 @@ private fun mapTypeAliasArguments(
 
         override fun substituteArgument(projection: ConeTypeProjection): ConeTypeProjection? {
             val type = (projection as? ConeKotlinTypeProjection)?.type ?: return null
-            val symbol = (type as? ConeTypeParameterType)?.lookupTag?.toSymbol() ?: return super.substituteArgument(projection)
+            val symbol = (type as? ConeTypeParameterType)?.lookupTag?.symbol ?: return super.substituteArgument(projection)
             val mappedProjection = typeAliasMap[symbol] ?: return super.substituteArgument(projection)
             val mappedType = (mappedProjection as? ConeKotlinTypeProjection)?.type ?: return mappedProjection
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallKind.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallKind.kt
index 7070991fecb..088286a4d26 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallKind.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallKind.kt
@@ -12,8 +12,8 @@ sealed class CallKind(vararg resolutionSequence: ResolutionStage) {
         CheckExplicitReceiverConsistency,
         NoTypeArguments,
         CreateFreshTypeVariableSubstitutorStage,
-        CheckReceivers.Dispatch,
-        CheckReceivers.Extension,
+        CheckDispatchReceiver,
+        CheckExtensionReceiver,
         CheckLowPriorityInOverloadResolution,
         PostponedVariablesInitializerResolutionStage
     )
@@ -33,8 +33,8 @@ sealed class CallKind(vararg resolutionSequence: ResolutionStage) {
         CheckExplicitReceiverConsistency,
         MapTypeArguments,
         CreateFreshTypeVariableSubstitutorStage,
-        CheckReceivers.Dispatch,
-        CheckReceivers.Extension,
+        CheckDispatchReceiver,
+        CheckExtensionReceiver,
         CheckArguments,
         EagerResolveOfCallableReferences,
         CheckLowPriorityInOverloadResolution,
@@ -47,8 +47,8 @@ sealed class CallKind(vararg resolutionSequence: ResolutionStage) {
         CheckExplicitReceiverConsistency,
         MapTypeArguments,
         CreateFreshTypeVariableSubstitutorStage,
-        CheckReceivers.Dispatch,
-        CheckReceivers.Extension,
+        CheckDispatchReceiver,
+        CheckExtensionReceiver,
         CheckArguments,
         EagerResolveOfCallableReferences
     )
@@ -58,8 +58,8 @@ sealed class CallKind(vararg resolutionSequence: ResolutionStage) {
         DiscriminateSynthetics,
         NoTypeArguments,
         CreateFreshTypeVariableSubstitutorStage,
-        CheckReceivers.Dispatch,
-        CheckReceivers.Extension,
+        CheckDispatchReceiver,
+        CheckExtensionReceiver,
         CheckCallableReferenceExpectedType,
         CheckLowPriorityInOverloadResolution
     )
@@ -102,8 +102,8 @@ class ResolutionSequenceBuilder(
             if (checkExplicitReceiverConsistency) add(CheckExplicitReceiverConsistency)
             if (mapTypeArguments) add(MapTypeArguments) else add(NoTypeArguments)
             if (checkArguments || checkDispatchReceiver || checkExtensionReceiver) add(CreateFreshTypeVariableSubstitutorStage)
-            if (checkDispatchReceiver) add(CheckReceivers.Dispatch)
-            if (checkExtensionReceiver) add(CheckReceivers.Extension)
+            if (checkDispatchReceiver) add(CheckDispatchReceiver)
+            if (checkExtensionReceiver) add(CheckExtensionReceiver)
             if (checkArguments) add(CheckArguments)
             if (resolveCallableReferenceArguments) add(EagerResolveOfCallableReferences)
             if (checkLowPriorityInOverloadResolution) add(CheckLowPriorityInOverloadResolution)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt
index 4bb43f4a416..697b5c25814 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt
@@ -5,9 +5,7 @@
 
 package org.jetbrains.kotlin.fir.resolve.calls
 
-import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.FirSourceElement
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
@@ -45,7 +43,7 @@ internal object CheckCallableReferenceExpectedType : CheckerStage() {
 
         val fir: FirCallableDeclaration<*> = candidate.symbol.fir
 
-        val (rawResultingType, callableReferenceAdaptation) = buildReflectionType(fir, resultingReceiverType, callInfo, context)
+        val (rawResultingType, callableReferenceAdaptation) = buildReflectionType(fir, resultingReceiverType, candidate, context)
         val resultingType = candidate.substitutor.substituteOrSelf(rawResultingType)
 
         if (callableReferenceAdaptation.needCompatibilityResolveForCallableReference()) {
@@ -89,17 +87,10 @@ internal object CheckCallableReferenceExpectedType : CheckerStage() {
     }
 }
 
-
-/*
-val resultingReceiverType = when (callInfo.lhs) {
-    is DoubleColonLHS.Type -> callInfo.lhs.type.takeIf { callInfo.explicitReceiver !is FirResolvedQualifier }
-    else -> null
-}
- */
 private fun buildReflectionType(
     fir: FirCallableDeclaration<*>,
     receiverType: ConeKotlinType?,
-    callInfo: CallInfo,
+    candidate: Candidate,
     context: ResolutionContext
 ): Pair<ConeKotlinType, CallableReferenceAdaptation?> {
     val returnTypeRef = context.bodyResolveComponents.returnTypeCalculator.tryCalculateReturnType(fir)
@@ -108,7 +99,7 @@ private fun buildReflectionType(
             val unboundReferenceTarget = if (receiverType != null) 1 else 0
             val callableReferenceAdaptation =
                 context.bodyResolveComponents
-                    .getCallableReferenceAdaptation(context.session, fir, callInfo.expectedType, unboundReferenceTarget)
+                    .getCallableReferenceAdaptation(context.session, fir, candidate.callInfo.expectedType, unboundReferenceTarget)
 
             val parameters = mutableListOf<ConeKotlinType>()
 
@@ -133,7 +124,7 @@ private fun buildReflectionType(
                 isSuspend = isSuspend
             ) to callableReferenceAdaptation
         }
-        is FirVariable -> createKPropertyType(fir, receiverType, returnTypeRef) to null
+        is FirVariable -> createKPropertyType(fir, receiverType, returnTypeRef, candidate) to null
         else -> ConeClassErrorType(ConeUnsupportedCallableReferenceTarget(fir)) to null
     }
 }
@@ -396,10 +387,20 @@ fun ConeKotlinType.isKCallableType(): Boolean {
 private fun createKPropertyType(
     propertyOrField: FirVariable<*>,
     receiverType: ConeKotlinType?,
-    returnTypeRef: FirResolvedTypeRef
+    returnTypeRef: FirResolvedTypeRef,
+    candidate: Candidate,
 ): ConeKotlinType {
     val propertyType = returnTypeRef.type
     return org.jetbrains.kotlin.fir.resolve.createKPropertyType(
-        receiverType, propertyType, isMutable = propertyOrField.isVar
+        receiverType,
+        propertyType,
+        isMutable = propertyOrField.canBeMutableReference(candidate)
     )
 }
+
+private fun FirVariable<*>.canBeMutableReference(candidate: Candidate): Boolean {
+    if (!isVar) return false
+    if (this is FirField) return true
+    return source?.kind == FirFakeSourceElementKind.PropertyFromParameter ||
+            (setter is FirMemberDeclaration && candidate.callInfo.session.visibilityChecker.isVisible(setter!!, candidate))
+}
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
index c0a8e5ad41f..91096caae85 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.builder.buildArgumentList
 import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
 import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
-import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents
 import org.jetbrains.kotlin.fir.resolve.DoubleColonLHS
 import org.jetbrains.kotlin.fir.resolve.inference.InferenceComponents
 import org.jetbrains.kotlin.fir.resolve.inference.PostponedResolvedAtom
@@ -31,6 +30,8 @@ import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemOperation
 import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintStorage
 import org.jetbrains.kotlin.resolve.calls.inference.model.NewConstraintSystemImpl
 import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
+import org.jetbrains.kotlin.resolve.calls.tower.CandidateApplicability
+import org.jetbrains.kotlin.resolve.calls.tower.isSuccess
 
 data class CallInfo(
     val callKind: CallKind,
@@ -51,16 +52,12 @@ data class CallInfo(
     // Four properties for callable references only
     val expectedType: ConeKotlinType? = null,
     val outerCSBuilder: ConstraintSystemBuilder? = null,
-    val lhs: DoubleColonLHS? = null,
-    val stubReceiver: FirExpression? = null
+    val lhs: DoubleColonLHS? = null
 ) {
     val arguments: List<FirExpression> get() = argumentList.arguments
 
     val argumentCount get() = arguments.size
 
-    fun noStubReceiver(): CallInfo =
-        if (stubReceiver == null) this else copy(stubReceiver = null)
-
     fun replaceWithVariableAccess(): CallInfo =
         copy(callKind = CallKind.VariableAccess, typeArguments = emptyList(), argumentList = FirEmptyArgumentList)
 
@@ -79,7 +76,7 @@ data class CallInfo(
 class Candidate(
     val symbol: AbstractFirBasedSymbol<*>,
     val dispatchReceiverValue: ReceiverValue?,
-    val implicitExtensionReceiverValue: ImplicitReceiverValue<*>?,
+    val extensionReceiverValue: ReceiverValue?,
     val explicitReceiverKind: ExplicitReceiverKind,
     val constraintSystemFactory: InferenceComponents.ConstraintSystemFactory,
     private val baseSystem: ConstraintStorage,
@@ -107,22 +104,30 @@ class Candidate(
     lateinit var typeArgumentMapping: TypeArgumentMapping
     val postponedAtoms = mutableListOf<PostponedResolvedAtom>()
 
-    val diagnostics: MutableList<ResolutionDiagnostic> = mutableListOf()
+    var currentApplicability = CandidateApplicability.RESOLVED
+        private set
+
+    private val _diagnostics: MutableList<ResolutionDiagnostic> = mutableListOf()
+    val diagnostics: List<ResolutionDiagnostic>
+        get() = _diagnostics
+
+    fun addDiagnostic(diagnostic: ResolutionDiagnostic) {
+        _diagnostics += diagnostic
+        if (diagnostic.applicability < currentApplicability) {
+            currentApplicability = diagnostic.applicability
+        }
+    }
+
+    val isSuccessful: Boolean
+        get() = currentApplicability.isSuccess && (!systemInitialized || !system.hasContradiction)
 
     var passedStages: Int = 0
 
-    fun dispatchReceiverExpression(): FirExpression = when (explicitReceiverKind) {
-        ExplicitReceiverKind.DISPATCH_RECEIVER, ExplicitReceiverKind.BOTH_RECEIVERS ->
-            callInfo.explicitReceiver?.takeIf { it !is FirExpressionStub } ?: FirNoReceiverExpression
-        else -> dispatchReceiverValue?.receiverExpression ?: FirNoReceiverExpression
-    }
+    fun dispatchReceiverExpression(): FirExpression =
+        dispatchReceiverValue?.receiverExpression?.takeIf { it !is FirExpressionStub } ?: FirNoReceiverExpression
 
-    fun extensionReceiverExpression(): FirExpression = when (explicitReceiverKind) {
-        ExplicitReceiverKind.EXTENSION_RECEIVER, ExplicitReceiverKind.BOTH_RECEIVERS ->
-            callInfo.explicitReceiver?.takeIf { it !is FirExpressionStub } ?: FirNoReceiverExpression
-        else ->
-            implicitExtensionReceiverValue?.receiverExpression ?: FirNoReceiverExpression
-    }
+    fun extensionReceiverExpression(): FirExpression =
+        extensionReceiverValue?.receiverExpression?.takeIf { it !is FirExpressionStub } ?: FirNoReceiverExpression
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt
index ce91f453cd2..0b55ef668ab 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
 
 class CandidateFactory private constructor(
     val context: ResolutionContext,
-    val callInfo: CallInfo,
     private val baseSystem: ConstraintStorage
 ) {
 
@@ -37,26 +36,19 @@ class CandidateFactory private constructor(
         }
     }
 
-    constructor(context: ResolutionContext, callInfo: CallInfo) :
-            this(context, callInfo, buildBaseSystem(context, callInfo))
-
-    fun replaceCallInfo(callInfo: CallInfo): CandidateFactory {
-        if (this.callInfo.arguments.size != callInfo.arguments.size) {
-            throw AssertionError("Incorrect replacement of call info in CandidateFactory")
-        }
-        return CandidateFactory(context, callInfo, baseSystem)
-    }
+    constructor(context: ResolutionContext, callInfo: CallInfo) : this(context, buildBaseSystem(context, callInfo))
 
     fun createCandidate(
+        callInfo: CallInfo,
         symbol: AbstractFirBasedSymbol<*>,
         explicitReceiverKind: ExplicitReceiverKind,
         scope: FirScope?,
         dispatchReceiverValue: ReceiverValue? = null,
-        implicitExtensionReceiverValue: ImplicitReceiverValue<*>? = null,
+        extensionReceiverValue: ReceiverValue? = null,
         builtInExtensionFunctionReceiverValue: ReceiverValue? = null
     ): Candidate {
         return Candidate(
-            symbol, dispatchReceiverValue, implicitExtensionReceiverValue,
+            symbol, dispatchReceiverValue, extensionReceiverValue,
             explicitReceiverKind, context.inferenceComponents.constraintSystemFactory, baseSystem,
             builtInExtensionFunctionReceiverValue?.receiverExpression?.let {
                 callInfo.withReceiverAsArgument(it)
@@ -65,7 +57,7 @@ class CandidateFactory private constructor(
         )
     }
 
-    fun createErrorCandidate(diagnostic: ConeDiagnostic): Candidate {
+    fun createErrorCandidate(callInfo: CallInfo, diagnostic: ConeDiagnostic): Candidate {
         val symbol: AbstractFirBasedSymbol<*> = when (callInfo.callKind) {
             is CallKind.VariableAccess -> createErrorPropertySymbol(diagnostic)
             is CallKind.Function,
@@ -78,7 +70,7 @@ class CandidateFactory private constructor(
         return Candidate(
             symbol,
             dispatchReceiverValue = null,
-            implicitExtensionReceiverValue = null,
+            extensionReceiverValue = null,
             explicitReceiverKind = ExplicitReceiverKind.NO_EXPLICIT_RECEIVER,
             context.inferenceComponents.constraintSystemFactory,
             baseSystem,
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CheckerSink.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CheckerSink.kt
index a7df41f8a59..fd0f9f3d006 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CheckerSink.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CheckerSink.kt
@@ -32,20 +32,12 @@ suspend inline fun CheckerSink.yieldDiagnostic(diagnostic: ResolutionDiagnostic)
 }
 
 class CheckerSinkImpl(
+    private val candidate: Candidate,
     var continuation: Continuation<Unit>? = null,
-    val stopOnFirstError: Boolean = true
+    val stopOnFirstError: Boolean = true,
 ) : CheckerSink() {
-    var currentApplicability = CandidateApplicability.RESOLVED
-        private set
-
-    private val _diagnostics: MutableList<ResolutionDiagnostic> = mutableListOf()
-
-    val diagnostics: List<ResolutionDiagnostic>
-        get() = _diagnostics
-
     override fun reportDiagnostic(diagnostic: ResolutionDiagnostic) {
-        _diagnostics += diagnostic
-        if (diagnostic.applicability < currentApplicability) currentApplicability = diagnostic.applicability
+        candidate.addDiagnostic(diagnostic)
     }
 
     @PrivateForInline
@@ -55,6 +47,5 @@ class CheckerSinkImpl(
     }
 
     override val needYielding: Boolean
-        get() = stopOnFirstError && !currentApplicability.isSuccess
-
+        get() = stopOnFirstError && !candidate.isSuccessful
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeCompositeConflictResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeCompositeConflictResolver.kt
index f86a3140aa8..129a3cdd6ae 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeCompositeConflictResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeCompositeConflictResolver.kt
@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.fir.resolve.calls
 
 class ConeCompositeConflictResolver(
-    private vararg val conflictResolvers: AbstractConeCallConflictResolver
+    private vararg val conflictResolvers: ConeCallConflictResolver
 ) : ConeCallConflictResolver() {
     override fun chooseMaximallySpecificCandidates(
         candidates: Set<Candidate>,
@@ -22,4 +22,4 @@ class ConeCompositeConflictResolver(
         }
         return currentCandidates
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt
index 02fe401afbe..fb830ca4691 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt
@@ -8,12 +8,13 @@ package org.jetbrains.kotlin.fir.resolve.calls
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.builder.buildConstructedClassTypeParameterRef
-import org.jetbrains.kotlin.fir.declarations.builder.buildConstructor
 import org.jetbrains.kotlin.fir.declarations.builder.buildConstructorCopy
-import org.jetbrains.kotlin.fir.declarations.builder.buildValueParameter
-import org.jetbrains.kotlin.fir.resolve.*
+import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents
+import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
+import org.jetbrains.kotlin.fir.resolve.scope
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap
+import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.resolve.transformers.ensureResolved
 import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
 import org.jetbrains.kotlin.fir.scopes.FirScope
@@ -118,18 +119,43 @@ private fun FirTypeAliasSymbol.findSAMConstructorForTypeAlias(
 
     val namedSymbol = samConstructorForClass.symbol as? FirNamedFunctionSymbol ?: return null
 
-    val substitutor = prepareSubstitutorForTypeAliasConstructors<FirSimpleFunction>(
-        this,
+    val substitutor = prepareSubstitutorForTypeAliasConstructors(
         type,
         session
-    ) { newReturnType, newParameterTypes, newTypeParameters ->
-        FirFakeOverrideGenerator.createFakeOverrideFunction(
-            session, this, namedSymbol, null,
-            newReturnType, newParameterTypes, newTypeParameters
-        ).fir
-    } ?: return null
+    ) ?: return null
 
-    return substitutor.substitute(samConstructorForClass)
+    val typeParameters = this@findSAMConstructorForTypeAlias.fir.typeParameters
+    val newReturnType = samConstructorForClass.returnTypeRef.coneType.let(substitutor::substituteOrNull)
+
+    val newParameterTypes = samConstructorForClass.valueParameters.map { valueParameter ->
+        valueParameter.returnTypeRef.coneType.let(substitutor::substituteOrNull)
+    }
+
+    if (newReturnType == null && newParameterTypes.all { it == null }) return samConstructorForClass
+
+    return FirFakeOverrideGenerator.createSubstitutionOverrideFunction(
+        session, samConstructorForClass, namedSymbol,
+        newDispatchReceiverType = null,
+        newReceiverType = null,
+        newReturnType, newParameterTypes, typeParameters,
+        expansionRegularClass.classId,
+    ).fir
+}
+
+private fun prepareSubstitutorForTypeAliasConstructors(
+    expandedType: ConeClassLikeType,
+    session: FirSession
+): ConeSubstitutor? {
+    val expandedClass = expandedType.lookupTag.toSymbol(session)?.fir as? FirRegularClass ?: return null
+
+    val resultingTypeArguments = expandedType.typeArguments.map {
+        // We don't know how to handle cases like yet
+        // typealias A = ArrayList<*>()
+        it as? ConeKotlinType ?: return null
+    }
+    return substitutorByMap(
+        expandedClass.typeParameters.map { it.symbol }.zip(resultingTypeArguments).toMap()
+    )
 }
 
 private fun processConstructors(
@@ -148,10 +174,14 @@ private fun processConstructors(
                     val type = matchedSymbol.fir.expandedTypeRef.coneTypeUnsafe<ConeClassLikeType>().fullyExpandedType(session)
                     val basicScope = type.scope(session, bodyResolveComponents.scopeSession, FakeOverrideTypeCalculator.DoNothing)
 
-                    if (basicScope != null && type.typeArguments.isNotEmpty()) {
-                        prepareSubstitutingScopeForTypeAliasConstructors(
-                            matchedSymbol, session, basicScope
-                        ) ?: return
+                    val outerType = bodyResolveComponents.outerClassManager.outerType(type)
+
+                    if (basicScope != null && (matchedSymbol.fir.typeParameters.isNotEmpty() || outerType != null)) {
+                        TypeAliasConstructorsSubstitutingScope(
+                            matchedSymbol,
+                            basicScope,
+                            outerType
+                        )
                     } else basicScope
                 }
                 is FirClassSymbol ->
@@ -163,9 +193,7 @@ private fun processConstructors(
             //TODO: why don't we use declared member scope at this point?
             scope?.processDeclaredConstructors {
                 if (includeInnerConstructors || !it.fir.isInner) {
-                    val constructorSymbolToProcess =
-                        prepareCopyConstructorForTypealiasNestedClass(matchedSymbol, it, session, bodyResolveComponents) ?: it
-                    processor(constructorSymbolToProcess)
+                    processor(it)
                 }
             }
         }
@@ -176,160 +204,55 @@ private fun processConstructors(
 
 private class TypeAliasConstructorsSubstitutingScope(
     private val typeAliasSymbol: FirTypeAliasSymbol,
-    private val copyFactory: ConstructorCopyFactory<FirConstructor>,
-    private val delegatingScope: FirScope
+    private val delegatingScope: FirScope,
+    private val outerType: ConeClassLikeType?,
 ) : FirScope() {
 
+    init {
+        require(outerType != null || typeAliasSymbol.fir.typeParameters.isNotEmpty())
+    }
+
     override fun processDeclaredConstructors(processor: (FirConstructorSymbol) -> Unit) {
-        delegatingScope.processDeclaredConstructors {
-
+        delegatingScope.processDeclaredConstructors wrapper@{ originalConstructorSymbol ->
             val typeParameters = typeAliasSymbol.fir.typeParameters
-            if (typeParameters.isEmpty()) processor(it)
-            else {
-                processor(it.fir.copyFactory(
-                    null,
-                    null,
-                    typeParameters.map { buildConstructedClassTypeParameterRef { symbol = it.symbol } }
-                ).symbol)
-            }
-        }
-    }
-}
 
-private typealias ConstructorCopyFactory2<F> =
-        F.(newReturnType: ConeKotlinType?, newValueParameterTypes: List<ConeKotlinType?>?, newTypeParameters: List<FirTypeParameter>) -> F
-
-private typealias ConstructorCopyFactory<F> =
-        F.(newReturnType: ConeKotlinType?, newValueParameterTypes: List<ConeKotlinType?>?, newTypeParameters: List<FirTypeParameterRef>) -> F
-
-private class TypeAliasConstructorsSubstitutor<F : FirFunction<F>>(
-    private val typeAliasSymbol: FirTypeAliasSymbol,
-    private val substitutor: ConeSubstitutor,
-    private val copyFactory: ConstructorCopyFactory2<F>
-) {
-    fun substitute(baseFunction: F): F {
-        val typeParameters = typeAliasSymbol.fir.typeParameters
-        val newReturnType = baseFunction.returnTypeRef.coneType.let(substitutor::substituteOrNull)
-
-        val newParameterTypes = baseFunction.valueParameters.map { valueParameter ->
-            valueParameter.returnTypeRef.coneType.let(substitutor::substituteOrNull)
-        }
-
-        if (newReturnType == null && newParameterTypes.all { it == null }) return baseFunction
-
-        return baseFunction.copyFactory(
-            newReturnType,
-            newParameterTypes,
-            typeParameters
-        )
-    }
-}
-
-private fun prepareSubstitutingScopeForTypeAliasConstructors(
-    typeAliasSymbol: FirTypeAliasSymbol,
-    session: FirSession,
-    delegatingScope: FirScope
-): FirScope? {
-    val copyFactory2: ConstructorCopyFactory<FirConstructor> = factory@{ newReturnType, newParameterTypes, newTypeParameters ->
-        buildConstructor {
-            source = this@factory.source
-            this.session = session
-            origin = FirDeclarationOrigin.SubstitutionOverride
-            returnTypeRef = this@factory.returnTypeRef.withReplacedConeType(newReturnType)
-            receiverTypeRef = this@factory.receiverTypeRef
-            status = this@factory.status
-            symbol = FirConstructorSymbol(this@factory.symbol.callableId, overriddenSymbol = this@factory.symbol)
-            resolvePhase = this@factory.resolvePhase
-            if (newParameterTypes != null) {
-                valueParameters +=
-                    this@factory.valueParameters.zip(
-                        newParameterTypes
-                    ) { valueParameter, newParameterType ->
-                        buildValueParameter {
-                            source = valueParameter.source
-                            this.session = session
-                            resolvePhase = valueParameter.resolvePhase
-                            origin = FirDeclarationOrigin.SubstitutionOverride
-                            returnTypeRef = valueParameter.returnTypeRef.withReplacedConeType(newParameterType)
-                            name = valueParameter.name
-                            symbol = FirVariableSymbol(valueParameter.symbol.callableId)
-                            defaultValue = valueParameter.defaultValue
-                            isCrossinline = valueParameter.isCrossinline
-                            isNoinline = valueParameter.isNoinline
-                            isVararg = valueParameter.isVararg
-                        }
-                    }
-            } else {
-                valueParameters += this@factory.valueParameters
-            }
-            this.typeParameters += newTypeParameters
-        }
-    }
-
-    return TypeAliasConstructorsSubstitutingScope(
-        typeAliasSymbol,
-        copyFactory2,
-        delegatingScope
-    )
-}
-
-private fun <F : FirFunction<F>> prepareSubstitutorForTypeAliasConstructors(
-    typeAliasSymbol: FirTypeAliasSymbol,
-    expandedType: ConeClassLikeType,
-    session: FirSession,
-    copyFactory: ConstructorCopyFactory2<F>
-): TypeAliasConstructorsSubstitutor<F>? {
-    val expandedClass = expandedType.lookupTag.toSymbol(session)?.fir as? FirRegularClass ?: return null
-
-    val resultingTypeArguments = expandedType.typeArguments.map {
-        // We don't know how to handle cases like yet
-        // typealias A = ArrayList<*>()
-        it as? ConeKotlinType ?: return null
-    }
-
-    val substitutor = substitutorByMap(
-        expandedClass.typeParameters.map { it.symbol }.zip(resultingTypeArguments).toMap()
-    )
-
-    return TypeAliasConstructorsSubstitutor(typeAliasSymbol, substitutor, copyFactory)
-}
-
-private fun prepareCopyConstructorForTypealiasNestedClass(
-    matchedSymbol: FirClassLikeSymbol<*>,
-    originalSymbol: FirConstructorSymbol,
-    session: FirSession,
-    bodyResolveComponents: BodyResolveComponents,
-): FirConstructorSymbol? {
-    // If the matched symbol is a type alias, and the expanded type is a nested class, e.g.,
-    //
-    //   class Outer {
-    //     inner class Inner
-    //   }
-    //   typealias OI = Outer.Inner
-    //   fun foo() { Outer().OI() }
-    //
-    // the chances are that `processor` belongs to [ScopeTowerLevel] (to resolve type aliases at top-level), which treats
-    // the explicit receiver (`Outer()`) as an extension receiver, whereas the constructor of the nested class may regard
-    // the same explicit receiver as a dispatch receiver (hence inconsistent receiver).
-    // Here, we add a copy of the nested class constructor, along with the outer type as an extension receiver, so that it
-    // can be seen as if resolving:
-    //
-    //   fun Outer.OI(): OI = ...
-    //
-    if (originalSymbol.callableId.classId?.isNestedClass == true && matchedSymbol is FirTypeAliasSymbol) {
-        val innerTypeRef = originalSymbol.fir.returnTypeRef
-        val innerType = innerTypeRef.coneType.fullyExpandedType(session) as? ConeClassLikeType
-        if (innerType != null) {
-            val outerType = bodyResolveComponents.outerClassManager.outerType(innerType)
-            if (outerType != null) {
-                val extCopy = buildConstructorCopy(originalSymbol.fir) {
+            processor(
+                buildConstructorCopy(originalConstructorSymbol.fir) {
+                    symbol = FirConstructorSymbol(originalConstructorSymbol.callableId)
                     origin = FirDeclarationOrigin.Synthetic
-                    receiverTypeRef = innerTypeRef.withReplacedConeType(outerType)
-                    symbol = FirConstructorSymbol(originalSymbol.callableId, overriddenSymbol = originalSymbol)
-                }
-                return extCopy.symbol
-            }
+
+                    this.typeParameters.clear()
+                    this.typeParameters += typeParameters.map { buildConstructedClassTypeParameterRef { symbol = it.symbol } }
+
+                    if (outerType != null) {
+                        // If the matched symbol is a type alias, and the expanded type is a nested class, e.g.,
+                        //
+                        //   class Outer {
+                        //     inner class Inner
+                        //   }
+                        //   typealias OI = Outer.Inner
+                        //   fun foo() { Outer().OI() }
+                        //
+                        // the chances are that `processor` belongs to [ScopeTowerLevel] (to resolve type aliases at top-level), which treats
+                        // the explicit receiver (`Outer()`) as an extension receiver, whereas the constructor of the nested class may regard
+                        // the same explicit receiver as a dispatch receiver (hence inconsistent receiver).
+                        // Here, we add a copy of the nested class constructor, along with the outer type as an extension receiver, so that it
+                        // can be seen as if resolving:
+                        //
+                        //   fun Outer.OI(): OI = ...
+                        //
+                        //
+                        receiverTypeRef = originalConstructorSymbol.fir.returnTypeRef.withReplacedConeType(outerType)
+                    }
+
+                }.apply {
+                    originalConstructorIfTypeAlias = originalConstructorSymbol.fir
+                }.symbol
+            )
         }
     }
-    return null
 }
+
+private object TypeAliasConstructorKey : FirDeclarationDataKey()
+
+var FirConstructor.originalConstructorIfTypeAlias: FirConstructor? by FirDeclarationDataRegistry.data(TypeAliasConstructorKey)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt
index 8e1a8201baa..a8eb72f0d49 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt
@@ -22,8 +22,11 @@ import org.jetbrains.kotlin.fir.scopes.FirTypeScope
 import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
-import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.types.ConeKotlinErrorType
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
+import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.fir.types.coneTypeSafe
 
 interface Receiver
 
@@ -51,7 +54,7 @@ abstract class AbstractExplicitReceiverValue<E : FirExpression> : AbstractExplic
         get() = explicitReceiver
 }
 
-internal class ExpressionReceiverValue(
+class ExpressionReceiverValue(
     override val explicitReceiver: FirExpression
 ) : AbstractExplicitReceiverValue<FirExpression>(), ReceiverValue
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirSyntheticNamesProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirSyntheticNamesProvider.kt
index e5467ace73b..6320b301cdc 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirSyntheticNamesProvider.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirSyntheticNamesProvider.kt
@@ -13,7 +13,7 @@ abstract class FirSyntheticNamesProvider : FirSessionComponent {
     abstract fun possibleGetterNamesByPropertyName(name: Name): List<Name>
     abstract fun setterNameByGetterName(name: Name): Name?
     abstract fun getterNameBySetterName(name: Name): Name?
-    abstract fun propertyNameByAccessorName(name: Name): Name?
+    abstract fun possiblePropertyNamesByAccessorName(name: Name): List<Name>
 }
 
 val FirSession.syntheticNamesProvider: FirSyntheticNamesProvider by FirSession.sessionComponentAccessor()
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt
index 3e6e23a6798..b3ee019a4c8 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt
@@ -60,3 +60,5 @@ object ResolvedWithLowPriority : ResolutionDiagnostic(CandidateApplicability.RES
 object InapplicableWrongReceiver : ResolutionDiagnostic(CandidateApplicability.INAPPLICABLE_WRONG_RECEIVER)
 
 object LowerPriorityToPreserveCompatibilityDiagnostic : ResolutionDiagnostic(CandidateApplicability.RESOLVED_NEED_PRESERVE_COMPATIBILITY)
+
+object CandidateChosenUsingOverloadResolutionByLambdaAnnotation : ResolutionDiagnostic(CandidateApplicability.RESOLVED)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStageRunner.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStageRunner.kt
index cd60d63f7a4..2fda86facfc 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStageRunner.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStageRunner.kt
@@ -15,7 +15,7 @@ import kotlin.coroutines.resume
 
 class ResolutionStageRunner {
     fun processCandidate(candidate: Candidate, context: ResolutionContext, stopOnFirstError: Boolean = true): CandidateApplicability {
-        val sink = CheckerSinkImpl(stopOnFirstError = stopOnFirstError)
+        val sink = CheckerSinkImpl(candidate, stopOnFirstError = stopOnFirstError)
         var finished = false
         sink.continuation = suspend {
             candidate.callInfo.callKind.resolutionSequence.forEachIndexed { index, stage ->
@@ -35,11 +35,10 @@ class ResolutionStageRunner {
 
         while (!finished) {
             sink.continuation!!.resume(Unit)
-            if (!sink.currentApplicability.isSuccess) {
+            if (!candidate.isSuccessful) {
                 break
             }
         }
-        candidate.diagnostics += sink.diagnostics
-        return sink.currentApplicability
+        return candidate.currentApplicability
     }
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt
index c184071e083..fbbcdfe2ecf 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier
 import org.jetbrains.kotlin.fir.references.FirSuperReference
 import org.jetbrains.kotlin.fir.resolve.*
 import org.jetbrains.kotlin.fir.resolve.inference.*
-import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.SyntheticSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
@@ -23,8 +22,8 @@ import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
 import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.*
+import org.jetbrains.kotlin.types.AbstractNullabilityChecker
 
 abstract class ResolutionStage {
     abstract suspend fun check(candidate: Candidate, callInfo: CallInfo, sink: CheckerSink, context: ResolutionContext)
@@ -58,52 +57,44 @@ internal object CheckExplicitReceiverConsistency : ResolutionStage() {
     }
 }
 
-internal sealed class CheckReceivers : ResolutionStage() {
-    object Dispatch : CheckReceivers() {
-        override fun ExplicitReceiverKind.shouldBeCheckedAgainstImplicit(): Boolean {
-            return this == EXTENSION_RECEIVER // For NO_EXPLICIT_RECEIVER we can check extension receiver only
-        }
-
-        override fun ExplicitReceiverKind.shouldBeCheckedAgainstExplicit(): Boolean {
-            return this == DISPATCH_RECEIVER || this == BOTH_RECEIVERS
-        }
-
-        override fun Candidate.getReceiverType(context: ResolutionContext): ConeKotlinType? {
-            return dispatchReceiverValue?.type
-        }
-    }
-
-    object Extension : CheckReceivers() {
-        override fun ExplicitReceiverKind.shouldBeCheckedAgainstImplicit(): Boolean {
-            return this == DISPATCH_RECEIVER || this == NO_EXPLICIT_RECEIVER
-        }
-
-        override fun ExplicitReceiverKind.shouldBeCheckedAgainstExplicit(): Boolean {
-            return this == EXTENSION_RECEIVER || this == BOTH_RECEIVERS
-        }
-
-        override fun Candidate.getReceiverType(context: ResolutionContext): ConeKotlinType? {
-            val callableSymbol = symbol as? FirCallableSymbol<*> ?: return null
-            val callable = callableSymbol.fir
-            val receiverType = callable.receiverTypeRef?.coneType
-            if (receiverType != null) return receiverType
-            val returnTypeRef = callable.returnTypeRef as? FirResolvedTypeRef ?: return null
-            if (!returnTypeRef.type.isExtensionFunctionType(context.session)) return null
-            return (returnTypeRef.type.typeArguments.firstOrNull() as? ConeKotlinTypeProjection)?.type
-        }
-    }
-
-    abstract fun Candidate.getReceiverType(context: ResolutionContext): ConeKotlinType?
-
-    abstract fun ExplicitReceiverKind.shouldBeCheckedAgainstExplicit(): Boolean
-
-    abstract fun ExplicitReceiverKind.shouldBeCheckedAgainstImplicit(): Boolean
-
+object CheckExtensionReceiver : ResolutionStage() {
     override suspend fun check(candidate: Candidate, callInfo: CallInfo, sink: CheckerSink, context: ResolutionContext) {
-        val expectedReceiverType = candidate.getReceiverType(context)
-        val explicitReceiverExpression = callInfo.explicitReceiver
-        val explicitReceiverKind = candidate.explicitReceiverKind
+        val expectedReceiverType = candidate.getReceiverType(context) ?: return
 
+        val argumentExtensionReceiverValue = candidate.extensionReceiverValue ?: return
+        val expectedType = candidate.substitutor.substituteOrSelf(expectedReceiverType.type)
+        val argumentType = captureFromTypeParameterUpperBoundIfNeeded(
+            argumentType = argumentExtensionReceiverValue.type,
+            expectedType = expectedType,
+            session = context.session
+        )
+        candidate.resolvePlainArgumentType(
+            candidate.csBuilder,
+            argumentType = argumentType,
+            expectedType = expectedType,
+            sink = sink,
+            context = context,
+            isReceiver = true,
+            isDispatch = false,
+        )
+
+        sink.yieldIfNeed()
+    }
+
+    private fun Candidate.getReceiverType(context: ResolutionContext): ConeKotlinType? {
+        val callableSymbol = symbol as? FirCallableSymbol<*> ?: return null
+        val callable = callableSymbol.fir
+        val receiverType = callable.receiverTypeRef?.coneType
+        if (receiverType != null) return receiverType
+        val returnTypeRef = callable.returnTypeRef as? FirResolvedTypeRef ?: return null
+        if (!returnTypeRef.type.isExtensionFunctionType(context.session)) return null
+        return (returnTypeRef.type.typeArguments.firstOrNull() as? ConeKotlinTypeProjection)?.type
+    }
+}
+
+object CheckDispatchReceiver : ResolutionStage() {
+    override suspend fun check(candidate: Candidate, callInfo: CallInfo, sink: CheckerSink, context: ResolutionContext) {
+        val explicitReceiverExpression = callInfo.explicitReceiver
         if (explicitReceiverExpression.isSuperCall()) {
             val status = candidate.symbol.fir as? FirMemberDeclaration
             if (status?.modality == Modality.ABSTRACT) {
@@ -111,50 +102,17 @@ internal sealed class CheckReceivers : ResolutionStage() {
             }
         }
 
-        if (expectedReceiverType != null) {
-            if (explicitReceiverExpression != null &&
-                explicitReceiverKind.shouldBeCheckedAgainstExplicit() &&
-                !explicitReceiverExpression.isSuperReferenceExpression()
-            ) {
-                candidate.resolveArgumentExpression(
-                    candidate.csBuilder,
-                    argument = explicitReceiverExpression,
-                    expectedType = candidate.substitutor.substituteOrSelf(expectedReceiverType),
-                    expectedTypeRef = explicitReceiverExpression.typeRef,
-                    sink = sink,
-                    context = context,
-                    isReceiver = true,
-                    isDispatch = this is Dispatch
-                )
-                sink.yieldIfNeed()
-            } else {
-                val argumentExtensionReceiverValue = candidate.implicitExtensionReceiverValue
-                if (argumentExtensionReceiverValue != null && explicitReceiverKind.shouldBeCheckedAgainstImplicit()) {
-                    val expectedType = candidate.substitutor.substituteOrSelf(expectedReceiverType.type)
-                    val argumentType = captureFromTypeParameterUpperBoundIfNeeded(
-                        argumentType = argumentExtensionReceiverValue.type,
-                        expectedType = expectedType,
-                        session = context.session
-                    )
-                    candidate.resolvePlainArgumentType(
-                        candidate.csBuilder,
-                        argumentType = argumentType,
-                        expectedType = expectedType,
-                        sink = sink,
-                        context = context,
-                        isReceiver = true,
-                        isDispatch = this is Dispatch
-                    )
-                    sink.yieldIfNeed()
-                }
-            }
+        val dispatchReceiverValueType = candidate.dispatchReceiverValue?.type ?: return
+
+        if (!AbstractNullabilityChecker.isSubtypeOfAny(context.session.typeContext, dispatchReceiverValueType)) {
+            sink.yieldDiagnostic(InapplicableWrongReceiver)
         }
     }
+}
 
-    private fun FirExpression?.isSuperCall(): Boolean {
-        if (this !is FirQualifiedAccessExpression) return false
-        return calleeReference is FirSuperReference
-    }
+private fun FirExpression?.isSuperCall(): Boolean {
+    if (this !is FirQualifiedAccessExpression) return false
+    return calleeReference is FirSuperReference
 }
 
 private fun FirExpression.isSuperReferenceExpression(): Boolean {
@@ -226,33 +184,31 @@ internal object CheckVisibility : CheckerStage() {
         val symbol = candidate.symbol
         val declaration = symbol.fir
         if (declaration is FirMemberDeclaration) {
-            if (!checkVisibility(declaration, symbol, sink, candidate, visibilityChecker)) {
+            if (!checkVisibility(declaration, sink, candidate, visibilityChecker)) {
                 return
             }
         }
 
         if (declaration is FirConstructor) {
-            val ownerClassId = declaration.symbol.callableId.classId!!
-            val provider = declaration.session.firSymbolProvider
-            val classSymbol = provider.getClassLikeSymbolByFqName(ownerClassId)
+            // TODO: Should be some other form
+            val classSymbol = declaration.returnTypeRef.coneTypeUnsafe<ConeClassLikeType>().lookupTag.toSymbol(declaration.session)
 
             if (classSymbol is FirRegularClassSymbol) {
                 if (classSymbol.fir.classKind.isSingleton) {
                     sink.yieldDiagnostic(HiddenCandidate)
                 }
-                checkVisibility(classSymbol.fir, classSymbol, sink, candidate, visibilityChecker)
+                checkVisibility(classSymbol.fir, sink, candidate, visibilityChecker)
             }
         }
     }
 
-    private suspend fun checkVisibility(
-        declaration: FirMemberDeclaration,
-        symbol: AbstractFirBasedSymbol<*>,
+    private suspend fun <T> checkVisibility(
+        declaration: T,
         sink: CheckerSink,
         candidate: Candidate,
         visibilityChecker: FirVisibilityChecker
-    ): Boolean {
-        if (!visibilityChecker.isVisible(declaration, symbol, candidate)) {
+    ): Boolean where T : FirMemberDeclaration, T : FirSymbolOwner<*> {
+        if (!visibilityChecker.isVisible(declaration, candidate)) {
             sink.yieldDiagnostic(HiddenCandidate)
             return false
         }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/SuperCalls.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/SuperCalls.kt
index fd3eef45bf6..08f80b1da1c 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/SuperCalls.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/SuperCalls.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirProperty
 import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
 import org.jetbrains.kotlin.fir.declarations.modality
+import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
 import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess
 import org.jetbrains.kotlin.fir.references.FirNamedReference
@@ -20,12 +21,12 @@ import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
-import org.jetbrains.kotlin.fir.symbols.impl.unwrapSubstitutionOverrides
 import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.FirTypeRef
+import org.jetbrains.kotlin.fir.unwrapFakeOverrides
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.AbstractTypeChecker
 import org.jetbrains.kotlin.utils.SmartList
@@ -146,5 +147,5 @@ private fun BodyResolveComponents.isConcreteMember(supertype: ConeKotlinType, me
     val classSymbol =
         (supertype as? ConeClassLikeType)?.lookupTag?.toSymbol(session) as? FirRegularClassSymbol ?: return true
     if (classSymbol.fir.classKind != ClassKind.INTERFACE) return true
-    return member.symbol.unwrapSubstitutionOverrides().callableId.classId != StandardClassIds.Any
+    return member.symbol.unwrapFakeOverrides().dispatchReceiverClassOrNull()?.classId != StandardClassIds.Any
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
index 6c365b65288..99afcf68f14 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
 import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
 import org.jetbrains.kotlin.fir.declarations.isStatic
 import org.jetbrains.kotlin.fir.declarations.synthetic.buildSyntheticProperty
+import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
 import org.jetbrains.kotlin.fir.scopes.FirScope
 import org.jetbrains.kotlin.fir.scopes.FirTypeScope
 import org.jetbrains.kotlin.fir.scopes.ProcessorAction
@@ -21,6 +22,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.ConeNullability.NOT_NULL
+import org.jetbrains.kotlin.fir.unwrapFakeOverrides
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.AbstractTypeChecker
 
@@ -74,7 +76,7 @@ class FirSyntheticPropertiesScope(
                     val parameter = setter.valueParameters.singleOrNull() ?: return
                     if (setter.typeParameters.isNotEmpty() || setter.isStatic) return
                     val parameterType = (parameter.returnTypeRef as? FirResolvedTypeRef)?.type ?: return
-                    if (getter.symbol.callableId.classId == setter.symbol.callableId.classId) {
+                    if (getter.symbol.dispatchReceiverClassOrNull() == setter.symbol.dispatchReceiverClassOrNull()) {
                         if (getterReturnType.withNullability(NOT_NULL) != parameterType.withNullability(NOT_NULL)) {
                             return
                         }
@@ -102,12 +104,16 @@ class FirSyntheticPropertiesScope(
             }
         }
 
+        val classLookupTag = getterSymbol.dispatchReceiverClassOrNull()
+        val packageName = classLookupTag?.classId?.packageFqName ?: getterSymbol.callableId.packageName
+        val className = classLookupTag?.classId?.relativeClassName
+
         val property = buildSyntheticProperty {
             session = this@FirSyntheticPropertiesScope.session
             name = propertyName
             symbol = SyntheticPropertySymbol(
                 accessorId = getterSymbol.callableId,
-                callableId = CallableId(getterSymbol.callableId.packageName, getterSymbol.callableId.className, propertyName)
+                callableId = CallableId(packageName, className, propertyName)
             )
             delegateGetter = getter
             delegateSetter = matchingSetter
@@ -118,7 +124,7 @@ class FirSyntheticPropertiesScope(
     private fun FirFunctionSymbol<*>.hasJavaOverridden(): Boolean {
         var result = false
         baseScope.processOverriddenFunctionsAndSelf(this) {
-            if (it.unwrapSubstitutionOverrides().fir.origin == FirDeclarationOrigin.Enhancement) {
+            if (it.unwrapFakeOverrides().fir.origin == FirDeclarationOrigin.Enhancement) {
                 result = true
                 ProcessorAction.STOP
             } else {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirInvokeResolveTowerExtension.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirInvokeResolveTowerExtension.kt
index 6c4e401f8e6..fb199e89b79 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirInvokeResolveTowerExtension.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirInvokeResolveTowerExtension.kt
@@ -245,7 +245,6 @@ internal class FirInvokeResolveTowerExtension(
         receiverGroup,
         candidateFactoriesAndCollectors.resultCollector,
         candidateFactory,
-        candidateFactoriesAndCollectors.stubReceiverCandidateFactory
     )
 }
 
@@ -307,7 +306,6 @@ private class InvokeReceiverResolveTask(
     towerDataElementsForName,
     collector,
     candidateFactory,
-    stubReceiverCandidateFactory = null
 ) {
     override fun interceptTowerGroup(towerGroup: TowerGroup): TowerGroup =
         towerGroup.InvokeResolvePriority(InvokeResolvePriority.INVOKE_RECEIVER)
@@ -324,14 +322,12 @@ private class InvokeFunctionResolveTask(
     private val receiverGroup: TowerGroup,
     collector: CandidateCollector,
     candidateFactory: CandidateFactory,
-    stubReceiverCandidateFactory: CandidateFactory? = null
 ) : FirBaseTowerResolveTask(
     components,
     manager,
     towerDataElementsForName,
     collector,
     candidateFactory,
-    stubReceiverCandidateFactory
 ) {
 
     override fun interceptTowerGroup(towerGroup: TowerGroup): TowerGroup =
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt
index bd6406e3af3..5d1d8bfde07 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt
@@ -7,16 +7,17 @@ package org.jetbrains.kotlin.fir.resolve.calls.tower
 
 import org.jetbrains.kotlin.fir.asReversedFrozen
 import org.jetbrains.kotlin.fir.expressions.FirExpression
+import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
 import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier
+import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub
 import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents
+import org.jetbrains.kotlin.fir.resolve.DoubleColonLHS
 import org.jetbrains.kotlin.fir.resolve.FirTowerDataContext
 import org.jetbrains.kotlin.fir.resolve.calls.*
-import org.jetbrains.kotlin.fir.resolve.scope
-import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
-import org.jetbrains.kotlin.fir.scopes.FirCompositeScope
 import org.jetbrains.kotlin.fir.scopes.FirScope
 import org.jetbrains.kotlin.fir.scopes.ProcessorAction
 import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.impl.FirImplicitBuiltinTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
@@ -55,8 +56,7 @@ internal abstract class FirBaseTowerResolveTask(
     private val manager: TowerResolveManager,
     protected val towerDataElementsForName: TowerDataElementsForName,
     private val collector: CandidateCollector,
-    private val candidateFactory: CandidateFactory,
-    private val stubReceiverCandidateFactory: CandidateFactory? = null
+    private val candidateFactory: CandidateFactory
 ) {
     protected val session get() = components.session
 
@@ -133,7 +133,6 @@ internal abstract class FirBaseTowerResolveTask(
         val result = handler.handleLevel(
             collector,
             candidateFactory,
-            stubReceiverCandidateFactory,
             callInfo,
             explicitReceiverKind,
             finalGroup,
@@ -151,14 +150,12 @@ internal open class FirTowerResolveTask(
     towerDataElementsForName: TowerDataElementsForName,
     collector: CandidateCollector,
     candidateFactory: CandidateFactory,
-    stubReceiverCandidateFactory: CandidateFactory? = null
 ) : FirBaseTowerResolveTask(
     components,
     manager,
     towerDataElementsForName,
     collector,
     candidateFactory,
-    stubReceiverCandidateFactory
 ) {
 
     suspend fun runResolverForQualifierReceiver(
@@ -180,16 +177,24 @@ internal open class FirTowerResolveTask(
 
         if (resolvedQualifier.symbol != null) {
             val typeRef = resolvedQualifier.typeRef
-            // NB: yet built-in Unit is used for "no-value" type
-            if (info.callKind == CallKind.CallableReference) {
-                if (info.stubReceiver != null || typeRef !is FirImplicitBuiltinTypeRef) {
-                    runResolverForExpressionReceiver(info, resolvedQualifier, parentGroup = TowerGroup.QualifierValue)
-                }
-            } else {
-                if (typeRef !is FirImplicitBuiltinTypeRef) {
-                    runResolverForExpressionReceiver(info, resolvedQualifier, parentGroup = TowerGroup.QualifierValue)
+            if (info.callKind == CallKind.CallableReference && info.lhs is DoubleColonLHS.Type) {
+                val stubReceiver = buildExpressionStub {
+                    source = info.explicitReceiver?.source
+                    this.typeRef = buildResolvedTypeRef {
+                        type = info.lhs.type
+                    }
                 }
+
+                val stubReceiverInfo = info.replaceExplicitReceiver(stubReceiver)
+
+                runResolverForExpressionReceiver(stubReceiverInfo, stubReceiver, parentGroup = TowerGroup.QualifierValue)
             }
+
+            // NB: yet built-in Unit is used for "no-value" type
+            if (typeRef !is FirImplicitBuiltinTypeRef) {
+                runResolverForExpressionReceiver(info, resolvedQualifier, parentGroup = TowerGroup.QualifierValue)
+            }
+
         }
     }
 
@@ -200,7 +205,7 @@ internal open class FirTowerResolveTask(
         val callableScope = qualifierReceiver.callableScope() ?: return
         processLevel(
             callableScope.toScopeTowerLevel(includeInnerConstructors = false),
-            info.noStubReceiver(), TowerGroup.Qualifier
+            info, TowerGroup.Qualifier
         )
     }
 
@@ -215,7 +220,7 @@ internal open class FirTowerResolveTask(
         val scope = qualifierReceiver.classifierScope() ?: return
         val group = if (prioritized) TowerGroup.ClassifierPrioritized else TowerGroup.Classifier
         processLevel(
-            scope.toScopeTowerLevel(includeInnerConstructors = false), info.noStubReceiver(),
+            scope.toScopeTowerLevel(includeInnerConstructors = false), info,
             group
         )
     }
@@ -285,20 +290,12 @@ internal open class FirTowerResolveTask(
 
     suspend fun runResolverForSuperReceiver(
         info: CallInfo,
-        superTypeRef: FirTypeRef
+        superCall: FirQualifiedAccessExpression,
     ) {
-        val scope = when (superTypeRef) {
-            is FirResolvedTypeRef -> superTypeRef.type.scope(session, components.scopeSession, FakeOverrideTypeCalculator.DoNothing)
-            is FirComposedSuperTypeRef -> FirCompositeScope(
-                superTypeRef.superTypeRefs.mapNotNull {
-                    it.type.scope(session, components.scopeSession, FakeOverrideTypeCalculator.DoNothing)
-                }
-            )
-            else -> null
-        } ?: return
+        val receiverValue = ExpressionReceiverValue(superCall)
         processLevel(
-            scope.toScopeTowerLevel(),
-            info, TowerGroup.Member, explicitReceiverKind = ExplicitReceiverKind.DISPATCH_RECEIVER
+            receiverValue.toMemberScopeTowerLevel(),
+            info, TowerGroup.Member, explicitReceiverKind = ExplicitReceiverKind.DISPATCH_RECEIVER,
         )
     }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolver.kt
index 37879b83e89..48d0ac06de7 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolver.kt
@@ -52,7 +52,6 @@ class FirTowerResolver(
             TowerDataElementsForName(info.name, components.towerDataContext),
             candidateFactoriesAndCollectors.resultCollector,
             candidateFactoriesAndCollectors.candidateFactory,
-            candidateFactoriesAndCollectors.stubReceiverCandidateFactory
         )
         when (val receiver = info.explicitReceiver) {
             is FirResolvedQualifier -> {
@@ -65,9 +64,8 @@ class FirTowerResolver(
             }
             else -> {
                 if (receiver is FirQualifiedAccessExpression) {
-                    val calleeReference = receiver.calleeReference
-                    if (calleeReference is FirSuperReference) {
-                        manager.enqueueResolverTask { mainTask.runResolverForSuperReceiver(info, receiver.typeRef) }
+                    if (receiver.calleeReference is FirSuperReference) {
+                        manager.enqueueResolverTask { mainTask.runResolverForSuperReceiver(info, receiver) }
                         return
                     }
                 }
@@ -104,11 +102,12 @@ class FirTowerResolver(
             resultCollector.consumeCandidate(
                 TowerGroup.Member,
                 candidateFactory.createCandidate(
+                    info,
                     it,
                     ExplicitReceiverKind.NO_EXPLICIT_RECEIVER,
                     scope,
                     dispatchReceiver,
-                    implicitExtensionReceiverValue = null,
+                    extensionReceiverValue = null,
                     builtInExtensionFunctionReceiverValue = null
                 ),
                 context
@@ -124,16 +123,10 @@ class FirTowerResolver(
         context: ResolutionContext
     ): CandidateFactoriesAndCollectors {
         val candidateFactory = CandidateFactory(context, info)
-        val stubReceiverCandidateFactory =
-            if (info.callKind == CallKind.CallableReference && info.stubReceiver != null)
-                candidateFactory.replaceCallInfo(info.replaceExplicitReceiver(info.stubReceiver))
-            else
-                null
 
         return CandidateFactoriesAndCollectors(
             candidateFactory,
-            collector,
-            stubReceiverCandidateFactory
+            collector
         )
     }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevelHandler.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevelHandler.kt
index 5b8ef780304..754b641da99 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevelHandler.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevelHandler.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.fir.resolve.calls.tower
 
-import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier
 import org.jetbrains.kotlin.fir.resolve.calls.*
 import org.jetbrains.kotlin.fir.scopes.FirScope
@@ -14,8 +13,10 @@ import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.fir.typeContext
-import org.jetbrains.kotlin.fir.types.*
-import org.jetbrains.kotlin.fir.types.impl.FirImplicitBuiltinTypeRef
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
+import org.jetbrains.kotlin.fir.types.ConeStarProjection
+import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.fir.types.constructClassType
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
 import org.jetbrains.kotlin.types.AbstractTypeChecker
@@ -24,9 +25,6 @@ internal class CandidateFactoriesAndCollectors(
     // Common calls
     val candidateFactory: CandidateFactory,
     val resultCollector: CandidateCollector,
-
-    // Callable references
-    val stubReceiverCandidateFactory: CandidateFactory?,
 )
 
 
@@ -38,7 +36,6 @@ internal class TowerLevelHandler {
     fun handleLevel(
         collector: CandidateCollector,
         candidateFactory: CandidateFactory,
-        stubReceiverCandidateFactory: CandidateFactory? = null,
         info: CallInfo,
         explicitReceiverKind: ExplicitReceiverKind,
         group: TowerGroup,
@@ -47,7 +44,7 @@ internal class TowerLevelHandler {
         processResult = ProcessorAction.NONE
         val processor =
             TowerScopeLevelProcessor(
-                info.explicitReceiver,
+                info,
                 explicitReceiverKind,
                 collector,
                 candidateFactory,
@@ -66,28 +63,7 @@ internal class TowerLevelHandler {
                 towerLevel.processFunctions(info.name, processor)
             }
             CallKind.CallableReference -> {
-                val stubReceiver = info.stubReceiver
-                if (stubReceiver != null) {
-                    val stubReceiverValue = ExpressionReceiverValue(stubReceiver)
-                    val stubProcessor = TowerScopeLevelProcessor(
-                        info.explicitReceiver,
-                        if (towerLevel is MemberScopeTowerLevel && towerLevel.dispatchReceiver is AbstractExplicitReceiver<*>) {
-                            ExplicitReceiverKind.DISPATCH_RECEIVER
-                        } else {
-                            ExplicitReceiverKind.EXTENSION_RECEIVER
-                        },
-                        collector,
-                        stubReceiverCandidateFactory!!, group
-                    )
-                    val towerLevelWithStubReceiver = towerLevel.replaceReceiverValue(stubReceiverValue)
-                    towerLevelWithStubReceiver.processFunctionsAndProperties(info.name, stubProcessor)
-                    // NB: we don't perform this for implicit Unit
-                    if (!collector.isSuccess() && info.explicitReceiver?.typeRef !is FirImplicitBuiltinTypeRef) {
-                        towerLevel.processFunctionsAndProperties(info.name, processor)
-                    }
-                } else {
-                    towerLevel.processFunctionsAndProperties(info.name, processor)
-                }
+                towerLevel.processFunctionsAndProperties(info.name, processor)
             }
             else -> {
                 throw AssertionError("Unsupported call kind in tower resolver: ${info.callKind}")
@@ -138,7 +114,7 @@ internal class TowerLevelHandler {
 }
 
 private class TowerScopeLevelProcessor(
-    val explicitReceiver: FirExpression?,
+    val callInfo: CallInfo,
     val explicitReceiverKind: ExplicitReceiverKind,
     val resultCollector: CandidateCollector,
     val candidateFactory: CandidateFactory,
@@ -147,18 +123,17 @@ private class TowerScopeLevelProcessor(
     override fun consumeCandidate(
         symbol: AbstractFirBasedSymbol<*>,
         dispatchReceiverValue: ReceiverValue?,
-        implicitExtensionReceiverValue: ImplicitReceiverValue<*>?,
+        extensionReceiverValue: ReceiverValue?,
         scope: FirScope,
         builtInExtensionFunctionReceiverValue: ReceiverValue?
     ) {
         // Check explicit extension receiver for default package members
         if (symbol is FirNamedFunctionSymbol && dispatchReceiverValue == null &&
-            (implicitExtensionReceiverValue == null) != (explicitReceiver == null) &&
-            explicitReceiver !is FirResolvedQualifier &&
+            extensionReceiverValue != null &&
+            callInfo.explicitReceiver !is FirResolvedQualifier &&
             symbol.callableId.packageName.startsWith(defaultPackage)
         ) {
-            val extensionReceiverType = explicitReceiver?.typeRef?.coneTypeSafe()
-                ?: implicitExtensionReceiverValue?.type as? ConeClassLikeType
+            val extensionReceiverType = extensionReceiverValue.type as? ConeClassLikeType
             if (extensionReceiverType != null) {
                 val declarationReceiverType = (symbol as? FirCallableSymbol<*>)?.fir?.receiverTypeRef?.coneType
                 if (declarationReceiverType is ConeClassLikeType) {
@@ -179,11 +154,12 @@ private class TowerScopeLevelProcessor(
         // ---
         resultCollector.consumeCandidate(
             group, candidateFactory.createCandidate(
+                callInfo,
                 symbol,
                 explicitReceiverKind,
                 scope,
                 dispatchReceiverValue,
-                implicitExtensionReceiverValue,
+                extensionReceiverValue,
                 builtInExtensionFunctionReceiverValue
             ), candidateFactory.context
         )
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt
index ae5996dfd79..e5e11b61a25 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt
@@ -7,25 +7,19 @@ package org.jetbrains.kotlin.fir.resolve.calls.tower
 
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirConstructor
-import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
 import org.jetbrains.kotlin.fir.declarations.isInner
-import org.jetbrains.kotlin.fir.expressions.FirExpression
+import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
 import org.jetbrains.kotlin.fir.expressions.builder.buildResolvedQualifier
-import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
+import org.jetbrains.kotlin.fir.resolve.*
 import org.jetbrains.kotlin.fir.resolve.calls.*
-import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.resultType
-import org.jetbrains.kotlin.fir.resolve.typeForQualifier
 import org.jetbrains.kotlin.fir.scopes.FirScope
 import org.jetbrains.kotlin.fir.scopes.ProcessorAction
+import org.jetbrains.kotlin.fir.scopes.impl.importedFromObjectData
 import org.jetbrains.kotlin.fir.scopes.processClassifiersByName
 import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.*
-import org.jetbrains.kotlin.fir.types.ConeKotlinType
-import org.jetbrains.kotlin.fir.types.ConeNullability
-import org.jetbrains.kotlin.fir.types.classId
-import org.jetbrains.kotlin.fir.types.withNullability
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
@@ -47,7 +41,7 @@ interface TowerScopeLevel {
         fun consumeCandidate(
             symbol: T,
             dispatchReceiverValue: ReceiverValue?,
-            implicitExtensionReceiverValue: ImplicitReceiverValue<*>?,
+            extensionReceiverValue: ReceiverValue?,
             scope: FirScope,
             builtInExtensionFunctionReceiverValue: ReceiverValue? = null
         )
@@ -71,7 +65,7 @@ abstract class SessionBasedTowerLevel(val session: FirSession) : TowerScopeLevel
 class MemberScopeTowerLevel(
     session: FirSession,
     private val bodyResolveComponents: BodyResolveComponents,
-    val dispatchReceiver: ReceiverValue,
+    val dispatchReceiverValue: ReceiverValue,
     private val extensionReceiver: ReceiverValue? = null,
     private val implicitExtensionInvokeMode: Boolean = false,
     private val scopeSession: ScopeSession
@@ -81,7 +75,7 @@ class MemberScopeTowerLevel(
         processScopeMembers: FirScope.(processor: (T) -> Unit) -> Unit
     ): ProcessorAction {
         var empty = true
-        val scope = dispatchReceiver.scope(session, scopeSession) ?: return ProcessorAction.NONE
+        val scope = dispatchReceiverValue.scope(session, scopeSession) ?: return ProcessorAction.NONE
         scope.processScopeMembers { candidate ->
             empty = false
             if (candidate is FirCallableSymbol<*> &&
@@ -91,24 +85,23 @@ class MemberScopeTowerLevel(
                 if ((fir as? FirConstructor)?.isInner == false) {
                     return@processScopeMembers
                 }
-                val dispatchReceiverValue = NotNullableReceiverValue(dispatchReceiver)
 
                 output.consumeCandidate(
                     candidate, dispatchReceiverValue,
-                    implicitExtensionReceiverValue = extensionReceiver as? ImplicitReceiverValue<*>,
+                    extensionReceiverValue = extensionReceiver,
                     scope
                 )
 
                 if (implicitExtensionInvokeMode) {
                     output.consumeCandidate(
                         candidate, dispatchReceiverValue,
-                        implicitExtensionReceiverValue = null,
+                        extensionReceiverValue = null,
                         scope,
                         builtInExtensionFunctionReceiverValue = this.extensionReceiver
                     )
                 }
             } else if (candidate is FirClassLikeSymbol<*>) {
-                output.consumeCandidate(candidate, null, extensionReceiver as? ImplicitReceiverValue<*>, scope)
+                output.consumeCandidate(candidate, null, extensionReceiver, scope)
             }
         }
 
@@ -116,7 +109,7 @@ class MemberScopeTowerLevel(
             val withSynthetic = FirSyntheticPropertiesScope(session, scope)
             withSynthetic.processScopeMembers { symbol ->
                 empty = false
-                output.consumeCandidate(symbol, NotNullableReceiverValue(dispatchReceiver), null, scope)
+                output.consumeCandidate(symbol, dispatchReceiverValue, null, scope)
             }
         }
         return if (empty) ProcessorAction.NONE else ProcessorAction.NEXT
@@ -150,13 +143,7 @@ class MemberScopeTowerLevel(
                     }
                 )
             }
-            TowerScopeLevel.Token.Objects -> processMembers(processor) { consumer ->
-                this.processClassifiersByName(name) {
-                    // WARNING, DO NOT CAST FUNCTIONAL TYPE ITSELF
-                    @Suppress("UNCHECKED_CAST")
-                    consumer(it as T)
-                }
-            }
+            TowerScopeLevel.Token.Objects -> ProcessorAction.NEXT
         }
     }
 
@@ -190,13 +177,13 @@ class ScopeTowerLevel(
         }
 
     private fun dispatchReceiverValue(candidate: FirCallableSymbol<*>): ReceiverValue? {
-        val holderId = candidate.callableId.classId
-        if (holderId != null && candidate.fir.origin == FirDeclarationOrigin.ImportedFromObject) {
-            val symbol = session.firSymbolProvider.getClassLikeSymbolByFqName(holderId)
+        candidate.fir.importedFromObjectData?.let { data ->
+            val objectClassId = data.objectClassId
+            val symbol = session.firSymbolProvider.getClassLikeSymbolByFqName(objectClassId)
             if (symbol is FirRegularClassSymbol) {
                 val resolvedQualifier = buildResolvedQualifier {
-                    packageFqName = holderId.packageFqName
-                    relativeClassFqName = holderId.relativeClassName
+                    packageFqName = objectClassId.packageFqName
+                    relativeClassFqName = objectClassId.relativeClassName
                     this.symbol = symbol
                 }.apply {
                     resultType = bodyResolveComponents.typeForQualifier(this)
@@ -204,11 +191,13 @@ class ScopeTowerLevel(
                 return ExpressionReceiverValue(resolvedQualifier)
             }
         }
+
+        val lookupTag = candidate.dispatchReceiverClassOrNull()
         return when {
             candidate !is FirBackingFieldSymbol -> null
-            candidate.callableId.classId != null -> {
+            lookupTag != null -> {
                 bodyResolveComponents.implicitReceiverStack.lastDispatchReceiver { implicitReceiverValue ->
-                    implicitReceiverValue.type.classId == holderId
+                    (implicitReceiverValue.type as? ConeClassLikeType)?.fullyExpandedType(session)?.lookupTag == lookupTag
                 }
             }
             else -> {
@@ -223,13 +212,11 @@ class ScopeTowerLevel(
     ) {
         if (candidate.hasConsistentReceivers(extensionReceiver)) {
             val dispatchReceiverValue = dispatchReceiverValue(candidate)
-            val unwrappedCandidate = if (candidate.fir.origin == FirDeclarationOrigin.ImportedFromObject) {
-                candidate.overriddenSymbol!!
-            } else candidate
+            val unwrappedCandidate = candidate.fir.importedFromObjectData?.original?.symbol ?: candidate
             @Suppress("UNCHECKED_CAST")
             processor.consumeCandidate(
                 unwrappedCandidate as T, dispatchReceiverValue,
-                implicitExtensionReceiverValue = extensionReceiver as? ImplicitReceiverValue<*>,
+                extensionReceiverValue = extensionReceiver,
                 scope
             )
         }
@@ -260,7 +247,7 @@ class ScopeTowerLevel(
                 empty = false
                 processor.consumeCandidate(
                     it as T, dispatchReceiverValue = null,
-                    implicitExtensionReceiverValue = null,
+                    extensionReceiverValue = null,
                     scope = scope
                 )
             }
@@ -269,13 +256,6 @@ class ScopeTowerLevel(
     }
 }
 
-class NotNullableReceiverValue(val value: ReceiverValue) : ReceiverValue {
-    override val type: ConeKotlinType
-        get() = value.type.withNullability(ConeNullability.NOT_NULL)
-    override val receiverExpression: FirExpression
-        get() = value.receiverExpression
-}
-
 private fun FirCallableSymbol<*>.hasExtensionReceiver(): Boolean {
     return fir.receiverTypeRef != null
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
index d151b828065..d0734c68154 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
@@ -637,7 +637,9 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
     fun enterTryExpression(tryExpression: FirTryExpression) {
         val (tryExpressionEnterNode, tryMainBlockEnterNode) = graphBuilder.enterTryExpression(tryExpression)
         tryExpressionEnterNode.mergeIncomingFlow()
-        tryMainBlockEnterNode.mergeIncomingFlow()
+        // NB: fork to isolate effects inside the try main block
+        // Otherwise, changes in the try main block could affect the try expression enter node as well as its previous nodes.
+        tryMainBlockEnterNode.mergeIncomingFlow(shouldForkFlow = true)
     }
 
     fun exitTryMainBlock(tryExpression: FirTryExpression) {
@@ -645,7 +647,9 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
     }
 
     fun enterCatchClause(catch: FirCatch) {
-        graphBuilder.enterCatchClause(catch).mergeIncomingFlow(updateReceivers = true)
+        // NB: fork to isolate effects inside the catch clause
+        // Otherwise, changes in the catch clause could affect the previous node: try main block.
+        graphBuilder.enterCatchClause(catch).mergeIncomingFlow(updateReceivers = true, shouldForkFlow = true)
     }
 
     fun exitCatchClause(catch: FirCatch) {
@@ -653,19 +657,20 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
     }
 
     fun enterFinallyBlock() {
-        // TODO
-        graphBuilder.enterFinallyBlock().mergeIncomingFlow()
+        // NB: fork to isolate effects inside the finally block
+        // Otherwise, changes in the finally block could affect the previous nodes: try main block and catch clauses.
+        graphBuilder.enterFinallyBlock().mergeIncomingFlow(shouldForkFlow = true)
     }
 
     fun exitFinallyBlock(tryExpression: FirTryExpression) {
-        // TODO
         graphBuilder.exitFinallyBlock(tryExpression).mergeIncomingFlow()
     }
 
     fun exitTryExpression(callCompleted: Boolean) {
-        // TODO
         val (tryExpressionExitNode, unionNode) = graphBuilder.exitTryExpression(callCompleted)
-        tryExpressionExitNode.mergeIncomingFlow()
+        // NB: fork to prevent effects after the try expression from being flown into the try expression
+        // Otherwise, changes in any following nodes could affect the previous nodes, including try main block and finally block if any.
+        tryExpressionExitNode.mergeIncomingFlow(shouldForkFlow = true)
         unionNode?.let { unionFlowFromArguments(it) }
     }
 
@@ -839,7 +844,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
 
     fun exitConstExpression(constExpression: FirConstExpression<*>) {
         if (constExpression.resultType is FirResolvedTypeRef && !contractDescriptionVisitingMode) return
-        graphBuilder.exitConstExpresion(constExpression).mergeIncomingFlow()
+        graphBuilder.exitConstExpression(constExpression).mergeIncomingFlow()
     }
 
     fun exitLocalVariableDeclaration(variable: FirProperty) {
@@ -894,8 +899,11 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
         }
 
         if (isAssignment) {
-            if (initializer is FirConstExpression<*> && initializer.kind == FirConstKind.Null) return
-            flow.addTypeStatement(propertyVariable typeEq initializer.typeRef.coneType)
+            if (initializer is FirConstExpression<*> && initializer.kind == FirConstKind.Null) {
+                flow.addTypeStatement(propertyVariable typeEq property.returnTypeRef.coneType.withNullability(ConeNullability.NULLABLE))
+            } else {
+                flow.addTypeStatement(propertyVariable typeEq initializer.typeRef.coneType)
+            }
         }
     }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt
index e1d8ff91d28..567f9226ffa 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt
@@ -109,11 +109,6 @@ abstract class PersistentLogicSystem(context: ConeInferenceContext) : LogicSyste
         return foldFlow(
             flows,
             mergeOperation = { statements -> this.or(statements).takeIf { it.isNotEmpty } },
-            computeVariables = { computeVariablesDiffWithCommonFlow ->
-                flows.map {
-                    computeVariablesDiffWithCommonFlow(it).toList()
-                }.intersectSets().takeIf { it.isNotEmpty() }
-            }
         )
     }
 
@@ -121,18 +116,12 @@ abstract class PersistentLogicSystem(context: ConeInferenceContext) : LogicSyste
         return foldFlow(
             flows,
             this::and,
-            computeVariables = { computeVariablesDiffWithCommonFlow ->
-                flows.flatMapTo(mutableSetOf()) {
-                    computeVariablesDiffWithCommonFlow(it)
-                }
-            }
         )
     }
 
     private inline fun foldFlow(
         flows: Collection<PersistentFlow>,
         mergeOperation: (Collection<TypeStatement>) -> MutableTypeStatement?,
-        computeVariables: (computeVariablesDiffWithCommonFlow: (PersistentFlow) -> Iterable<RealVariable>) -> Collection<RealVariable>?
     ): PersistentFlow {
         if (flows.isEmpty()) return createEmptyFlow()
         flows.singleOrNull()?.let { return it }
@@ -140,11 +129,11 @@ abstract class PersistentLogicSystem(context: ConeInferenceContext) : LogicSyste
         val aliasedVariablesThatDontChangeAlias = computeAliasesThatDontChange(flows)
 
         val commonFlow = flows.reduce(::lowestCommonFlow)
-        val variables =
-            computeVariables { it.diffVariablesIterable(commonFlow, aliasedVariablesThatDontChangeAlias.keys) } ?: return commonFlow
 
+        val variables = flows.flatMap { it.approvedTypeStatements.keys }.toSet()
         for (variable in variables) {
-            val info = mergeOperation(flows.map { it.getApprovedTypeStatementsDiff(variable, commonFlow) }) ?: continue
+            val info = mergeOperation(flows.map { it.getApprovedTypeStatements(variable, commonFlow) }) ?: continue
+            removeAllAboutVariable(commonFlow, variable)
             commonFlow.addApprovedStatements(info)
         }
 
@@ -209,16 +198,23 @@ abstract class PersistentLogicSystem(context: ConeInferenceContext) : LogicSyste
     }
 
     @OptIn(DfaInternals::class)
-    private fun PersistentFlow.getApprovedTypeStatementsDiff(variable: RealVariable, parentFlow: PersistentFlow): MutableTypeStatement {
+    private fun PersistentFlow.getApprovedTypeStatements(variable: RealVariable, parentFlow: PersistentFlow): MutableTypeStatement {
         var flow = this
         val result = MutableTypeStatement(variable)
         val variableUnderAlias = directAliasMap[variable]
         if (variableUnderAlias == null) {
-            while (flow != parentFlow) {
-                flow.approvedTypeStatementsDiff[variable]?.let {
+            // get approved type statement even though the starting flow == parent flow
+            if (flow == parentFlow) {
+                flow.approvedTypeStatements[variable]?.let {
                     result += it
                 }
-                flow = flow.previousFlow!!
+            } else {
+                while (flow != parentFlow) {
+                    flow.approvedTypeStatements[variable]?.let {
+                        result += it
+                    }
+                    flow = flow.previousFlow!!
+                }
             }
         } else {
             result.exactType.addIfNotNull(variableUnderAlias.originalType)
@@ -227,54 +223,6 @@ abstract class PersistentLogicSystem(context: ConeInferenceContext) : LogicSyste
         return result
     }
 
-    /**
-     * This is an iterable over real variable that has known facts in flow range
-     *   from [this] to [parentFlow]
-     */
-    private fun PersistentFlow.diffVariablesIterable(
-        parentFlow: PersistentFlow,
-        aliasedVariablesThatDontChangeAlias: Set<RealVariable>
-    ): Iterable<RealVariable> =
-        object : DiffIterable<RealVariable>(parentFlow, this) {
-            override fun extractIterator(flow: PersistentFlow): Iterator<RealVariable> {
-                val variablesWithNewInfo = flow.approvedTypeStatementsDiff.keys
-                val updatedVariables = ArrayList(variablesWithNewInfo)
-                updatedVariables += flow.updatedAliasDiff
-                variablesWithNewInfo.flatMapTo(updatedVariables) { variableWithNewInfo ->
-                    flow.backwardsAliasMap[variableWithNewInfo]?.filter { it !in aliasedVariablesThatDontChangeAlias } ?: emptyList()
-                }
-                return updatedVariables.iterator()
-            }
-        }
-
-    private abstract class DiffIterable<T>(private val parentFlow: PersistentFlow, private var currentFlow: PersistentFlow) : Iterable<T> {
-        @Suppress("LeakingThis")
-        private var currentIterator = extractIterator(currentFlow)
-
-        abstract fun extractIterator(flow: PersistentFlow): Iterator<T>
-
-        override fun iterator(): Iterator<T> {
-            return object : Iterator<T> {
-                override fun hasNext(): Boolean {
-                    if (currentIterator.hasNext()) return true
-                    while (currentFlow != parentFlow) {
-                        currentFlow = currentFlow.previousFlow!!
-                        currentIterator = extractIterator(currentFlow)
-                        if (currentIterator.hasNext()) return true
-                    }
-                    return false
-                }
-
-                override fun next(): T {
-                    if (!hasNext()) {
-                        throw NoSuchElementException()
-                    }
-                    return currentIterator.next()
-                }
-            }
-        }
-    }
-
     override fun addTypeStatement(flow: PersistentFlow, statement: TypeStatement) {
         if (statement.isEmpty) return
         with(flow) {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt
index 282732b54c1..ad3bb7a7adf 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt
@@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.resolve.dfa
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject
 import org.jetbrains.kotlin.fir.declarations.FirProperty
-import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor
 import org.jetbrains.kotlin.fir.declarations.modality
 import org.jetbrains.kotlin.fir.expressions.*
@@ -163,18 +161,15 @@ class VariableStorage(private val session: FirSession) {
             property.receiverTypeRef != null -> false
             property.getter.let { it != null && it !is FirDefaultPropertyAccessor } -> false
             property.modality != Modality.FINAL -> {
-                val dispatchReceiver = (originalFir as? FirQualifiedAccess)?.dispatchReceiver ?: return false
-                val propertyClassName = (this as FirPropertySymbol).let { it.overriddenSymbol ?: it }.callableId.classId
+                val dispatchReceiver = (originalFir.unwrapElement() as? FirQualifiedAccess)?.dispatchReceiver ?: return false
                 val receiverType = dispatchReceiver.typeRef.coneTypeSafe<ConeClassLikeType>()?.fullyExpandedType(session) ?: return false
-                val receiverSymbol = receiverType.fullyExpandedType(session).lookupTag.toSymbol(session) ?: return false
-                val receiverClassName = receiverSymbol.classId
-                if (propertyClassName != receiverClassName) {
-                    when (val receiverFir = receiverSymbol.fir) {
-                        is FirAnonymousObject -> true
-                        is FirRegularClass -> receiverFir.modality == Modality.FINAL
-                        else -> throw IllegalStateException("Should not be here: $receiverFir")
-                    }
-                } else false
+                val receiverSymbol = receiverType.lookupTag.toSymbol(session) ?: return false
+                when (val receiverFir = receiverSymbol.fir) {
+                    is org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -> true
+                    is org.jetbrains.kotlin.fir.declarations.FirRegularClass -> receiverFir.modality == Modality.FINAL
+                    else -> throw IllegalStateException("Should not be here: $receiverFir")
+                }
+
             }
             else -> true
         }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt
index 374545d5a75..ceccaf39958 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt
@@ -122,7 +122,10 @@ fun CFGNode<*>.render(): String =
     }
 
 private object CfgRenderMode : FirRenderer.RenderMode(
-    renderLambdaBodies = false, renderCallArguments = false, renderCallableFqNames = false, renderDeclatationResovlePhase = false
+    renderLambdaBodies = false,
+    renderCallArguments = false,
+    renderCallableFqNames = false,
+    renderDeclarationResolvePhase = false
 )
 
 private fun FirFunction<*>.name(): String = when (this) {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt
index e2f8ef632d4..5446b6ffedb 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt
@@ -84,6 +84,7 @@ class ControlFlowGraphBuilder {
     private val binaryOrExitNodes: Stack<BinaryOrExitNode> = stackOf()
 
     private val tryExitNodes: NodeStorage<FirTryExpression, TryExpressionExitNode> = NodeStorage()
+    private val tryMainExitNodes: NodeStorage<FirTryExpression, TryMainBlockExitNode> = NodeStorage()
     private val catchNodeStorages: Stack<NodeStorage<FirCatch, CatchClauseEnterNode>> = stackOf()
     private val catchNodeStorage: NodeStorage<FirCatch, CatchClauseEnterNode> get() = catchNodeStorages.top()
     private val finallyEnterNodes: Stack<FinallyBlockEnterNode> = stackOf()
@@ -269,7 +270,9 @@ class ControlFlowGraphBuilder {
         val exitNode = createFunctionExitNode(anonymousFunction).also {
             exitsOfAnonymousFunctions[symbol] = it
             exitTargetsForReturn.push(it)
-            exitTargetsForTry.push(it)
+            if (!invocationKind.isInPlace) {
+                exitTargetsForTry.push(it)
+            }
         }
 
         if (invocationKind.hasTowardEdge) {
@@ -298,13 +301,16 @@ class ControlFlowGraphBuilder {
             else -> false
         }
 
+    private val EventOccurrencesRange?.isInPlace: Boolean
+        get() = this != null
+
     fun exitAnonymousFunction(anonymousFunction: FirAnonymousFunction): Triple<FunctionExitNode, PostponedLambdaExitNode?, ControlFlowGraph> {
-
-
         val symbol = anonymousFunction.symbol
         val exitNode = exitsOfAnonymousFunctions.remove(symbol)!!.also {
             require(it == exitTargetsForReturn.pop())
-            require(it == exitTargetsForTry.pop())
+            if (!anonymousFunction.invocationKind.isInPlace) {
+                require(it == exitTargetsForTry.pop())
+            }
         }
         popAndAddEdge(exitNode)
         exitNode.updateDeadStatus()
@@ -540,6 +546,7 @@ class ControlFlowGraphBuilder {
 
     fun exitJump(jump: FirJump<*>): JumpNode {
         val node = createJumpNode(jump)
+        // TODO: if within `try` with `finally`, don't go to the target directly.
         val nextNode = when (jump) {
             is FirReturnExpression -> exitTargetsForReturn[jump.target.labeledElement.symbol]
             is FirContinueExpression -> loopEnterNodes[jump.target.labeledElement]
@@ -786,19 +793,19 @@ class ControlFlowGraphBuilder {
         levelCounter++
         val enterTryNodeBlock = createTryMainBlockEnterNode(tryExpression)
         addNewSimpleNode(enterTryNodeBlock)
-        addEdge(enterTryNodeBlock, exitTargetsForTry.top())
 
         for (catch in tryExpression.catches) {
             val catchNode = createCatchClauseEnterNode(catch)
             catchNodeStorage.push(catchNode)
-            addEdge(enterTryNodeBlock, catchNode)
-            addEdge(catchNode, exitTargetsForTry.top())
+            // a flow where an exception of interest is thrown and caught before executing any of try-main block.
+            addEdge(enterTryExpressionNode, catchNode)
         }
         levelCounter++
 
         if (tryExpression.finallyBlock != null) {
             val finallyEnterNode = createFinallyBlockEnterNode(tryExpression)
-            addEdge(enterTryNodeBlock, finallyEnterNode, label = UncaughtExceptionPath)
+            // a flow where an uncaught exception is thrown before executing any of try-main block.
+            addEdge(enterTryExpressionNode, finallyEnterNode, label = UncaughtExceptionPath)
             finallyEnterNodes.push(finallyEnterNode)
         }
 
@@ -808,10 +815,12 @@ class ControlFlowGraphBuilder {
     fun exitTryMainBlock(tryExpression: FirTryExpression): TryMainBlockExitNode {
         levelCounter--
         val node = createTryMainBlockExitNode(tryExpression)
+        tryMainExitNodes.push(node)
         popAndAddEdge(node)
         val finallyEnterNode = finallyEnterNodes.topOrNull()
         // NB: Check the level to avoid adding an edge to the finally block at an upper level.
         if (finallyEnterNode != null && finallyEnterNode.level == levelCounter + 1) {
+            // TODO: in case of return/throw in try main block, we need a unique label.
             addEdge(node, finallyEnterNode)
         } else {
             addEdge(node, tryExitNodes.top())
@@ -820,7 +829,21 @@ class ControlFlowGraphBuilder {
     }
 
     fun enterCatchClause(catch: FirCatch): CatchClauseEnterNode {
-        return catchNodeStorage[catch]!!.also { lastNodes.push(it) }.also { levelCounter++ }
+        return catchNodeStorage[catch]!!.also {
+            val tryMainExitNode = tryMainExitNodes.top()
+            // a flow where an exception of interest is thrown and caught after executing all of try-main block.
+            addEdge(tryMainExitNode, it)
+            val finallyEnterNode = finallyEnterNodes.topOrNull()
+            // a flow where an uncaught exception is thrown before executing any of catch clause.
+            // NB: Check the level to avoid adding an edge to the finally block at an upper level.
+            if (finallyEnterNode != null && finallyEnterNode.level == levelCounter + 1) {
+                addEdge(it, finallyEnterNode, label = UncaughtExceptionPath)
+            } else {
+                addEdge(it, exitTargetsForTry.top(), label = UncaughtExceptionPath)
+            }
+            lastNodes.push(it)
+            levelCounter++
+        }
     }
 
     fun exitCatchClause(catch: FirCatch): CatchClauseExitNode {
@@ -830,6 +853,7 @@ class ControlFlowGraphBuilder {
             val finallyEnterNode = finallyEnterNodes.topOrNull()
             // NB: Check the level to avoid adding an edge to the finally block at an upper level.
             if (finallyEnterNode != null && finallyEnterNode.level == levelCounter + 1) {
+                // TODO: in case of return/rethrow in catch clause, we need a unique label.
                 addEdge(it, finallyEnterNode, propagateDeadness = false)
             } else {
                 addEdge(it, tryExitNodes.top(), propagateDeadness = false)
@@ -847,8 +871,11 @@ class ControlFlowGraphBuilder {
         return createFinallyBlockExitNode(tryExpression).also {
             popAndAddEdge(it)
             val tryExitNode = tryExitNodes.top()
+            // a flow where either there wasn't any exception or caught if any.
             addEdge(it, tryExitNode)
+            // a flow that exits to the exit target while there was an uncaught exception.
             addEdge(it, exitTargetsForTry.top(), label = UncaughtExceptionPath)
+            // TODO: differentiate flows that return/(re)throw in try main block or catch clauses.
         }
     }
 
@@ -857,6 +884,7 @@ class ControlFlowGraphBuilder {
     ): Pair<TryExpressionExitNode, UnionFunctionCallArgumentsNode?> {
         levelCounter--
         catchNodeStorages.pop()
+        tryMainExitNodes.pop()
         val node = tryExitNodes.pop()
         node.updateDeadStatus()
         lastNodes.push(node)
@@ -919,7 +947,7 @@ class ControlFlowGraphBuilder {
         return node to unionNode
     }
 
-    fun exitConstExpresion(constExpression: FirConstExpression<*>): ConstExpressionNode {
+    fun exitConstExpression(constExpression: FirConstExpression<*>): ConstExpressionNode {
         return createConstExpressionNode(constExpression).also { addNewSimpleNode(it) }
     }
 
@@ -1109,11 +1137,13 @@ class ControlFlowGraphBuilder {
 
         return createContractDescriptionEnterNode().also {
             lastNodes.push(it)
+            exitTargetsForTry.push(it)
         }
     }
 
     fun exitContractDescription() {
         lastNodes.pop()
+        exitTargetsForTry.pop()
         popGraph()
     }
 
@@ -1242,4 +1272,4 @@ class ControlFlowGraphBuilder {
 
 }
 
-fun FirDeclaration?.isLocalClassOrAnonymousObject() = ((this as? FirRegularClass)?.isLocal == true) || this is FirAnonymousObject
\ No newline at end of file
+fun FirDeclaration?.isLocalClassOrAnonymousObject() = ((this as? FirRegularClass)?.isLocal == true) || this is FirAnonymousObject
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
index 729665c5102..217f86e2997 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
@@ -12,8 +12,11 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.FirResolvable
 import org.jetbrains.kotlin.fir.expressions.FirStatement
 import org.jetbrains.kotlin.fir.resolve.ResolutionMode
+import org.jetbrains.kotlin.fir.resolve.calls.Candidate
 import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate
 import org.jetbrains.kotlin.fir.resolve.calls.ResolutionContext
+import org.jetbrains.kotlin.fir.resolve.inference.model.ConeArgumentConstraintPosition
+import org.jetbrains.kotlin.fir.resolve.initialTypeOfCandidate
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.transformers.FirCallCompletionResultsWriterTransformer
 import org.jetbrains.kotlin.fir.resolve.transformers.InvocationKindTransformer
@@ -25,14 +28,17 @@ import org.jetbrains.kotlin.fir.resolvedTypeFromPrototype
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
+import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 import org.jetbrains.kotlin.fir.visitors.transformSingle
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.calls.inference.buildAbstractResultingSubstitutor
 import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintSystemCompletionMode
+import org.jetbrains.kotlin.resolve.calls.inference.model.ArgumentConstraintPosition
 import org.jetbrains.kotlin.resolve.calls.inference.model.SimpleConstraintSystemConstraintPosition
 import org.jetbrains.kotlin.types.TypeApproximatorConfiguration
 import org.jetbrains.kotlin.types.model.StubTypeMarker
 import org.jetbrains.kotlin.types.model.TypeVariableMarker
+import org.jetbrains.kotlin.types.model.safeSubstitute
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
 
 class FirCallCompleter(
@@ -52,9 +58,7 @@ class FirCallCompleter(
 
         val reference = call.calleeReference as? FirNamedReferenceWithCandidate ?: return CompletionResult(call, true)
         val candidate = reference.candidate
-        val initialSubstitutor = candidate.substitutor
-
-        val initialType = initialSubstitutor.substituteOrSelf(typeRef.type)
+        val initialType = components.initialTypeOfCandidate(candidate, call)
 
         if (call is FirExpression) {
             call.resultType = typeRef.resolvedTypeFromPrototype(initialType)
@@ -72,15 +76,7 @@ class FirCallCompleter(
         return when (completionMode) {
             ConstraintSystemCompletionMode.FULL -> {
                 if (inferenceSession.shouldRunCompletion(call)) {
-                    completer.complete(
-                        candidate.system.asConstraintSystemCompleterContext(),
-                        completionMode,
-                        listOf(call),
-                        initialType,
-                        transformer.resolutionContext
-                    ) {
-                        analyzer.analyze(candidate.system.asPostponedArgumentsAnalyzerContext(), it, candidate)
-                    }
+                    runCompletionForCall(candidate, completionMode, call, initialType, analyzer)
                     val finalSubstitutor = candidate.system.asReadOnlyStorage()
                         .buildAbstractResultingSubstitutor(session.inferenceComponents.ctx) as ConeSubstitutor
                     val completedCall = call.transformSingle(
@@ -99,15 +95,7 @@ class FirCallCompleter(
             }
 
             ConstraintSystemCompletionMode.PARTIAL -> {
-                completer.complete(
-                    candidate.system.asConstraintSystemCompleterContext(),
-                    completionMode,
-                    listOf(call),
-                    initialType,
-                    transformer.resolutionContext
-                ) {
-                    analyzer.analyze(candidate.system.asPostponedArgumentsAnalyzerContext(), it, candidate)
-                }
+                runCompletionForCall(candidate, completionMode, call, initialType, analyzer)
                 inferenceSession.addPartiallyResolvedCall(call)
                 CompletionResult(call, false)
             }
@@ -116,6 +104,47 @@ class FirCallCompleter(
         }
     }
 
+    fun <T> runCompletionForCall(
+        candidate: Candidate,
+        completionMode: ConstraintSystemCompletionMode,
+        call: T,
+        initialType: ConeKotlinType,
+        analyzer: PostponedArgumentsAnalyzer? = null
+    ) where T : FirResolvable, T : FirStatement {
+        @Suppress("NAME_SHADOWING")
+        val analyzer = analyzer ?: createPostponedArgumentsAnalyzer(transformer.resolutionContext)
+        completer.complete(
+            candidate.system.asConstraintSystemCompleterContext(),
+            completionMode,
+            listOf(call),
+            initialType,
+            transformer.resolutionContext
+        ) {
+            analyzer.analyze(candidate.system.asPostponedArgumentsAnalyzerContext(), it, candidate)
+        }
+    }
+
+    fun prepareLambdaAtomForFactoryPattern(
+        atom: ResolvedLambdaAtom,
+        candidate: Candidate
+    ) {
+        val returnVariable = ConeTypeVariableForLambdaReturnType(atom.atom, "_R")
+        val csBuilder = candidate.system.getBuilder()
+        csBuilder.registerVariable(returnVariable)
+        val functionalType = csBuilder.buildCurrentSubstitutor()
+            .safeSubstitute(csBuilder.asConstraintSystemCompleterContext(), atom.expectedType!!) as ConeClassLikeType
+        val size = functionalType.typeArguments.size
+        val expectedType = ConeClassLikeTypeImpl(
+            functionalType.lookupTag,
+            Array(size) { index -> if (index != size - 1) functionalType.typeArguments[index] else returnVariable.defaultType },
+            isNullable = functionalType.isNullable,
+            functionalType.attributes
+        )
+        csBuilder.addSubtypeConstraint(expectedType, functionalType, ConeArgumentConstraintPosition())
+        atom.replaceExpectedType(expectedType)
+        atom.replaceTypeVariableForLambdaReturnType(returnVariable)
+    }
+
     fun createCompletionResultsWriter(
         substitutor: ConeSubstitutor,
         mode: FirCallCompletionResultsWriterTransformer.Mode = FirCallCompletionResultsWriterTransformer.Mode.Normal
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceUtils.kt
index 8622e283300..dc9e4f15eda 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceUtils.kt
@@ -9,17 +9,17 @@ import org.jetbrains.kotlin.builtins.functions.FunctionClassKind
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
 import org.jetbrains.kotlin.fir.declarations.FirClass
+import org.jetbrains.kotlin.fir.originalForSubstitutionOverride
 import org.jetbrains.kotlin.fir.resolve.*
 import org.jetbrains.kotlin.fir.resolve.calls.Candidate
+import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
 import org.jetbrains.kotlin.fir.scopes.ProcessorAction
 import org.jetbrains.kotlin.fir.scopes.processOverriddenFunctions
 import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
+import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.fir.typeContext
-import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
-import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
-import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 import org.jetbrains.kotlin.name.ClassId
@@ -29,12 +29,22 @@ import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 
 @OptIn(ExperimentalContracts::class)
-private fun ConeKotlinType.functionClassKind(session: FirSession): FunctionClassKind? {
+private fun ConeKotlinType.classId(session: FirSession): ClassId? {
     contract {
-        returns(true) implies (this@functionClassKind is ConeClassLikeType)
+        returns(true) implies (this@classId is ConeClassLikeType)
     }
     if (this !is ConeClassLikeType) return null
-    val classId = fullyExpandedType(session).lookupTag.classId
+    return fullyExpandedType(session).lookupTag.classId
+}
+
+fun ConeKotlinType.isKMutableProperty(session: FirSession): Boolean {
+    val classId = classId(session) ?: return false
+    return classId.packageFqName == StandardClassIds.BASE_REFLECT_PACKAGE &&
+            classId.shortClassName.identifier.startsWith("KMutableProperty")
+}
+
+private fun ConeKotlinType.functionClassKind(session: FirSession): FunctionClassKind? {
+    val classId = classId(session) ?: return null
     return FunctionClassKind.byClassNamePrefix(classId.packageFqName, classId.relativeClassName.asString())
 }
 
@@ -46,6 +56,11 @@ fun ConeKotlinType.isBuiltinFunctionalType(session: FirSession): Boolean {
             kind == FunctionClassKind.KSuspendFunction
 }
 
+fun ConeKotlinType.isFunctionalType(session: FirSession): Boolean {
+    val kind = functionClassKind(session) ?: return false
+    return kind == FunctionClassKind.Function
+}
+
 fun ConeKotlinType.isSuspendFunctionType(session: FirSession): Boolean {
     val kind = functionClassKind(session) ?: return false
     return kind == FunctionClassKind.SuspendFunction ||
@@ -122,7 +137,7 @@ fun ConeKotlinType.findContributedInvokeSymbol(
     if (declaredInvoke != null) {
         // Make sure the user-contributed or type-substituted invoke we just found above is an override of base invoke.
         scope.processOverriddenFunctions(declaredInvoke!!) { functionSymbol ->
-            if (functionSymbol == baseInvokeSymbol || functionSymbol.overriddenSymbol == baseInvokeSymbol) {
+            if (functionSymbol == baseInvokeSymbol || functionSymbol.originalForSubstitutionOverride == baseInvokeSymbol) {
                 overriddenInvoke = functionSymbol
                 ProcessorAction.STOP
             } else {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedArgumentsAnalyzer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedArgumentsAnalyzer.kt
index 1f8b5a101cf..314f0cc7d58 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedArgumentsAnalyzer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedArgumentsAnalyzer.kt
@@ -55,7 +55,7 @@ class PostponedArgumentsAnalyzer(
         argument: PostponedResolvedAtom,
         candidate: Candidate
     ) {
-        return when (argument) {
+        when (argument) {
             is ResolvedLambdaAtom ->
                 analyzeLambda(c, argument, candidate)
 
@@ -97,12 +97,12 @@ class PostponedArgumentsAnalyzer(
         }
     }
 
-    private fun analyzeLambda(
+    fun analyzeLambda(
         c: PostponedArgumentsAnalyzerContext,
         lambda: ResolvedLambdaAtom,
         candidate: Candidate
         //diagnosticHolder: KotlinDiagnosticsHolder
-    ) {
+    ): ReturnArgumentsAnalysisResult {
         val unitType = components.session.builtinTypes.unitType.type
         val stubsForPostponedVariables = c.bindingStubsForPostponedVariables()
         val currentSubstitutor = c.buildCurrentSubstitutor(stubsForPostponedVariables.mapKeys { it.key.freshTypeConstructor(c) })
@@ -122,7 +122,7 @@ class PostponedArgumentsAnalyzer(
             else -> null
         }
 
-        val (returnArguments, inferenceSession) = lambdaAnalyzer.analyzeAndGetLambdaReturnArguments(
+        val results = lambdaAnalyzer.analyzeAndGetLambdaReturnArguments(
             lambda,
             receiver,
             parameters,
@@ -130,7 +130,18 @@ class PostponedArgumentsAnalyzer(
             rawReturnType,
             stubsForPostponedVariables
         )
+        applyResultsOfAnalyzedLambdaToCandidateSystem(c, lambda, candidate, results, ::substitute)
+        return results
+    }
 
+    fun applyResultsOfAnalyzedLambdaToCandidateSystem(
+        c: PostponedArgumentsAnalyzerContext,
+        lambda: ResolvedLambdaAtom,
+        candidate: Candidate,
+        results: ReturnArgumentsAnalysisResult,
+        substitute: (ConeKotlinType) -> ConeKotlinType = c.createSubstituteFunctorForLambdaAnalysis()
+    ) {
+        val (returnArguments, inferenceSession) = results
         if (inferenceSession != null) {
             val storageSnapshot = c.getBuilder().currentStorage()
 
@@ -151,10 +162,10 @@ class PostponedArgumentsAnalyzer(
 
         returnArguments.forEach { c.addSubsystemFromExpression(it) }
 
-        val checkerSink: CheckerSink = CheckerSinkImpl()
+        val checkerSink: CheckerSink = CheckerSinkImpl(candidate)
 
         var hasExpressionInReturnArguments = false
-        val lambdaReturnType = lambda.returnType.let(::substitute).takeUnless { it.isUnit }
+        val lambdaReturnType = lambda.returnType.let(substitute).takeUnless { it.isUnit }
         returnArguments.forEach {
             if (it !is FirExpression) return@forEach
             hasExpressionInReturnArguments = true
@@ -172,12 +183,22 @@ class PostponedArgumentsAnalyzer(
 
         if (!hasExpressionInReturnArguments && lambdaReturnType != null) {
             /*LambdaArgumentConstraintPosition(lambda)*/
-            c.getBuilder().addEqualityConstraint(lambdaReturnType, unitType, SimpleConstraintSystemConstraintPosition)
+            c.getBuilder().addEqualityConstraint(
+                lambdaReturnType,
+                components.session.builtinTypes.unitType.type,
+                SimpleConstraintSystemConstraintPosition
+            )
         }
 
         lambda.analyzed = true
         lambda.returnStatements = returnArguments
     }
+
+    fun PostponedArgumentsAnalyzerContext.createSubstituteFunctorForLambdaAnalysis(): (ConeKotlinType) -> ConeKotlinType {
+        val stubsForPostponedVariables = bindingStubsForPostponedVariables()
+        val currentSubstitutor = buildCurrentSubstitutor(stubsForPostponedVariables.mapKeys { it.key.freshTypeConstructor(this) })
+        return { currentSubstitutor.safeSubstitute(this, it) as ConeKotlinType }
+    }
 }
 
 fun LambdaWithTypeVariableAsExpectedTypeAtom.transformToResolvedLambda(
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedAtoms.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedAtoms.kt
index 3eafe7e786f..c7f1ab6bfc8 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedAtoms.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedAtoms.kt
@@ -41,12 +41,12 @@ sealed class PostponedResolvedAtom : PostponedResolvedAtomMarker {
 
 class ResolvedLambdaAtom(
     val atom: FirAnonymousFunction,
-    override val expectedType: ConeKotlinType?,
+    expectedType: ConeKotlinType?,
     val isSuspend: Boolean,
     val receiver: ConeKotlinType?,
     val parameters: List<ConeKotlinType>,
     val returnType: ConeKotlinType,
-    val typeVariableForLambdaReturnType: ConeTypeVariableForLambdaReturnType?,
+    typeVariableForLambdaReturnType: ConeTypeVariableForLambdaReturnType?,
     candidateOfOuterCall: Candidate?
 ) : PostponedResolvedAtom() {
     init {
@@ -55,10 +55,24 @@ class ResolvedLambdaAtom(
         }
     }
 
+    var typeVariableForLambdaReturnType = typeVariableForLambdaReturnType
+        private set
+
+    override var expectedType = expectedType
+        private set
+
     lateinit var returnStatements: Collection<FirStatement>
 
     override val inputTypes: Collection<ConeKotlinType> get() = receiver?.let { parameters + it } ?: parameters
     override val outputType: ConeKotlinType get() = returnType
+
+    fun replaceExpectedType(expectedType: ConeKotlinType) {
+        this.expectedType = expectedType
+    }
+
+    fun replaceTypeVariableForLambdaReturnType(typeVariableForLambdaReturnType: ConeTypeVariableForLambdaReturnType) {
+        this.typeVariableForLambdaReturnType = typeVariableForLambdaReturnType
+    }
 }
 
 class LambdaWithTypeVariableAsExpectedTypeAtom(
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt
index 7d8fd4b65e3..33825d8e5cc 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.builder.buildRegularClass
 import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunction
 import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
+import org.jetbrains.kotlin.fir.resolve.constructType
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals
 import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
@@ -47,6 +48,7 @@ class FirCloneableSymbolProvider(session: FirSession, scopeProvider: FirScopePro
             Modality.ABSTRACT
         )
         classKind = ClassKind.INTERFACE
+        symbol = FirRegularClassSymbol(CLONEABLE_CLASS_ID)
         declarations += buildSimpleFunction {
             this.session = session
             resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
@@ -57,10 +59,11 @@ class FirCloneableSymbolProvider(session: FirSession, scopeProvider: FirScopePro
             status = FirDeclarationStatusImpl(Visibilities.Protected, Modality.OPEN)
             name = CLONE
             symbol = FirNamedFunctionSymbol(CallableId(CLONEABLE_CLASS_ID, CLONE))
+            dispatchReceiverType = this@buildRegularClass.symbol.constructType(emptyArray(), isNullable = false)
         }
         this.scopeProvider = scopeProvider
         name = CLONEABLE
-        symbol = FirRegularClassSymbol(CLONEABLE_CLASS_ID)
+
     }
 
     override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt
index 94b12ce92d2..e2956676d6d 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.ThreadSafeMutableState
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
+import org.jetbrains.kotlin.fir.originalIfFakeOverride
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirProviderInternals
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
@@ -30,7 +31,7 @@ class FirProviderImpl(val session: FirSession, val kotlinScopeProvider: KotlinSc
     override val symbolProvider: FirSymbolProvider = SymbolProvider()
 
     override fun getFirCallableContainerFile(symbol: FirCallableSymbol<*>): FirFile? {
-        symbol.overriddenSymbol?.let {
+        symbol.originalIfFakeOverride()?.let {
             return getFirCallableContainerFile(it)
         }
         if (symbol is FirAccessorSymbol) {
@@ -120,7 +121,10 @@ class FirProviderImpl(val session: FirSession, val kotlinScopeProvider: KotlinSc
             state.classifierContainerFileMap[classId] = file
         }
 
-        override fun <F : FirCallableDeclaration<F>> visitCallableDeclaration(callableDeclaration: FirCallableDeclaration<F>, data: Pair<State, FirFile>) {
+        override fun <F : FirCallableDeclaration<F>> visitCallableDeclaration(
+            callableDeclaration: FirCallableDeclaration<F>,
+            data: Pair<State, FirFile>
+        ) {
             val symbol = callableDeclaration.symbol
             val callableId = symbol.callableId
             val (state, file) = data
@@ -138,6 +142,8 @@ class FirProviderImpl(val session: FirSession, val kotlinScopeProvider: KotlinSc
 
         override fun visitProperty(property: FirProperty, data: Pair<State, FirFile>) {
             visitCallableDeclaration(property, data)
+            property.getter?.let { visitCallableDeclaration(it, data) }
+            property.setter?.let { visitCallableDeclaration(it, data) }
         }
 
         override fun visitEnumEntry(enumEntry: FirEnumEntry, data: Pair<State, FirFile>) {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
index 2fd8a19c0b8..7a10ae85036 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.extensions.extensionService
 import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider
 import org.jetbrains.kotlin.fir.extensions.supertypeGenerators
 import org.jetbrains.kotlin.fir.resolve.*
-import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.LocalClassesNavigationInfo
 import org.jetbrains.kotlin.fir.scopes.FirCompositeScope
 import org.jetbrains.kotlin.fir.scopes.FirScope
@@ -228,7 +227,7 @@ private class FirSupertypeResolverVisitor(
 
                 // Local classes should be treated specially and supplied with localClassesNavigationInfo, normally
                 // But it seems to be too strict to add an assertion here
-                val navigationInfo = localClassesNavigationInfo ?: return persistentListOf()
+                if (localClassesNavigationInfo == null) return persistentListOf()
 
                 val parent = localClassesNavigationInfo.parentForClass[classLikeDeclaration]
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt
index fedc5fc9b95..103949d3eb2 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt
@@ -172,12 +172,15 @@ class FirSyntheticCallGenerator(
         return FirNamedReferenceWithCandidate(null, name, candidate)
     }
 
-    private fun generateCandidate(callInfo: CallInfo, function: FirSimpleFunction, context: ResolutionContext): Candidate =
-        CandidateFactory(context, callInfo).createCandidate(
+    private fun generateCandidate(callInfo: CallInfo, function: FirSimpleFunction, context: ResolutionContext): Candidate {
+        val candidateFactory = CandidateFactory(context, callInfo)
+        return candidateFactory.createCandidate(
+            callInfo,
             symbol = function.symbol,
             explicitReceiverKind = ExplicitReceiverKind.NO_EXPLICIT_RECEIVER,
             scope = null
         )
+    }
 
     private fun generateCallInfo(name: Name, argumentList: FirArgumentList, callKind: CallKind) = CallInfo(
         callKind = callKind,
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt
index 397a973122a..1957b5de6c5 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt
@@ -20,7 +20,7 @@ fun AbstractFirBasedSymbol<*>.ensureResolved(
     requiredPhase: FirResolvePhase,
     // TODO: Currently, the parameter is unused but it's needed to guarantee that all call-sites are able to supply use-site session
     // TODO: Decide which one session should be used and probably get rid of the parameter if use-site session is not needed
-    useSiteSession: FirSession,
+    @Suppress("UNUSED_PARAMETER") useSiteSession: FirSession,
 ) {
     val fir = fir as FirDeclaration
     val availablePhase = fir.resolvePhase
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt
index a20d1eb5b04..42b6f473833 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt
@@ -85,8 +85,11 @@ class BodyResolveContext(
     fun getTowerDataContextForConstructorResolution(): FirTowerDataContext =
         firTowerDataContextsForClassParts().forConstructorHeaders
 
-    fun getPrimaryConstructorParametersScope(): FirLocalScope? =
-        towerDataContextsForClassParts?.primaryConstructorParametersScope
+    fun getPrimaryConstructorPureParametersScope(): FirLocalScope? =
+        towerDataContextsForClassParts?.primaryConstructorPureParametersScope
+
+    fun getPrimaryConstructorAllParametersScope(): FirLocalScope? =
+        towerDataContextsForClassParts?.primaryConstructorAllParametersScope
 
     private fun firTowerDataContextsForClassParts() =
         towerDataContextsForClassParts.sure { "towerDataContextForStaticNestedClasses should not be null" }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt
index 9d3cb58deff..6a9861c2657 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt
@@ -122,7 +122,7 @@ abstract class FirAbstractBodyResolveTransformer(phase: FirResolvePhase) : FirAb
         override val symbolProvider: FirSymbolProvider = session.firSymbolProvider
 
         override val resolutionStageRunner: ResolutionStageRunner = ResolutionStageRunner()
-        override val samResolver: FirSamResolver = FirSamResolverImpl(session, scopeSession)
+
         private val qualifiedResolver: FirQualifiedNameResolver = FirQualifiedNameResolver(this)
         override val callResolver: FirCallResolver = FirCallResolver(
             this,
@@ -137,5 +137,6 @@ abstract class FirAbstractBodyResolveTransformer(phase: FirResolvePhase) : FirAb
         override val syntheticCallGenerator: FirSyntheticCallGenerator = FirSyntheticCallGenerator(this)
         override val doubleColonExpressionResolver: FirDoubleColonExpressionResolver = FirDoubleColonExpressionResolver(session)
         override val outerClassManager: FirOuterClassManager = FirOuterClassManager(session, context.outerLocalClassForNested)
+        override val samResolver: FirSamResolver = FirSamResolverImpl(session, scopeSession, outerClassManager)
     }
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
index 36b97e91216..9b35691af73 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
@@ -121,13 +121,14 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
             dataFlowAnalyzer.enterProperty(property)
             withFullBodyResolve {
                 withLocalScopeCleanup {
+                    val primaryConstructorParametersScope = context.getPrimaryConstructorPureParametersScope()
                     context.withContainer(property) {
                         if (property.delegate != null) {
-                            addLocalScope(context.getPrimaryConstructorParametersScope())
+                            addLocalScope(primaryConstructorParametersScope)
                             transformPropertyWithDelegate(property)
                         } else {
                             withLocalScopeCleanup {
-                                addLocalScope(context.getPrimaryConstructorParametersScope())
+                                addLocalScope(primaryConstructorParametersScope)
                                 property.transformChildrenWithoutAccessors(returnTypeRef)
                             }
                             if (property.initializer != null) {
@@ -577,7 +578,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
             }
 
             val scopeWithValueParameters = if (constructor.isPrimary) {
-                context.getPrimaryConstructorParametersScope()
+                context.getPrimaryConstructorAllParametersScope()
             } else {
                 constructor.scopeWithParameters()
             }
@@ -624,7 +625,9 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
         if (implicitTypeOnly) return anonymousInitializer.compose()
         return withLocalScopeCleanup {
             dataFlowAnalyzer.enterInitBlock(anonymousInitializer)
-            addLocalScope(context.getPrimaryConstructorParametersScope())
+            addLocalScope(
+                context.getPrimaryConstructorPureParametersScope()
+            )
             addNewLocalScope()
             val result =
                 transformDeclarationContent(anonymousInitializer, ResolutionMode.ContextIndependent).single as FirAnonymousInitializer
@@ -841,17 +844,20 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
                 staticsAndCompanion
 
         val constructor = (owner as? FirRegularClass)?.declarations?.firstOrNull { it is FirConstructor } as? FirConstructor
-        val primaryConstructorParametersScope =
+        val (primaryConstructorPureParametersScope, primaryConstructorAllParametersScope) =
             if (constructor?.isPrimary == true) {
-                constructor.scopeWithParameters()
-            } else null
+                constructor.scopesWithPrimaryConstructorParameters(owner)
+            } else {
+                null to null
+            }
 
         components.context.replaceTowerDataContext(forMembersResolution)
 
         val newContexts = FirTowerDataContextsForClassParts(
             newTowerDataContextForStaticNestedClasses,
             scopeForConstructorHeader,
-            primaryConstructorParametersScope
+            primaryConstructorPureParametersScope,
+            primaryConstructorAllParametersScope
         )
 
         context.withNewTowerDataForClassParts(newContexts) {
@@ -863,6 +869,22 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
         return valueParameters.fold(FirLocalScope()) { acc, param -> acc.storeVariable(param) }
     }
 
+    private fun FirConstructor.scopesWithPrimaryConstructorParameters(
+        ownerClass: FirClass<*>
+    ): Pair<FirLocalScope, FirLocalScope> {
+        var parameterScope = FirLocalScope()
+        var allScope = FirLocalScope()
+        val properties = ownerClass.declarations.filterIsInstance<FirProperty>().associateBy { it.name }
+        for (parameter in valueParameters) {
+            allScope = allScope.storeVariable(parameter)
+            val property = properties[parameter.name]
+            if (property?.source?.kind != FirFakeSourceElementKind.PropertyFromParameter) {
+                parameterScope = parameterScope.storeVariable(parameter)
+            }
+        }
+        return parameterScope to allScope
+    }
+
     protected inline fun <T> withLabelAndReceiverType(
         labelName: Name?,
         owner: FirCallableDeclaration<*>,
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
index fbaaf7358b1..82218152e9e 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
@@ -760,7 +760,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
             context.withTowerDataCleanup {
                 if ((context.containerIfAny as? FirConstructor)?.isPrimary == true) {
                     context.replaceTowerDataContext(context.getTowerDataContextForConstructorResolution())
-                    context.getPrimaryConstructorParametersScope()?.let(context::addLocalScope)
+                    context.getPrimaryConstructorAllParametersScope()?.let(context::addLocalScope)
                 }
 
                 // it's just a constructor parameters scope created in
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
index 62cb3c4d51e..725bf09fb9e 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
@@ -5,20 +5,17 @@
 
 package org.jetbrains.kotlin.fir.resolve.transformers.body.resolve
 
-import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
 import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic
 import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind
-import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.ResolutionMode
 import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.firProvider
 import org.jetbrains.kotlin.fir.resolve.transformers.*
 import org.jetbrains.kotlin.fir.resolve.transformers.contracts.runContractResolveForLocalClass
 import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
-import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirAccessorSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef
@@ -213,15 +210,14 @@ private class ReturnTypeCalculatorWithJump(
             return tryCalculateReturnType(declaration.getter.delegate)
         }
 
-        if (declaration.origin == FirDeclarationOrigin.IntersectionOverride) {
-            val result = tryCalculateReturnType(declaration.symbol.overriddenSymbol!!.fir)
+        if (declaration.isIntersectionOverride) {
+            val result = tryCalculateReturnType(declaration.symbol.baseForIntersectionOverride!!.fir)
             declaration.replaceReturnTypeRef(result)
             return result
         }
 
-        runIf(declaration.origin == FirDeclarationOrigin.SubstitutionOverride) {
-            val possiblyFirFakeOverrideSymbol = declaration.symbol as PossiblyFirFakeOverrideSymbol<*, *>
-            val overriddenDeclaration = possiblyFirFakeOverrideSymbol.overriddenSymbol?.fir as FirTypedDeclaration? ?: return@runIf
+        runIf(declaration.isSubstitutionOverride) {
+            val overriddenDeclaration = declaration.originalForSubstitutionOverride ?: return@runIf
             tryCalculateReturnType(overriddenDeclaration)
             return FakeOverrideTypeCalculator.Forced.computeReturnType(declaration)
         }
@@ -236,8 +232,6 @@ private class ReturnTypeCalculatorWithJump(
 
     private fun computeReturnTypeRef(declaration: FirCallableMemberDeclaration<*>): FirResolvedTypeRef {
         val symbol = declaration.symbol
-        val id = symbol.callableId
-
         val provider = session.firProvider
 
         val (designation, outerBodyResolveContext) = if (declaration in designationMapForLocalClasses) {
@@ -245,7 +239,7 @@ private class ReturnTypeCalculatorWithJump(
         } else {
             val file = provider.getFirCallableContainerFile(symbol)
 
-            val outerClasses = generateSequence(id.classId) { classId ->
+            val outerClasses = generateSequence(symbol.containingClass()?.classId) { classId ->
                 classId.outerClassId
             }.mapTo(mutableListOf()) { provider.getFirClassifierByFqName(it) }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/KotlinScopeProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/KotlinScopeProvider.kt
index 30e6d7dc0b8..14632038c67 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/KotlinScopeProvider.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/KotlinScopeProvider.kt
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap
 import org.jetbrains.kotlin.fir.scopes.impl.*
 import org.jetbrains.kotlin.fir.symbols.CallableId
-import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 import org.jetbrains.kotlin.fir.types.ConeClassErrorType
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
@@ -48,7 +47,8 @@ class KotlinScopeProvider(
                         symbol.fir.scopeForSupertype(
                             substitutor(symbol, useSiteSuperType, useSiteSession),
                             useSiteSession, scopeSession, delegateField,
-                            subClass = klass
+                            subClass = klass,
+                            decoratedDeclaredMemberScope
                         ).let {
                             it as? FirTypeScope ?: error("$it is expected to be FirOverrideAwareScope")
                         }
@@ -60,9 +60,9 @@ class KotlinScopeProvider(
                 useSiteSession,
                 FirTypeIntersectionScope.prepareIntersectionScope(
                     useSiteSession, FirStandardOverrideChecker(useSiteSession), scopes,
-                    klass.classId,
+                    klass.defaultType(),
                 ),
-                decoratedDeclaredMemberScope
+                decoratedDeclaredMemberScope,
             )
         }
     }
@@ -113,7 +113,7 @@ fun FirClass<*>.scopeForClass(
 ): FirTypeScope = scopeForClassImpl(
     substitutor, useSiteSession, scopeSession,
     skipPrivateMembers = false,
-    containingClassForAdditionalMembers = symbol.toLookupTag(),
+    classFirDispatchReceiver = this,
     // TODO: why it's always false?
     isFromExpectClass = false
 )
@@ -123,18 +123,19 @@ private fun FirClass<*>.scopeForSupertype(
     useSiteSession: FirSession,
     scopeSession: ScopeSession,
     delegateField: FirField?,
-    subClass: FirClass<*>
+    subClass: FirClass<*>,
+    declaredMemberScope: FirScope,
 ): FirTypeScope = scopeForClassImpl(
     substitutor,
     useSiteSession,
     scopeSession,
     skipPrivateMembers = true,
-    containingClassForAdditionalMembers = subClass.symbol.toLookupTag(),
+    classFirDispatchReceiver = subClass,
     isFromExpectClass = (subClass as? FirRegularClass)?.isExpect == true
 ).let {
     if (delegateField != null) {
         scopeSession.getOrBuild(delegateField, DelegatedMemberScopeKey(delegateField.symbol.callableId)) {
-            FirDelegatedMemberScope(it, useSiteSession, subClass.symbol.toLookupTag(), delegateField)
+            FirDelegatedMemberScope(it, useSiteSession, subClass, delegateField, declaredMemberScope)
         }
     } else {
         it
@@ -146,18 +147,18 @@ private fun FirClass<*>.scopeForClassImpl(
     useSiteSession: FirSession,
     scopeSession: ScopeSession,
     skipPrivateMembers: Boolean,
-    containingClassForAdditionalMembers: ConeClassLikeLookupTag,
+    classFirDispatchReceiver: FirClass<*>,
     isFromExpectClass: Boolean
 ): FirTypeScope {
     val basicScope = unsubstitutedScope(useSiteSession, scopeSession, withForcedTypeCalculator = false)
     if (substitutor == ConeSubstitutor.Empty) return basicScope
 
     return scopeSession.getOrBuild(
-        this, ConeSubstitutionScopeKey(containingClassForAdditionalMembers.classId, isFromExpectClass, substitutor)
+        this, ConeSubstitutionScopeKey(classFirDispatchReceiver.classId, isFromExpectClass, substitutor)
     ) {
         FirClassSubstitutionScope(
-            useSiteSession, basicScope, substitutor, skipPrivateMembers,
-            containingClassForAdditionalMembers.classId, makeExpect = isFromExpectClass
+            useSiteSession, basicScope,  substitutor, classFirDispatchReceiver.defaultType(),
+            skipPrivateMembers, makeExpect = isFromExpectClass
         )
     }
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt
index 8b0618b7197..28fc28d6904 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt
@@ -8,17 +8,12 @@ package org.jetbrains.kotlin.fir.scopes.impl
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.builder.FirPropertyBuilder
 import org.jetbrains.kotlin.fir.declarations.builder.FirSimpleFunctionBuilder
-import org.jetbrains.kotlin.fir.declarations.builder.FirValueParameterBuilder
-import org.jetbrains.kotlin.fir.expressions.FirExpression
-import org.jetbrains.kotlin.fir.scopes.FirTypeScope
 import org.jetbrains.kotlin.fir.scopes.FirOverrideChecker
+import org.jetbrains.kotlin.fir.scopes.FirTypeScope
 import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
-import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
-import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
 
 abstract class AbstractFirOverrideScope(
     val session: FirSession,
@@ -65,55 +60,4 @@ abstract class AbstractFirOverrideScope(
         return override
     }
 
-    protected open fun createFunctionCopy(
-        firSimpleFunction: FirSimpleFunction,
-        newSymbol: FirNamedFunctionSymbol
-    ): FirSimpleFunctionBuilder =
-        FirSimpleFunctionBuilder().apply {
-            source = firSimpleFunction.source
-            session = firSimpleFunction.session
-            resolvePhase = firSimpleFunction.resolvePhase
-            origin = FirDeclarationOrigin.SubstitutionOverride
-            returnTypeRef = firSimpleFunction.returnTypeRef
-            receiverTypeRef = firSimpleFunction.receiverTypeRef
-            name = firSimpleFunction.name
-            status = firSimpleFunction.status
-            symbol = newSymbol
-        }
-
-    protected open fun createValueParameterCopy(parameter: FirValueParameter, newDefaultValue: FirExpression?): FirValueParameterBuilder =
-        FirValueParameterBuilder().apply {
-            source = parameter.source
-            session = parameter.session
-            resolvePhase = parameter.resolvePhase
-            origin = FirDeclarationOrigin.SubstitutionOverride
-            returnTypeRef = parameter.returnTypeRef
-            name = parameter.name
-            symbol = FirVariableSymbol(parameter.symbol.callableId)
-            defaultValue = newDefaultValue
-            isCrossinline = parameter.isCrossinline
-            isNoinline = parameter.isNoinline
-            isVararg = parameter.isVararg
-        }
-
-    protected open fun createPropertyCopy(
-        firProperty: FirProperty,
-        newSymbol: FirPropertySymbol
-    ): FirPropertyBuilder =
-        FirPropertyBuilder().apply {
-            source = firProperty.source
-            session = firProperty.session
-            resolvePhase = firProperty.resolvePhase
-            origin = FirDeclarationOrigin.SubstitutionOverride
-            returnTypeRef = firProperty.returnTypeRef
-            receiverTypeRef = firProperty.receiverTypeRef
-            isVar = firProperty.isVar
-            isLocal = firProperty.isLocal
-            getter = firProperty.getter
-            setter = firProperty.setter
-            name = firProperty.name
-            status = firProperty.status
-            symbol = newSymbol
-        }
-
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt
index d77013263d6..808ddf6985e 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt
@@ -8,17 +8,14 @@ package org.jetbrains.kotlin.fir.scopes.impl
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.builder.*
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.chain
-import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap
 import org.jetbrains.kotlin.fir.scopes.FakeOverrideSubstitution
 import org.jetbrains.kotlin.fir.scopes.FirTypeScope
 import org.jetbrains.kotlin.fir.scopes.ProcessorAction
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
-import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
 
@@ -26,18 +23,20 @@ class FirClassSubstitutionScope(
     private val session: FirSession,
     private val useSiteMemberScope: FirTypeScope,
     private val substitutor: ConeSubstitutor,
+    private val dispatchReceiverTypeForSubstitutedMembers: ConeClassLikeType,
     private val skipPrivateMembers: Boolean,
-    private val derivedClassId: ClassId? = null,
     private val makeExpect: Boolean = false
 ) : FirTypeScope() {
 
-    private val fakeOverrideFunctions = mutableMapOf<FirFunctionSymbol<*>, FirFunctionSymbol<*>>()
-    private val fakeOverrideConstructors = mutableMapOf<FirConstructorSymbol, FirConstructorSymbol>()
-    private val fakeOverrideVariables = mutableMapOf<FirVariableSymbol<*>, FirVariableSymbol<*>>()
+    private val substitutionOverrideFunctions = mutableMapOf<FirFunctionSymbol<*>, FirFunctionSymbol<*>>()
+    private val substitutionOverrideConstructors = mutableMapOf<FirConstructorSymbol, FirConstructorSymbol>()
+    private val substitutionOverrideVariables = mutableMapOf<FirVariableSymbol<*>, FirVariableSymbol<*>>()
+
+    private val newOwnerClassId = dispatchReceiverTypeForSubstitutedMembers.lookupTag.classId
 
     override fun processFunctionsByName(name: Name, processor: (FirFunctionSymbol<*>) -> Unit) {
         useSiteMemberScope.processFunctionsByName(name) process@{ original ->
-            val function = fakeOverrideFunctions.getOrPut(original) { createFakeOverrideFunction(original) }
+            val function = substitutionOverrideFunctions.getOrPut(original) { createSubstitutionOverrideFunction(original) }
             processor(function)
         }
 
@@ -49,7 +48,7 @@ class FirClassSubstitutionScope(
         processor: (FirFunctionSymbol<*>, FirTypeScope) -> ProcessorAction
     ): ProcessorAction =
         processDirectOverriddenWithBaseScope(
-            functionSymbol, processor, FirTypeScope::processDirectOverriddenFunctionsWithBaseScope, fakeOverrideFunctions
+            functionSymbol, processor, FirTypeScope::processDirectOverriddenFunctionsWithBaseScope, substitutionOverrideFunctions
         )
 
     private inline fun <reified D : FirCallableSymbol<*>> processDirectOverriddenWithBaseScope(
@@ -58,7 +57,7 @@ class FirClassSubstitutionScope(
         processDirectOverriddenCallablesWithBaseScope: FirTypeScope.(D, ((D, FirTypeScope) -> ProcessorAction)) -> ProcessorAction,
         fakeOverridesMap: Map<out FirCallableSymbol<*>, FirCallableSymbol<*>>
     ): ProcessorAction {
-        val original = (callableSymbol.overriddenSymbol as? D)?.takeIf { it in fakeOverridesMap }
+        val original = callableSymbol.originalForSubstitutionOverride?.takeIf { it in fakeOverridesMap }
             ?: return useSiteMemberScope.processDirectOverriddenCallablesWithBaseScope(callableSymbol, processor)
 
         if (!processor(original, useSiteMemberScope)) return ProcessorAction.STOP
@@ -70,15 +69,15 @@ class FirClassSubstitutionScope(
         return useSiteMemberScope.processPropertiesByName(name) process@{ original ->
             when (original) {
                 is FirPropertySymbol -> {
-                    val property = fakeOverrideVariables.getOrPut(original) { createFakeOverrideProperty(original) }
+                    val property = substitutionOverrideVariables.getOrPut(original) { createSubstitutionOverrideProperty(original) }
                     processor(property)
                 }
                 is FirFieldSymbol -> {
-                    val field = fakeOverrideVariables.getOrPut(original) { createFakeOverrideField(original) }
+                    val field = substitutionOverrideVariables.getOrPut(original) { createSubstitutionOverrideField(original) }
                     processor(field)
                 }
                 is FirAccessorSymbol -> {
-                    val accessor = fakeOverrideVariables.getOrPut(original) { createFakeOverrideAccessor(original) }
+                    val accessor = substitutionOverrideVariables.getOrPut(original) { createSubstitutionOverrideAccessor(original) }
                     processor(accessor)
                 }
                 else -> {
@@ -94,7 +93,7 @@ class FirClassSubstitutionScope(
     ): ProcessorAction =
         processDirectOverriddenWithBaseScope(
             propertySymbol, processor, FirTypeScope::processDirectOverriddenPropertiesWithBaseScope,
-            fakeOverrideVariables
+            substitutionOverrideVariables
         )
 
     override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
@@ -111,7 +110,7 @@ class FirClassSubstitutionScope(
         return substitutor.substituteOrNull(this)
     }
 
-    private fun createFakeOverrideFunction(original: FirFunctionSymbol<*>): FirFunctionSymbol<*> {
+    private fun createSubstitutionOverrideFunction(original: FirFunctionSymbol<*>): FirFunctionSymbol<*> {
         if (substitutor == ConeSubstitutor.Empty) return original
         val member = when (original) {
             is FirNamedFunctionSymbol -> original.fir
@@ -135,21 +134,22 @@ class FirClassSubstitutionScope(
          *   it's safe to cast newTypeParameters to List<FirTypeParameter>
          */
         @Suppress("UNCHECKED_CAST")
-        return FirFakeOverrideGenerator.createFakeOverrideFunction(
+        return FirFakeOverrideGenerator.createSubstitutionOverrideFunction(
             session,
             member,
             original,
+            dispatchReceiverTypeForSubstitutedMembers,
             newReceiverType,
             newReturnType,
             newParameterTypes,
             newTypeParameters as List<FirTypeParameter>,
-            derivedClassId,
+            newOwnerClassId,
             makeExpect,
             fakeOverrideSubstitution
         )
     }
 
-    private fun createFakeOverrideConstructor(original: FirConstructorSymbol): FirConstructorSymbol {
+    private fun createSubstitutionOverrideConstructor(original: FirConstructorSymbol): FirConstructorSymbol {
         if (substitutor == ConeSubstitutor.Empty) return original
         val constructor = original.fir
 
@@ -161,13 +161,14 @@ class FirClassSubstitutionScope(
         if (newReturnType == null && newParameterTypes.all { it == null } && newTypeParameters === constructor.typeParameters) {
             return original
         }
-        return FirFakeOverrideGenerator.createFakeOverrideConstructor(
-            FirConstructorSymbol(original.callableId, overriddenSymbol = original),
-            session, constructor, newReturnType, newParameterTypes, newTypeParameters, makeExpect, fakeOverrideSubstitution
+        return FirFakeOverrideGenerator.createSubstitutionOverrideConstructor(
+            FirConstructorSymbol(original.callableId),
+            session, constructor, dispatchReceiverTypeForSubstitutedMembers,
+            newReturnType, newParameterTypes, newTypeParameters, makeExpect, fakeOverrideSubstitution
         ).symbol
     }
 
-    private fun createFakeOverrideProperty(original: FirPropertySymbol): FirPropertySymbol {
+    private fun createSubstitutionOverrideProperty(original: FirPropertySymbol): FirPropertySymbol {
         if (substitutor == ConeSubstitutor.Empty) return original
         val member = original.fir
         if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
@@ -180,14 +181,15 @@ class FirClassSubstitutionScope(
         }
 
         @Suppress("UNCHECKED_CAST")
-        return FirFakeOverrideGenerator.createFakeOverrideProperty(
+        return FirFakeOverrideGenerator.createSubstitutionOverrideProperty(
             session,
             member,
             original,
+            dispatchReceiverTypeForSubstitutedMembers,
             newReceiverType,
             newReturnType,
             newTypeParameters as List<FirTypeParameter>,
-            derivedClassId,
+            newOwnerClassId,
             makeExpect,
             fakeOverrideSubstitution
         )
@@ -205,7 +207,7 @@ class FirClassSubstitutionScope(
         val (newTypeParameters, substitutor) = FirFakeOverrideGenerator.createNewTypeParametersAndSubstitutor(
             member as FirTypeParameterRefsOwner,
             substitutor,
-            forceTypeParametersRecreation = derivedClassId != null && derivedClassId != member.symbol.callableId.classId
+            forceTypeParametersRecreation = dispatchReceiverTypeForSubstitutedMembers.lookupTag != member.dispatchReceiverClassOrNull()
         )
 
         val receiverType = member.receiverTypeRef?.coneType
@@ -217,7 +219,7 @@ class FirClassSubstitutionScope(
         return SubstitutedData(newTypeParameters, newReceiverType, newReturnType, substitutor, fakeOverrideSubstitution)
     }
 
-    private fun createFakeOverrideField(original: FirFieldSymbol): FirFieldSymbol {
+    private fun createSubstitutionOverrideField(original: FirFieldSymbol): FirFieldSymbol {
         if (substitutor == ConeSubstitutor.Empty) return original
         val member = original.fir
         if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
@@ -226,10 +228,10 @@ class FirClassSubstitutionScope(
         // TODO: do we have fields with implicit type?
         val newReturnType = returnType?.substitute() ?: return original
 
-        return FirFakeOverrideGenerator.createFakeOverrideField(session, member, original, newReturnType, derivedClassId)
+        return FirFakeOverrideGenerator.createSubstitutionOverrideField(session, member, original, newReturnType, newOwnerClassId)
     }
 
-    private fun createFakeOverrideAccessor(original: FirAccessorSymbol): FirAccessorSymbol {
+    private fun createSubstitutionOverrideAccessor(original: FirAccessorSymbol): FirAccessorSymbol {
         if (substitutor == ConeSubstitutor.Empty) return original
         val member = original.fir as FirSyntheticProperty
         if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
@@ -238,27 +240,35 @@ class FirClassSubstitutionScope(
         val fakeOverrideSubstitution = runIf(returnType == null) { FakeOverrideSubstitution(substitutor, original) }
         val newReturnType = returnType?.substitute()
 
-        val newParameterTypes = member.getter.valueParameters.map {
+        val newGetterParameterTypes = member.getter.valueParameters.map {
             it.returnTypeRef.coneType.substitute()
         }
+        val newSetterParameterTypes = member.setter?.valueParameters?.map {
+            it.returnTypeRef.coneType.substitute()
+        }.orEmpty()
 
-        if (newReturnType == null && newParameterTypes.all { it == null }) {
+        if (newReturnType == null &&
+            newGetterParameterTypes.all { it == null } &&
+            newSetterParameterTypes.all { it == null }
+        ) {
             return original
         }
 
-        return FirFakeOverrideGenerator.createFakeOverrideAccessor(
+        return FirFakeOverrideGenerator.createSubstitutionOverrideAccessor(
             session,
             member,
             original,
+            dispatchReceiverTypeForSubstitutedMembers,
             newReturnType,
-            newParameterTypes,
+            newGetterParameterTypes,
+            newSetterParameterTypes,
             fakeOverrideSubstitution
         )
     }
 
     override fun processDeclaredConstructors(processor: (FirConstructorSymbol) -> Unit) {
         useSiteMemberScope.processDeclaredConstructors process@{ original ->
-            val constructor = fakeOverrideConstructors.getOrPut(original) { createFakeOverrideConstructor(original) }
+            val constructor = substitutionOverrideConstructors.getOrPut(original) { createSubstitutionOverrideConstructor(original) }
             processor(constructor)
         }
     }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
index 1fd0b4cb952..cda5129b689 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
@@ -6,34 +6,51 @@
 package org.jetbrains.kotlin.fir.scopes.impl
 
 import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.scopes.FirTypeScope
-import org.jetbrains.kotlin.fir.scopes.ProcessorAction
+import org.jetbrains.kotlin.fir.resolve.defaultType
+import org.jetbrains.kotlin.fir.scopes.*
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
+import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.*
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
+import org.jetbrains.kotlin.fir.types.ConeFlexibleType
+import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.fir.types.isMarkedNullable
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 
 class FirDelegatedMemberScope(
     private val useSiteScope: FirTypeScope,
     private val session: FirSession,
-    private val containingClass: ConeClassLikeLookupTag,
+    private val containingClass: FirClass<*>,
     private val delegateField: FirField,
+    private val declaredMemberScope: FirScope,
 ) : FirTypeScope() {
     private val delegatedFunctionCache = mutableMapOf<FirNamedFunctionSymbol, FirNamedFunctionSymbol>()
     private val delegatedPropertyCache = mutableMapOf<FirPropertySymbol, FirPropertySymbol>()
+    private val dispatchReceiverType = containingClass.defaultType()
+    private val overrideChecker = FirStandardOverrideChecker(session)
 
     override fun processFunctionsByName(name: Name, processor: (FirFunctionSymbol<*>) -> Unit) {
         useSiteScope.processFunctionsByName(name) processor@{ functionSymbol ->
-            if (functionSymbol !is FirNamedFunctionSymbol) {
+            if (functionSymbol !is FirNamedFunctionSymbol || functionSymbol.fir.isPublicInAny()) {
                 processor(functionSymbol)
                 return@processor
             }
+
             val original = functionSymbol.fir
-            if (original.modality == Modality.FINAL) {
+            if (original.modality == Modality.FINAL || original.visibility == Visibilities.Private) {
                 processor(functionSymbol)
                 return@processor
             }
+
+            if (declaredMemberScope.getFunctions(name).any { it is FirNamedFunctionSymbol && overrideChecker.isOverriddenFunction(it.fir, original) }) {
+                processor(functionSymbol)
+                return@processor
+            }
+
             val delegatedSymbol = delegatedFunctionCache.getOrPut(functionSymbol) {
                 val newSymbol = FirNamedFunctionSymbol(
                     functionSymbol.callableId,
@@ -43,9 +60,10 @@ class FirDelegatedMemberScope(
                     original,
                     session,
                     FirDeclarationOrigin.Delegated,
+                    newDispatchReceiverType = dispatchReceiverType,
                     newModality = Modality.OPEN,
                 ).apply {
-                    delegatedWrapperData = DelegatedWrapperData(functionSymbol.fir, containingClass, delegateField)
+                    delegatedWrapperData = DelegatedWrapperData(functionSymbol.fir, containingClass.symbol.toLookupTag(), delegateField)
                 }.symbol as FirNamedFunctionSymbol
             }
             processor(delegatedSymbol)
@@ -58,22 +76,31 @@ class FirDelegatedMemberScope(
                 processor(propertySymbol)
                 return@processor
             }
+
             val original = propertySymbol.fir
-            if (original.modality == Modality.FINAL) {
+
+            if (original.modality == Modality.FINAL || original.visibility == Visibilities.Private) {
                 processor(propertySymbol)
                 return@processor
             }
+
+            if (declaredMemberScope.getProperties(name).any { it is FirPropertySymbol && overrideChecker.isOverriddenProperty(it.fir, original) }) {
+                processor(propertySymbol)
+                return@processor
+            }
+
             val delegatedSymbol = delegatedPropertyCache.getOrPut(propertySymbol) {
                 FirFakeOverrideGenerator.createCopyForFirProperty(
                     FirPropertySymbol(
-                        propertySymbol.callableId,
-                        overriddenSymbol = propertySymbol
+                        propertySymbol.callableId
                     ),
                     original,
                     session,
+                    FirDeclarationOrigin.Delegated,
                     newModality = Modality.OPEN,
+                    newDispatchReceiverType = dispatchReceiverType,
                 ).apply {
-                    delegatedWrapperData = DelegatedWrapperData(propertySymbol.fir, containingClass, delegateField)
+                    delegatedWrapperData = DelegatedWrapperData(propertySymbol.fir, containingClass.symbol.toLookupTag(), delegateField)
                 }.symbol
             }
             processor(delegatedSymbol)
@@ -105,7 +132,7 @@ class FirDelegatedMemberScope(
     ): ProcessorAction {
         val wrappedData = (symbol.fir as? FirCallableMemberDeclaration<*>)?.delegatedWrapperData
         return when {
-            wrappedData == null || wrappedData.containingClass != containingClass -> {
+            wrappedData == null || wrappedData.containingClass != containingClass.symbol.toLookupTag() -> {
                 useSiteScope.processDirectOverriddenCallablesWithBaseScope(symbol, processor)
             }
             else -> processor(wrappedData.wrapped.symbol as D, useSiteScope)
@@ -129,3 +156,31 @@ class DelegatedWrapperData<D : FirCallableDeclaration<*>>(
 )
 var <D : FirCallableDeclaration<*>>
         D.delegatedWrapperData: DelegatedWrapperData<D>? by FirDeclarationDataRegistry.data(DelegatedWrapperDataKey)
+
+
+// From the definition of function interfaces in the Java specification (pt. 9.8):
+// "methods that are members of I that do not have the same signature as any public instance method of the class Object"
+// It means that if an interface declares `int hashCode()` then the method won't be taken into account when
+// checking if the interface is SAM.
+fun FirSimpleFunction.isPublicInAny(): Boolean {
+    if (name.asString() !in PUBLIC_METHOD_NAMES_IN_ANY) return false
+
+    return when (name.asString()) {
+        "hashCode", "toString" -> valueParameters.isEmpty()
+        "equals" -> valueParameters.singleOrNull()?.hasTypeOf(StandardClassIds.Any, allowNullable = true) == true
+        else -> error("Unexpected method name: $name")
+    }
+}
+
+fun FirValueParameter.hasTypeOf(classId: ClassId, allowNullable: Boolean): Boolean {
+    val classLike = when (val type = returnTypeRef.coneType) {
+        is ConeClassLikeType -> type
+        is ConeFlexibleType -> type.upperBound as? ConeClassLikeType ?: return false
+        else -> return false
+    }
+
+    if (classLike.isMarkedNullable && !allowNullable) return false
+    return classLike.lookupTag.classId == classId
+}
+
+private val PUBLIC_METHOD_NAMES_IN_ANY = setOf("equals", "hashCode", "toString")
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt
index 276de0851bd..27b8d8f85f2 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt
@@ -13,12 +13,14 @@ import org.jetbrains.kotlin.fir.declarations.builder.*
 import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
 import org.jetbrains.kotlin.fir.declarations.synthetic.buildSyntheticProperty
+import org.jetbrains.kotlin.fir.originalForSubstitutionOverrideAttr
 import org.jetbrains.kotlin.fir.resolve.substitution.ChainedSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap
 import org.jetbrains.kotlin.fir.scopes.FakeOverrideSubstitution
 import org.jetbrains.kotlin.fir.scopes.fakeOverrideSubstitution
 import org.jetbrains.kotlin.fir.symbols.CallableId
+import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.builder.buildImplicitTypeRef
@@ -28,10 +30,11 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
 
 object FirFakeOverrideGenerator {
-    fun createFakeOverrideFunction(
+    fun createSubstitutionOverrideFunction(
         session: FirSession,
         baseFunction: FirSimpleFunction,
         baseSymbol: FirNamedFunctionSymbol,
+        newDispatchReceiverType: ConeKotlinType?,
         newReceiverType: ConeKotlinType? = null,
         newReturnType: ConeKotlinType? = null,
         newParameterTypes: List<ConeKotlinType?>? = null,
@@ -41,20 +44,20 @@ object FirFakeOverrideGenerator {
         fakeOverrideSubstitution: FakeOverrideSubstitution? = null
     ): FirNamedFunctionSymbol {
         val symbol = FirNamedFunctionSymbol(
-            CallableId(derivedClassId ?: baseSymbol.callableId.classId!!, baseFunction.name),
-            isFakeOverride = true, overriddenSymbol = baseSymbol
+            CallableId(derivedClassId ?: baseSymbol.callableId.classId!!, baseFunction.name)
         )
-        createFakeOverrideFunction(
-            symbol, session, baseFunction, newReceiverType, newReturnType,
+        createSubstitutionOverrideFunction(
+            symbol, session, baseFunction, newDispatchReceiverType, newReceiverType, newReturnType,
             newParameterTypes, newTypeParameters, isExpect, fakeOverrideSubstitution
         )
         return symbol
     }
 
-    private fun createFakeOverrideFunction(
+    private fun createSubstitutionOverrideFunction(
         fakeOverrideSymbol: FirFunctionSymbol<FirSimpleFunction>,
         session: FirSession,
         baseFunction: FirSimpleFunction,
+        newDispatchReceiverType: ConeKotlinType?,
         newReceiverType: ConeKotlinType?,
         newReturnType: ConeKotlinType?,
         newParameterTypes: List<ConeKotlinType?>?,
@@ -70,12 +73,15 @@ object FirFakeOverrideGenerator {
             session,
             FirDeclarationOrigin.SubstitutionOverride,
             isExpect,
+            newDispatchReceiverType,
             newParameterTypes,
             newTypeParameters,
             newReceiverType,
             newReturnType,
             fakeOverrideSubstitution = fakeOverrideSubstitution
-        )
+        ).apply {
+            originalForSubstitutionOverrideAttr = baseFunction
+        }
     }
 
     fun createCopyForFirFunction(
@@ -84,6 +90,7 @@ object FirFakeOverrideGenerator {
         session: FirSession,
         origin: FirDeclarationOrigin,
         isExpect: Boolean = baseFunction.isExpect,
+        newDispatchReceiverType: ConeKotlinType?,
         newParameterTypes: List<ConeKotlinType?>? = null,
         newTypeParameters: List<FirTypeParameter>? = null,
         newReceiverType: ConeKotlinType? = null,
@@ -101,17 +108,19 @@ object FirFakeOverrideGenerator {
             symbol = newSymbol
             resolvePhase = baseFunction.resolvePhase
 
+            dispatchReceiverType = newDispatchReceiverType
+            attributes = baseFunction.attributes.copy()
             typeParameters += configureAnnotationsTypeParametersAndSignature(
-                session, baseFunction, newParameterTypes,
-                newTypeParameters, newReceiverType, newReturnType, fakeOverrideSubstitution
+                baseFunction, newParameterTypes, newTypeParameters, newReceiverType, newReturnType, fakeOverrideSubstitution
             ).filterIsInstance<FirTypeParameter>()
         }
     }
 
-    fun createFakeOverrideConstructor(
+    fun createSubstitutionOverrideConstructor(
         fakeOverrideSymbol: FirConstructorSymbol,
         session: FirSession,
         baseConstructor: FirConstructor,
+        newDispatchReceiverType: ConeKotlinType?,
         newReturnType: ConeKotlinType?,
         newParameterTypes: List<ConeKotlinType?>?,
         newTypeParameters: List<FirTypeParameterRef>?,
@@ -121,22 +130,27 @@ object FirFakeOverrideGenerator {
         // TODO: consider using here some light-weight functions instead of pseudo-real FirMemberFunctionImpl
         // As second alternative, we can invent some light-weight kind of FirRegularClass
         return buildConstructor {
-            source = baseConstructor.source
             this.session = session
             origin = FirDeclarationOrigin.SubstitutionOverride
             receiverTypeRef = baseConstructor.receiverTypeRef?.withReplacedConeType(null)
             status = baseConstructor.status.updatedStatus(isExpect)
             symbol = fakeOverrideSymbol
-            resolvePhase = baseConstructor.resolvePhase
 
             typeParameters += configureAnnotationsTypeParametersAndSignature(
-                session, baseConstructor, newParameterTypes, newTypeParameters, newReceiverType = null, newReturnType, fakeOverrideSubstitution
+                baseConstructor, newParameterTypes, newTypeParameters, newReceiverType = null, newReturnType, fakeOverrideSubstitution
             )
+
+            dispatchReceiverType = newDispatchReceiverType
+
+            resolvePhase = baseConstructor.resolvePhase
+            source = baseConstructor.source
+            attributes = baseConstructor.attributes.copy()
+        }.apply {
+            originalForSubstitutionOverrideAttr = baseConstructor
         }
     }
 
     private fun FirFunctionBuilder.configureAnnotationsTypeParametersAndSignature(
-        session: FirSession,
         baseFunction: FirFunction<*>,
         newParameterTypes: List<ConeKotlinType?>?,
         newTypeParameters: List<FirTypeParameterRef>?,
@@ -147,7 +161,6 @@ object FirFakeOverrideGenerator {
         return when {
             baseFunction.typeParameters.isEmpty() -> {
                 configureAnnotationsAndSignature(
-                    session,
                     baseFunction,
                     newParameterTypes,
                     newReceiverType,
@@ -172,7 +185,6 @@ object FirFakeOverrideGenerator {
                     else -> null to FakeOverrideSubstitution(substitutor, symbol)
                 }
                 configureAnnotationsAndSignature(
-                    session,
                     baseFunction,
                     copiedParameterTypes,
                     copiedReceiverType,
@@ -183,7 +195,6 @@ object FirFakeOverrideGenerator {
             }
             else -> {
                 configureAnnotationsAndSignature(
-                    session,
                     baseFunction,
                     newParameterTypes,
                     newReceiverType,
@@ -196,7 +207,6 @@ object FirFakeOverrideGenerator {
     }
 
     private fun FirFunctionBuilder.configureAnnotationsAndSignature(
-        session: FirSession,
         baseFunction: FirFunction<*>,
         newParameterTypes: List<ConeKotlinType?>?,
         newReceiverType: ConeKotlinType?,
@@ -231,10 +241,11 @@ object FirFakeOverrideGenerator {
         }
     }
 
-    fun createFakeOverrideProperty(
+    fun createSubstitutionOverrideProperty(
         session: FirSession,
         baseProperty: FirProperty,
         baseSymbol: FirPropertySymbol,
+        newDispatchReceiverType: ConeKotlinType?,
         newReceiverType: ConeKotlinType? = null,
         newReturnType: ConeKotlinType? = null,
         newTypeParameters: List<FirTypeParameter>? = null,
@@ -243,14 +254,15 @@ object FirFakeOverrideGenerator {
         fakeOverrideSubstitution: FakeOverrideSubstitution? = null
     ): FirPropertySymbol {
         val symbol = FirPropertySymbol(
-            CallableId(derivedClassId ?: baseSymbol.callableId.classId!!, baseProperty.name),
-            isFakeOverride = true, overriddenSymbol = baseSymbol
+            CallableId(derivedClassId ?: baseSymbol.callableId.classId!!, baseProperty.name)
         )
         createCopyForFirProperty(
-            symbol, baseProperty, session, isExpect,
-            newTypeParameters, newReceiverType, newReturnType,
+            symbol, baseProperty, session, FirDeclarationOrigin.SubstitutionOverride, isExpect,
+            newDispatchReceiverType, newTypeParameters, newReceiverType, newReturnType,
             fakeOverrideSubstitution = fakeOverrideSubstitution
-        )
+        ).apply {
+            originalForSubstitutionOverrideAttr = baseProperty
+        }
         return symbol
     }
 
@@ -258,7 +270,9 @@ object FirFakeOverrideGenerator {
         newSymbol: FirPropertySymbol,
         baseProperty: FirProperty,
         session: FirSession,
+        origin: FirDeclarationOrigin,
         isExpect: Boolean = baseProperty.isExpect,
+        newDispatchReceiverType: ConeKotlinType?,
         newTypeParameters: List<FirTypeParameter>? = null,
         newReceiverType: ConeKotlinType? = null,
         newReturnType: ConeKotlinType? = null,
@@ -269,7 +283,7 @@ object FirFakeOverrideGenerator {
         return buildProperty {
             source = baseProperty.source
             this.session = session
-            origin = FirDeclarationOrigin.SubstitutionOverride
+            this.origin = origin
             name = baseProperty.name
             isVar = baseProperty.isVar
             this.symbol = newSymbol
@@ -277,6 +291,8 @@ object FirFakeOverrideGenerator {
             status = baseProperty.status.updatedStatus(isExpect, newModality, newVisibility)
 
             resolvePhase = baseProperty.resolvePhase
+            dispatchReceiverType = newDispatchReceiverType
+            attributes = baseProperty.attributes.copy()
             typeParameters += configureAnnotationsTypeParametersAndSignature(
                 baseProperty,
                 newTypeParameters,
@@ -362,7 +378,7 @@ object FirFakeOverrideGenerator {
         receiverTypeRef = baseProperty.receiverTypeRef?.withReplacedConeType(newReceiverType)
     }
 
-    fun createFakeOverrideField(
+    fun createSubstitutionOverrideField(
         session: FirSession,
         baseField: FirField,
         baseSymbol: FirFieldSymbol,
@@ -373,37 +389,58 @@ object FirFakeOverrideGenerator {
             CallableId(derivedClassId ?: baseSymbol.callableId.classId!!, baseField.name)
         )
         buildField {
-            source = baseField.source
             this.session = session
-            origin = FirDeclarationOrigin.SubstitutionOverride
-            resolvePhase = baseField.resolvePhase
-            returnTypeRef = baseField.returnTypeRef.withReplacedConeType(newReturnType)
-            name = baseField.name
             this.symbol = symbol
+            origin = FirDeclarationOrigin.SubstitutionOverride
+            returnTypeRef = baseField.returnTypeRef.withReplacedConeType(newReturnType)
+
+            source = baseField.source
+            resolvePhase = baseField.resolvePhase
+            name = baseField.name
             isVar = baseField.isVar
             status = baseField.status
             resolvePhase = baseField.resolvePhase
             annotations += baseField.annotations
+            attributes = baseField.attributes.copy()
+            dispatchReceiverType = baseField.dispatchReceiverType
+        }.apply {
+            originalForSubstitutionOverrideAttr = baseField
         }
         return symbol
     }
 
-    fun createFakeOverrideAccessor(
+    fun createSubstitutionOverrideAccessor(
         session: FirSession,
         baseProperty: FirSyntheticProperty,
         baseSymbol: FirAccessorSymbol,
+        newDispatchReceiverType: ConeKotlinType?,
         newReturnType: ConeKotlinType?,
-        newParameterTypes: List<ConeKotlinType?>?,
+        newGetterParameterTypes: List<ConeKotlinType?>?,
+        newSetterParameterTypes: List<ConeKotlinType?>?,
         fakeOverrideSubstitution: FakeOverrideSubstitution?
     ): FirAccessorSymbol {
-        val functionSymbol = FirNamedFunctionSymbol(baseSymbol.accessorId)
-        val function = createFakeOverrideFunction(
-            functionSymbol,
+        val getterSymbol = FirNamedFunctionSymbol(baseSymbol.accessorId)
+        val getter = createSubstitutionOverrideFunction(
+            getterSymbol,
             session,
             baseProperty.getter.delegate,
+            newDispatchReceiverType,
             newReceiverType = null,
             newReturnType,
-            newParameterTypes,
+            newGetterParameterTypes,
+            newTypeParameters = null,
+            fakeOverrideSubstitution = fakeOverrideSubstitution
+        )
+        val setterSymbol = FirNamedFunctionSymbol(baseSymbol.accessorId)
+        val baseSetter = baseProperty.setter
+        val setter = if (baseSetter == null) null else createSubstitutionOverrideFunction(
+            setterSymbol,
+            session,
+            baseSetter.delegate,
+            newDispatchReceiverType,
+            newReceiverType = null,
+            StandardClassIds.Unit.constructClassLikeType(emptyArray(), isNullable = false),
+            newSetterParameterTypes,
             newTypeParameters = null,
             fakeOverrideSubstitution = fakeOverrideSubstitution
         )
@@ -411,7 +448,8 @@ object FirFakeOverrideGenerator {
             this.session = session
             name = baseProperty.name
             symbol = FirAccessorSymbol(baseSymbol.callableId, baseSymbol.accessorId)
-            delegateGetter = function
+            delegateGetter = getter
+            delegateSetter = setter
         }.symbol
     }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScope.kt
index 464a831cc02..ee6e8c45f59 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScope.kt
@@ -43,11 +43,9 @@ class FirNestedClassifierScope(val klass: FirClass<*>) : FirScope(), FirContaini
         processor(matchedClass, ConeSubstitutorByMap(substitution))
     }
 
-    fun getClassifierByName(name: Name): FirRegularClassSymbol? = classIndex[name]
-
     override fun getClassifierNames(): Set<Name> = classIndex.keys
 
     override fun getCallableNames(): Set<Name> = emptySet()
 }
 
-fun FirTypeParameterRef.toConeType(): ConeKotlinType = ConeTypeParameterTypeImpl(ConeTypeParameterLookupTag(symbol), isNullable = false)
\ No newline at end of file
+fun FirTypeParameterRef.toConeType(): ConeKotlinType = ConeTypeParameterTypeImpl(ConeTypeParameterLookupTag(symbol), isNullable = false)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScopeWithSubstitution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScopeWithSubstitution.kt
index 2440fc63890..a3fc0f9f7db 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScopeWithSubstitution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScopeWithSubstitution.kt
@@ -10,16 +10,34 @@ import org.jetbrains.kotlin.fir.declarations.isInner
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.transformers.createSubstitutionForSupertype
 import org.jetbrains.kotlin.fir.scopes.FirScope
-import org.jetbrains.kotlin.fir.symbols.impl.FirClassifierSymbol
+import org.jetbrains.kotlin.fir.scopes.getSingleClassifier
+import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.name.Name
 
-class FirNestedClassifierScopeWithSubstitution(
-    private val scope: FirNestedClassifierScope,
+private class FirNestedClassifierScopeWithSubstitution(
+    private val scope: FirScope,
     private val substitutor: ConeSubstitutor
 ) : FirScope() {
+
+    override fun processFunctionsByName(name: Name, processor: (FirFunctionSymbol<*>) -> Unit) {
+        scope.processFunctionsByName(name, processor)
+    }
+
+    override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
+        scope.processPropertiesByName(name, processor)
+    }
+
+    override fun processDeclaredConstructors(processor: (FirConstructorSymbol) -> Unit) {
+        scope.processDeclaredConstructors(processor)
+    }
+
+    override fun mayContainName(name: Name): Boolean {
+        return scope.mayContainName(name)
+    }
+
     override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
-        val matchedClass = scope.getClassifierByName(name) ?: return
+        val matchedClass = scope.getSingleClassifier(name) as? FirRegularClassSymbol ?: return
         val substitutor = substitutor.takeIf { matchedClass.fir.isInner } ?: ConeSubstitutor.Empty
         processor(matchedClass, substitutor)
     }
@@ -28,9 +46,7 @@ class FirNestedClassifierScopeWithSubstitution(
 fun FirScope.wrapNestedClassifierScopeWithSubstitutionForSuperType(
     superType: ConeClassLikeType,
     session: FirSession
-): FirScope = if (this is FirNestedClassifierScope) {
+): FirScope {
     val substitutor = createSubstitutionForSupertype(superType, session)
-    FirNestedClassifierScopeWithSubstitution(this, substitutor)
-} else {
-    this
-}
\ No newline at end of file
+    return FirNestedClassifierScopeWithSubstitution(this, substitutor)
+}
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
index 090981949c0..8d4e082837c 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
@@ -5,17 +5,14 @@
 
 package org.jetbrains.kotlin.fir.scopes.impl
 
-import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
-import org.jetbrains.kotlin.fir.declarations.builder.buildProperty
-import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunction
+import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.declarations.builder.buildPropertyCopy
+import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunctionCopy
 import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
 import org.jetbrains.kotlin.fir.scopes.FirScope
 import org.jetbrains.kotlin.fir.scopes.FirTypeScope
 import org.jetbrains.kotlin.fir.symbols.CallableId
-import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
-import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
-import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
-import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 
@@ -30,19 +27,11 @@ class FirObjectImportedCallableScope(
                 return@wrapper
             }
             val function = symbol.fir
-            val syntheticFunction = buildSimpleFunction {
-                source = function.source
-                session = function.session
+            val syntheticFunction = buildSimpleFunctionCopy(function) {
                 origin = FirDeclarationOrigin.ImportedFromObject
-                returnTypeRef = function.returnTypeRef
-                receiverTypeRef = function.receiverTypeRef
-                this.name = function.name
-                status = function.status
-                this.symbol = FirNamedFunctionSymbol(CallableId(importedClassId, name), overriddenSymbol = symbol)
-                resolvePhase = function.resolvePhase
-                typeParameters.addAll(function.typeParameters)
-                valueParameters.addAll(function.valueParameters)
-                annotations.addAll(function.annotations)
+                this.symbol = FirNamedFunctionSymbol(CallableId(importedClassId, name))
+            }.apply {
+                importedFromObjectData = ImportedFromObjectData(importedClassId, function)
             }
             processor(syntheticFunction.symbol)
         }
@@ -55,20 +44,12 @@ class FirObjectImportedCallableScope(
                 return@wrapper
             }
             val property = symbol.fir
-            val syntheticFunction = buildProperty {
-                source = property.source
-                session = property.session
+            val syntheticFunction = buildPropertyCopy(property) {
                 origin = FirDeclarationOrigin.ImportedFromObject
-                returnTypeRef = property.returnTypeRef
-                receiverTypeRef = property.receiverTypeRef
-                this.name = property.name
-                status = property.status
-                isVar = property.isVar
-                isLocal = property.isLocal
-                this.symbol = FirPropertySymbol(CallableId(importedClassId, name), overriddenSymbol = symbol)
-                resolvePhase = property.resolvePhase
-                typeParameters.addAll(property.typeParameters)
-                annotations.addAll(property.annotations)
+                this.symbol = FirPropertySymbol(CallableId(importedClassId, name))
+                this.delegateFieldSymbol = null
+            }.apply {
+                importedFromObjectData = ImportedFromObjectData(importedClassId, property)
             }
             processor(syntheticFunction.symbol)
         }
@@ -77,4 +58,14 @@ class FirObjectImportedCallableScope(
     override fun getCallableNames(): Set<Name> = objectUseSiteScope.getCallableNames()
 
     override fun getClassifierNames(): Set<Name> = emptySet()
-}
\ No newline at end of file
+}
+
+private object ImportedFromObjectClassIdKey : FirDeclarationDataKey()
+
+class ImportedFromObjectData<D : FirCallableDeclaration<*>>(
+    val objectClassId: ClassId,
+    val original: D,
+)
+
+var <D : FirCallableDeclaration<*>>
+        D.importedFromObjectData: ImportedFromObjectData<D>? by FirDeclarationDataRegistry.data(ImportedFromObjectClassIdKey)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirScopeWithFakeOverrideTypeCalculator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirScopeWithFakeOverrideTypeCalculator.kt
index 5df2d932cc9..26871a7fa40 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirScopeWithFakeOverrideTypeCalculator.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirScopeWithFakeOverrideTypeCalculator.kt
@@ -5,8 +5,10 @@
 
 package org.jetbrains.kotlin.fir.scopes.impl
 
-import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
+import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration
+import org.jetbrains.kotlin.fir.isIntersectionOverride
+import org.jetbrains.kotlin.fir.isSubstitutionOverride
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
 import org.jetbrains.kotlin.fir.scopes.FirTypeScope
@@ -73,7 +75,8 @@ class FirScopeWithFakeOverrideTypeCalculator(
     }
 
     private fun updateReturnType(declaration: FirTypedDeclaration) {
-        if (declaration.origin == FirDeclarationOrigin.SubstitutionOverride || declaration.origin == FirDeclarationOrigin.IntersectionOverride) {
+        if (declaration !is FirCallableMemberDeclaration<*>) return
+        if (declaration.isSubstitutionOverride || declaration.isIntersectionOverride) {
             fakeOverrideTypeCalculator.computeReturnType(declaration)
         }
     }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt
index c71abeac6fc..ed44c7157cc 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt
@@ -10,16 +10,13 @@ import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
+import org.jetbrains.kotlin.fir.originalForIntersectionOverrideAttr
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.scopes.*
 import org.jetbrains.kotlin.fir.symbols.CallableId
-import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.*
-import org.jetbrains.kotlin.fir.types.ConeFlexibleType
-import org.jetbrains.kotlin.fir.types.ConeKotlinType
-import org.jetbrains.kotlin.fir.types.ConeTypeCheckerContext
-import org.jetbrains.kotlin.fir.types.coneTypeSafe
-import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.AbstractTypeChecker
 import org.jetbrains.kotlin.types.AbstractTypeCheckerContext
@@ -30,7 +27,7 @@ class FirTypeIntersectionScope private constructor(
     session: FirSession,
     overrideChecker: FirOverrideChecker,
     private val scopes: List<FirTypeScope>,
-    private val derivedClassId: ClassId?,
+    private val dispatchReceiverType: ConeKotlinType,
 ) : AbstractFirOverrideScope(session, overrideChecker) {
     private val absentFunctions: MutableSet<Name> = mutableSetOf()
     private val absentProperties: MutableSet<Name> = mutableSetOf()
@@ -190,7 +187,7 @@ class FirTypeIntersectionScope private constructor(
         processDirectOverridden: FirTypeScope.(D, (D, FirTypeScope) -> ProcessorAction) -> ProcessorAction,
     ) {
         if (!visited.add(symbol)) return
-        if (!symbol.isIntersectionOverride && !(symbol as PossiblyFirFakeOverrideSymbol<*, *>).isFakeOverride) {
+        if (!symbol.fir.origin.fromSupertypes) {
             result.add(MemberWithBaseScope(symbol, scope))
             return
         }
@@ -261,21 +258,25 @@ class FirTypeIntersectionScope private constructor(
         newModality: Modality,
         newVisibility: Visibility,
     ): FirNamedFunctionSymbol {
+
         val newSymbol =
             FirNamedFunctionSymbol(
-                CallableId(derivedClassId ?: mostSpecific.callableId.classId!!, mostSpecific.fir.name),
-                mostSpecific.isFakeOverride,
-                mostSpecific,
-                isIntersectionOverride = true
+                CallableId(
+                    dispatchReceiverType.classId ?: mostSpecific.dispatchReceiverClassOrNull()?.classId!!,
+                    mostSpecific.fir.name
+                )
             )
         val mostSpecificFunction = mostSpecific.fir
         FirFakeOverrideGenerator.createCopyForFirFunction(
             newSymbol,
             mostSpecificFunction, session, FirDeclarationOrigin.IntersectionOverride,
             mostSpecificFunction.isExpect,
+            newDispatchReceiverType = dispatchReceiverType,
             newModality = newModality,
             newVisibility = newVisibility,
-        )
+        ).apply {
+            originalForIntersectionOverrideAttr = mostSpecific.fir
+        }
         return newSymbol
     }
 
@@ -284,13 +285,16 @@ class FirTypeIntersectionScope private constructor(
         newModality: Modality,
         newVisibility: Visibility,
     ): FirPropertySymbol {
-        val newSymbol = FirPropertySymbol(mostSpecific.callableId, mostSpecific.isFakeOverride, mostSpecific, isIntersectionOverride = true)
+        val newSymbol = FirPropertySymbol(mostSpecific.callableId)
         val mostSpecificProperty = mostSpecific.fir
         FirFakeOverrideGenerator.createCopyForFirProperty(
-            newSymbol, mostSpecificProperty, mostSpecificProperty.session,
+            newSymbol, mostSpecificProperty, mostSpecificProperty.session, FirDeclarationOrigin.IntersectionOverride,
             newModality = newModality,
             newVisibility = newVisibility,
-        )
+            newDispatchReceiverType = dispatchReceiverType,
+        ).apply {
+            originalForIntersectionOverrideAttr = mostSpecific.fir
+        }
         return newSymbol
     }
 
@@ -443,7 +447,7 @@ class FirTypeIntersectionScope private constructor(
         functionSymbol: FirFunctionSymbol<*>,
         processor: (FirFunctionSymbol<*>, FirTypeScope) -> ProcessorAction
     ): ProcessorAction =
-        processDirectOverriddenCallablesCallablesWithBaseScope(
+        processDirectOverriddenCallablesWithBaseScope(
             functionSymbol, processor,
             FirTypeScope::processDirectOverriddenFunctionsWithBaseScope
         )
@@ -452,12 +456,12 @@ class FirTypeIntersectionScope private constructor(
         propertySymbol: FirPropertySymbol,
         processor: (FirPropertySymbol, FirTypeScope) -> ProcessorAction
     ): ProcessorAction =
-        processDirectOverriddenCallablesCallablesWithBaseScope(
+        processDirectOverriddenCallablesWithBaseScope(
             propertySymbol, processor,
             FirTypeScope::processDirectOverriddenPropertiesWithBaseScope
         )
 
-    private fun <D : FirCallableSymbol<*>> processDirectOverriddenCallablesCallablesWithBaseScope(
+    private fun <D : FirCallableSymbol<*>> processDirectOverriddenCallablesWithBaseScope(
         callableSymbol: D,
         processor: (D, FirTypeScope) -> ProcessorAction,
         processDirectOverriddenInBaseScope: FirTypeScope.(D, ((D, FirTypeScope) -> ProcessorAction)) -> ProcessorAction
@@ -486,10 +490,13 @@ class FirTypeIntersectionScope private constructor(
             session: FirSession,
             overrideChecker: FirOverrideChecker,
             scopes: List<FirTypeScope>,
-            derivedClassId: ClassId? = null,
+            dispatchReceiverType: ConeKotlinType,
         ): FirTypeScope {
             scopes.singleOrNull()?.let { return it }
-            return FirTypeIntersectionScope(session, overrideChecker, scopes, derivedClassId)
+            if (scopes.isEmpty()) {
+                return Empty
+            }
+            return FirTypeIntersectionScope(session, overrideChecker, scopes, dispatchReceiverType)
         }
     }
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
index 179bebe402f..fdb35bc8da0 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
@@ -168,7 +168,8 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
 
     override fun CapturedTypeMarker.lowerType(): KotlinTypeMarker? {
         require(this is ConeCapturedType)
-        return this.lowerType
+        if (!this.isMarkedNullable) return this.lowerType
+        return this.lowerType?.makeNullable()
     }
 
     override fun TypeArgumentMarker.isStarProjection(): Boolean {
@@ -329,7 +330,7 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
         }
 
         val substitutor = substitutorByMap((0 until argumentsCount).map { index ->
-            (typeConstructor.getParameter(index) as ConeTypeParameterLookupTag).toSymbol() to (newArguments[index] as ConeKotlinType)
+            (typeConstructor.getParameter(index) as ConeTypeParameterLookupTag).symbol to (newArguments[index] as ConeKotlinType)
         }.toMap())
 
         for (index in 0 until argumentsCount) {
@@ -457,7 +458,10 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
 
     override fun arrayType(componentType: KotlinTypeMarker): SimpleTypeMarker = TODO("not implemented")
 
-    override fun KotlinTypeMarker.isArrayOrNullableArray(): Boolean = TODO("not implemented")
+    override fun KotlinTypeMarker.isArrayOrNullableArray(): Boolean {
+        require(this is ConeKotlinType)
+        return this.classId == StandardClassIds.Array
+    }
 
     override fun TypeConstructorMarker.isFinalClassOrEnumEntryOrAnnotationClassConstructor(): Boolean {
         val firRegularClass = toFirRegularClass() ?: return false
@@ -561,8 +565,8 @@ class ConeTypeCheckerContext(
         }
     }
 
-    override fun areEqualTypeConstructors(a: TypeConstructorMarker, b: TypeConstructorMarker): Boolean {
-        return a == b
+    override fun areEqualTypeConstructors(c1: TypeConstructorMarker, c2: TypeConstructorMarker): Boolean {
+        return c1 == c2
     }
 
     override fun prepareType(type: KotlinTypeMarker): KotlinTypeMarker {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
index a5006fdf445..9fe8a454905 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.classId
 import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic
+import org.jetbrains.kotlin.fir.expressions.classId
 import org.jetbrains.kotlin.fir.fakeElement
 import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
@@ -83,6 +84,7 @@ fun <T : ConeKotlinType> T.withAttributes(attributes: ConeAttributes): T {
         is ConeClassLikeTypeImpl -> ConeClassLikeTypeImpl(lookupTag, typeArguments, nullability.isNullable, attributes)
         is ConeDefinitelyNotNullType -> ConeDefinitelyNotNullType.create(original.withAttributes(attributes))!!
         is ConeTypeParameterTypeImpl -> ConeTypeParameterTypeImpl(lookupTag, nullability.isNullable, attributes)
+        is ConeFlexibleType -> ConeFlexibleType(lowerBound.withAttributes(attributes), upperBound.withAttributes(attributes))
         else -> error("Not supported: $this: ${this.render()}")
     } as T
 }
@@ -103,8 +105,12 @@ fun ConeTypeContext.hasNullableSuperType(type: ConeKotlinType): Boolean {
     return false
 }
 
-fun <T : ConeKotlinType> T.withNullability(nullability: ConeNullability, typeContext: ConeInferenceContext? = null): T {
-    if (this.nullability == nullability) {
+fun <T : ConeKotlinType> T.withNullability(
+    nullability: ConeNullability,
+    typeContext: ConeInferenceContext? = null,
+    attributes: ConeAttributes = this.attributes,
+): T {
+    if (this.nullability == nullability && this.attributes == attributes) {
         return this
     }
 
@@ -183,6 +189,26 @@ fun FirTypeRef.isUnsafeVarianceType(session: FirSession): Boolean {
     return coneTypeSafe<ConeKotlinType>()?.isUnsafeVarianceType(session) == true
 }
 
+fun FirTypeRef.hasEnhancedNullability(): Boolean =
+    coneTypeSafe<ConeKotlinType>()?.hasEnhancedNullability == true
+
+fun FirTypeRef.hasFlexibleNullability(): Boolean =
+    coneTypeSafe<ConeKotlinType>()?.hasFlexibleNullability == true
+
+fun FirTypeRef.withoutEnhancedNullability(): FirTypeRef {
+    require(this is FirResolvedTypeRef)
+    if (!hasEnhancedNullability()) return this
+    return buildResolvedTypeRef {
+        source = this@withoutEnhancedNullability.source
+        type = this@withoutEnhancedNullability.type.withAttributes(
+            ConeAttributes.create(
+                this@withoutEnhancedNullability.type.attributes.filter { it != CompilerConeAttributes.EnhancedNullability }
+            )
+        )
+        annotations += this@withoutEnhancedNullability.annotations
+    }
+}
+
 // Unlike other cases, return types may be implicit, i.e. unresolved
 // But in that cases newType should also be `null`
 fun FirTypeRef.withReplacedReturnType(newType: ConeKotlinType?): FirTypeRef {
@@ -237,7 +263,7 @@ fun FirTypeRef.approximatedIfNeededOrSelf(
     } else {
         this
     }
-    return approximatedType.hideLocalTypeIfNeeded(containingCallableVisibility, isInlineFunction)
+    return approximatedType.hideLocalTypeIfNeeded(containingCallableVisibility, isInlineFunction).withoutEnhancedNullability()
 }
 
 private fun ConeKotlinType.requiresApproximationInPublicPosition(): Boolean {
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt
index c1dc9ebb7c9..a2f51cbd82b 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.fir.visitors.*
@@ -31,6 +32,7 @@ interface FirCallableMemberDeclaration<F : FirCallableMemberDeclaration<F>> : Fi
     override val typeParameters: List<FirTypeParameterRef>
     override val status: FirDeclarationStatus
     val containerSource: DeserializedContainerSource?
+    val dispatchReceiverType: ConeKotlinType?
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitCallableMemberDeclaration(this, data)
 
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt
index ef918088b7d..d28a5fed3f3 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.fir.visitors.*
@@ -35,6 +36,7 @@ abstract class FirConstructor : FirPureAbstractElement(), FirFunction<FirConstru
     abstract override val valueParameters: List<FirValueParameter>
     abstract override val status: FirDeclarationStatus
     abstract override val containerSource: DeserializedContainerSource?
+    abstract override val dispatchReceiverType: ConeKotlinType?
     abstract override val annotations: List<FirAnnotationCall>
     abstract override val symbol: FirConstructorSymbol
     abstract val delegatedConstructor: FirDelegatedConstructorCall?
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt
index c90a4dc95ac..eb8f5cc8c5f 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -42,6 +43,7 @@ abstract class FirEnumEntry : FirVariable<FirEnumEntry>(), FirCallableMemberDecl
     abstract override val typeParameters: List<FirTypeParameterRef>
     abstract override val status: FirDeclarationStatus
     abstract override val containerSource: DeserializedContainerSource?
+    abstract override val dispatchReceiverType: ConeKotlinType?
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitEnumEntry(this, data)
 
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt
index 991542c898d..8fc02aa2cf3 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -42,6 +43,7 @@ abstract class FirField : FirVariable<FirField>(), FirTypeParametersOwner, FirCa
     abstract override val typeParameters: List<FirTypeParameter>
     abstract override val status: FirDeclarationStatus
     abstract override val containerSource: DeserializedContainerSource?
+    abstract override val dispatchReceiverType: ConeKotlinType?
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitField(this, data)
 
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt
index 1e339d96b55..05e024e3a86 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -43,6 +44,7 @@ abstract class FirProperty : FirVariable<FirProperty>(), FirTypeParametersOwner,
     abstract override val typeParameters: List<FirTypeParameter>
     abstract override val controlFlowGraphReference: FirControlFlowGraphReference?
     abstract override val containerSource: DeserializedContainerSource?
+    abstract override val dispatchReceiverType: ConeKotlinType?
     abstract override val symbol: FirPropertySymbol
     abstract val backingFieldSymbol: FirBackingFieldSymbol
     abstract val isLocal: Boolean
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt
index d298bf54368..4fd2da4e163 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.fir.visitors.*
@@ -35,6 +36,7 @@ abstract class FirPropertyAccessor : FirPureAbstractElement(), FirFunction<FirPr
     abstract override val body: FirBlock?
     abstract override val status: FirDeclarationStatus
     abstract override val containerSource: DeserializedContainerSource?
+    abstract override val dispatchReceiverType: ConeKotlinType?
     abstract override val contractDescription: FirContractDescription
     abstract override val symbol: FirPropertyAccessorSymbol
     abstract val isGetter: Boolean
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt
index c7de7cb3a43..db8a0c96919 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -36,6 +37,7 @@ abstract class FirSimpleFunction : FirPureAbstractElement(), FirFunction<FirSimp
     abstract override val body: FirBlock?
     abstract override val status: FirDeclarationStatus
     abstract override val containerSource: DeserializedContainerSource?
+    abstract override val dispatchReceiverType: ConeKotlinType?
     abstract override val contractDescription: FirContractDescription
     abstract val name: Name
     abstract override val symbol: FirFunctionSymbol<FirSimpleFunction>
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt
index 615fc1b3ae6..1760228750f 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -46,6 +47,7 @@ interface FirAbstractConstructorBuilder : FirFunctionBuilder {
     abstract var controlFlowGraphReference: FirControlFlowGraphReference?
     abstract var status: FirDeclarationStatus
     abstract var containerSource: DeserializedContainerSource?
+    abstract var dispatchReceiverType: ConeKotlinType?
     abstract var symbol: FirConstructorSymbol
     abstract var delegatedConstructor: FirDelegatedConstructorCall?
     override fun build(): FirConstructor
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt
index ccb3d34716d..8bc8af44ab4 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -46,6 +47,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC
     override val valueParameters: MutableList<FirValueParameter> = mutableListOf()
     override lateinit var status: FirDeclarationStatus
     override var containerSource: DeserializedContainerSource? = null
+    override var dispatchReceiverType: ConeKotlinType? = null
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     override lateinit var symbol: FirConstructorSymbol
     override var delegatedConstructor: FirDelegatedConstructorCall? = null
@@ -64,6 +66,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC
             valueParameters,
             status,
             containerSource,
+            dispatchReceiverType,
             annotations,
             symbol,
             delegatedConstructor,
@@ -98,13 +101,14 @@ inline fun buildConstructorCopy(original: FirConstructor, init: FirConstructorBu
     copyBuilder.session = original.session
     copyBuilder.resolvePhase = original.resolvePhase
     copyBuilder.origin = original.origin
-    copyBuilder.attributes = original.attributes
+    copyBuilder.attributes = original.attributes.copy()
     copyBuilder.returnTypeRef = original.returnTypeRef
     copyBuilder.receiverTypeRef = original.receiverTypeRef
     copyBuilder.typeParameters.addAll(original.typeParameters)
     copyBuilder.valueParameters.addAll(original.valueParameters)
     copyBuilder.status = original.status
     copyBuilder.containerSource = original.containerSource
+    copyBuilder.dispatchReceiverType = original.dispatchReceiverType
     copyBuilder.annotations.addAll(original.annotations)
     copyBuilder.symbol = original.symbol
     copyBuilder.delegatedConstructor = original.delegatedConstructor
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt
index 5da7b892d03..f3a52a76cf2 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*
 import org.jetbrains.kotlin.name.Name
@@ -47,6 +48,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder {
     val typeParameters: MutableList<FirTypeParameterRef> = mutableListOf()
     lateinit var status: FirDeclarationStatus
     var containerSource: DeserializedContainerSource? = null
+    var dispatchReceiverType: ConeKotlinType? = null
 
     override fun build(): FirEnumEntry {
         return FirEnumEntryImpl(
@@ -63,6 +65,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder {
             typeParameters,
             status,
             containerSource,
+            dispatchReceiverType,
         )
     }
 
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt
index 647a90ca479..bb7132a48e6 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*
 import org.jetbrains.kotlin.name.Name
@@ -47,6 +48,7 @@ open class FirFieldBuilder : FirAnnotationContainerBuilder {
     open val typeParameters: MutableList<FirTypeParameter> = mutableListOf()
     open lateinit var status: FirDeclarationStatus
     open var containerSource: DeserializedContainerSource? = null
+    open var dispatchReceiverType: ConeKotlinType? = null
 
     override fun build(): FirField {
         return FirFieldImpl(
@@ -63,6 +65,7 @@ open class FirFieldBuilder : FirAnnotationContainerBuilder {
             typeParameters,
             status,
             containerSource,
+            dispatchReceiverType,
         )
     }
 
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt
index 62c8a88c7a4..5ad8596fd15 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -46,6 +47,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio
     override val valueParameters: MutableList<FirValueParameter> = mutableListOf()
     override lateinit var status: FirDeclarationStatus
     override var containerSource: DeserializedContainerSource? = null
+    override var dispatchReceiverType: ConeKotlinType? = null
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     override lateinit var symbol: FirConstructorSymbol
     override var delegatedConstructor: FirDelegatedConstructorCall? = null
@@ -64,6 +66,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio
             valueParameters,
             status,
             containerSource,
+            dispatchReceiverType,
             annotations,
             symbol,
             delegatedConstructor,
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt
index 8bcb8d90f05..2f541f39fca 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -48,6 +49,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui
     override var body: FirBlock? = null
     lateinit var status: FirDeclarationStatus
     var containerSource: DeserializedContainerSource? = null
+    var dispatchReceiverType: ConeKotlinType? = null
     var contractDescription: FirContractDescription = FirEmptyContractDescription
     lateinit var symbol: FirPropertyAccessorSymbol
     var isGetter: Boolean by kotlin.properties.Delegates.notNull<Boolean>()
@@ -67,6 +69,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui
             body,
             status,
             containerSource,
+            dispatchReceiverType,
             contractDescription,
             symbol,
             isGetter,
@@ -95,12 +98,13 @@ inline fun buildPropertyAccessorCopy(original: FirPropertyAccessor, init: FirPro
     copyBuilder.session = original.session
     copyBuilder.resolvePhase = original.resolvePhase
     copyBuilder.origin = original.origin
-    copyBuilder.attributes = original.attributes
+    copyBuilder.attributes = original.attributes.copy()
     copyBuilder.returnTypeRef = original.returnTypeRef
     copyBuilder.valueParameters.addAll(original.valueParameters)
     copyBuilder.body = original.body
     copyBuilder.status = original.status
     copyBuilder.containerSource = original.containerSource
+    copyBuilder.dispatchReceiverType = original.dispatchReceiverType
     copyBuilder.contractDescription = original.contractDescription
     copyBuilder.symbol = original.symbol
     copyBuilder.isGetter = original.isGetter
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt
index a32c2fd2841..8c0b709c20f 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*
 import org.jetbrains.kotlin.name.Name
@@ -54,6 +55,7 @@ class FirPropertyBuilder : FirTypeParametersOwnerBuilder, FirAnnotationContainer
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     override val typeParameters: MutableList<FirTypeParameter> = mutableListOf()
     var containerSource: DeserializedContainerSource? = null
+    var dispatchReceiverType: ConeKotlinType? = null
     lateinit var symbol: FirPropertySymbol
     var isLocal: Boolean by kotlin.properties.Delegates.notNull<Boolean>()
     lateinit var status: FirDeclarationStatus
@@ -77,6 +79,7 @@ class FirPropertyBuilder : FirTypeParametersOwnerBuilder, FirAnnotationContainer
             annotations,
             typeParameters,
             containerSource,
+            dispatchReceiverType,
             symbol,
             isLocal,
             status,
@@ -103,7 +106,7 @@ inline fun buildPropertyCopy(original: FirProperty, init: FirPropertyBuilder.()
     copyBuilder.session = original.session
     copyBuilder.resolvePhase = original.resolvePhase
     copyBuilder.origin = original.origin
-    copyBuilder.attributes = original.attributes
+    copyBuilder.attributes = original.attributes.copy()
     copyBuilder.returnTypeRef = original.returnTypeRef
     copyBuilder.receiverTypeRef = original.receiverTypeRef
     copyBuilder.name = original.name
@@ -116,6 +119,7 @@ inline fun buildPropertyCopy(original: FirProperty, init: FirPropertyBuilder.()
     copyBuilder.annotations.addAll(original.annotations)
     copyBuilder.typeParameters.addAll(original.typeParameters)
     copyBuilder.containerSource = original.containerSource
+    copyBuilder.dispatchReceiverType = original.dispatchReceiverType
     copyBuilder.symbol = original.symbol
     copyBuilder.isLocal = original.isLocal
     copyBuilder.status = original.status
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt
index 955bde403f2..ca78e01239b 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*
 import org.jetbrains.kotlin.name.Name
@@ -50,6 +51,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner
     override var body: FirBlock? = null
     open lateinit var status: FirDeclarationStatus
     open var containerSource: DeserializedContainerSource? = null
+    open var dispatchReceiverType: ConeKotlinType? = null
     open var contractDescription: FirContractDescription = FirEmptyContractDescription
     open lateinit var name: Name
     open lateinit var symbol: FirFunctionSymbol<FirSimpleFunction>
@@ -70,6 +72,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner
             body,
             status,
             containerSource,
+            dispatchReceiverType,
             contractDescription,
             name,
             symbol,
@@ -98,13 +101,14 @@ inline fun buildSimpleFunctionCopy(original: FirSimpleFunction, init: FirSimpleF
     copyBuilder.session = original.session
     copyBuilder.resolvePhase = original.resolvePhase
     copyBuilder.origin = original.origin
-    copyBuilder.attributes = original.attributes
+    copyBuilder.attributes = original.attributes.copy()
     copyBuilder.returnTypeRef = original.returnTypeRef
     copyBuilder.receiverTypeRef = original.receiverTypeRef
     copyBuilder.valueParameters.addAll(original.valueParameters)
     copyBuilder.body = original.body
     copyBuilder.status = original.status
     copyBuilder.containerSource = original.containerSource
+    copyBuilder.dispatchReceiverType = original.dispatchReceiverType
     copyBuilder.contractDescription = original.contractDescription
     copyBuilder.name = original.name
     copyBuilder.symbol = original.symbol
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt
index e5d6abcad00..bd059d3da02 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt
@@ -86,7 +86,7 @@ inline fun buildValueParameterCopy(original: FirValueParameter, init: FirValuePa
     copyBuilder.session = original.session
     copyBuilder.resolvePhase = original.resolvePhase
     copyBuilder.origin = original.origin
-    copyBuilder.attributes = original.attributes
+    copyBuilder.attributes = original.attributes.copy()
     copyBuilder.returnTypeRef = original.returnTypeRef
     copyBuilder.name = original.name
     copyBuilder.symbol = original.symbol
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt
index 0bae5a016c1..63bd1d946c7 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.fir.visitors.*
@@ -40,6 +41,7 @@ internal class FirConstructorImpl(
     override val valueParameters: MutableList<FirValueParameter>,
     override var status: FirDeclarationStatus,
     override val containerSource: DeserializedContainerSource?,
+    override val dispatchReceiverType: ConeKotlinType?,
     override val annotations: MutableList<FirAnnotationCall>,
     override val symbol: FirConstructorSymbol,
     override var delegatedConstructor: FirDelegatedConstructorCall?,
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt
index feef07e1aea..e2c9a19c9a1 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -42,6 +43,7 @@ internal class FirEnumEntryImpl(
     override val typeParameters: MutableList<FirTypeParameterRef>,
     override var status: FirDeclarationStatus,
     override val containerSource: DeserializedContainerSource?,
+    override val dispatchReceiverType: ConeKotlinType?,
 ) : FirEnumEntry() {
     override val receiverTypeRef: FirTypeRef? get() = null
     override val delegate: FirExpression? get() = null
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt
index 5e515ff69fe..8708335687c 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -42,6 +43,7 @@ internal class FirFieldImpl(
     override val typeParameters: MutableList<FirTypeParameter>,
     override var status: FirDeclarationStatus,
     override val containerSource: DeserializedContainerSource?,
+    override val dispatchReceiverType: ConeKotlinType?,
 ) : FirField() {
     override val receiverTypeRef: FirTypeRef? get() = null
     override val initializer: FirExpression? get() = null
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt
index 116edabe5ac..268d596c66a 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.fir.visitors.*
@@ -40,6 +41,7 @@ internal class FirPrimaryConstructor(
     override val valueParameters: MutableList<FirValueParameter>,
     override var status: FirDeclarationStatus,
     override val containerSource: DeserializedContainerSource?,
+    override val dispatchReceiverType: ConeKotlinType?,
     override val annotations: MutableList<FirAnnotationCall>,
     override val symbol: FirConstructorSymbol,
     override var delegatedConstructor: FirDelegatedConstructorCall?,
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt
index f73c394679b..808c6698755 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.fir.visitors.*
@@ -41,6 +42,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor(
     override var body: FirBlock?,
     override var status: FirDeclarationStatus,
     override val containerSource: DeserializedContainerSource?,
+    override val dispatchReceiverType: ConeKotlinType?,
     override var contractDescription: FirContractDescription,
     override val symbol: FirPropertyAccessorSymbol,
     override val isGetter: Boolean,
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt
index a7fef8d744e..7f8849fb8f0 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -48,6 +49,7 @@ internal class FirPropertyImpl(
     override val annotations: MutableList<FirAnnotationCall>,
     override val typeParameters: MutableList<FirTypeParameter>,
     override val containerSource: DeserializedContainerSource?,
+    override val dispatchReceiverType: ConeKotlinType?,
     override val symbol: FirPropertySymbol,
     override val isLocal: Boolean,
     override var status: FirDeclarationStatus,
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt
index b50aebe187c..436d7a0fb7d 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -42,6 +43,7 @@ open class FirSimpleFunctionImpl @FirImplementationDetail constructor(
     override var body: FirBlock?,
     override var status: FirDeclarationStatus,
     override val containerSource: DeserializedContainerSource?,
+    override val dispatchReceiverType: ConeKotlinType?,
     override var contractDescription: FirContractDescription,
     override val name: Name,
     override val symbol: FirFunctionSymbol<FirSimpleFunction>,
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirComposedSuperTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirComposedSuperTypeRef.kt
deleted file mode 100644
index da01644ee59..00000000000
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirComposedSuperTypeRef.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.types
-
-import org.jetbrains.kotlin.fir.FirSourceElement
-import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
-import org.jetbrains.kotlin.fir.visitors.*
-
-/*
- * This file was generated automatically
- * DO NOT MODIFY IT MANUALLY
- */
-
-abstract class FirComposedSuperTypeRef : FirTypeRef() {
-    abstract override val source: FirSourceElement?
-    abstract override val annotations: List<FirAnnotationCall>
-    abstract val superTypeRefs: List<FirResolvedTypeRef>
-
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitComposedSuperTypeRef(this, data)
-
-    abstract override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirComposedSuperTypeRef
-}
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirComposedSuperTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirComposedSuperTypeRefBuilder.kt
deleted file mode 100644
index 281df8c7dab..00000000000
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirComposedSuperTypeRefBuilder.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.types.builder
-
-import kotlin.contracts.*
-import org.jetbrains.kotlin.fir.FirSourceElement
-import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder
-import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
-import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
-import org.jetbrains.kotlin.fir.types.FirComposedSuperTypeRef
-import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
-import org.jetbrains.kotlin.fir.types.impl.FirComposedSuperTypeRefImpl
-import org.jetbrains.kotlin.fir.visitors.*
-
-/*
- * This file was generated automatically
- * DO NOT MODIFY IT MANUALLY
- */
-
-@FirBuilderDsl
-class FirComposedSuperTypeRefBuilder : FirAnnotationContainerBuilder {
-    override var source: FirSourceElement? = null
-    override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
-    val superTypeRefs: MutableList<FirResolvedTypeRef> = mutableListOf()
-
-    override fun build(): FirComposedSuperTypeRef {
-        return FirComposedSuperTypeRefImpl(
-            source,
-            annotations,
-            superTypeRefs,
-        )
-    }
-
-}
-
-@OptIn(ExperimentalContracts::class)
-inline fun buildComposedSuperTypeRef(init: FirComposedSuperTypeRefBuilder.() -> Unit = {}): FirComposedSuperTypeRef {
-    contract {
-        callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE)
-    }
-    return FirComposedSuperTypeRefBuilder().apply(init).build()
-}
-
-@OptIn(ExperimentalContracts::class)
-inline fun buildComposedSuperTypeRefCopy(original: FirComposedSuperTypeRef, init: FirComposedSuperTypeRefBuilder.() -> Unit = {}): FirComposedSuperTypeRef {
-    contract {
-        callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE)
-    }
-    val copyBuilder = FirComposedSuperTypeRefBuilder()
-    copyBuilder.source = original.source
-    copyBuilder.annotations.addAll(original.annotations)
-    copyBuilder.superTypeRefs.addAll(original.superTypeRefs)
-    return copyBuilder.apply(init).build()
-}
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirComposedSuperTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirComposedSuperTypeRefImpl.kt
deleted file mode 100644
index f217189009e..00000000000
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirComposedSuperTypeRefImpl.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.types.impl
-
-import org.jetbrains.kotlin.fir.FirSourceElement
-import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
-import org.jetbrains.kotlin.fir.types.FirComposedSuperTypeRef
-import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
-import org.jetbrains.kotlin.fir.visitors.*
-
-/*
- * This file was generated automatically
- * DO NOT MODIFY IT MANUALLY
- */
-
-internal class FirComposedSuperTypeRefImpl(
-    override val source: FirSourceElement?,
-    override val annotations: MutableList<FirAnnotationCall>,
-    override val superTypeRefs: MutableList<FirResolvedTypeRef>,
-) : FirComposedSuperTypeRef() {
-    override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
-        annotations.forEach { it.accept(visitor, data) }
-        superTypeRefs.forEach { it.accept(visitor, data) }
-    }
-
-    override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirComposedSuperTypeRefImpl {
-        transformAnnotations(transformer, data)
-        superTypeRefs.transformInplace(transformer, data)
-        return this
-    }
-
-    override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirComposedSuperTypeRefImpl {
-        annotations.transformInplace(transformer, data)
-        return this
-    }
-}
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt
index 011b3ace157..cbcf887d6a6 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt
@@ -125,7 +125,6 @@ import org.jetbrains.kotlin.fir.types.FirUserTypeRef
 import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef
 import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef
 import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef
-import org.jetbrains.kotlin.fir.types.FirComposedSuperTypeRef
 import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration
 import org.jetbrains.kotlin.fir.contracts.FirContractDescription
 import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription
@@ -618,10 +617,6 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
         return transformElement(implicitTypeRef, data)
     }
 
-    open fun transformComposedSuperTypeRef(composedSuperTypeRef: FirComposedSuperTypeRef, data: D): CompositeTransformResult<FirTypeRef> {
-        return transformElement(composedSuperTypeRef, data)
-    }
-
     open fun transformEffectDeclaration(effectDeclaration: FirEffectDeclaration, data: D): CompositeTransformResult<FirEffectDeclaration> {
         return transformElement(effectDeclaration, data)
     }
@@ -1122,10 +1117,6 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
         return transformImplicitTypeRef(implicitTypeRef, data)
     }
 
-    final override fun visitComposedSuperTypeRef(composedSuperTypeRef: FirComposedSuperTypeRef, data: D): CompositeTransformResult<FirTypeRef> {
-        return transformComposedSuperTypeRef(composedSuperTypeRef, data)
-    }
-
     final override fun visitEffectDeclaration(effectDeclaration: FirEffectDeclaration, data: D): CompositeTransformResult<FirEffectDeclaration> {
         return transformEffectDeclaration(effectDeclaration, data)
     }
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt
index 9d413a5969d..fd9733dab48 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt
@@ -125,7 +125,6 @@ import org.jetbrains.kotlin.fir.types.FirUserTypeRef
 import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef
 import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef
 import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef
-import org.jetbrains.kotlin.fir.types.FirComposedSuperTypeRef
 import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration
 import org.jetbrains.kotlin.fir.contracts.FirContractDescription
 import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription
@@ -378,8 +377,6 @@ abstract class FirVisitor<out R, in D> {
 
     open fun visitImplicitTypeRef(implicitTypeRef: FirImplicitTypeRef, data: D): R  = visitElement(implicitTypeRef, data)
 
-    open fun visitComposedSuperTypeRef(composedSuperTypeRef: FirComposedSuperTypeRef, data: D): R  = visitElement(composedSuperTypeRef, data)
-
     open fun visitEffectDeclaration(effectDeclaration: FirEffectDeclaration, data: D): R  = visitElement(effectDeclaration, data)
 
     open fun visitContractDescription(contractDescription: FirContractDescription, data: D): R  = visitElement(contractDescription, data)
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt
index 89064e4316c..2cd2bce364c 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt
@@ -125,7 +125,6 @@ import org.jetbrains.kotlin.fir.types.FirUserTypeRef
 import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef
 import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef
 import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef
-import org.jetbrains.kotlin.fir.types.FirComposedSuperTypeRef
 import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration
 import org.jetbrains.kotlin.fir.contracts.FirContractDescription
 import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription
@@ -616,10 +615,6 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
         visitElement(implicitTypeRef)
     }
 
-    open fun visitComposedSuperTypeRef(composedSuperTypeRef: FirComposedSuperTypeRef) {
-        visitElement(composedSuperTypeRef)
-    }
-
     open fun visitEffectDeclaration(effectDeclaration: FirEffectDeclaration) {
         visitElement(effectDeclaration)
     }
@@ -1120,10 +1115,6 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
         visitImplicitTypeRef(implicitTypeRef)
     }
 
-    final override fun visitComposedSuperTypeRef(composedSuperTypeRef: FirComposedSuperTypeRef, data: Nothing?) {
-        visitComposedSuperTypeRef(composedSuperTypeRef)
-    }
-
     final override fun visitEffectDeclaration(effectDeclaration: FirEffectDeclaration, data: Nothing?) {
         visitEffectDeclaration(effectDeclaration)
     }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
new file mode 100644
index 00000000000..8fe3915a9e2
--- /dev/null
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir
+
+import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
+import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
+import org.jetbrains.kotlin.fir.types.ConeIntersectionType
+
+fun FirCallableSymbol<*>.dispatchReceiverClassOrNull(): ConeClassLikeLookupTag? =
+    (fir as? FirCallableMemberDeclaration<*>)?.dispatchReceiverClassOrNull()
+
+fun FirCallableDeclaration<*>.dispatchReceiverClassOrNull(): ConeClassLikeLookupTag? {
+    if (this !is FirCallableMemberDeclaration<*>) return null
+    if (dispatchReceiverType is ConeIntersectionType && isIntersectionOverride) return symbol.baseForIntersectionOverride!!.fir.dispatchReceiverClassOrNull()
+
+    return (dispatchReceiverType as? ConeClassLikeType)?.lookupTag
+}
+
+fun FirCallableSymbol<*>.containingClass(): ConeClassLikeLookupTag? = fir.containingClass()
+fun FirCallableDeclaration<*>.containingClass(): ConeClassLikeLookupTag? {
+    return (containingClassAttr ?: dispatchReceiverClassOrNull())
+}
+
+private object ContainingClassKey : FirDeclarationDataKey()
+var FirCallableDeclaration<*>.containingClassAttr: ConeClassLikeLookupTag? by FirDeclarationDataRegistry.data(ContainingClassKey)
+
+
+val FirCallableDeclaration<*>.isIntersectionOverride get() = origin == FirDeclarationOrigin.IntersectionOverride
+val FirCallableDeclaration<*>.isSubstitutionOverride get() = origin == FirDeclarationOrigin.SubstitutionOverride
+
+inline val <reified D : FirCallableDeclaration<*>> D.originalForSubstitutionOverride: D?
+    get() = if (isSubstitutionOverride) originalForSubstitutionOverrideAttr else null
+
+inline val <reified S : FirCallableSymbol<*>> S.originalForSubstitutionOverride: S?
+    get() = fir.originalForSubstitutionOverride?.symbol as S?
+
+inline val <reified D : FirCallableDeclaration<*>> D.baseForIntersectionOverride: D?
+    get() = if (isIntersectionOverride) originalForIntersectionOverrideAttr else null
+
+inline val <reified S : FirCallableSymbol<*>> S.baseForIntersectionOverride: S?
+    get() = fir.baseForIntersectionOverride?.symbol as S?
+
+inline fun <reified D : FirCallableDeclaration<*>> D.originalIfFakeOverride(): D? =
+    originalForSubstitutionOverride ?: baseForIntersectionOverride
+
+inline fun <reified S : FirCallableSymbol<*>> S.originalIfFakeOverride(): S? =
+    fir.originalIfFakeOverride()?.symbol as S?
+
+inline fun <reified D : FirCallableDeclaration<*>> D.unwrapFakeOverrides(): D {
+    var current = this
+
+    do {
+        val next = current.originalIfFakeOverride() ?: return current
+        current = next
+    } while (true)
+}
+
+inline fun <reified S : FirCallableSymbol<*>> S.unwrapFakeOverrides(): S = fir.unwrapFakeOverrides().symbol as S
+
+private object SubstitutedOverrideOriginalKey : FirDeclarationDataKey()
+var <D : FirCallableDeclaration<*>>
+        D.originalForSubstitutionOverrideAttr: D? by FirDeclarationDataRegistry.data(SubstitutedOverrideOriginalKey)
+
+private object IntersectionOverrideOriginalKey : FirDeclarationDataKey()
+var <D : FirCallableDeclaration<*>>
+        D.originalForIntersectionOverrideAttr: D? by FirDeclarationDataRegistry.data(IntersectionOverrideOriginalKey)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
index d247d89336f..4e502fddd80 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
@@ -55,6 +55,8 @@ fun FirRegularClassBuilder.generateValuesFunction(
         symbol = FirNamedFunctionSymbol(CallableId(packageFqName, classFqName, ENUM_VALUES))
         resolvePhase = FirResolvePhase.BODY_RESOLVE
         body = buildEmptyExpressionBlock()
+    }.apply {
+        containingClassAttr = this@generateValuesFunction.symbol.toLookupTag()
     }
 }
 
@@ -93,5 +95,7 @@ fun FirRegularClassBuilder.generateValueOfFunction(
         }
         resolvePhase = FirResolvePhase.BODY_RESOLVE
         body = buildEmptyExpressionBlock()
+    }.apply {
+        containingClassAttr = this@generateValueOfFunction.symbol.toLookupTag()
     }
 }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
index 76595390c80..0ffe3c50a01 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -51,27 +51,27 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
         val renderLambdaBodies: Boolean,
         val renderCallArguments: Boolean,
         val renderCallableFqNames: Boolean,
-        val renderDeclatationResovlePhase: Boolean
+        val renderDeclarationResolvePhase: Boolean
     ) {
         object Normal : RenderMode(
             renderLambdaBodies = true,
             renderCallArguments = true,
             renderCallableFqNames = false,
-            renderDeclatationResovlePhase = false
+            renderDeclarationResolvePhase = false
         )
 
         object WithFqNames : RenderMode(
             renderLambdaBodies = true,
             renderCallArguments = true,
             renderCallableFqNames = true,
-            renderDeclatationResovlePhase = false
+            renderDeclarationResolvePhase = false
         )
 
         object WithResolvePhases : RenderMode(
             renderLambdaBodies = true,
             renderCallArguments = true,
             renderCallableFqNames = false,
-            renderDeclatationResovlePhase = true
+            renderDeclarationResolvePhase = true
         )
     }
 
@@ -340,7 +340,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
     }
 
     override fun visitDeclaration(declaration: FirDeclaration) {
-        if (mode.renderDeclatationResovlePhase) {
+        if (mode.renderDeclarationResolvePhase) {
             print("[${declaration.resolvePhase}] ")
         }
         print(
@@ -973,14 +973,10 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
     override fun visitResolvedNamedReference(resolvedNamedReference: FirResolvedNamedReference) {
         print("R|")
         val symbol = resolvedNamedReference.resolvedSymbol
-        val isFakeOverride = when (symbol) {
-            is FirNamedFunctionSymbol -> symbol.isFakeOverride
-            is FirPropertySymbol -> symbol.isFakeOverride
-            else -> false
-        }
+        val isSubstitutionOverride = (symbol.fir as? FirCallableMemberDeclaration)?.isSubstitutionOverride == true
 
-        if (isFakeOverride) {
-            print("FakeOverride<")
+        if (isSubstitutionOverride) {
+            print("SubstitutionOverride<")
         }
 
         print(symbol.unwrapIntersectionOverrides().render())
@@ -995,7 +991,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
             }
         }
 
-        if (isFakeOverride) {
+        if (isSubstitutionOverride) {
             when (symbol) {
                 is FirNamedFunctionSymbol -> {
                     print(": ")
@@ -1012,7 +1008,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
     }
 
     private fun AbstractFirBasedSymbol<*>.unwrapIntersectionOverrides(): AbstractFirBasedSymbol<*> {
-        if (this is FirCallableSymbol<*> && isIntersectionOverride) return overriddenSymbol!!.unwrapIntersectionOverrides()
+        (this as? FirCallableSymbol<*>)?.baseForIntersectionOverride?.let { return it.unwrapIntersectionOverrides() }
         return this
     }
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSession.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSession.kt
index aefdd736477..391182ef4f8 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSession.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSession.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.fir
 
-import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.fir.types.impl.*
 import org.jetbrains.kotlin.fir.utils.ArrayMapAccessor
@@ -13,7 +12,6 @@ import org.jetbrains.kotlin.fir.utils.ComponentArrayOwner
 import org.jetbrains.kotlin.fir.utils.NullableArrayMapAccessor
 import org.jetbrains.kotlin.fir.utils.TypeRegistry
 import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
-import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KClass
 
 interface FirSessionComponent
@@ -44,8 +42,6 @@ abstract class FirSession @PrivateSessionConstructor constructor(val sessionProv
 }
 
 interface FirSessionProvider {
-    val project: Project
-
     fun getSession(moduleInfo: ModuleInfo): FirSession?
 }
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Primitives.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Primitives.kt
index f2f7e82b657..0f32bf94638 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Primitives.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Primitives.kt
@@ -31,7 +31,10 @@ fun ConeClassLikeType.isLong(): Boolean = lookupTag.classId == StandardClassIds.
 fun ConeClassLikeType.isInt(): Boolean = lookupTag.classId == StandardClassIds.Int
 fun ConeClassLikeType.isShort(): Boolean = lookupTag.classId == StandardClassIds.Short
 fun ConeClassLikeType.isByte(): Boolean = lookupTag.classId == StandardClassIds.Byte
+fun ConeClassLikeType.isBoolean(): Boolean = lookupTag.classId == StandardClassIds.Boolean
+fun ConeClassLikeType.isChar(): Boolean = lookupTag.classId == StandardClassIds.Char
 
+fun ConeClassLikeType.isPrimitiveType(): Boolean = isPrimitiveNumberOrUnsignedNumberType() || isBoolean() || isByte() || isShort()
 fun ConeClassLikeType.isPrimitiveNumberType(): Boolean = lookupTag.classId in PRIMITIVE_NUMBER_CLASS_IDS
 fun ConeClassLikeType.isPrimitiveUnsignedNumberType(): Boolean = lookupTag.classId in PRIMITIVE_UNSIGNED_NUMBER_CLASS_IDS
 fun ConeClassLikeType.isPrimitiveNumberOrUnsignedNumberType(): Boolean = isPrimitiveNumberType() || isPrimitiveUnsignedNumberType()
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt
index a4d0c0fb8d3..13d2c3e7ba3 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt
@@ -8,7 +8,10 @@ package org.jetbrains.kotlin.fir
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirExpression
-import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef
+import org.jetbrains.kotlin.fir.types.FirErrorTypeRef
+import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef
+import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.builder.*
 import org.jetbrains.kotlin.fir.types.impl.*
 
@@ -40,9 +43,6 @@ fun <R : FirTypeRef> R.copyWithNewSourceKind(newKind: FirFakeSourceElementKind):
         is FirImplicitTypeRef -> buildImplicitTypeRefCopy(typeRef) {
             source = newSource
         }
-        is FirComposedSuperTypeRef -> buildComposedSuperTypeRefCopy(typeRef) {
-            source = newSource
-        }
         is FirFunctionTypeRefImpl -> buildFunctionTypeRefCopy(typeRef) {
             source = newSource
         }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt
index 3e57cc4e459..698e7ffd4ef 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.declarations
 
+import org.jetbrains.kotlin.fir.utils.ArrayMap
 import org.jetbrains.kotlin.fir.utils.AttributeArrayOwner
 import org.jetbrains.kotlin.fir.utils.NullableArrayMapAccessor
 import org.jetbrains.kotlin.fir.utils.TypeRegistry
@@ -14,10 +15,13 @@ import kotlin.reflect.KProperty
 
 abstract class FirDeclarationDataKey
 
-class FirDeclarationAttributes : AttributeArrayOwner<FirDeclarationDataKey, Any>() {
+class FirDeclarationAttributes : AttributeArrayOwner<FirDeclarationDataKey, Any> {
     override val typeRegistry: TypeRegistry<FirDeclarationDataKey, Any>
         get() = FirDeclarationDataRegistry
 
+    constructor() : super()
+    private constructor(arrayMap: ArrayMap<Any>) : super(arrayMap)
+
     internal operator fun set(key: KClass<out FirDeclarationDataKey>, value: Any?) {
         if (value == null) {
             removeComponent(key)
@@ -25,6 +29,8 @@ class FirDeclarationAttributes : AttributeArrayOwner<FirDeclarationDataKey, Any>
             registerComponent(key, value)
         }
     }
+
+    fun copy(): FirDeclarationAttributes = FirDeclarationAttributes(arrayMap.copy())
 }
 
 /*
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt
index cf6bdf729a7..fc1d8f5d69a 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt
@@ -6,10 +6,10 @@
 package org.jetbrains.kotlin.fir.declarations.impl
 
 import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirImplementationDetail
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
-import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
@@ -46,6 +46,7 @@ abstract class FirDefaultPropertyAccessor(
     body = null,
     FirDeclarationStatusImpl(visibility, Modality.FINAL),
     containerSource = null,
+    dispatchReceiverType = null,
     contractDescription = FirEmptyContractDescription,
     symbol,
     isGetter,
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt
index 39071d28e9c..d6adcd91ade 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirAccessorSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.FirTransformer
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
@@ -37,6 +38,9 @@ class FirSyntheticProperty(
     override val returnTypeRef: FirTypeRef
         get() = getter.returnTypeRef
 
+    override val dispatchReceiverType: ConeKotlinType?
+        get() = getter.dispatchReceiverType
+
     override val source: FirSourceElement?
         get() = null
 
@@ -145,4 +149,4 @@ class FirSyntheticProperty(
     override fun replaceInitializer(newInitializer: FirExpression?) {
         throw AssertionError("Mutation of synthetic property isn't supported")
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt
index 60382c17c45..ca23b2b789e 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.FirTransformer
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
@@ -42,6 +43,9 @@ class FirSyntheticPropertyAccessor(
     override val status: FirDeclarationStatus
         get() = delegate.status
 
+    override val dispatchReceiverType: ConeKotlinType?
+        get() = delegate.dispatchReceiverType
+
     override val receiverTypeRef: FirTypeRef?
         get() = null
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirScope.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirScope.kt
index 533a509d3c8..6cb30557051 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirScope.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirScope.kt
@@ -35,6 +35,22 @@ abstract class FirScope {
     open fun mayContainName(name: Name) = true
 }
 
+fun FirScope.getSingleClassifier(name: Name): FirClassifierSymbol<*>? = mutableListOf<FirClassifierSymbol<*>>().apply {
+    processClassifiersByName(name, this::add)
+}.singleOrNull()
+
+fun FirScope.getFunctions(name: Name): List<FirFunctionSymbol<*>> = mutableListOf<FirFunctionSymbol<*>>().apply {
+    processFunctionsByName(name, this::add)
+}
+
+fun FirScope.getProperties(name: Name): List<FirVariableSymbol<*>> = mutableListOf<FirVariableSymbol<*>>().apply {
+    processPropertiesByName(name, this::add)
+}
+
+fun FirScope.getDeclaredConstructors(): List<FirConstructorSymbol> = mutableListOf<FirConstructorSymbol>().apply {
+    processDeclaredConstructors(this::add)
+}
+
 fun FirTypeScope.processOverriddenFunctionsAndSelf(
     functionSymbol: FirFunctionSymbol<*>,
     processor: (FirFunctionSymbol<*>) -> ProcessorAction
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt
index 89c84c78e4c..34fdbb741d0 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.scopes
 
+import org.jetbrains.kotlin.fir.isIntersectionOverride
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
@@ -69,7 +70,7 @@ abstract class FirTypeScope : FirScope(), FirContainingNamesAwareScope {
                 ?: return baseScope.processDirectOverriddenCallables(callableSymbol, processor)
 
             for (overridden in directOverridden) {
-                if (overridden.isIntersectionOverride) {
+                if (overridden.fir.isIntersectionOverride) {
                     if (!baseScope.processDirectOverriddenCallables(overridden, processor)) return ProcessorAction.STOP
                 }
                 if (!processor(overridden, baseScope)) return ProcessorAction.STOP
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/PossiblyFirFakeOverrideSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/PossiblyFirFakeOverrideSymbol.kt
deleted file mode 100644
index 49a5c50a653..00000000000
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/PossiblyFirFakeOverrideSymbol.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.symbols
-
-import org.jetbrains.kotlin.fir.FirSymbolOwner
-import org.jetbrains.kotlin.fir.declarations.FirDeclaration
-
-interface PossiblyFirFakeOverrideSymbol<E, S : FirBasedSymbol<E>> : FirBasedSymbol<E> where E : FirSymbolOwner<E>, E : FirDeclaration {
-    // contract isFakeOverride == true <=> overriddenSymbol != null
-    val isFakeOverride: Boolean
-    val overriddenSymbol: S?
-}
\ No newline at end of file
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/SymbolUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/SymbolUtils.kt
index fda7c77b46e..197e65bec02 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/SymbolUtils.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/SymbolUtils.kt
@@ -5,8 +5,6 @@
 
 package org.jetbrains.kotlin.fir.symbols
 
-import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
-import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLookupTagWithFixedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.ConeStarProjection
@@ -14,8 +12,7 @@ import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 
 fun FirClassSymbol<*>.constructStarProjectedType(typeParameterNumber: Int): ConeClassLikeType {
     return ConeClassLikeTypeImpl(
-        if (classId.isLocal) ConeClassLookupTagWithFixedSymbol(classId, this)
-        else ConeClassLikeLookupTagImpl(classId),
+        toLookupTag(),
         Array(typeParameterNumber) { ConeStarProjection },
         isNullable = false
     )
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/ConeClassLikeLookupTagImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/ConeClassLikeLookupTagImpl.kt
index 1383c5fb40c..b48feaf2b74 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/ConeClassLikeLookupTagImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/ConeClassLikeLookupTagImpl.kt
@@ -13,6 +13,11 @@ import org.jetbrains.kotlin.name.ClassId
 annotation class LookupTagInternals
 
 class ConeClassLikeLookupTagImpl(override val classId: ClassId) : ConeClassLikeLookupTag() {
+
+    init {
+        assert(!classId.isLocal) { "You should use ConeClassLookupTagWithFixedSymbol for local $classId!" }
+    }
+
     @LookupTagInternals
     var boundSymbol: OneElementWeakMap<FirSession, FirClassLikeSymbol<*>?>? = null
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt
index 0948332cfd9..8af9b14bbce 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt
@@ -14,11 +14,6 @@ import org.jetbrains.kotlin.fir.symbols.CallableId
 
 abstract class FirCallableSymbol<D : FirCallableDeclaration<D>> : AbstractFirBasedSymbol<D>() {
     abstract val callableId: CallableId
-
-    open val overriddenSymbol: FirCallableSymbol<D>?
-        get() = null
-
-    open val isIntersectionOverride: Boolean get() = false
 }
 
 val FirCallableSymbol<*>.isStatic: Boolean get() = (fir as? FirMemberDeclaration)?.status?.isStatic == true
@@ -29,12 +24,3 @@ val FirCallableSymbol<*>.isExtension: Boolean
         is FirProperty -> fir.receiverTypeRef != null
         else -> false
     }
-
-inline fun <reified E : FirCallableSymbol<*>> E.unwrapSubstitutionOverrides(): E {
-    var current = this
-    while (current.overriddenSymbol != null) {
-        current = current.overriddenSymbol as E
-    }
-
-    return current
-}
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt
index 857ed082c87..333105d0adc 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.symbols.impl
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.symbols.AccessorSymbol
 import org.jetbrains.kotlin.fir.symbols.CallableId
-import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -24,15 +23,10 @@ sealed class FirFunctionSymbol<D : FirFunction<D>>(
 
 open class FirNamedFunctionSymbol(
     callableId: CallableId,
-    override val isFakeOverride: Boolean = false,
-    // Actual for fake override only
-    override val overriddenSymbol: FirNamedFunctionSymbol? = null,
-    override val isIntersectionOverride: Boolean = false,
-) : FirFunctionSymbol<FirSimpleFunction>(callableId), PossiblyFirFakeOverrideSymbol<FirSimpleFunction, FirNamedFunctionSymbol>
+) : FirFunctionSymbol<FirSimpleFunction>(callableId)
 
 class FirConstructorSymbol(
-    callableId: CallableId,
-    override val overriddenSymbol: FirConstructorSymbol? = null
+    callableId: CallableId
 ) : FirFunctionSymbol<FirConstructor>(callableId)
 
 open class FirAccessorSymbol(
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt
index 2d776e76ebf..87d90e6ec24 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.fir.declarations.FirVariable
 import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.symbols.CallableId
-import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
@@ -23,11 +22,7 @@ open class FirVariableSymbol<D : FirVariable<D>>(override val callableId: Callab
 
 open class FirPropertySymbol(
     callableId: CallableId,
-    override val isFakeOverride: Boolean = false,
-    // Actual for fake override only
-    override val overriddenSymbol: FirPropertySymbol? = null,
-    override val isIntersectionOverride: Boolean = false,
-) : FirVariableSymbol<FirProperty>(callableId), PossiblyFirFakeOverrideSymbol<FirProperty, FirPropertySymbol> {
+) : FirVariableSymbol<FirProperty>(callableId) {
     // TODO: should we use this constructor for local variables?
     constructor(name: Name) : this(CallableId(name))
 }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/ConeIntegerLiteralTypeImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/ConeIntegerLiteralTypeImpl.kt
index d4bf312bde6..5a49bb42ab0 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/ConeIntegerLiteralTypeImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/ConeIntegerLiteralTypeImpl.kt
@@ -17,7 +17,11 @@ class ConeIntegerLiteralTypeImpl : ConeIntegerLiteralType {
     override val attributes: ConeAttributes
         get() = ConeAttributes.Empty
 
-    constructor(value: Long, isUnsigned: Boolean, nullability: ConeNullability = ConeNullability.NOT_NULL) : super(value, isUnsigned, nullability) {
+    constructor(
+        value: Long,
+        isUnsigned: Boolean,
+        nullability: ConeNullability = ConeNullability.NOT_NULL
+    ) : super(value, isUnsigned, nullability) {
         possibleTypes = mutableListOf()
 
         fun checkBoundsAndAddPossibleType(classId: ClassId, range: LongRange) {
@@ -75,7 +79,7 @@ class ConeIntegerLiteralTypeImpl : ConeIntegerLiteralType {
 
     @OptIn(ExperimentalUnsignedTypes::class)
     companion object {
-        fun createType(classId: ClassId): ConeClassLikeType {
+        private fun createType(classId: ClassId): ConeClassLikeType {
             return ConeClassLikeTypeImpl(ConeClassLikeLookupTagImpl(classId), emptyArray(), false)
         }
 
@@ -130,7 +134,7 @@ class ConeIntegerLiteralTypeImpl : ConeIntegerLiteralType {
             }
         }
 
-        private fun fold(left: ConeIntegerLiteralType, right: ConeIntegerLiteralType, mode: Mode): ConeIntegerLiteralType? {
+        private fun fold(left: ConeIntegerLiteralType, right: ConeIntegerLiteralType, mode: Mode): ConeIntegerLiteralType {
             val possibleTypes = when (mode) {
                 Mode.COMMON_SUPER_TYPE -> left.possibleTypes intersect right.possibleTypes
                 Mode.INTERSECTION_TYPE -> left.possibleTypes union right.possibleTypes
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
index 28022b87cdd..d3f114085c1 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
@@ -138,3 +138,21 @@ private fun ConeTypeParameterType.hasNotNullUpperBound(): Boolean {
         }
     }
 }
+
+val FirTypeRef.canBeNull: Boolean
+    // TODO: replace with coneType (for some reason, implicit type still can arise here)
+    get() = coneTypeSafe<ConeKotlinType>()?.canBeNull == true
+
+val ConeKotlinType.canBeNull: Boolean
+    get() {
+        if (isMarkedNullable) {
+            return true
+        }
+        return when (this) {
+            is ConeFlexibleType -> upperBound.canBeNull
+            is ConeDefinitelyNotNullType -> false
+            is ConeTypeParameterType -> this.lookupTag.typeParameterSymbol.fir.bounds.any { it.canBeNull }
+            is ConeIntersectionType -> intersectedTypes.any { it.canBeNull }
+            else -> isNullable
+        }
+    }
\ No newline at end of file
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/TypeConstructionUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/TypeConstructionUtils.kt
index 5f4469e30dd..20be3ebc486 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/TypeConstructionUtils.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/TypeConstructionUtils.kt
@@ -15,11 +15,12 @@ import org.jetbrains.kotlin.name.ClassId
 
 fun ConeClassifierLookupTag.constructType(
     typeArguments: Array<out ConeTypeProjection>,
-    isNullable: Boolean
+    isNullable: Boolean,
+    attributes: ConeAttributes = ConeAttributes.Empty
 ): ConeLookupTagBasedType {
     return when (this) {
-        is ConeTypeParameterLookupTag -> ConeTypeParameterTypeImpl(this, isNullable)
-        is ConeClassLikeLookupTag -> this.constructClassType(typeArguments, isNullable)
+        is ConeTypeParameterLookupTag -> ConeTypeParameterTypeImpl(this, isNullable, attributes)
+        is ConeClassLikeLookupTag -> this.constructClassType(typeArguments, isNullable, attributes)
         else -> error("! ${this::class}")
     }
 }
diff --git a/compiler/fir/tree/tree-generator/build.gradle.kts b/compiler/fir/tree/tree-generator/build.gradle.kts
index 342c3d14919..7324a7e7cfd 100644
--- a/compiler/fir/tree/tree-generator/build.gradle.kts
+++ b/compiler/fir/tree/tree-generator/build.gradle.kts
@@ -23,9 +23,7 @@ dependencies {
         includeJars("trove4j", rootProject = rootProject)
     }
 
-    Platform[192].orHigher {
-        runtimeOnly(intellijCoreDep()) { includeJars("jdom") }
-    }
+    runtimeOnly(intellijCoreDep()) { includeJars("jdom") }
 }
 
 val writeCopyright by task<WriteCopyrightToFile> {
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt
index e2e02b919b0..20501be0b0a 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt
@@ -241,10 +241,6 @@ object BuilderConfigurator : AbstractBuilderConfigurator<FirTreeBuilder>(FirTree
             withCopy()
         }
 
-        builder(composedSuperTypeRef) {
-            withCopy()
-        }
-
         builder(breakExpression) {
             parents += loopJumpBuilder
         }
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt
index c54d63eb90d..735a2390931 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt
@@ -148,7 +148,6 @@ object FirTreeBuilder : AbstractFirTreeBuilder() {
     val dynamicTypeRef = element("DynamicTypeRef", TypeRef, typeRefWithNullability)
     val functionTypeRef = element("FunctionTypeRef", TypeRef, typeRefWithNullability)
     val implicitTypeRef = element("ImplicitTypeRef", TypeRef, typeRef)
-    val composedSuperTypeRef = element("ComposedSuperTypeRef", TypeRef, typeRef)
 
     val effectDeclaration = element("EffectDeclaration", Contracts)
 
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
index 4c1ef33be38..634ec2f9339 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
@@ -411,8 +411,6 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
             defaultEmptyList("annotations")
         }
 
-        impl(composedSuperTypeRef)
-
         impl(reference, "FirStubReference") {
             default("source") {
                 value = "null"
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
index 786c1d5ebb3..c3af76d7f56 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
@@ -95,6 +95,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
             withArg("F", "FirCallableMemberDeclaration<F>")
             parentArg(callableDeclaration, "F", "F")
             +field("containerSource", type(DeserializedContainerSource::class), nullable = true)
+            +field("dispatchReceiverType", coneKotlinTypeType, nullable = true)
         }
 
         function.configure {
@@ -578,10 +579,6 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
             +booleanField("isSuspend")
         }
 
-        composedSuperTypeRef.configure {
-            +fieldList("superTypeRefs", resolvedTypeRef)
-        }
-
         thisReceiverExpression.configure {
             +field("calleeReference", thisReference)
         }
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt
index e6050cb2df8..25bd5c33832 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.tree.generator.printer
 
+import org.jetbrains.kotlin.fir.tree.generator.declarationAttributesType
 import org.jetbrains.kotlin.fir.tree.generator.model.*
 import java.io.File
 
@@ -294,12 +295,13 @@ private fun SmartPrinter.printDslBuildCopyFunction(
         println("}")
         println("val copyBuilder = $builderType()")
         for (field in builder.allFields) {
-            when (field.origin) {
-                is FieldList -> println("copyBuilder.${field.name}.addAll(original.${field.name})")
+            when {
+                field.origin is FieldList -> println("copyBuilder.${field.name}.addAll(original.${field.name})")
+                field.type == declarationAttributesType.type -> println("copyBuilder.${field.name} = original.${field.name}.copy()")
                 else -> println("copyBuilder.${field.name} = original.${field.name}")
             }
         }
         println("return copyBuilder.apply(init).build()")
     }
     println("}")
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
index 86a43e6f6aa..dbe5acafa61 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.kotlin.incremental
 
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
-import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackageFragmentProviderOptimized
 import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
 import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource
 import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder
@@ -49,7 +49,7 @@ class IncrementalPackageFragmentProvider(
     val incrementalCache: IncrementalCache,
     val target: TargetId,
     private val kotlinClassFinder: KotlinClassFinder
-) : PackageFragmentProvider {
+) : PackageFragmentProviderOptimized {
     private val fqNameToPackageFragment =
         PackagePartClassUtils.getFilesWithCallables(sourceFiles)
             .mapTo(hashSetOf()) { it.packageFqName }
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotations/jvmAnnotationUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotations/jvmAnnotationUtil.kt
index 91eca15f61d..8ed167fb0ae 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotations/jvmAnnotationUtil.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotations/jvmAnnotationUtil.kt
@@ -20,6 +20,8 @@ import org.jetbrains.kotlin.util.findImplementationFromInterface
 val JVM_DEFAULT_FQ_NAME = FqName("kotlin.jvm.JvmDefault")
 val JVM_DEFAULT_NO_COMPATIBILITY_FQ_NAME = FqName("kotlin.jvm.JvmDefaultWithoutCompatibility")
 val JVM_OVERLOADS_FQ_NAME = FqName("kotlin.jvm.JvmOverloads")
+
+@JvmField
 val JVM_SYNTHETIC_ANNOTATION_FQ_NAME = FqName("kotlin.jvm.JvmSynthetic")
 
 @JvmField
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/multiplatform/OptionalAnnotationPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/multiplatform/OptionalAnnotationPackageFragmentProvider.kt
index 0c63bf74b17..b766d67aa14 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/multiplatform/OptionalAnnotationPackageFragmentProvider.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/multiplatform/OptionalAnnotationPackageFragmentProvider.kt
@@ -33,7 +33,7 @@ class OptionalAnnotationPackageFragmentProvider(
     notFoundClasses: NotFoundClasses,
     languageVersionSettings: LanguageVersionSettings,
     packagePartProvider: PackagePartProvider,
-) : PackageFragmentProvider {
+) : PackageFragmentProviderOptimized {
     val packages: Map<FqName, PackageFragmentDescriptor> by storageManager.createLazyValue p@{
         // We call getAllOptionalAnnotationClasses under lazy value only because IncrementalPackagePartProvider requires
         // deserializationConfiguration to be injected.
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt
index 89b626ffefa..1e07157dc1f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt
@@ -8,9 +8,7 @@ package org.jetbrains.kotlin.analyzer
 import com.intellij.openapi.util.ModificationTracker
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.context.ProjectContext
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
-import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -238,19 +236,21 @@ private class DelegatingPackageFragmentProvider<M : ModuleInfo>(
     private val module: ModuleDescriptor,
     moduleContent: ModuleContent<M>,
     private val packageOracle: PackageOracle
-) : PackageFragmentProvider {
+) : PackageFragmentProviderOptimized {
     private val syntheticFilePackages = moduleContent.syntheticFiles.map { it.packageFqName }.toSet()
 
+    @Suppress("OverridingDeprecatedMember")
     override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> {
         if (certainlyDoesNotExist(fqName)) return emptyList()
 
+        @Suppress("DEPRECATION")
         return resolverForProject.resolverForModuleDescriptor(module).packageFragmentProvider.getPackageFragments(fqName)
     }
 
     override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) {
         if (certainlyDoesNotExist(fqName)) return
 
-        resolverForProject.resolverForModuleDescriptor(module).packageFragmentProvider.collectPackageFragments(fqName, packageFragments)
+        resolverForProject.resolverForModuleDescriptor(module).packageFragmentProvider.collectPackageFragmentsOptimizedIfPossible(fqName, packageFragments)
     }
 
     override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName> {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
index 1a078064c08..5dbdf8f0090 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
@@ -155,13 +155,20 @@ class LazyModuleDependencies<M : ModuleInfo>(
 
     override val allDependencies: List<ModuleDescriptorImpl> get() = dependencies()
 
-    override val expectedByDependencies by storageManager.createLazyValue {
+    override val directExpectedByDependencies by storageManager.createLazyValue {
         module.expectedBy.map {
             @Suppress("UNCHECKED_CAST")
             resolverForProject.descriptorForModule(it as M)
         }
     }
 
+    override val allExpectedByDependencies: Set<ModuleDescriptorImpl> by storageManager.createLazyValue {
+        collectAllExpectedByModules(module).mapTo(HashSet<ModuleDescriptorImpl>()) {
+            @Suppress("UNCHECKED_CAST")
+            resolverForProject.descriptorForModule(it as M)
+        }
+    }
+
     override val modulesWhoseInternalsAreVisible: Set<ModuleDescriptorImpl>
         get() =
             module.modulesWhoseInternalsAreVisible().mapTo(LinkedHashSet()) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ModuleInfoUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ModuleInfoUtils.kt
index 955af9039b2..c5031a94500 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ModuleInfoUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ModuleInfoUtils.kt
@@ -9,3 +9,17 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 
 val ModuleDescriptor.moduleInfo: ModuleInfo?
     get() = getCapability(ModuleInfo.Capability)
+
+internal fun collectAllExpectedByModules(entryModule: ModuleInfo): Set<ModuleInfo> {
+    val unprocessedModules = ArrayDeque<ModuleInfo>().apply { addAll(entryModule.expectedBy) }
+    val expectedByModules = HashSet<ModuleInfo>()
+
+    while (unprocessedModules.isNotEmpty()) {
+        val nextImplemented = unprocessedModules.removeFirst()
+        if (expectedByModules.add(nextImplemented)) {
+            unprocessedModules.addAll(nextImplemented.expectedBy)
+        }
+    }
+
+    return expectedByModules
+}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
index 327c76c341a..10b44a4f9c1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
@@ -107,7 +107,7 @@ class TextDiagnostic(
                 extractDataBefore(matcher.group(2), ":")
 
             val name = matcher.group(3)
-            val parameters = matcher.group(4) ?: return TextDiagnostic(
+            val parameters = matcher.group(5) ?: return TextDiagnostic(
                 name,
                 platform,
                 null,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/CheckerTestUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/CheckerTestUtil.kt
index 9787deadf42..8c50415868d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/CheckerTestUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/CheckerTestUtil.kt
@@ -60,9 +60,9 @@ object CheckerTestUtil {
     const val OLD_INFERENCE_PREFIX = "OI"
 
     private const val IGNORE_DIAGNOSTIC_PARAMETER = "IGNORE"
-    private const val INDIVIDUAL_DIAGNOSTIC = """(\w+;)?(\w+:)?(\w+)(?:\(((?:".*?")(?:,\s*".*?")*)\))?"""
+    private const val INDIVIDUAL_DIAGNOSTIC = """(\w+;)?(\w+:)?(\w+)(\{[\w;]+})?(?:\(((?:".*?")(?:,\s*".*?")*)\))?"""
 
-    internal val rangeStartOrEndPattern = Pattern.compile("(<!$INDIVIDUAL_DIAGNOSTIC(,\\s*$INDIVIDUAL_DIAGNOSTIC)*!>)|(<!>)")
+    val rangeStartOrEndPattern = Pattern.compile("(<!$INDIVIDUAL_DIAGNOSTIC(,\\s*$INDIVIDUAL_DIAGNOSTIC)*!>)|(<!>)")
     val individualDiagnosticPattern: Pattern = Pattern.compile(INDIVIDUAL_DIAGNOSTIC)
 
     fun getDiagnosticsIncludingSyntaxErrors(
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index d8f128127ca..592ac5f4f16 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -352,10 +352,8 @@ public interface Errors {
     DiagnosticFactory0<PsiElement> INLINE_CLASS_NOT_TOP_LEVEL = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory0<PsiElement> INLINE_CLASS_NOT_FINAL = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory0<PsiElement> ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS = DiagnosticFactory0.create(ERROR);
-    DiagnosticFactory0<PsiElement> NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory0<KtElement> INLINE_CLASS_CONSTRUCTOR_WRONG_PARAMETERS_SIZE = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory0<KtParameter> INLINE_CLASS_CONSTRUCTOR_NOT_FINAL_READ_ONLY_PARAMETER = DiagnosticFactory0.create(ERROR);
-    DiagnosticFactory0<PsiElement> INLINE_CLASS_WITH_INITIALIZER = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory0<KtProperty> PROPERTY_WITH_BACKING_FIELD_INSIDE_INLINE_CLASS = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE);
     DiagnosticFactory0<PsiElement> DELEGATED_PROPERTY_INSIDE_INLINE_CLASS = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory1<KtTypeReference, KotlinType> INLINE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE = DiagnosticFactory1.create(ERROR);
@@ -1130,6 +1128,7 @@ public interface Errors {
     DiagnosticFactory0<KtDeclaration> INLINE_PROPERTY_WITH_BACKING_FIELD = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE);
     DiagnosticFactory0<KtAnnotationEntry> NON_INTERNAL_PUBLISHED_API = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory1<PsiElement, CallableDescriptor> PROTECTED_CALL_FROM_PUBLIC_INLINE = DiagnosticFactory1.create(WARNING);
+    DiagnosticFactory1<PsiElement, CallableDescriptor> PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE = DiagnosticFactory1.create(WARNING);
     DiagnosticFactory1<PsiElement, CallableDescriptor> PROTECTED_CALL_FROM_PUBLIC_INLINE_ERROR = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory2<KtElement, KtExpression, DeclarationDescriptor> INVALID_DEFAULT_FUNCTIONAL_PARAMETER_FOR_INLINE = DiagnosticFactory2.create(ERROR);
     DiagnosticFactory2<KtElement, KtExpression, DeclarationDescriptor> NOT_SUPPORTED_INLINE_PARAMETER_IN_INLINE_PARAMETER_DEFAULT_VALUE = DiagnosticFactory2.create(ERROR);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
index fb09ce2e121..67dcbee7f88 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
@@ -706,10 +706,8 @@ public class DefaultErrorMessages {
         MAP.put(INLINE_CLASS_NOT_TOP_LEVEL, "Inline classes are only allowed on top level");
         MAP.put(INLINE_CLASS_NOT_FINAL, "Inline classes can be only final");
         MAP.put(ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS, "Primary constructor is required for inline class");
-        MAP.put(NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS, "Primary constructor of inline class must be public");
         MAP.put(INLINE_CLASS_CONSTRUCTOR_WRONG_PARAMETERS_SIZE, "Inline class must have exactly one primary constructor parameter");
         MAP.put(INLINE_CLASS_CONSTRUCTOR_NOT_FINAL_READ_ONLY_PARAMETER, "Inline class primary constructor must have only final read-only (val) property parameter");
-        MAP.put(INLINE_CLASS_WITH_INITIALIZER, "Inline class cannot have an initializer block");
         MAP.put(PROPERTY_WITH_BACKING_FIELD_INSIDE_INLINE_CLASS, "Inline class cannot have properties with backing fields");
         MAP.put(DELEGATED_PROPERTY_INSIDE_INLINE_CLASS, "Inline class cannot have delegated properties");
         MAP.put(INLINE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE, "Inline class cannot have value parameter of type ''{0}''", RENDER_TYPE);
@@ -1018,6 +1016,7 @@ public class DefaultErrorMessages {
         MAP.put(INLINE_PROPERTY_WITH_BACKING_FIELD, "Inline property cannot have backing field");
         MAP.put(NON_INTERNAL_PUBLISHED_API, "@PublishedApi annotation is only applicable for internal declaration");
         MAP.put(PROTECTED_CALL_FROM_PUBLIC_INLINE, "Protected function call from public-API inline function is deprecated", NAME);
+        MAP.put(PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE, "Protected constructor call from public-API inline function is deprecated", NAME);
         MAP.put(PROTECTED_CALL_FROM_PUBLIC_INLINE_ERROR, "Protected function call from public-API inline function is prohibited", NAME);
         MAP.put(INVALID_DEFAULT_FUNCTIONAL_PARAMETER_FOR_INLINE, "Invalid default value for inline parameter: ''{0}''. Only lambdas, anonymous functions, and callable references are supported", ELEMENT_TEXT, SHORT_NAMES_IN_TYPES);
         MAP.put(NOT_SUPPORTED_INLINE_PARAMETER_IN_INLINE_PARAMETER_DEFAULT_VALUE, "Usage of inline parameter ''{0}'' in default value for another inline parameter is not supported", ELEMENT_TEXT, SHORT_NAMES_IN_TYPES);
@@ -1032,8 +1031,8 @@ public class DefaultErrorMessages {
         MAP.put(ILLEGAL_SUSPEND_PROPERTY_ACCESS, "Suspend property ''{0}'' should be accessed only from a coroutine or suspend function", NAME);
         MAP.put(ILLEGAL_RESTRICTED_SUSPENDING_FUNCTION_CALL, "Restricted suspending functions can only invoke member or extension suspending functions on their restricted coroutine scope");
         MAP.put(NON_MODIFIER_FORM_FOR_BUILT_IN_SUSPEND, "''suspend'' function can only be called in a form of modifier of a lambda: suspend { ... }");
-        MAP.put(IMPLICIT_NOTHING_TYPE_ARGUMENT_IN_RETURN_POSITION, "Returning type parameter has been inferred to Nothing implicitly. Please, specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime.");
-        MAP.put(IMPLICIT_NOTHING_TYPE_ARGUMENT_AGAINST_NOT_NOTHING_EXPECTED_TYPE, "Returning type parameter has been inferred to Nothing implicitly because Nothing is more specific than specified expected type. Please specify type arguments explicitly in accordance with expected type to hide this warning. Nothing can produce an exception at runtime.");
+        MAP.put(IMPLICIT_NOTHING_TYPE_ARGUMENT_IN_RETURN_POSITION, "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime.");
+        MAP.put(IMPLICIT_NOTHING_TYPE_ARGUMENT_AGAINST_NOT_NOTHING_EXPECTED_TYPE, "Returning type parameter has been inferred to Nothing implicitly because Nothing is more specific than specified expected type. Please specify type arguments explicitly in accordance with expected type to hide this warning. Nothing can produce an exception at runtime. See KT-36776 for more details.");
         MAP.put(RETURN_FOR_BUILT_IN_SUSPEND, "Using implicit label for this lambda is prohibited");
         MAP.put(MODIFIER_FORM_FOR_NON_BUILT_IN_SUSPEND, "Calls having a form of ''suspend {}'' are deprecated because ''suspend'' in the context will have a meaning of a modifier. Add empty argument list to the call: ''suspend() { ... }''");
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java
index 91a71daada5..e74dca1ed96 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java
@@ -79,6 +79,11 @@ public final class DiagnosticFactoryToRendererMap {
         map.put(factory, new DiagnosticWithParameters3Renderer<A, B, C>(message, rendererA, rendererB, rendererC));
     }
 
+    public void put(@NotNull DiagnosticFactory<?> factory, @NotNull DiagnosticRenderer<?> renderer) {
+        checkMutability();
+        map.put(factory, renderer);
+    }
+
     @Nullable
     public DiagnosticRenderer<?> get(@NotNull DiagnosticFactory<?> factory) {
         return map.get(factory);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java
index 0d97fc986c7..49946047706 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.KtExpression;
+import org.jetbrains.kotlin.resolve.diagnostics.BindingContextSuppressCache;
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics;
 import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression;
 import org.jetbrains.kotlin.types.KotlinType;
@@ -93,12 +94,12 @@ public class BindingTraceContext implements BindingTrace {
         this(TRACK_REWRITES && !allowSliceRewrite ? new TrackingSlicedMap(TRACK_WITH_STACK_TRACES) : new SlicedMapImpl(allowSliceRewrite), filter);
     }
 
-
     private BindingTraceContext(@NotNull MutableSlicedMap map, BindingTraceFilter filter) {
         this.map = map;
-        this.mutableDiagnostics = !filter.getIgnoreDiagnostics()
-                                  ? new MutableDiagnosticsWithSuppression(bindingContext, Diagnostics.Companion.getEMPTY())
-                                  : null;
+        this.mutableDiagnostics =
+                filter.getIgnoreDiagnostics()
+                ? null
+                : new MutableDiagnosticsWithSuppression(new BindingContextSuppressCache(bindingContext), Diagnostics.Companion.getEMPTY());
     }
 
     @TestOnly
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
index 1ab509d1023..42fea2834eb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
@@ -772,7 +772,7 @@ class DeclarationsChecker(
                 if (function.hasModifier(KtTokens.PRIVATE_KEYWORD)) {
                     trace.report(PRIVATE_FUNCTION_WITH_NO_BODY.on(function, functionDescriptor))
                 }
-                if (!hasAbstractModifier && function.hasModifier(KtTokens.OPEN_KEYWORD)) {
+                if (!containingDescriptor.isExpect && !hasAbstractModifier && function.hasModifier(KtTokens.OPEN_KEYWORD)) {
                     trace.report(REDUNDANT_OPEN_IN_INTERFACE.on(function))
                 }
             }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt
index 3b284d77a93..59c1c93dc27 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.kt
@@ -20,7 +20,9 @@ import com.google.common.collect.ImmutableMap
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.resolve.diagnostics.BindingContextSuppressCache
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
+import org.jetbrains.kotlin.resolve.diagnostics.KotlinSuppressCache
 import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.expressions.typeInfoFactory.createTypeInfo
@@ -31,7 +33,8 @@ open class DelegatingBindingTrace(
     private val name: String,
     withParentDiagnostics: Boolean = true,
     private val filter: BindingTraceFilter = BindingTraceFilter.ACCEPT_ALL,
-    allowSliceRewrite: Boolean = false
+    allowSliceRewrite: Boolean = false,
+    customSuppressCache: KotlinSuppressCache? = null,
 ) : BindingTrace {
 
     protected val map = if (BindingTraceContext.TRACK_REWRITES && !allowSliceRewrite)
@@ -39,8 +42,6 @@ open class DelegatingBindingTrace(
     else
         SlicedMapImpl(allowSliceRewrite)
 
-    protected val mutableDiagnostics: MutableDiagnosticsWithSuppression?
-
     private inner class MyBindingContext : BindingContext {
         override fun getDiagnostics(): Diagnostics = mutableDiagnostics ?: Diagnostics.EMPTY
 
@@ -68,13 +69,12 @@ open class DelegatingBindingTrace(
 
     private val bindingContext = MyBindingContext()
 
-    init {
-        this.mutableDiagnostics = when {
-            filter.ignoreDiagnostics -> null
-            withParentDiagnostics -> MutableDiagnosticsWithSuppression(bindingContext, parentContext.diagnostics)
-            else -> MutableDiagnosticsWithSuppression(bindingContext)
-        }
-    }
+    protected val mutableDiagnostics: MutableDiagnosticsWithSuppression? =
+        if (filter.ignoreDiagnostics) null
+        else MutableDiagnosticsWithSuppression(
+            customSuppressCache ?: BindingContextSuppressCache(bindingContext),
+            if (withParentDiagnostics) parentContext.diagnostics else Diagnostics.EMPTY
+        )
 
     constructor(
         parentContext: BindingContext,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
index 7c29ab39f7e..0dc196429ab 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
@@ -80,7 +80,7 @@ public class ModifiersChecker {
             boolean allowSealed
     ) {
         KtModifierList modifierList = (modifierListOwner != null) ? modifierListOwner.getModifierList() : null;
-        Modality modality = resolveModalityFromModifiers(modifierList, defaultModality, allowSealed);
+        Modality modality = resolveModalityFromModifiers(containingDescriptor, modifierList, defaultModality, allowSealed);
 
         if (modifierListOwner != null) {
             Collection<DeclarationAttributeAltererExtension> extensions =
@@ -103,6 +103,7 @@ public class ModifiersChecker {
 
     @NotNull
     private static Modality resolveModalityFromModifiers(
+            @Nullable DeclarationDescriptor containingDescriptor,
             @Nullable KtModifierList modifierList,
             @NotNull Modality defaultModality,
             boolean allowSealed
@@ -115,6 +116,12 @@ public class ModifiersChecker {
             return Modality.SEALED;
         }
         if (modifierList.hasModifier(OPEN_KEYWORD)) {
+            if (containingDescriptor instanceof ClassDescriptor) {
+                ClassDescriptor classOrInterface = (ClassDescriptor) containingDescriptor;
+                if (classOrInterface.getKind() == ClassKind.INTERFACE && classOrInterface.isExpect()) {
+                    return Modality.OPEN;
+                }
+            }
             if (hasAbstractModifier || defaultModality == Modality.ABSTRACT) {
                 return Modality.ABSTRACT;
             }
@@ -141,7 +148,10 @@ public class ModifiersChecker {
         return resolveVisibilityFromModifiers(modifierListOwner.getModifierList(), defaultVisibility);
     }
 
-    public static DescriptorVisibility resolveVisibilityFromModifiers(@Nullable KtModifierList modifierList, @NotNull DescriptorVisibility defaultVisibility) {
+    public static DescriptorVisibility resolveVisibilityFromModifiers(
+            @Nullable KtModifierList modifierList,
+            @NotNull DescriptorVisibility defaultVisibility
+    ) {
         if (modifierList == null) return defaultVisibility;
         if (modifierList.hasModifier(PRIVATE_KEYWORD)) return DescriptorVisibilities.PRIVATE;
         if (modifierList.hasModifier(PUBLIC_KEYWORD)) return DescriptorVisibilities.PUBLIC;
@@ -226,7 +236,7 @@ public class ModifiersChecker {
         public void checkModifiersForDestructuringDeclaration(@NotNull KtDestructuringDeclaration multiDeclaration) {
             annotationChecker.check(multiDeclaration, trace, null);
             ModifierCheckerCore.INSTANCE.check(multiDeclaration, trace, null, languageVersionSettings);
-            for (KtDestructuringDeclarationEntry multiEntry: multiDeclaration.getEntries()) {
+            for (KtDestructuringDeclarationEntry multiEntry : multiDeclaration.getEntries()) {
                 annotationChecker.check(multiEntry, trace, null);
                 ModifierCheckerCore.INSTANCE.check(multiEntry, trace, null, languageVersionSettings);
                 UnderscoreChecker.INSTANCE.checkNamed(multiEntry, trace, languageVersionSettings, /* allowSingleUnderscore = */ true);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java
index 1c2d37ccc1e..a47b22985f1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java
@@ -39,7 +39,7 @@ public class TemporaryBindingTrace extends DelegatingBindingTrace {
     protected final BindingTrace trace;
 
     protected TemporaryBindingTrace(@NotNull BindingTrace trace, String debugName, BindingTraceFilter filter) {
-        super(trace.getBindingContext(), debugName, true, filter, false);
+        super(trace.getBindingContext(), debugName, true, filter, false, null);
         this.trace = trace;
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
index 634c3268532..4069520529c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.builtins.UnsignedTypes
 import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor
 import org.jetbrains.kotlin.builtins.isExtensionFunctionType
 import org.jetbrains.kotlin.config.LanguageFeature
-import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.diagnostics.Errors.*
 import org.jetbrains.kotlin.diagnostics.Errors.BadNamedArgumentsTarget.*
 import org.jetbrains.kotlin.diagnostics.reportDiagnosticOnce
@@ -67,7 +66,7 @@ class DiagnosticReporterByTrackingStrategy(
             AbstractSuperCall::class.java -> tracingStrategy.abstractSuperCall(trace)
             NonApplicableCallForBuilderInferenceDiagnostic::class.java -> {
                 val reportOn = (diagnostic as NonApplicableCallForBuilderInferenceDiagnostic).kotlinCall
-                trace.reportDiagnosticOnce(Errors.NON_APPLICABLE_CALL_FOR_BUILDER_INFERENCE.on(reportOn.psiKotlinCall.psiCall.callElement))
+                trace.reportDiagnosticOnce(NON_APPLICABLE_CALL_FOR_BUILDER_INFERENCE.on(reportOn.psiKotlinCall.psiCall.callElement))
             }
             CandidateChosenUsingOverloadResolutionByLambdaAnnotation::class.java -> {
                 trace.report(CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION.on(psiKotlinCall.psiCall.callElement))
@@ -338,8 +337,8 @@ class DiagnosticReporterByTrackingStrategy(
     override fun constraintError(error: ConstraintSystemError) {
         when (error.javaClass) {
             NewConstraintError::class.java -> {
-                val constraintError = error as NewConstraintError
-                val position = constraintError.position.from
+                error as NewConstraintError
+                val position = error.position.from
                 val argument =
                     when (position) {
                         is ArgumentConstraintPositionImpl -> position.argument
@@ -351,16 +350,16 @@ class DiagnosticReporterByTrackingStrategy(
                 argument?.let {
                     it.safeAs<LambdaKotlinCallArgument>()?.let lambda@{ lambda ->
                         val parameterTypes = lambda.parametersTypes?.toList() ?: return@lambda
-                        val index = parameterTypes.indexOf(constraintError.upperKotlinType.unwrap())
+                        val index = parameterTypes.indexOf(error.upperKotlinType.unwrap())
                         val lambdaExpression = lambda.psiExpression as? KtLambdaExpression ?: return@lambda
                         val parameter = lambdaExpression.valueParameters.getOrNull(index) ?: return@lambda
-                        trace.report(Errors.EXPECTED_PARAMETER_TYPE_MISMATCH.on(parameter, constraintError.upperKotlinType))
+                        trace.report(EXPECTED_PARAMETER_TYPE_MISMATCH.on(parameter, error.upperKotlinType))
                         return
                     }
 
                     val expression = it.psiExpression ?: return
                     val deparenthesized = KtPsiUtil.safeDeparenthesize(expression)
-                    if (reportConstantTypeMismatch(constraintError, deparenthesized)) return
+                    if (reportConstantTypeMismatch(error, deparenthesized)) return
 
                     val compileTimeConstant = trace[BindingContext.COMPILE_TIME_VALUE, deparenthesized] as? TypedCompileTimeConstant
                     if (compileTimeConstant != null) {
@@ -371,40 +370,22 @@ class DiagnosticReporterByTrackingStrategy(
                             return
                         }
                     }
-                    trace.report(
-                        Errors.TYPE_MISMATCH.on(
-                            deparenthesized,
-                            constraintError.upperKotlinType,
-                            constraintError.lowerKotlinType
-                        )
-                    )
+                    trace.report(TYPE_MISMATCH.on(deparenthesized, error.upperKotlinType, error.lowerKotlinType))
                 }
 
                 (position as? ExpectedTypeConstraintPositionImpl)?.let {
                     val call = it.topLevelCall.psiKotlinCall.psiCall.callElement.safeAs<KtExpression>()
                     val inferredType =
-                        if (!constraintError.lowerKotlinType.isNullableNothing()) constraintError.lowerKotlinType
-                        else constraintError.upperKotlinType.makeNullable()
+                        if (!error.lowerKotlinType.isNullableNothing()) error.lowerKotlinType
+                        else error.upperKotlinType.makeNullable()
                     if (call != null) {
-                        trace.report(
-                            Errors.TYPE_MISMATCH.on(
-                                call,
-                                constraintError.upperKotlinType,
-                                inferredType
-                            )
-                        )
+                        trace.report(TYPE_MISMATCH.on(call, error.upperKotlinType, inferredType))
                     }
                 }
 
                 (position as? ExplicitTypeParameterConstraintPositionImpl)?.let {
                     val typeArgumentReference = (it.typeArgument as SimpleTypeArgumentImpl).typeReference
-                    trace.report(
-                        UPPER_BOUND_VIOLATED.on(
-                            typeArgumentReference,
-                            constraintError.upperKotlinType,
-                            constraintError.lowerKotlinType
-                        )
-                    )
+                    trace.report(UPPER_BOUND_VIOLATED.on(typeArgumentReference, error.upperKotlinType, error.lowerKotlinType))
                 }
 
                 (position as? FixVariableConstraintPositionImpl)?.let {
@@ -417,36 +398,29 @@ class DiagnosticReporterByTrackingStrategy(
                     val call = it.resolvedAtom?.atom?.safeAs<PSIKotlinCall>()?.psiCall ?: call
                     val expression = call.calleeExpression ?: return
 
-                    trace.reportDiagnosticOnce(
-                        TYPE_MISMATCH.on(
-                            expression,
-                            constraintError.upperKotlinType,
-                            constraintError.lowerKotlinType
-                        )
-                    )
+                    trace.reportDiagnosticOnce(TYPE_MISMATCH.on(expression, error.upperKotlinType, error.lowerKotlinType))
                 }
             }
 
             CapturedTypeFromSubtyping::class.java -> {
-                val capturedError = error as CapturedTypeFromSubtyping
-                val position = capturedError.position
-                val argumentPosition =
-                    position.safeAs<ArgumentConstraintPositionImpl>()
-                        ?: position.safeAs<IncorporationConstraintPosition>()?.from.safeAs<ArgumentConstraintPositionImpl>()
+                error as CapturedTypeFromSubtyping
+                val position = error.position
+                val argumentPosition: ArgumentConstraintPositionImpl? =
+                    position.safeAs() ?: position.safeAs<IncorporationConstraintPosition>()?.from.safeAs()
 
                 argumentPosition?.let {
                     val expression = it.argument.psiExpression ?: return
                     trace.reportDiagnosticOnce(
                         NEW_INFERENCE_ERROR.on(
                             expression,
-                            "Capture type from subtyping ${capturedError.constraintType} for variable ${capturedError.typeVariable}"
+                            "Capture type from subtyping ${error.constraintType} for variable ${error.typeVariable}"
                         )
                     )
                 }
             }
 
             NotEnoughInformationForTypeParameterImpl::class.java -> {
-                val error = error as NotEnoughInformationForTypeParameterImpl
+                error as NotEnoughInformationForTypeParameterImpl
                 if (allDiagnostics.any {
                         when (it) {
                             is WrongCountOfTypeArguments -> true
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ImplicitNothingAsTypeParameterCallChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ImplicitNothingAsTypeParameterCallChecker.kt
index 9a07cd5b68e..c1072a92f71 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ImplicitNothingAsTypeParameterCallChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ImplicitNothingAsTypeParameterCallChecker.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.SPECIAL_FUNCTION_NAMES
 import org.jetbrains.kotlin.resolve.calls.callUtil.getParameterForArgument
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
+import org.jetbrains.kotlin.resolve.calls.components.stableType
 import org.jetbrains.kotlin.resolve.calls.model.*
 import org.jetbrains.kotlin.resolve.calls.tower.NewResolvedCallImpl
 import org.jetbrains.kotlin.resolve.calls.tower.psiExpression
@@ -96,6 +97,11 @@ object ImplicitNothingAsTypeParameterCallChecker : CallChecker {
             }
 
             val resolvedCallAtom = resolvedAtom.getResolvedCallAtom(context.trace.bindingContext) ?: continue
+            val atom = resolvedAtom.atom
+
+            if (atom is SimpleKotlinCallArgument && !atom.receiver.stableType.isNothingOrNullableNothing())
+                continue
+
             val candidateDescriptor = resolvedCallAtom.candidateDescriptor
             val isReturnTypeOwnTypeParameter = candidateDescriptor.typeParameters.any {
                 it.typeConstructor == candidateDescriptor.returnType?.constructor
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.kt
index 3d7d92f250a..37bb400e12e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.kt
@@ -265,14 +265,21 @@ internal class InlineChecker(private val descriptor: FunctionDescriptor) : CallC
             checkPrivateClassMemberAccess(calledDescriptor, expression, context)
         }
 
-        if (calledDescriptor !is ConstructorDescriptor &&
+        val isConstructorCall = calledDescriptor is ConstructorDescriptor
+        if ((!isConstructorCall || expression !is KtConstructorCalleeExpression) &&
             isInlineFunPublicOrPublishedApi &&
             inlineFunEffectiveVisibility.toVisibility() !== Visibilities.Protected &&
             calledFunEffectiveVisibility.toVisibility() === Visibilities.Protected) {
-            if (prohibitProtectedCallFromInline) {
-                context.trace.report(PROTECTED_CALL_FROM_PUBLIC_INLINE_ERROR.on(expression, calledDescriptor))
-            } else {
-                context.trace.report(PROTECTED_CALL_FROM_PUBLIC_INLINE.on(expression, calledDescriptor))
+            when {
+                isConstructorCall -> {
+                    context.trace.report(PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE.on(expression, calledDescriptor))
+                }
+                prohibitProtectedCallFromInline -> {
+                    context.trace.report(PROTECTED_CALL_FROM_PUBLIC_INLINE_ERROR.on(expression, calledDescriptor))
+                }
+                else -> {
+                    context.trace.report(PROTECTED_CALL_FROM_PUBLIC_INLINE.on(expression, calledDescriptor))
+                }
             }
         }
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/VarargWrongExecutionOrderChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/VarargWrongExecutionOrderChecker.kt
index c18deff6c4b..56634e1ccd9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/VarargWrongExecutionOrderChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/VarargWrongExecutionOrderChecker.kt
@@ -12,12 +12,15 @@ import org.jetbrains.kotlin.psi.KtValueArgument
 import org.jetbrains.kotlin.resolve.calls.callUtil.getParameterForArgument
 import org.jetbrains.kotlin.resolve.calls.components.isVararg
 import org.jetbrains.kotlin.resolve.calls.model.*
+import org.jetbrains.kotlin.resolve.descriptorUtil.isAnnotationConstructor
 
 object VarargWrongExecutionOrderChecker : CallChecker {
     override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
         val isCorrectExecutionOrderForVarargArgumentsAlreadyUsed =
             context.languageVersionSettings.getFeatureSupport(LanguageFeature.UseCorrectExecutionOrderForVarargArguments) == LanguageFeature.State.ENABLED
 
+        if (resolvedCall.candidateDescriptor.isAnnotationConstructor()) return
+
         if (isCorrectExecutionOrderForVarargArgumentsAlreadyUsed) return
 
         val valueArguments = resolvedCall.call.valueArguments
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java
index bc58a8d007d..c451ce71c06 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java
@@ -23,13 +23,13 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings;
 import org.jetbrains.kotlin.descriptors.CallableDescriptor;
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor;
 import org.jetbrains.kotlin.resolve.BindingTrace;
-import org.jetbrains.kotlin.resolve.calls.KotlinCallResolver;
 import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt;
 import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext;
 import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode;
 import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall;
 import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy;
 import org.jetbrains.kotlin.resolve.calls.tower.TowerUtilsKt;
+import org.jetbrains.kotlin.resolve.descriptorUtil.AnnotationsForResolveKt;
 import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner;
 import org.jetbrains.kotlin.util.CancellationChecker;
 
@@ -229,7 +229,7 @@ public class ResolutionResultsHandler {
             specificCalls = specificCalls.stream()
                     .filter((call) ->
                                     !call.getCandidateDescriptor().getAnnotations().hasAnnotation(
-                                            KotlinCallResolver.Companion.getOVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION())
+                                            AnnotationsForResolveKt.getOVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION_FQ_NAME())
                     ).collect(Collectors.toSet());
         }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactoryImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactoryImpl.kt
index edcd23c2c87..1cbfe6dda9f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactoryImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactoryImpl.kt
@@ -89,11 +89,11 @@ class DataFlowValueFactoryImpl constructor(private val languageVersionSettings:
             KotlinBuiltIns.isNullableNothing(type) ->
                 DataFlowValue.nullValue(containingDeclarationOrModule.builtIns) // 'null' is the only inhabitant of 'Nothing?'
 
-        // In most cases type of `E!!`-expression is strictly not nullable and we could get proper Nullability
-        // by calling `getImmanentNullability` (as it happens below).
-        //
-        // But there are some problem with types built on type parameters, e.g.
-        // fun <T : Any?> foo(x: T) = x!!.hashCode() // there no way in type system to denote that `x!!` is not nullable
+            // In most cases type of `E!!`-expression is strictly not nullable and we could get proper Nullability
+            // by calling `getImmanentNullability` (as it happens below).
+            //
+            // But there are some problem with types built on type parameters, e.g.
+            // fun <T : Any?> foo(x: T) = x!!.hashCode() // there no way in type system to denote that `x!!` is not nullable
             ExpressionTypingUtils.isExclExclExpression(KtPsiUtil.deparenthesize(expression)) ->
                 DataFlowValue(IdentifierInfo.Expression(expression), type, Nullability.NOT_NULL)
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueKindUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueKindUtils.kt
index a863014205e..54388a4e277 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueKindUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueKindUtils.kt
@@ -24,13 +24,23 @@ internal fun PropertyDescriptor.propertyKind(usageModule: ModuleDescriptor?): Da
     if (!hasDefaultGetter()) return DataFlowValue.Kind.PROPERTY_WITH_GETTER
     if (!isInvisibleFromOtherModules()) {
         val declarationModule = DescriptorUtils.getContainingModule(this)
-        if (usageModule == null || usageModule != declarationModule) {
+        if (!areCompiledTogether(usageModule, declarationModule)) {
             return DataFlowValue.Kind.ALIEN_PUBLIC_PROPERTY
         }
     }
     return DataFlowValue.Kind.STABLE_VALUE
 }
 
+internal fun areCompiledTogether(
+    usageModule: ModuleDescriptor?,
+    declarationModule: ModuleDescriptor,
+): Boolean {
+    if (usageModule == null) return false
+    if (usageModule == declarationModule) return true
+
+    return declarationModule in usageModule.allExpectedByModules
+}
+
 internal fun VariableDescriptor.variableKind(
     usageModule: ModuleDescriptor?,
     bindingContext: BindingContext,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/IdentifierInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/IdentifierInfo.kt
index 54bd50140a0..0e6167c77f3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/IdentifierInfo.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/IdentifierInfo.kt
@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver
 import org.jetbrains.kotlin.types.KotlinType
-import org.jetbrains.kotlin.types.KotlinTypeRefinerImpl
 import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
 
 interface IdentifierInfo {
@@ -150,8 +149,10 @@ internal fun getIdForStableIdentifier(
         is KtQualifiedExpression -> {
             val receiverExpression = expression.receiverExpression
             val selectorExpression = expression.selectorExpression
-            val receiverInfo = getIdForStableIdentifier(receiverExpression, bindingContext, containingDeclarationOrModule, languageVersionSettings)
-            val selectorInfo = getIdForStableIdentifier(selectorExpression, bindingContext, containingDeclarationOrModule, languageVersionSettings)
+            val receiverInfo =
+                getIdForStableIdentifier(receiverExpression, bindingContext, containingDeclarationOrModule, languageVersionSettings)
+            val selectorInfo =
+                getIdForStableIdentifier(selectorExpression, bindingContext, containingDeclarationOrModule, languageVersionSettings)
 
             qualified(
                 receiverInfo, bindingContext.getType(receiverExpression),
@@ -267,7 +268,7 @@ private fun getIdForImplicitReceiver(receiverValue: ReceiverValue?, expression:
 private fun getIdForThisReceiver(descriptorOfThisReceiver: DeclarationDescriptor?) = when (descriptorOfThisReceiver) {
     is CallableDescriptor -> {
         val receiverParameter = descriptorOfThisReceiver.extensionReceiverParameter
-                ?: error("'This' refers to the callable member without a receiver parameter: $descriptorOfThisReceiver")
+            ?: error("'This' refers to the callable member without a receiver parameter: $descriptorOfThisReceiver")
         IdentifierInfo.Receiver(receiverParameter.value)
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
index f88a0e9cec9..547442b4c47 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
@@ -661,10 +661,8 @@ sealed class NewAbstractResolvedCall<D : CallableDescriptor>() : ResolvedCall<D>
             }
 
             if (varargMappings != null && !needToUseCorrectExecutionOrderForVarargArguments) {
-                if (varargMappings != null) {
-                    for ((parameter, argument) in varargMappings) {
-                        result[parameter] = argument
-                    }
+                for ((parameter, argument) in varargMappings) {
+                    result[parameter] = argument
                 }
             }
         }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/InlineClassDeclarationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/InlineClassDeclarationChecker.kt
index 8879441b42b..b5f3decc39d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/InlineClassDeclarationChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/InlineClassDeclarationChecker.kt
@@ -46,12 +46,6 @@ object InlineClassDeclarationChecker : DeclarationChecker {
             return
         }
 
-        val primaryConstructorVisibility = descriptor.unsubstitutedPrimaryConstructor?.visibility
-        if (primaryConstructorVisibility != null && primaryConstructorVisibility != DescriptorVisibilities.PUBLIC) {
-            trace.report(Errors.NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS.on(primaryConstructor.visibilityModifier() ?: inlineKeyword))
-            return
-        }
-
         val baseParameter = primaryConstructor.valueParameters.singleOrNull()
         if (baseParameter == null) {
             (primaryConstructor.valueParameterList ?: declaration).let {
@@ -65,17 +59,6 @@ object InlineClassDeclarationChecker : DeclarationChecker {
             return
         }
 
-        val anonymousInitializers = declaration.getAnonymousInitializers()
-        if (anonymousInitializers.isNotEmpty()) {
-            for (anonymousInitializer in anonymousInitializers) {
-                if (anonymousInitializer is KtClassInitializer) {
-                    trace.report(Errors.INLINE_CLASS_WITH_INITIALIZER.on(anonymousInitializer.initKeyword))
-                }
-            }
-
-            return
-        }
-
         val baseParameterType = descriptor.safeAs<ClassDescriptor>()?.defaultType?.substitutedUnderlyingType()
         val baseParameterTypeReference = baseParameter.typeReference
         if (baseParameterType != null && baseParameterTypeReference != null) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java
index 4034b27f304..4463565bd84 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java
@@ -23,20 +23,19 @@ import kotlin.collections.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.resolve.BindingContext;
 
 import java.util.Collection;
 import java.util.Iterator;
 
 public class DiagnosticsWithSuppression implements Diagnostics {
-    private final KotlinSuppressCache kotlinSuppressCache;
+    private final KotlinSuppressCache suppressCache;
     private final Collection<Diagnostic> diagnostics;
     private final DiagnosticsElementsCache elementsCache;
 
-    public DiagnosticsWithSuppression(@NotNull BindingContext context, @NotNull Collection<Diagnostic> diagnostics) {
+    public DiagnosticsWithSuppression(@NotNull KotlinSuppressCache suppressCache, @NotNull Collection<Diagnostic> diagnostics) {
         this.diagnostics = diagnostics;
-        this.kotlinSuppressCache = new BindingContextSuppressCache(context);
-        this.elementsCache = new DiagnosticsElementsCache(this, kotlinSuppressCache.getFilter());
+        this.suppressCache = suppressCache;
+        this.elementsCache = new DiagnosticsElementsCache(this, suppressCache.getFilter());
     }
 
     @NotNull
@@ -48,13 +47,13 @@ public class DiagnosticsWithSuppression implements Diagnostics {
     @NotNull
     @Override
     public Iterator<Diagnostic> iterator() {
-        return new FilteringIterator<>(diagnostics.iterator(), kotlinSuppressCache.getFilter()::invoke);
+        return new FilteringIterator<>(diagnostics.iterator(), suppressCache.getFilter()::invoke);
     }
 
     @NotNull
     @Override
     public Collection<Diagnostic> all() {
-        return CollectionsKt.filter(diagnostics, kotlinSuppressCache.getFilter());
+        return CollectionsKt.filter(diagnostics, suppressCache.getFilter());
     }
 
     @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt
index 11db7df1ce1..6b355d1dbc1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt
@@ -39,7 +39,7 @@ interface DiagnosticSuppressor {
 
     companion object {
         val EP_NAME: ExtensionPointName<DiagnosticSuppressor> =
-            ExtensionPointName.create<DiagnosticSuppressor>("org.jetbrains.kotlin.diagnosticSuppressor")
+            ExtensionPointName.create("org.jetbrains.kotlin.diagnosticSuppressor")
     }
 }
 
@@ -49,13 +49,13 @@ abstract class KotlinSuppressCache {
     // The cache is weak: we're OK with losing it
     private val suppressors = ContainerUtil.createConcurrentWeakValueMap<KtAnnotated, Suppressor>()
 
-    val filter: (Diagnostic) -> Boolean = { diagnostic: Diagnostic -> !isSuppressed(diagnostic) }
+    val filter: (Diagnostic) -> Boolean = { diagnostic: Diagnostic ->
+        !isSuppressed(DiagnosticSuppressRequest(diagnostic))
+    }
 
     fun isSuppressed(psiElement: PsiElement, suppressionKey: String, severity: Severity) =
         isSuppressed(StringSuppressRequest(psiElement, severity, suppressionKey.toLowerCase()))
 
-    fun isSuppressed(diagnostic: Diagnostic): Boolean = isSuppressed(DiagnosticSuppressRequest(diagnostic))
-
     private fun isSuppressed(request: SuppressRequest): Boolean {
         // If diagnostics are reported in a synthetic file generated by KtPsiFactory (dummy.kt),
         // there's no point to present such diagnostics to the user, because the user didn't write this code
@@ -78,7 +78,7 @@ abstract class KotlinSuppressCache {
         return isSuppressedByAnnotated(request.suppressKey, request.severity, annotated, 0)
     }
 
-    open fun isSuppressedByExtension(suppressor: DiagnosticSuppressor, diagnostic: Diagnostic): Boolean {
+    protected open fun isSuppressedByExtension(suppressor: DiagnosticSuppressor, diagnostic: Diagnostic): Boolean {
         return suppressor.isSuppressed(diagnostic)
     }
 
@@ -111,34 +111,30 @@ abstract class KotlinSuppressCache {
 
        This way we need no more lookups than the number of suppress() annotations from here to the root.
      */
-    protected fun isSuppressedByAnnotated(suppressionKey: String, severity: Severity, annotated: KtAnnotated, debugDepth: Int): Boolean {
+    private fun isSuppressedByAnnotated(suppressionKey: String, severity: Severity, annotated: KtAnnotated, debugDepth: Int): Boolean {
         val suppressor = getOrCreateSuppressor(annotated)
         if (suppressor.isSuppressed(suppressionKey, severity)) return true
 
-        val annotatedAbove = KtStubbedPsiUtil.getPsiOrStubParent(suppressor.annotatedElement, KtAnnotated::class.java, true) ?: return false
+        val annotatedAbove = KtStubbedPsiUtil.getPsiOrStubParent(annotated, KtAnnotated::class.java, true) ?: return false
 
         val suppressed = isSuppressedByAnnotated(suppressionKey, severity, annotatedAbove, debugDepth + 1)
         val suppressorAbove = suppressors[annotatedAbove]
         if (suppressorAbove != null && suppressorAbove.dominates(suppressor)) {
-            suppressors.put(annotated, suppressorAbove)
+            suppressors[annotated] = suppressorAbove
         }
 
         return suppressed
     }
 
-    private fun getOrCreateSuppressor(annotated: KtAnnotated): Suppressor {
-        var suppressor: Suppressor? = suppressors[annotated]
-        if (suppressor == null) {
+    private fun getOrCreateSuppressor(annotated: KtAnnotated): Suppressor =
+        suppressors.getOrPut(annotated) {
             val strings = getSuppressingStrings(annotated)
-            suppressor = when {
-                strings.isEmpty() -> EmptySuppressor(annotated)
-                strings.size == 1 -> SingularSuppressor(annotated, strings.iterator().next())
-                else -> MultiSuppressor(annotated, strings)
+            when (strings.size) {
+                0 -> EmptySuppressor
+                1 -> SingularSuppressor(strings.first())
+                else -> MultiSuppressor(strings)
             }
-            suppressors.put(annotated, suppressor)
         }
-        return suppressor
-    }
 
     abstract fun getSuppressionAnnotations(annotated: KtAnnotated): List<AnnotationDescriptor>
 
@@ -156,7 +152,7 @@ abstract class KotlinSuppressCache {
 
         // We only add strings and skip other values to facilitate recovery in presence of erroneous code
         for (arrayValue in annotationDescriptor.allValueArguments.values) {
-            if ((arrayValue is ArrayValue)) {
+            if (arrayValue is ArrayValue) {
                 for (value in arrayValue.value) {
                     if (value is StringValue) {
                         builder.add(value.value.toLowerCase())
@@ -167,36 +163,30 @@ abstract class KotlinSuppressCache {
     }
 
     companion object {
-        fun getDiagnosticSuppressKey(diagnostic: Diagnostic): String {
-            return diagnostic.factory.name.toLowerCase()
-        }
+        private fun getDiagnosticSuppressKey(diagnostic: Diagnostic): String =
+            diagnostic.factory.name.toLowerCase()
 
-        fun isSuppressedByStrings(key: String, strings: Set<String>, severity: Severity): Boolean {
-            if (strings.contains("warnings") && severity == Severity.WARNING) return true
-
-            return strings.contains(key)
-        }
+        private fun isSuppressedByStrings(key: String, strings: Set<String>, severity: Severity): Boolean =
+            severity == Severity.WARNING && "warnings" in strings || key in strings
     }
 
-    private abstract class Suppressor protected constructor(val annotatedElement: KtAnnotated) {
-        abstract fun isSuppressed(diagnostic: Diagnostic): Boolean
+    private abstract class Suppressor {
+        open fun isSuppressed(diagnostic: Diagnostic): Boolean =
+            isSuppressed(getDiagnosticSuppressKey(diagnostic), diagnostic.severity)
+
         abstract fun isSuppressed(suppressionKey: String, severity: Severity): Boolean
 
         // true is \forall x. other.isSuppressed(x) -> this.isSuppressed(x)
         abstract fun dominates(other: Suppressor): Boolean
     }
 
-    private class EmptySuppressor(annotated: KtAnnotated) : Suppressor(annotated) {
+    private object EmptySuppressor : Suppressor() {
         override fun isSuppressed(diagnostic: Diagnostic): Boolean = false
         override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean = false
-        override fun dominates(other: Suppressor): Boolean = other is EmptySuppressor
+        override fun dominates(other: Suppressor): Boolean = this === other
     }
 
-    private class SingularSuppressor(annotated: KtAnnotated, private val string: String) : Suppressor(annotated) {
-        override fun isSuppressed(diagnostic: Diagnostic): Boolean {
-            return isSuppressed(getDiagnosticSuppressKey(diagnostic), diagnostic.severity)
-        }
-
+    private class SingularSuppressor(private val string: String) : Suppressor() {
         override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean {
             return isSuppressedByStrings(suppressionKey, ImmutableSet.of(string), severity)
         }
@@ -206,11 +196,7 @@ abstract class KotlinSuppressCache {
         }
     }
 
-    private class MultiSuppressor(annotated: KtAnnotated, private val strings: Set<String>) : Suppressor(annotated) {
-        override fun isSuppressed(diagnostic: Diagnostic): Boolean {
-            return isSuppressed(getDiagnosticSuppressKey(diagnostic), diagnostic.severity)
-        }
-
+    private class MultiSuppressor(private val strings: Set<String>) : Suppressor() {
         override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean {
             return isSuppressedByStrings(suppressionKey, strings, severity)
         }
@@ -244,11 +230,8 @@ class BindingContextSuppressCache(val context: BindingContext) : KotlinSuppressC
     override fun getSuppressionAnnotations(annotated: KtAnnotated): List<AnnotationDescriptor> {
         val descriptor = context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotated)
 
-        return if (descriptor != null) {
-            descriptor.annotations.toList()
-        } else {
-            annotated.annotationEntries.mapNotNull { context.get(BindingContext.ANNOTATION, it) }
-        }
+        return descriptor?.annotations?.toList()
+            ?: annotated.annotationEntries.mapNotNull { context.get(BindingContext.ANNOTATION, it) }
     }
 
     override fun isSuppressedByExtension(suppressor: DiagnosticSuppressor, diagnostic: Diagnostic): Boolean {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
index 47b3f4934ce..7157dfdec02 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
@@ -16,26 +16,24 @@
 
 package org.jetbrains.kotlin.resolve.diagnostics
 
-import org.jetbrains.kotlin.diagnostics.Diagnostic
-import java.util.ArrayList
 import com.intellij.openapi.util.CompositeModificationTracker
-import com.intellij.util.CachedValueImpl
-import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.PsiElement
+import com.intellij.psi.util.CachedValueProvider
+import com.intellij.util.CachedValueImpl
 import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.diagnostics.Diagnostic
 
-class MutableDiagnosticsWithSuppression @JvmOverloads constructor(
-    private val bindingContext: BindingContext,
-    private val delegateDiagnostics: Diagnostics = Diagnostics.EMPTY
+class MutableDiagnosticsWithSuppression(
+    private val suppressCache: KotlinSuppressCache,
+    private val delegateDiagnostics: Diagnostics,
 ) : Diagnostics {
     private val diagnosticList = ArrayList<Diagnostic>()
 
     //NOTE: CachedValuesManager is not used because it requires Project passed to this object
-    private val cache = CachedValueImpl(CachedValueProvider {
+    private val cache = CachedValueImpl {
         val allDiagnostics = delegateDiagnostics.noSuppression().all() + diagnosticList
-        CachedValueProvider.Result(DiagnosticsWithSuppression(bindingContext, allDiagnostics), modificationTracker)
-    })
+        CachedValueProvider.Result(DiagnosticsWithSuppression(suppressCache, allDiagnostics), modificationTracker)
+    }
 
     private fun readonlyView(): DiagnosticsWithSuppression = cache.value!!
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/PrecomputedSuppressCache.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/PrecomputedSuppressCache.kt
new file mode 100644
index 00000000000..332fa4e4225
--- /dev/null
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/PrecomputedSuppressCache.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.resolve.diagnostics
+
+import org.jetbrains.kotlin.builtins.StandardNames
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.psi.KtAnnotated
+import org.jetbrains.kotlin.psi.KtElement
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
+import org.jetbrains.kotlin.resolve.BindingContext
+
+/**
+ * A [KotlinSuppressCache] implementation that computes all suppressions at the moment of instantiation.
+ * This is useful in the IR backend, where we clear the main binding context after psi2ir to avoid taking extra memory.
+ * To make suppression of errors reported from backend possible though, we need to precompute all resolved `@Suppress` annotations,
+ * and store this information outside of the binding context, which is going to be cleared.
+ *
+ * @param context the binding context where the data should be loaded from. Note that it shouldn't be stored as a property because the
+ *   primary use case of this class is when that binding context is cleared and thus is useless after a certain point.
+ */
+class PrecomputedSuppressCache(context: BindingContext, files: List<KtFile>) : KotlinSuppressCache() {
+    val storage: Map<KtAnnotated, List<AnnotationDescriptor>> =
+        mutableMapOf<KtAnnotated, List<AnnotationDescriptor>>().also { storage ->
+            val visitor = PrecomputingVisitor(storage, BindingContextSuppressCache(context))
+            for (file in files) {
+                file.accept(visitor, null)
+            }
+        }
+
+    private class PrecomputingVisitor(
+        val storage: MutableMap<KtAnnotated, List<AnnotationDescriptor>>,
+        val computer: KotlinSuppressCache,
+    ) : KtTreeVisitorVoid() {
+        override fun visitKtElement(element: KtElement) {
+            super.visitKtElement(element)
+            if (element is KtAnnotated) {
+                computeAnnotations(element)
+            }
+        }
+
+        override fun visitKtFile(file: KtFile) {
+            super.visitKtFile(file)
+            computeAnnotations(file)
+        }
+
+        private fun computeAnnotations(element: KtAnnotated) {
+            val suppressions = computer.getSuppressionAnnotations(element).filter { it.fqName == StandardNames.FqNames.suppress }
+            if (suppressions.isNotEmpty()) {
+                storage[element] = suppressions
+            }
+        }
+    }
+
+    override fun getSuppressionAnnotations(annotated: KtAnnotated): List<AnnotationDescriptor> =
+        storage[annotated].orEmpty()
+}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
index 7f38d196fa5..a4ea5c5269f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
@@ -179,7 +179,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
 
         this.declarationProviderFactory = declarationProviderFactory;
 
-        this.packageFragmentProvider = new PackageFragmentProvider() {
+        this.packageFragmentProvider = new PackageFragmentProviderOptimized() {
             @Override
             public void collectPackageFragments(
                     @NotNull FqName fqName, @NotNull Collection<PackageFragmentDescriptor> packageFragments
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/BuildDiffsStorage.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/BuildDiffsStorage.kt
index 08b303bcf3b..0e45f818432 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/BuildDiffsStorage.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/BuildDiffsStorage.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.incremental
 
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.build.report.ICReporter
 import org.jetbrains.kotlin.name.FqName
 import java.io.File
 import java.io.IOException
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedJavaFilesProcessor.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedJavaFilesProcessor.kt
index 97f1b101549..307ecffee2f 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedJavaFilesProcessor.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedJavaFilesProcessor.kt
@@ -19,6 +19,8 @@ package org.jetbrains.kotlin.incremental
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiJavaFile
+import org.jetbrains.kotlin.build.report.ICReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildAttribute
 import java.io.File
 import java.util.*
 
@@ -37,7 +39,7 @@ internal class ChangedJavaFilesProcessor(
 
         if (removedJava.any()) {
             reporter.report { "Some java files are removed: [${removedJava.joinToString()}]" }
-            return ChangesEither.Unknown()
+            return ChangesEither.Unknown(BuildAttribute.JAVA_CHANGE_UNTRACKED_FILE_IS_REMOVED)
         }
 
         val symbols = HashSet<LookupSymbol>()
@@ -47,7 +49,7 @@ internal class ChangedJavaFilesProcessor(
             val psiFile = psiFileFactory(javaFile)
             if (psiFile !is PsiJavaFile) {
                 reporter.report { "Expected PsiJavaFile, got ${psiFile?.javaClass}" }
-                return ChangesEither.Unknown()
+                return ChangesEither.Unknown(BuildAttribute.JAVA_CHANGE_UNEXPECTED_PSI)
             }
 
             psiFile.classes.forEach { it.addLookupSymbols(symbols) }
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangesEither.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangesEither.kt
index d1cd22bc253..cca15fc1d2b 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangesEither.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangesEither.kt
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.incremental
 
+import org.jetbrains.kotlin.build.report.metrics.BuildAttribute
 import org.jetbrains.kotlin.name.FqName
 
 internal sealed class ChangesEither {
@@ -24,5 +25,5 @@ internal sealed class ChangesEither {
         val fqNames: Collection<FqName> = emptyList()
     ) : ChangesEither()
 
-    internal class Unknown(val reason: String? = null) : ChangesEither()
+    internal class Unknown(val reason: BuildAttribute) : ChangesEither()
 }
\ No newline at end of file
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/DirtyFilesContainer.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/DirtyFilesContainer.kt
index 7c38ae6ddf6..050851d5ff5 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/DirtyFilesContainer.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/DirtyFilesContainer.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.incremental
 
+import org.jetbrains.kotlin.build.report.ICReporter
 import org.jetbrains.kotlin.name.FqName
 import java.io.File
 
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt
index 68d63bc85ad..c529463ac24 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt
@@ -16,17 +16,19 @@
 
 package org.jetbrains.kotlin.incremental
 
+import org.jetbrains.kotlin.build.report.ICReporter
 import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner
-import org.jetbrains.kotlin.incremental.storage.FileToCanonicalPathConverter
+import org.jetbrains.kotlin.incremental.storage.IncrementalFileToPathConverter
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import java.io.File
 
-private val PATH_CONVERTER = FileToCanonicalPathConverter
 
 abstract class IncrementalCachesManager<PlatformCache : AbstractIncrementalCache<*>>(
     cachesRootDir: File,
+    rootProjectDir: File?,
     protected val reporter: ICReporter
 ) {
+    val pathConverter = IncrementalFileToPathConverter(rootProjectDir)
     private val caches = arrayListOf<BasicMapsOwner>()
     protected fun <T : BasicMapsOwner> T.registerCache() {
         caches.add(this)
@@ -36,7 +38,7 @@ abstract class IncrementalCachesManager<PlatformCache : AbstractIncrementalCache
     private val lookupCacheDir = File(cachesRootDir, "lookups").apply { mkdirs() }
 
     val inputsCache: InputsCache = InputsCache(inputSnapshotsCacheDir, reporter).apply { registerCache() }
-    val lookupCache: LookupStorage = LookupStorage(lookupCacheDir, PATH_CONVERTER).apply { registerCache() }
+    val lookupCache: LookupStorage = LookupStorage(lookupCacheDir, pathConverter).apply { registerCache() }
     abstract val platformCache: PlatformCache
 
     fun close(flush: Boolean = false): Boolean {
@@ -66,20 +68,20 @@ abstract class IncrementalCachesManager<PlatformCache : AbstractIncrementalCache
 
 class IncrementalJvmCachesManager(
     cacheDirectory: File,
+    rootProjectDir: File?,
     outputDir: File,
     reporter: ICReporter
-) : IncrementalCachesManager<IncrementalJvmCache>(cacheDirectory, reporter) {
-
+) : IncrementalCachesManager<IncrementalJvmCache>(cacheDirectory, rootProjectDir, reporter) {
     private val jvmCacheDir = File(cacheDirectory, "jvm").apply { mkdirs() }
-    override val platformCache = IncrementalJvmCache(jvmCacheDir, outputDir, PATH_CONVERTER).apply { registerCache() }
+    override val platformCache = IncrementalJvmCache(jvmCacheDir, outputDir, pathConverter).apply { registerCache() }
 }
 
 class IncrementalJsCachesManager(
     cachesRootDir: File,
+    rootProjectDir: File,
     reporter: ICReporter,
     serializerProtocol: SerializerExtensionProtocol
-) : IncrementalCachesManager<IncrementalJsCache>(cachesRootDir, reporter) {
-
+) : IncrementalCachesManager<IncrementalJsCache>(cachesRootDir, rootProjectDir, reporter) {
     private val jsCacheFile = File(cachesRootDir, "js").apply { mkdirs() }
-    override val platformCache = IncrementalJsCache(jsCacheFile, PATH_CONVERTER, serializerProtocol).apply { registerCache() }
+    override val platformCache = IncrementalJsCache(jsCacheFile, pathConverter, serializerProtocol).apply { registerCache() }
 }
\ No newline at end of file
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt
index 80fc775b2ff..ecdbf02d6b2 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt
@@ -18,6 +18,10 @@ package org.jetbrains.kotlin.incremental
 
 import org.jetbrains.kotlin.build.DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
 import org.jetbrains.kotlin.build.GeneratedFile
+import org.jetbrains.kotlin.build.report.BuildReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildTime
+import org.jetbrains.kotlin.build.report.metrics.BuildAttribute
+import org.jetbrains.kotlin.build.report.metrics.measure
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -41,7 +45,7 @@ abstract class IncrementalCompilerRunner<
         >(
     private val workingDir: File,
     cacheDirName: String,
-    protected val reporter: ICReporter,
+    protected val reporter: BuildReporter,
     private val buildHistoryFile: File,
     // there might be some additional output directories (e.g. for generated java in kapt)
     // to remove them correctly on rebuild, we pass them as additional argument
@@ -54,7 +58,7 @@ abstract class IncrementalCompilerRunner<
     protected open val kotlinSourceFilesExtensions: List<String> = DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
 
     protected abstract fun isICEnabled(): Boolean
-    protected abstract fun createCacheManager(args: Args): CacheManager
+    protected abstract fun createCacheManager(args: Args, projectDir: File?): CacheManager
     protected abstract fun destinationDir(args: Args): File
 
     fun compile(
@@ -63,21 +67,35 @@ abstract class IncrementalCompilerRunner<
         messageCollector: MessageCollector,
         // when [providedChangedFiles] is not null, changes are provided by external system (e.g. Gradle)
         // otherwise we track source files changes ourselves.
-        providedChangedFiles: ChangedFiles?
+        providedChangedFiles: ChangedFiles?,
+        projectDir: File? = null
+    ): ExitCode = reporter.measure(BuildTime.INCREMENTAL_COMPILATION) {
+        compileImpl(allSourceFiles, args, messageCollector, providedChangedFiles, projectDir)
+    }
+
+    private fun compileImpl(
+        allSourceFiles: List<File>,
+        args: Args,
+        messageCollector: MessageCollector,
+        providedChangedFiles: ChangedFiles?,
+        projectDir: File? = null
     ): ExitCode {
         assert(isICEnabled()) { "Incremental compilation is not enabled" }
-        var caches = createCacheManager(args)
+        var caches = createCacheManager(args, projectDir)
 
-        fun rebuild(reason: () -> String): ExitCode {
-            reporter.report(reason)
+        fun rebuild(reason: BuildAttribute): ExitCode {
+            reporter.report { "Non-incremental compilation will be performed: $reason" }
             caches.close(false)
-            clearLocalStateOnRebuild(args)
-            caches = createCacheManager(args)
+            // todo: we can recompile all files incrementally (not cleaning caches), so rebuild won't propagate
+            reporter.measure(BuildTime.CLEAR_OUTPUT_ON_REBUILD) {
+                clearLocalStateOnRebuild(args)
+            }
+            caches = createCacheManager(args, projectDir)
             if (providedChangedFiles == null) {
                 caches.inputsCache.sourceSnapshotMap.compareAndUpdate(allSourceFiles)
             }
             val allKotlinFiles = allSourceFiles.filter { it.isKotlinFile(kotlinSourceFilesExtensions) }
-            return compileIncrementally(args, caches, allKotlinFiles, CompilationMode.Rebuild(), messageCollector)
+            return compileIncrementally(args, caches, allKotlinFiles, CompilationMode.Rebuild(reason), messageCollector)
         }
 
         return try {
@@ -89,16 +107,17 @@ abstract class IncrementalCompilerRunner<
                     compileIncrementally(args, caches, allSourceFiles, compilationMode, messageCollector)
                 }
                 is CompilationMode.Rebuild -> {
-                    rebuild { "Non-incremental compilation will be performed: ${compilationMode.reason}" }
+                    rebuild(compilationMode.reason)
                 }
             }
 
             if (!caches.close(flush = true)) throw RuntimeException("Could not flush caches")
 
             return exitCode
-        } catch (e: Exception) {
+        } catch (e: Exception) { // todo: catch only cache corruption
             // todo: warn?
-            rebuild { "Possible cache corruption. Rebuilding. $e" }
+            reporter.report { "Rebuilding because of possible caches corruption: $e" }
+            rebuild(BuildAttribute.CACHE_CORRUPTION)
         }
     }
 
@@ -138,10 +157,17 @@ abstract class IncrementalCompilerRunner<
     ): CompilationMode =
         when (changedFiles) {
             is ChangedFiles.Known -> calculateSourcesToCompile(caches, changedFiles, args, messageCollector)
-            is ChangedFiles.Unknown -> CompilationMode.Rebuild { "inputs' changes are unknown (first or clean build)" }
+            is ChangedFiles.Unknown -> CompilationMode.Rebuild(BuildAttribute.UNKNOWN_CHANGES_IN_GRADLE_INPUTS)
         }
 
-    protected abstract fun calculateSourcesToCompile(
+    private fun calculateSourcesToCompile(
+        caches: CacheManager, changedFiles: ChangedFiles.Known, args: Args, messageCollector: MessageCollector
+    ): CompilationMode =
+        reporter.measure(BuildTime.IC_CALCULATE_INITIAL_DIRTY_SET) {
+            calculateSourcesToCompileImpl(caches, changedFiles, args, messageCollector)
+        }
+
+    protected abstract fun calculateSourcesToCompileImpl(
         caches: CacheManager,
         changedFiles: ChangedFiles.Known,
         args: Args,
@@ -160,9 +186,7 @@ abstract class IncrementalCompilerRunner<
 
     protected sealed class CompilationMode {
         class Incremental(val dirtyFiles: DirtyFilesContainer) : CompilationMode()
-        class Rebuild(getReason: () -> String = { "" }) : CompilationMode() {
-            val reason: String by lazy(getReason)
-        }
+        class Rebuild(val reason: BuildAttribute) : CompilationMode()
     }
 
     protected abstract fun updateCaches(
@@ -210,9 +234,17 @@ abstract class IncrementalCompilerRunner<
     ): ExitCode {
         preBuildHook(args, compilationMode)
 
+        val buildTimeMode: BuildTime
         val dirtySources = when (compilationMode) {
-            is CompilationMode.Incremental -> compilationMode.dirtyFiles.toMutableList()
-            is CompilationMode.Rebuild -> allKotlinSources.toMutableList()
+            is CompilationMode.Incremental -> {
+                buildTimeMode = BuildTime.INCREMENTAL_ITERATION
+                compilationMode.dirtyFiles.toMutableList()
+            }
+            is CompilationMode.Rebuild -> {
+                buildTimeMode = BuildTime.NON_INCREMENTAL_ITERATION
+                reporter.addAttribute(compilationMode.reason)
+                allKotlinSources.toMutableList()
+            }
         }
 
         val currentBuildInfo = BuildInfo(startTS = System.currentTimeMillis())
@@ -246,7 +278,9 @@ abstract class IncrementalCompilerRunner<
             val bufferingMessageCollector = BufferingMessageCollector()
             val messageCollectorAdapter = MessageCollectorToOutputItemsCollectorAdapter(bufferingMessageCollector, outputItemsCollector)
 
-            exitCode = runCompiler(sourcesToCompile.toSet(), args, caches, services, messageCollectorAdapter)
+            exitCode = reporter.measure(buildTimeMode) {
+                runCompiler(sourcesToCompile.toSet(), args, caches, services, messageCollectorAdapter)
+            }
 
             val generatedFiles = outputItemsCollector.outputs.map(SimpleOutputItem::toGeneratedFile)
             if (compilationMode is CompilationMode.Incremental) {
@@ -267,12 +301,13 @@ abstract class IncrementalCompilerRunner<
 
             dirtySourcesSinceLastTimeFile.delete()
 
-            caches.platformCache.updateComplementaryFiles(dirtySources, expectActualTracker)
-            caches.inputsCache.registerOutputForSourceFiles(generatedFiles)
-            caches.lookupCache.update(lookupTracker, sourcesToCompile, removedKotlinSources)
             val changesCollector = ChangesCollector()
-            updateCaches(services, caches, generatedFiles, changesCollector)
-
+            reporter.measure(BuildTime.IC_UPDATE_CACHES) {
+                caches.platformCache.updateComplementaryFiles(dirtySources, expectActualTracker)
+                caches.inputsCache.registerOutputForSourceFiles(generatedFiles)
+                caches.lookupCache.update(lookupTracker, sourcesToCompile, removedKotlinSources)
+                updateCaches(services, caches, generatedFiles, changesCollector)
+            }
             if (compilationMode is CompilationMode.Rebuild) break
 
             val (dirtyLookupSymbols, dirtyClassFqNames) = changesCollector.getDirtyData(listOf(caches.platformCache), reporter)
@@ -338,7 +373,7 @@ abstract class IncrementalCompilerRunner<
         compilationMode: CompilationMode,
         currentBuildInfo: BuildInfo,
         dirtyData: DirtyData
-    ) {
+    ) = reporter.measure(BuildTime.IC_WRITE_HISTORY_FILE) {
         val prevDiffs = BuildDiffsStorage.readFromFile(buildHistoryFile, reporter)?.buildDiffs ?: emptyList()
         val newDiff = if (compilationMode is CompilationMode.Incremental) {
             BuildDifference(currentBuildInfo.startTS, true, dirtyData)
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt
index 9709b75e6a4..09c17ebfd2f 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt
@@ -17,6 +17,10 @@
 package org.jetbrains.kotlin.incremental
 
 import org.jetbrains.kotlin.build.GeneratedFile
+import org.jetbrains.kotlin.build.report.BuildReporter
+import org.jetbrains.kotlin.build.report.ICReporter
+import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildAttribute
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.isIrBackendEnabled
@@ -45,9 +49,10 @@ fun makeJsIncrementally(
         .filter { it.isFile && it.extension.equals("kt", ignoreCase = true) }.toList()
     val buildHistoryFile = File(cachesDir, "build-history.bin")
 
+    val buildReporter = BuildReporter(icReporter = reporter, buildMetricsReporter = DoNothingBuildMetricsReporter)
     withJsIC {
         val compiler = IncrementalJsCompilerRunner(
-            cachesDir, reporter,
+            cachesDir, buildReporter,
             buildHistoryFile = buildHistoryFile,
             modulesApiHistory = EmptyModulesApiHistory,
             scopeExpansion = scopeExpansion
@@ -68,8 +73,8 @@ inline fun <R> withJsIC(fn: () -> R): R {
 }
 
 class IncrementalJsCompilerRunner(
-    workingDir: File,
-    reporter: ICReporter,
+    private val workingDir: File,
+    reporter: BuildReporter,
     buildHistoryFile: File,
     private val modulesApiHistory: ModulesApiHistory,
     private val scopeExpansion: CompileScopeExpansionMode = CompileScopeExpansionMode.NEVER
@@ -82,22 +87,22 @@ class IncrementalJsCompilerRunner(
     override fun isICEnabled(): Boolean =
         IncrementalCompilation.isEnabledForJs()
 
-    override fun createCacheManager(args: K2JSCompilerArguments): IncrementalJsCachesManager {
+    override fun createCacheManager(args: K2JSCompilerArguments, projectDir: File?): IncrementalJsCachesManager {
         val serializerProtocol = if (!args.isIrBackendEnabled()) JsSerializerProtocol else KlibMetadataSerializerProtocol
-        return IncrementalJsCachesManager(cacheDirectory, reporter, serializerProtocol)
+        return IncrementalJsCachesManager(cacheDirectory, workingDir, reporter, serializerProtocol)
     }
 
     override fun destinationDir(args: K2JSCompilerArguments): File =
         File(args.outputFile).parentFile
 
-    override fun calculateSourcesToCompile(
+    override fun calculateSourcesToCompileImpl(
         caches: IncrementalJsCachesManager,
         changedFiles: ChangedFiles.Known,
         args: K2JSCompilerArguments,
         messageCollector: MessageCollector
     ): CompilationMode {
         val lastBuildInfo = BuildInfo.read(lastBuildInfoFile)
-            ?: return CompilationMode.Rebuild { "No information on previous build" }
+            ?: return CompilationMode.Rebuild(BuildAttribute.NO_BUILD_HISTORY)
 
         val dirtyFiles = DirtyFilesContainer(caches, reporter, kotlinSourceFilesExtensions)
         initDirtyFiles(dirtyFiles, changedFiles)
@@ -107,9 +112,9 @@ class IncrementalJsCompilerRunner(
 
         @Suppress("UNUSED_VARIABLE") // for sealed when
         val unused = when (classpathChanges) {
-            is ChangesEither.Unknown -> return CompilationMode.Rebuild {
-                // todo: we can recompile all files incrementally (not cleaning caches), so rebuild won't propagate
-                "Could not get classpath's changes${classpathChanges.reason?.let { ": $it" }}"
+            is ChangesEither.Unknown -> {
+                reporter.report { "Could not get classpath's changes: ${classpathChanges.reason}" }
+                return CompilationMode.Rebuild(classpathChanges.reason)
             }
             is ChangesEither.Known -> {
                 dirtyFiles.addByDirtySymbols(classpathChanges.lookupSymbols)
@@ -117,7 +122,6 @@ class IncrementalJsCompilerRunner(
             }
         }
 
-
         val removedClassesChanges = getRemovedClassesChanges(caches, changedFiles)
         dirtyFiles.addByDirtySymbols(removedClassesChanges.dirtyLookupSymbols)
         dirtyFiles.addByDirtyClasses(removedClassesChanges.dirtyClassesFqNames)
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
index 2694e9337d2..c85f8e6d573 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
@@ -25,6 +25,10 @@ import com.intellij.psi.PsiJavaFile
 import org.jetbrains.kotlin.build.DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
 import org.jetbrains.kotlin.build.GeneratedFile
 import org.jetbrains.kotlin.build.GeneratedJvmClass
+import org.jetbrains.kotlin.build.report.BuildReporter
+import org.jetbrains.kotlin.build.report.ICReporter
+import org.jetbrains.kotlin.build.report.ICReporterBase
+import org.jetbrains.kotlin.build.report.metrics.*
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
@@ -64,11 +68,12 @@ fun makeIncrementally(
     val sourceFiles = files.filter { it.extension.toLowerCase() in allExtensions }.toList()
     val buildHistoryFile = File(cachesDir, "build-history.bin")
     args.javaSourceRoots = sourceRoots.map { it.absolutePath }.toTypedArray()
+    val buildReporter = BuildReporter(icReporter = reporter, buildMetricsReporter = DoNothingBuildMetricsReporter)
 
     withIC {
         val compiler = IncrementalJvmCompilerRunner(
             cachesDir,
-            reporter,
+            buildReporter,
             // Use precise setting in case of non-Gradle build
             usePreciseJavaTracking = true,
             outputFiles = emptyList(),
@@ -104,7 +109,7 @@ inline fun <R> withIC(enabled: Boolean = true, fn: () -> R): R {
 
 class IncrementalJvmCompilerRunner(
     workingDir: File,
-    reporter: ICReporter,
+    reporter: BuildReporter,
     private val usePreciseJavaTracking: Boolean,
     buildHistoryFile: File,
     outputFiles: Collection<File>,
@@ -120,8 +125,9 @@ class IncrementalJvmCompilerRunner(
     override fun isICEnabled(): Boolean =
         IncrementalCompilation.isEnabledForJvm()
 
-    override fun createCacheManager(args: K2JVMCompilerArguments): IncrementalJvmCachesManager =
-        IncrementalJvmCachesManager(cacheDirectory, File(args.destination), reporter)
+    //TODO
+    override fun createCacheManager(args: K2JVMCompilerArguments, projectDir: File?): IncrementalJvmCachesManager =
+        IncrementalJvmCachesManager(cacheDirectory, projectDir, File(args.destination), reporter)
 
     override fun destinationDir(args: K2JVMCompilerArguments): File =
         args.destinationAsFile
@@ -153,7 +159,7 @@ class IncrementalJvmCompilerRunner(
         else
             null
 
-    override fun calculateSourcesToCompile(
+    override fun calculateSourcesToCompileImpl(
         caches: IncrementalJvmCachesManager,
         changedFiles: ChangedFiles.Known,
         args: K2JVMCompilerArguments,
@@ -175,16 +181,20 @@ class IncrementalJvmCompilerRunner(
         val dirtyFiles = DirtyFilesContainer(caches, reporter, kotlinSourceFilesExtensions)
         initDirtyFiles(dirtyFiles, changedFiles)
 
-        val lastBuildInfo = BuildInfo.read(lastBuildInfoFile) ?: return CompilationMode.Rebuild { "No information on previous build" }
+        val lastBuildInfo = BuildInfo.read(lastBuildInfoFile) ?: return CompilationMode.Rebuild(BuildAttribute.NO_BUILD_HISTORY)
         reporter.reportVerbose { "Last Kotlin Build info -- $lastBuildInfo" }
 
-        val classpathChanges = getClasspathChanges(args.classpathAsList, changedFiles, lastBuildInfo, modulesApiHistory, reporter)
+        val classpathChanges = reporter.measure(BuildTime.IC_ANALYZE_CHANGES_IN_DEPENDENCIES) {
+            getClasspathChanges(args.classpathAsList, changedFiles, lastBuildInfo, modulesApiHistory, reporter)
+        }
 
         @Suppress("UNUSED_VARIABLE") // for sealed when
         val unused = when (classpathChanges) {
-            is ChangesEither.Unknown -> return CompilationMode.Rebuild {
-                // todo: we can recompile all files incrementally (not cleaning caches), so rebuild won't propagate
-                "Could not get classpath's changes${classpathChanges.reason?.let { ": $it" }}"
+            is ChangesEither.Unknown -> {
+                reporter.report {
+                    "Could not get classpath's changes: ${classpathChanges.reason}"
+                }
+                return CompilationMode.Rebuild(classpathChanges.reason)
             }
             is ChangesEither.Known -> {
                 dirtyFiles.addByDirtySymbols(classpathChanges.lookupSymbols)
@@ -193,21 +203,26 @@ class IncrementalJvmCompilerRunner(
             }
         }
 
-        if (!usePreciseJavaTracking) {
-            val javaFilesChanges = javaFilesProcessor!!.process(changedFiles)
-            val affectedJavaSymbols = when (javaFilesChanges) {
-                is ChangesEither.Known -> javaFilesChanges.lookupSymbols
-                is ChangesEither.Unknown -> return CompilationMode.Rebuild { "Could not get changes for java files" }
-            }
-            dirtyFiles.addByDirtySymbols(affectedJavaSymbols)
-        } else {
-            if (!processChangedJava(changedFiles, caches)) {
-                return CompilationMode.Rebuild { "Could not get changes for java files" }
+        reporter.measure(BuildTime.IC_ANALYZE_CHANGES_IN_JAVA_SOURCES) {
+            if (!usePreciseJavaTracking) {
+                val javaFilesChanges = javaFilesProcessor!!.process(changedFiles)
+                val affectedJavaSymbols = when (javaFilesChanges) {
+                    is ChangesEither.Known -> javaFilesChanges.lookupSymbols
+                    is ChangesEither.Unknown -> return CompilationMode.Rebuild(javaFilesChanges.reason)
+                }
+                dirtyFiles.addByDirtySymbols(affectedJavaSymbols)
+            } else {
+                val rebuildReason = processChangedJava(changedFiles, caches)
+                if (rebuildReason != null) return CompilationMode.Rebuild(rebuildReason)
             }
         }
 
-        val androidLayoutChanges = processLookupSymbolsForAndroidLayouts(changedFiles)
-        val removedClassesChanges = getRemovedClassesChanges(caches, changedFiles)
+        val androidLayoutChanges = reporter.measure(BuildTime.IC_ANALYZE_CHANGES_IN_ANDROID_LAYOUTS) {
+            processLookupSymbolsForAndroidLayouts(changedFiles)
+        }
+        val removedClassesChanges = reporter.measure(BuildTime.IC_DETECT_REMOVED_CLASSES) {
+            getRemovedClassesChanges(caches, changedFiles)
+        }
 
         dirtyFiles.addByDirtySymbols(androidLayoutChanges)
         dirtyFiles.addByDirtySymbols(removedClassesChanges.dirtyLookupSymbols)
@@ -216,7 +231,7 @@ class IncrementalJvmCompilerRunner(
         return CompilationMode.Incremental(dirtyFiles)
     }
 
-    private fun processChangedJava(changedFiles: ChangedFiles.Known, caches: IncrementalJvmCachesManager): Boolean {
+    private fun processChangedJava(changedFiles: ChangedFiles.Known, caches: IncrementalJvmCachesManager): BuildAttribute? {
         val javaFiles = (changedFiles.modified + changedFiles.removed).filter(File::isJavaFile)
 
         for (javaFile in javaFiles) {
@@ -224,20 +239,20 @@ class IncrementalJvmCompilerRunner(
                 if (!javaFile.exists()) {
                     // todo: can we do this more optimal?
                     reporter.report { "Could not get changed for untracked removed java file $javaFile" }
-                    return false
+                    return BuildAttribute.JAVA_CHANGE_UNTRACKED_FILE_IS_REMOVED
                 }
 
                 val psiFile = psiFileProvider.javaFile(javaFile)
                 if (psiFile !is PsiJavaFile) {
                     reporter.report { "[Precise Java tracking] Expected PsiJavaFile, got ${psiFile?.javaClass}" }
-                    return false
+                    return BuildAttribute.JAVA_CHANGE_UNEXPECTED_PSI
                 }
 
                 for (psiClass in psiFile.classes) {
                     val qualifiedName = psiClass.qualifiedName
                     if (qualifiedName == null) {
                         reporter.report { "[Precise Java tracking] Class with unknown qualified name in $javaFile" }
-                        return false
+                        return BuildAttribute.JAVA_CHANGE_UNKNOWN_QUALIFIER
                     }
 
                     processChangedUntrackedJavaClass(psiClass, ClassId.topLevel(FqName(qualifiedName)))
@@ -246,7 +261,7 @@ class IncrementalJvmCompilerRunner(
         }
 
         caches.platformCache.markDirty(javaFiles)
-        return true
+        return null
     }
 
     private fun processChangedUntrackedJavaClass(psiClass: PsiClass, classId: ClassId) {
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/InputsCache.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/InputsCache.kt
index 0bc29062d6b..fc4bb78c93c 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/InputsCache.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/InputsCache.kt
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.incremental
 
 import com.intellij.util.containers.MultiMap
 import org.jetbrains.kotlin.build.GeneratedFile
+import org.jetbrains.kotlin.build.report.ICReporter
 import org.jetbrains.kotlin.incremental.snapshots.FileSnapshotMap
 import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner
 import org.jetbrains.kotlin.incremental.storage.SourceToOutputFilesMap
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/changesDetectionUtils.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/changesDetectionUtils.kt
index 4b7257a3bdf..290712bf01b 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/changesDetectionUtils.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/changesDetectionUtils.kt
@@ -5,6 +5,10 @@
 
 package org.jetbrains.kotlin.incremental
 
+import org.jetbrains.kotlin.build.report.BuildReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildTime
+import org.jetbrains.kotlin.build.report.metrics.BuildAttribute
+import org.jetbrains.kotlin.build.report.metrics.measure
 import org.jetbrains.kotlin.incremental.multiproject.ModulesApiHistory
 import org.jetbrains.kotlin.incremental.util.Either
 import org.jetbrains.kotlin.name.FqName
@@ -15,7 +19,7 @@ internal fun getClasspathChanges(
     changedFiles: ChangedFiles.Known,
     lastBuildInfo: BuildInfo,
     modulesApiHistory: ModulesApiHistory,
-    reporter: ICReporter?
+    reporter: BuildReporter
 ): ChangesEither {
     val classpathSet = HashSet<File>()
     for (file in classpath) {
@@ -29,7 +33,10 @@ internal fun getClasspathChanges(
     val removedClasspath = changedFiles.removed.filterTo(HashSet()) { it in classpathSet }
 
     // todo: removed classes could be processed normally
-    if (removedClasspath.isNotEmpty()) return ChangesEither.Unknown("Some files are removed from classpath $removedClasspath")
+    if (removedClasspath.isNotEmpty()) {
+        reporter.report { "Some files are removed from classpath: $removedClasspath" }
+        return ChangesEither.Unknown(BuildAttribute.DEP_CHANGE_REMOVED_ENTRY)
+    }
 
     if (modifiedClasspath.isEmpty()) return ChangesEither.Known()
 
@@ -38,28 +45,47 @@ internal fun getClasspathChanges(
     val symbols = HashSet<LookupSymbol>()
     val fqNames = HashSet<FqName>()
 
-    val historyFilesEither = modulesApiHistory.historyFilesForChangedFiles(modifiedClasspath)
+    val historyFilesEither =
+        reporter.measure(BuildTime.IC_FIND_HISTORY_FILES) {
+            modulesApiHistory.historyFilesForChangedFiles(modifiedClasspath)
+        }
     val historyFiles = when (historyFilesEither) {
         is Either.Success<Set<File>> -> historyFilesEither.value
-        is Either.Error -> return ChangesEither.Unknown(historyFilesEither.reason)
-    }
-
-    for (historyFile in historyFiles) {
-        val allBuilds = BuildDiffsStorage.readDiffsFromFile(historyFile, reporter = reporter)
-            ?: return ChangesEither.Unknown("Could not read diffs from $historyFile")
-        val (knownBuilds, newBuilds) = allBuilds.partition { it.ts <= lastBuildTS }
-        if (knownBuilds.isEmpty()) {
-            return ChangesEither.Unknown("No previously known builds for $historyFile")
-        }
-
-        for (buildDiff in newBuilds) {
-            if (!buildDiff.isIncremental) return ChangesEither.Unknown("Non-incremental build from dependency $historyFile")
-
-            val dirtyData = buildDiff.dirtyData
-            symbols.addAll(dirtyData.dirtyLookupSymbols)
-            fqNames.addAll(dirtyData.dirtyClassesFqNames)
+        is Either.Error -> {
+            reporter.report { "Could not find history files: ${historyFilesEither.reason}" }
+            return ChangesEither.Unknown(BuildAttribute.DEP_CHANGE_HISTORY_IS_NOT_FOUND)
         }
     }
 
-    return ChangesEither.Known(symbols, fqNames)
+    fun analyzeHistoryFiles(): ChangesEither {
+        for (historyFile in historyFiles) {
+            val allBuilds = BuildDiffsStorage.readDiffsFromFile(historyFile, reporter = reporter)
+                ?: return run {
+                    reporter.report { "Could not read diffs from $historyFile" }
+                    ChangesEither.Unknown(BuildAttribute.DEP_CHANGE_HISTORY_CANNOT_BE_READ)
+                }
+            val (knownBuilds, newBuilds) = allBuilds.partition { it.ts <= lastBuildTS }
+            if (knownBuilds.isEmpty()) {
+                reporter.report { "No previously known builds for $historyFile" }
+                return ChangesEither.Unknown(BuildAttribute.DEP_CHANGE_HISTORY_NO_KNOWN_BUILDS)
+            }
+
+            for (buildDiff in newBuilds) {
+                if (!buildDiff.isIncremental) {
+                    reporter.report { "Non-incremental build from dependency $historyFile" }
+                    return ChangesEither.Unknown(BuildAttribute.DEP_CHANGE_NON_INCREMENTAL_BUILD_IN_DEP)
+
+                }
+                val dirtyData = buildDiff.dirtyData
+                symbols.addAll(dirtyData.dirtyLookupSymbols)
+                fqNames.addAll(dirtyData.dirtyClassesFqNames)
+            }
+        }
+
+        return ChangesEither.Known(symbols, fqNames)
+    }
+
+    return reporter.measure(BuildTime.IC_ANALYZE_HISTORY_FILES) {
+        analyzeHistoryFiles()
+    }
 }
\ No newline at end of file
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildDiffsStorageTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildDiffsStorageTest.kt
index f74acf2bfba..90afd6eae67 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildDiffsStorageTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildDiffsStorageTest.kt
@@ -22,6 +22,7 @@ import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import java.io.File
+import java.nio.file.Files
 import java.util.*
 
 class BuildDiffsStorageTest {
@@ -30,7 +31,7 @@ class BuildDiffsStorageTest {
 
     @Before
     fun setUp() {
-        storageFile = File.createTempFile("BuildDiffsStorageTest", "storage")
+        storageFile = Files.createTempFile("BuildDiffsStorageTest", "storage").toFile()
     }
 
     @After
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt
index 68b39eccfb7..2c224ec38f7 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.incremental.utils
 
 import org.jetbrains.kotlin.cli.common.ExitCode
-import org.jetbrains.kotlin.incremental.ICReporterBase
+import org.jetbrains.kotlin.build.report.ICReporterBase
 import java.io.File
 
 class TestICReporter : ICReporterBase() {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/BackendContext.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/BackendContext.kt
index 67ec0092e50..d73998a3b67 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/BackendContext.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/BackendContext.kt
@@ -21,10 +21,7 @@ import org.jetbrains.kotlin.backend.common.ir.SharedVariablesManager
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrFactory
-import org.jetbrains.kotlin.ir.declarations.IrField
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
-import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.name.FqName
 
 interface BackendContext {
@@ -33,8 +30,6 @@ interface BackendContext {
     val irBuiltIns: IrBuiltIns
     val sharedVariablesManager: SharedVariablesManager
     val internalPackageFqn: FqName
-    val transformedFunction: MutableMap<IrFunctionSymbol, IrSimpleFunctionSymbol>
-    val lateinitNullableFields: MutableMap<IrField, IrField>
     val extractedLocalClasses: MutableSet<IrClass>
     val irFactory: IrFactory
 }
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt
index 3f49ae2c736..e2a4acd5d27 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt
@@ -26,8 +26,6 @@ import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.types.*
-import org.jetbrains.kotlin.ir.util.getInlineClassUnderlyingType
-import org.jetbrains.kotlin.ir.util.getInlinedClass
 import org.jetbrains.kotlin.ir.util.isAnnotationClass
 import org.jetbrains.kotlin.ir.util.render
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
@@ -92,6 +90,7 @@ class CheckIrElementVisitor(
     override fun <T> visitConst(expression: IrConst<T>) {
         super.visitConst(expression)
 
+        @Suppress("UNUSED_VARIABLE")
         val naturalType = when (expression.kind) {
             IrConstKind.Null -> {
                 expression.ensureNullable()
@@ -108,12 +107,17 @@ class CheckIrElementVisitor(
             IrConstKind.Double -> irBuiltIns.doubleType
         }
 
+        /*
+        TODO: This check used to have JS inline class helpers. Rewrite it in a common way.
         var type = expression.type
         while (true) {
             val inlinedClass = type.getInlinedClass() ?: break
+            if (getInlineClassUnderlyingType(inlinedClass) == type)
+                break
             type = getInlineClassUnderlyingType(inlinedClass)
         }
         expression.ensureTypesEqual(type, naturalType)
+        */
     }
 
     override fun visitStringConcatenation(expression: IrStringConcatenation) {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt
index 3dd02d18014..34932c56eab 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt
@@ -17,9 +17,12 @@
 package org.jetbrains.kotlin.backend.common
 
 import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrBody
+import org.jetbrains.kotlin.ir.expressions.IrStatementContainer
 import org.jetbrains.kotlin.ir.util.transformFlat
+import org.jetbrains.kotlin.ir.util.transformSubsetFlat
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
@@ -111,11 +114,6 @@ private class DeclarationContainerLoweringVisitor(
         declaration.acceptChildrenVoid(this)
         loweringPass.lower(declaration)
     }
-
-    override fun visitScript(declaration: IrScript) {
-        declaration.acceptChildrenVoid(this)
-        loweringPass.lower(declaration)
-    }
 }
 
 fun BodyLoweringPass.runOnFilePostfix(
@@ -160,11 +158,8 @@ private class BodyLoweringVisitor(
     }
 
     override fun visitScript(declaration: IrScript, data: IrDeclaration?) {
-        ArrayList(declaration.declarations).forEach { it.accept(this, declaration) }
-        if (withLocalDeclarations) {
-            declaration.statements.forEach { it.accept(this, null) }
-        }
         declaration.thisReceiver.accept(this, declaration)
+        ArrayList(declaration.statements).forEach { it.accept(this, declaration) }
     }
 }
 
@@ -214,22 +209,26 @@ interface DeclarationTransformer : FileLoweringPass {
 
             val visitor = this
 
+            fun IrDeclaration.replaceInContainer(container: MutableList<in IrDeclaration>, result: List<IrDeclaration>): Boolean {
+                var index = container.indexOf(this)
+                if (index == -1) {
+                    index = container.indexOf(declaration)
+                } else {
+                    container.removeAt(index)
+                    --index
+                }
+                return container.addAll(index + 1, result)
+            }
+
             fun IrDeclaration.transform() {
 
                 acceptVoid(visitor)
 
                 val result = transformer.transformFlatRestricted(this)
                 if (result != null) {
-                    (parent as? IrDeclarationContainer)?.let {
-                        var index = it.declarations.indexOf(this)
-                        if (index == -1) {
-                            index = it.declarations.indexOf(declaration)
-                        } else {
-                            it.declarations.removeAt(index)
-                            --index
-                        }
-
-                        it.declarations.addAll(index + 1, result)
+                    when (val parentCopy = parent) {
+                        is IrDeclarationContainer -> replaceInContainer(parentCopy.declarations, result)
+                        is IrStatementContainer -> replaceInContainer(parentCopy.statements, result)
                     }
                 }
             }
@@ -248,12 +247,12 @@ interface DeclarationTransformer : FileLoweringPass {
         }
 
         override fun visitScript(declaration: IrScript) {
-            ArrayList(declaration.declarations).forEach { it.accept(this, null) }
-            declaration.declarations.transformFlat(transformer::transformFlatRestricted)
-
-            if (transformer.withLocalDeclarations) {
-                declaration.statements.forEach { it.accept(this, null) }
+            ArrayList(declaration.statements).forEach {
+                if (transformer.withLocalDeclarations || it is IrDeclaration) {
+                    it.accept(this, null)
+                }
             }
+            declaration.statements.transformSubsetFlat(transformer::transformFlatRestricted)
 
             declaration.thisReceiver.accept(this, null)
         }
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
index c83e1029eec..95889632606 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
@@ -295,6 +295,9 @@ abstract class Symbols<out T : CommonBackendContext>(val context: T, irBuiltIns:
 
     abstract val throwKotlinNothingValueException: IrSimpleFunctionSymbol
 
+    open val throwISE: IrSimpleFunctionSymbol
+        get() = error("throwISE is not implemented")
+
     abstract val stringBuilder: IrClassSymbol
 
     abstract val defaultConstructorMarker: IrClassSymbol
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
index 1c7108275f2..01e5ac7cce1 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
@@ -8,12 +8,11 @@ package org.jetbrains.kotlin.backend.common.ir
 import org.jetbrains.kotlin.backend.common.CommonBackendContext
 import org.jetbrains.kotlin.backend.common.deepCopyWithVariables
 import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
-import org.jetbrains.kotlin.ir.builders.Scope
 import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
 import org.jetbrains.kotlin.ir.builders.declarations.buildReceiverParameter
 import org.jetbrains.kotlin.ir.builders.declarations.buildTypeParameter
@@ -28,6 +27,7 @@ import org.jetbrains.kotlin.ir.overrides.IrOverridingUtil
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrPropertySymbolImpl
+import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
 import org.jetbrains.kotlin.ir.types.*
@@ -164,14 +164,16 @@ fun IrTypeParameter.copyToWithoutSuperTypes(
     this.index = index
 }
 
-fun IrFunction.copyReceiverParametersFrom(from: IrFunction) {
+fun IrFunction.copyReceiverParametersFrom(from: IrFunction, substitutionMap: Map<IrTypeParameterSymbol, IrType>) {
     dispatchReceiverParameter = from.dispatchReceiverParameter?.run {
         val newDescriptor = WrappedReceiverParameterDescriptor()
         factory.createValueParameter(
             startOffset, endOffset, origin,
             IrValueParameterSymbolImpl(newDescriptor),
-            name,
-            index, type, varargElementType, isCrossinline, isNoinline
+            name, index,
+            type.substitute(substitutionMap),
+            varargElementType?.substitute(substitutionMap),
+            isCrossinline, isNoinline
         ).also { parameter ->
             parameter.parent = this@copyReceiverParametersFrom
             newDescriptor.bind(this)
@@ -180,16 +182,19 @@ fun IrFunction.copyReceiverParametersFrom(from: IrFunction) {
     extensionReceiverParameter = from.extensionReceiverParameter?.copyTo(this)
 }
 
-fun IrFunction.copyValueParametersFrom(from: IrFunction) {
-    copyReceiverParametersFrom(from)
+fun IrFunction.copyValueParametersFrom(from: IrFunction, substitutionMap: Map<IrTypeParameterSymbol, IrType>) {
+    copyReceiverParametersFrom(from, substitutionMap)
     val shift = valueParameters.size
-    valueParameters += from.valueParameters.map { it.copyTo(this, index = it.index + shift) }
+    valueParameters += from.valueParameters.map {
+        it.copyTo(this, index = it.index + shift, type = it.type.substitute(substitutionMap))
+    }
 }
 
 fun IrFunction.copyParameterDeclarationsFrom(from: IrFunction) {
     assert(typeParameters.isEmpty())
     copyTypeParametersFrom(from)
-    copyValueParametersFrom(from)
+    val substitutionMap = makeTypeParameterSubstitutionMap(from, this)
+    copyValueParametersFrom(from, substitutionMap)
 }
 
 fun IrTypeParametersContainer.copyTypeParameters(
@@ -232,6 +237,16 @@ fun IrMutableAnnotationContainer.copyAnnotationsFrom(source: IrAnnotationContain
     annotations += source.annotations.map { it.deepCopyWithSymbols(this as? IrDeclarationParent) }
 }
 
+fun makeTypeParameterSubstitutionMap(
+    original: IrTypeParametersContainer,
+    transformed: IrTypeParametersContainer
+): Map<IrTypeParameterSymbol, IrType> =
+    original.typeParameters
+        .map { it.symbol }
+        .zip(transformed.typeParameters.map { it.defaultType })
+        .toMap()
+
+
 // Copy value parameters, dispatch receiver, and extension receiver from source to value parameters of this function.
 // Type of dispatch receiver defaults to source's dispatch receiver. It is overridable in case the new function and the old one are used in
 // different contexts and expect different type of dispatch receivers. The overriding type should be assign compatible to the old type.
@@ -602,22 +617,35 @@ private fun IrSimpleFunction.copyAndRenameConflictingTypeParametersFrom(
 val IrSymbol.isSuspend: Boolean
     get() = this is IrSimpleFunctionSymbol && owner.isSuspend
 
-fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false): Set<IrSimpleFunction> {
-    val result = mutableSetOf<IrSimpleFunction>()
+fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false): List<IrSimpleFunction> {
+    val result = mutableListOf<IrSimpleFunction>()
     if (includeSelf) {
-        computeAllOverridden(this, result)
-    } else {
-        for (override in overriddenSymbols) {
-            computeAllOverridden(override.owner, result)
+        result.add(this)
+    }
+
+    var current = this
+    while (true) {
+        val overridden = current.overriddenSymbols
+        when (overridden.size) {
+            0 -> return result
+            1 -> {
+                current = overridden[0].owner
+                result.add(current)
+            }
+            else -> {
+                val resultSet = result.toMutableSet()
+                computeAllOverridden(current, resultSet)
+                return resultSet.toList()
+            }
         }
     }
-    return result
 }
 
 private fun computeAllOverridden(function: IrSimpleFunction, result: MutableSet<IrSimpleFunction>) {
-    if (result.add(function)) {
-        for (override in function.overriddenSymbols) {
-            computeAllOverridden(override.owner, result)
+    for (overriddenSymbol in function.overriddenSymbols) {
+        val override = overriddenSymbol.owner
+        if (result.add(override)) {
+            computeAllOverridden(override, result)
         }
     }
 }
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt
index 9a2ad00cd32..5c8c782a254 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt
@@ -271,9 +271,12 @@ class InlineClassLowering(val context: CommonBackendContext) {
         }
     }
 
-    private fun Name.toInlineClassImplementationName() = when {
-        isSpecial -> Name.special(asString() + INLINE_CLASS_IMPL_SUFFIX)
-        else -> Name.identifier(asString() + INLINE_CLASS_IMPL_SUFFIX)
+    private fun IrFunction.toInlineClassImplementationName(): Name {
+        val newName = parentAsClass.name.asString() + "__" + name.asString() + INLINE_CLASS_IMPL_SUFFIX
+        return when {
+            name.isSpecial -> Name.special("<$newName>")
+            else -> Name.identifier(newName)
+        }
     }
 
     private fun collectTypeParameters(declaration: IrTypeParametersContainer): List<IrTypeParameter> {
@@ -292,7 +295,7 @@ class InlineClassLowering(val context: CommonBackendContext) {
     private fun createStaticBodilessMethod(function: IrFunction): IrSimpleFunction =
         context.irFactory.createStaticFunctionWithReceivers(
             function.parent,
-            function.name.toInlineClassImplementationName(),
+            function.toInlineClassImplementationName(),
             function,
             typeParametersFromContext = collectTypeParameters(function.parentAsClass)
         )
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InnerClassesLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InnerClassesLowering.kt
index 70b0a778377..8b19b60b57f 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InnerClassesLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InnerClassesLowering.kt
@@ -97,10 +97,18 @@ private fun InnerClassesSupport.primaryConstructorParameterMap(originalConstruct
 
     val loweredConstructor = getInnerClassConstructorWithOuterThisParameter(originalConstructor)
 
-    originalConstructor.valueParameters.forEach { old ->
-        oldConstructorParameterToNew[old] = loweredConstructor.valueParameters[old.index + 1]
+    var index = 0
+
+    originalConstructor.dispatchReceiverParameter?.let {
+        oldConstructorParameterToNew[it] = loweredConstructor.valueParameters[index++]
     }
 
+    originalConstructor.valueParameters.forEach { old ->
+        oldConstructorParameterToNew[old] = loweredConstructor.valueParameters[index++]
+    }
+
+    assert(loweredConstructor.valueParameters.size == index)
+
     return oldConstructorParameterToNew
 }
 
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalClassPopupLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalClassPopupLowering.kt
index 46df03a6163..39452721e20 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalClassPopupLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalClassPopupLowering.kt
@@ -7,10 +7,12 @@ package org.jetbrains.kotlin.backend.common.lower
 
 import org.jetbrains.kotlin.backend.common.*
 import org.jetbrains.kotlin.backend.common.ir.addChild
+import org.jetbrains.kotlin.backend.common.ir.setDeclarationsParent
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrBody
+import org.jetbrains.kotlin.ir.expressions.IrStatementContainer
 import org.jetbrains.kotlin.ir.expressions.impl.IrCompositeImpl
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
@@ -22,8 +24,12 @@ open class LocalClassPopupLowering(val context: BackendContext) : BodyLoweringPa
         runOnFilePostfix(irFile, withLocalDeclarations = true, allowDeclarationModification = true)
     }
 
+    private data class ExtractedLocalClass(
+        val local: IrClass, val newContainer: IrDeclarationParent, val extractedUnder: IrStatement?
+    )
+
     override fun lower(irBody: IrBody, container: IrDeclaration) {
-        val extractedLocalClasses = arrayListOf<Pair<IrClass, IrDeclarationContainer>>()
+        val extractedLocalClasses = arrayListOf<ExtractedLocalClass>()
 
         irBody.transform(object : IrElementTransformerVoidWithContext() {
 
@@ -32,22 +38,46 @@ open class LocalClassPopupLowering(val context: BackendContext) : BodyLoweringPa
                     if (allScopes.size > 1) allScopes[allScopes.lastIndex - 1] else createScope(container as IrSymbolOwner)
                 if (!shouldPopUp(declaration, currentScope)) return declaration
 
-                val newContainer = run {
-                    var currentParent = declaration.parent
-                    while (currentParent is IrDeclaration && currentParent !is IrClass && currentParent !is IrScript) {
-                        currentParent = currentParent.parent
+                var extractedUnder: IrStatement? = declaration
+                var newContainer = declaration.parent
+                while (newContainer is IrDeclaration && newContainer !is IrClass && newContainer !is IrScript) {
+                    extractedUnder = newContainer
+                    newContainer = newContainer.parent
+                }
+                when (newContainer) {
+                    is IrStatementContainer -> {
+                        // TODO: check if it is the correct behavior
+                        if (extractedUnder == declaration) {
+                            extractedUnder = (newContainer.statements.indexOf(extractedUnder) + 1)
+                                .takeIf { it > 0 && it < newContainer.statements.size }
+                                ?.let { newContainer.statements[it] }
+                        }
+                        extractedLocalClasses.add(ExtractedLocalClass(declaration, newContainer, extractedUnder))
                     }
-
-                    currentParent as IrDeclarationContainer // IrClass or IrScript or IrPackageFragment
+                    is IrDeclarationContainer -> extractedLocalClasses.add(ExtractedLocalClass(declaration, newContainer, extractedUnder))
+                    else -> error("Inexpected container type $newContainer")
                 }
 
-                extractedLocalClasses.add(declaration to newContainer)
                 return IrCompositeImpl(declaration.startOffset, declaration.endOffset, context.irBuiltIns.unitType)
             }
         }, null)
 
-        for ((local, newContainer) in extractedLocalClasses) {
-            newContainer.addChild(local)
+        for ((local, newContainer, extractedUnder) in extractedLocalClasses) {
+            when (newContainer) {
+                is IrStatementContainer -> {
+                    val insertIndex = extractedUnder?.let { newContainer.statements.indexOf(it) } ?: -1
+                    if (insertIndex >= 0) {
+                        newContainer.statements.add(insertIndex, local)
+                    } else {
+                        newContainer.statements.add(local)
+                    }
+                    local.setDeclarationsParent(newContainer)
+                }
+                is IrDeclarationContainer -> {
+                    newContainer.addChild(local)
+                }
+                else -> error("Inexpected container type $newContainer")
+            }
 
             local.acceptVoid(object : IrElementVisitorVoid {
                 override fun visitElement(element: IrElement) {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
index db95dd20bc5..d9a850e635c 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.backend.common.lower
 
 import org.jetbrains.kotlin.backend.common.BodyLoweringPass
 import org.jetbrains.kotlin.backend.common.CommonBackendContext
+import org.jetbrains.kotlin.backend.common.descriptors.synthesizedName
 import org.jetbrains.kotlin.backend.common.descriptors.synthesizedString
 import org.jetbrains.kotlin.backend.common.ir.*
 import org.jetbrains.kotlin.backend.common.runOnFilePostfix
@@ -765,18 +766,22 @@ class LocalDeclarationsLowering(
             if (isSpecial) asString().substring(1, asString().length - 1) else asString()
 
         private fun suggestNameForCapturedValue(declaration: IrValueDeclaration, usedNames: MutableSet<String>): Name {
-            if (declaration is IrValueParameter && declaration.name.asString() == "<this>") {
-                if (declaration.isDispatchReceiver()) {
+            if (declaration is IrValueParameter) {
+                if (declaration.name.asString() == "<this>" && declaration.isDispatchReceiver()) {
                     return findFirstUnusedName("this\$0", usedNames) {
                         "this\$$it"
                     }
-                } else if (declaration.isExtensionReceiver()) {
+                } else if (declaration.name.asString() == "<this>" && declaration.isExtensionReceiver()) {
                     val parentNameSuffix = declaration.parentNameSuffixForExtensionReceiver
                     return findFirstUnusedName("\$this_$parentNameSuffix", usedNames) {
                         "\$this_$parentNameSuffix\$$it"
                     }
+                } else if (declaration.isCapturedReceiver()) {
+                    val baseName = declaration.name.asString().removePrefix(CAPTURED_RECEIVER_PREFIX)
+                    return findFirstUnusedName("\$this_$baseName", usedNames) {
+                        "\$this_$baseName\$$it"
+                    }
                 }
-                // TODO captured extension receivers of extension lambdas?
             }
             val base = if (declaration.name.isSpecial)
                 declaration.name.stripSpecialMarkers()
@@ -810,6 +815,11 @@ class LocalDeclarationsLowering(
             return parentFun.extensionReceiverParameter == this
         }
 
+        private val CAPTURED_RECEIVER_PREFIX = "\$this\$"
+
+        private fun IrValueParameter.isCapturedReceiver(): Boolean =
+            name.asString().startsWith(CAPTURED_RECEIVER_PREFIX)
+
         private val IrValueParameter.parentNameSuffixForExtensionReceiver: String
             get() {
                 val parentFun = parent as? IrSimpleFunction
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LowerUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LowerUtils.kt
index de30feb8ee4..cf606ccaada 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LowerUtils.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LowerUtils.kt
@@ -19,9 +19,9 @@ package org.jetbrains.kotlin.backend.common.lower
 import org.jetbrains.kotlin.backend.common.BackendContext
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
-import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
@@ -162,6 +162,12 @@ open class IrBuildingTransformer(private val context: BackendContext) : IrElemen
             return super.visitEnumEntry(declaration)
         }
     }
+
+    override fun visitScript(declaration: IrScript): IrStatement {
+        withBuilder(declaration.symbol) {
+            return super.visitScript(declaration)
+        }
+    }
 }
 
 fun IrConstructor.callsSuper(irBuiltIns: IrBuiltIns): Boolean {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt
index ed397e9c154..ffa170a558b 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt
@@ -66,6 +66,13 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) :
 
     abstract fun getSuperTypeForWrapper(typeOperand: IrType): IrType
 
+    protected open fun getWrappedFunctionType(klass: IrClass): IrType =
+        klass.defaultType
+
+    protected open fun IrFunctionBuilder.setConstructorSourceRange(createFor: IrElement) {
+        setSourceRange(createFor)
+    }
+
     abstract val IrType.needEqualsHashCodeMethods: Boolean
 
     open val inInlineFunctionScope get() = allScopes.any { scope -> (scope.irElement as? IrFunction)?.isInline ?: false }
@@ -161,7 +168,7 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) :
                 context.ir.symbols.suspendFunctionN(superMethod.valueParameters.size + extensionReceiversCount).owner
             else
                 context.ir.symbols.functionN(superMethod.valueParameters.size + extensionReceiversCount).owner
-        val wrappedFunctionType = wrappedFunctionClass.defaultType
+        val wrappedFunctionType = getWrappedFunctionType(wrappedFunctionClass)
 
         val subclass = context.irFactory.buildClass {
             name = wrapperName
@@ -177,16 +184,17 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) :
         val field = subclass.addField {
             name = Name.identifier(FUNCTION_FIELD_NAME)
             type = wrappedFunctionType
-            origin = subclass.origin
+            origin = IrDeclarationOrigin.SYNTHETIC_GENERATED_SAM_IMPLEMENTATION
             visibility = DescriptorVisibilities.PRIVATE
+            isFinal = true
             setSourceRange(createFor)
         }
 
         subclass.addConstructor {
-            origin = subclass.origin
+            origin = IrDeclarationOrigin.GENERATED_SAM_IMPLEMENTATION
             isPrimary = true
             visibility = wrapperVisibility
-            setSourceRange(createFor)
+            setConstructorSourceRange(createFor)
         }.apply {
             val parameter = addValueParameter {
                 name = field.name
@@ -205,7 +213,8 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) :
             name = superMethod.name
             returnType = superMethod.returnType
             visibility = superMethod.visibility
-            origin = subclass.origin
+            modality = Modality.FINAL
+            origin = IrDeclarationOrigin.SYNTHETIC_GENERATED_SAM_IMPLEMENTATION
             isSuspend = superMethod.isSuspend
             setSourceRange(createFor)
         }.apply {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt
index 542d94bb198..370e2487544 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt
@@ -162,11 +162,17 @@ class FunctionInlining(
             callee: IrFunction,
             performRecursiveInline: Boolean
         ): IrReturnableBlock {
-            val copiedCallee = copyIrElement.copy(callee).let {
-                (it as IrFunction).parent = callee.parent
-                if (performRecursiveInline)
-                    visitElement(it) as IrFunction
-                else it
+            val copiedCallee = (copyIrElement.copy(callee) as IrFunction).apply {
+                parent = callee.parent
+                if (performRecursiveInline) {
+                    body?.transformChildrenVoid()
+                    valueParameters.forEachIndexed { index, param ->
+                        if (callSite.getValueArgument(index) == null) {
+                            // Default values can recursively reference [callee] - transform only needed.
+                            param.defaultValue = param.defaultValue?.transform(this@FunctionInlining, null)
+                        }
+                    }
+                }
             }
 
             val evaluationStatements = evaluateArguments(callSite, copiedCallee)
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderProcessor.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderProcessor.kt
index 8d994e425bd..0300e61cc9e 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderProcessor.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderProcessor.kt
@@ -382,7 +382,9 @@ internal class IndexedGetLoopHeader(
         with(builder) {
             // loopVariable = objectVariable[inductionVariable]
             val indexedGetFun = with(headerInfo.expressionHandler) { headerInfo.objectVariable.type.getFunction }
-            val get = irCall(indexedGetFun.symbol).apply {
+            // Making sure that expression type has type of the variable when it exists.
+            // Return type of get function can be a type parameter (for example Array<T>::get) which is not a subtype of loopVariable type.
+            val get = irCall(indexedGetFun.symbol, type = loopVariable?.type ?: indexedGetFun.returnType).apply {
                 dispatchReceiver = irGet(headerInfo.objectVariable)
                 putValueArgument(0, irGet(inductionVariable))
             }
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/handlers/IndicesHandlers.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/handlers/IndicesHandlers.kt
index fa010712af7..b41176e868b 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/handlers/IndicesHandlers.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/handlers/IndicesHandlers.kt
@@ -26,9 +26,8 @@ internal abstract class IndicesHandler(protected val context: CommonBackendConte
     override fun build(expression: IrCall, data: ProgressionType, scopeOwner: IrSymbol): HeaderInfo? =
         with(context.createIrBuilder(scopeOwner, expression.startOffset, expression.endOffset)) {
             // `last = array.size - 1` (last is inclusive) for the loop `for (i in array.indices)`.
-            val receiver = expression.extensionReceiver!!
-            val last = irCall(receiver.type.sizePropertyGetter).apply {
-                dispatchReceiver = receiver
+            val last = irCall(expression.symbol.owner.extensionReceiverParameter!!.type.sizePropertyGetter).apply {
+                dispatchReceiver = expression.extensionReceiver!!
             }.decrement()
 
             ProgressionHeaderInfo(
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrTypeUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrTypeUtils.kt
index 7a2a75d9ebc..94958d2ccbf 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrTypeUtils.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrTypeUtils.kt
@@ -80,7 +80,7 @@ fun IrType.substitute(params: List<IrTypeParameter>, arguments: List<IrType>): I
     substitute(params.map { it.symbol }.zip(arguments).toMap())
 
 fun IrType.substitute(substitutionMap: Map<IrTypeParameterSymbol, IrType>): IrType {
-    if (this !is IrSimpleType) return this
+    if (this !is IrSimpleType || substitutionMap.isEmpty()) return this
 
     val newAnnotations = annotations.map { it.deepCopyWithSymbols() }
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/Dce.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/Dce.kt
index 296c4c85a3c..7b4e4906b2d 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/Dce.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/Dce.kt
@@ -284,7 +284,7 @@ fun usefulDeclarations(roots: Iterable<IrDeclaration>, context: JsIrBackendConte
 
                     when (expression.symbol) {
                         context.intrinsics.jsBoxIntrinsic -> {
-                            val inlineClass = expression.getTypeArgument(0)!!.getInlinedClass()!!
+                            val inlineClass = context.inlineClassesUtils.getInlinedClass(expression.getTypeArgument(0)!!)!!
                             val constructor = inlineClass.declarations.filterIsInstance<IrConstructor>().single { it.isPrimary }
                             constructor.enqueue("intrinsic: jsBoxIntrinsic")
                         }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsCommonBackendContext.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsCommonBackendContext.kt
index 22b3ca58aec..8ce110f8881 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsCommonBackendContext.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsCommonBackendContext.kt
@@ -6,10 +6,35 @@
 package org.jetbrains.kotlin.ir.backend.js
 
 import org.jetbrains.kotlin.backend.common.CommonBackendContext
+import org.jetbrains.kotlin.backend.common.ir.isOverridableOrOverrides
+import org.jetbrains.kotlin.ir.backend.js.utils.isDispatchReceiver
+import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.types.IrType
 
 interface JsCommonBackendContext : CommonBackendContext {
     override val mapping: JsMapping
 
+    val inlineClassesUtils: InlineClassesUtils
+
     val es6mode: Boolean
         get() = false
 }
+
+interface InlineClassesUtils {
+    fun isTypeInlined(type: IrType): Boolean
+
+    fun shouldValueParameterBeBoxed(parameter: IrValueParameter): Boolean {
+        val function = parameter.parent as? IrSimpleFunction ?: return false
+        val klass = function.parent as? IrClass ?: return false
+        if (!isClassInlineLike(klass)) return false
+        return parameter.isDispatchReceiver && function.isOverridableOrOverrides
+    }
+
+    fun getInlinedClass(type: IrType): IrClass?
+
+    fun isClassInlineLike(klass: IrClass): Boolean
+
+    val boxIntrinsic: IrSimpleFunctionSymbol
+    val unboxIntrinsic: IrSimpleFunctionSymbol
+}
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt
index 6dbe2803a91..33e68f4ab6e 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.ir.*
 import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
 import org.jetbrains.kotlin.ir.backend.js.lower.JsInnerClassesSupport
-import org.jetbrains.kotlin.ir.backend.js.utils.OperatorNames
+import org.jetbrains.kotlin.ir.backend.js.utils.*
 import org.jetbrains.kotlin.ir.builders.declarations.addFunction
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
@@ -45,12 +45,6 @@ class JsIrBackendContext(
     override val scriptMode: Boolean = false,
     override val es6mode: Boolean = false
 ) : JsCommonBackendContext {
-    override val transformedFunction
-        get() = error("Use Mapping.inlineClassMemberToStatic instead")
-
-    override val lateinitNullableFields
-        get() = error("Use Mapping.lateInitFieldToNullableField instead")
-
     override val extractedLocalClasses: MutableSet<IrClass> = hashSetOf()
 
     override val builtIns = module.builtIns
@@ -76,9 +70,6 @@ class JsIrBackendContext(
     val declarationLevelJsModules = mutableListOf<IrDeclarationWithName>()
 
     private val internalPackageFragmentDescriptor = EmptyPackageFragmentDescriptor(builtIns.builtInsModule, FqName("kotlin.js.internal"))
-    val implicitDeclarationFile = run {
-        syntheticFile("implicitDeclarations", irModuleFragment)
-    }
 
     private fun syntheticFile(name: String, module: IrModuleFragment): IrFile {
         return IrFileImpl(object : SourceManager.FileEntry {
@@ -122,6 +113,9 @@ class JsIrBackendContext(
         get() = testContainerFuns
 
     override val mapping = JsMapping()
+
+    override val inlineClassesUtils = JsInlineClassesUtils(this)
+
     val innerClassesSupport = JsInnerClassesSupport(mapping, irFactory)
 
     companion object {
@@ -195,6 +189,9 @@ class JsIrBackendContext(
             override val defaultConstructorMarker =
                 symbolTable.referenceClass(context.getJsInternalClass("DefaultConstructorMarker"))
 
+            override val throwISE: IrSimpleFunctionSymbol =
+                symbolTable.referenceSimpleFunction(getFunctions(kotlinPackageFqn.child(Name.identifier("THROW_ISE"))).single())
+
             override val stringBuilder
                 get() = TODO("not implemented")
             override val copyRangeTo: Map<ClassDescriptor, IrSimpleFunctionSymbol>
@@ -225,7 +222,7 @@ class JsIrBackendContext(
         }
 
         override fun unfoldInlineClassType(irType: IrType): IrType? {
-            return irType.getInlinedClass()?.typeWith()
+            return inlineClassesUtils.getInlinedClass(irType)?.typeWith()
         }
 
         override fun shouldGenerateHandlerParameterForDefaultBodyFun() = true
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
index 96b5ac3c756..c76db464522 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
@@ -272,7 +272,6 @@ private val enumClassConstructorBodyLoweringPhase = makeBodyLoweringPhase(
     description = "Transform Enum Class into regular Class"
 )
 
-
 private val enumEntryInstancesLoweringPhase = makeDeclarationTransformerPhase(
     ::EnumEntryInstancesLowering,
     name = "EnumEntryInstancesLowering",
@@ -315,6 +314,12 @@ private val enumUsageLoweringPhase = makeBodyLoweringPhase(
     prerequisite = setOf(enumEntryCreateGetInstancesFunsLoweringPhase)
 )
 
+private val externalEnumUsageLoweringPhase = makeBodyLoweringPhase(
+    ::ExternalEnumUsagesLowering,
+    name = "ExternalEnumUsagesLowering",
+    description = "Replace external enum entry accesses with field accesses"
+)
+
 private val enumEntryRemovalLoweringPhase = makeDeclarationTransformerPhase(
     ::EnumClassRemoveEntriesLowering,
     name = "EnumEntryRemovalLowering",
@@ -536,7 +541,7 @@ private val errorDeclarationLoweringPhase = makeDeclarationTransformerPhase(
 )
 
 private val bridgesConstructionPhase = makeDeclarationTransformerPhase(
-    ::BridgesConstruction,
+    ::JsBridgesConstruction,
     name = "BridgesConstruction",
     description = "Generate bridges",
     prerequisite = setOf(suspendFunctionsLoweringPhase)
@@ -647,6 +652,13 @@ private val objectDeclarationLoweringPhase = makeDeclarationTransformerPhase(
     description = "Create lazy object instance generator functions"
 )
 
+private val invokeStaticInitializersPhase = makeBodyLoweringPhase(
+    ::InvokeStaticInitializersLowering,
+    name = "IntroduceStaticInitializersLowering",
+    description = "Invoke companion object's initializers from companion object in object constructor",
+    prerequisite = setOf(objectDeclarationLoweringPhase)
+)
+
 private val objectUsageLoweringPhase = makeBodyLoweringPhase(
     ::ObjectUsageLowering,
     name = "ObjectUsageLowering",
@@ -706,6 +718,7 @@ val loweringList = listOf<Lowering>(
     enumEntryCreateGetInstancesFunsLoweringPhase,
     enumSyntheticFunsLoweringPhase,
     enumUsageLoweringPhase,
+    externalEnumUsageLoweringPhase,
     enumEntryRemovalLoweringPhase,
     suspendFunctionsLoweringPhase,
     propertyReferenceLoweringPhase,
@@ -742,6 +755,7 @@ val loweringList = listOf<Lowering>(
     blockDecomposerLoweringPhase,
     constLoweringPhase,
     objectDeclarationLoweringPhase,
+    invokeStaticInitializersPhase,
     objectUsageLoweringPhase,
     captureStackTraceInThrowablesPhase,
     callsLoweringPhase,
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/AutoboxingTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/AutoboxingTransformer.kt
index 35836a80d4f..86914f662a9 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/AutoboxingTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/AutoboxingTransformer.kt
@@ -7,18 +7,26 @@ package org.jetbrains.kotlin.ir.backend.js.lower
 
 import org.jetbrains.kotlin.backend.common.BodyLoweringPass
 import org.jetbrains.kotlin.backend.common.lower.AbstractValueUsageTransformer
-import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
+import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
 import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
 import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
-import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
+import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.types.*
-import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.util.isPrimitiveArray
+import org.jetbrains.kotlin.ir.util.patchDeclarationParents
+import org.jetbrains.kotlin.ir.util.render
 
 
 // Copied and adapted from Kotlin/Native
 
-class AutoboxingTransformer(val context: JsIrBackendContext) : AbstractValueUsageTransformer(context.irBuiltIns), BodyLoweringPass {
+abstract class AbstractValueUsageLowering(val context: JsCommonBackendContext) : AbstractValueUsageTransformer(context.irBuiltIns),
+    BodyLoweringPass {
+
+    val icUtils = context.inlineClassesUtils
 
     override fun lower(irBody: IrBody, container: IrDeclaration) {
         // TODO workaround for callable references
@@ -33,36 +41,27 @@ class AutoboxingTransformer(val context: JsIrBackendContext) : AbstractValueUsag
         irBody.patchDeclarationParents(container as? IrDeclarationParent ?: container.parent)
     }
 
-    private tailrec fun IrExpression.isGetUnit(): Boolean =
-        when(this) {
-            is IrContainerExpression ->
-                when (val lastStmt = this.statements.lastOrNull()) {
-                    is IrExpression -> lastStmt.isGetUnit()
-                    else -> false
-                }
 
-            is IrGetObjectValue ->
-                this.symbol == irBuiltIns.unitClass
-
-            else -> false
-        }
+    abstract fun IrExpression.useExpressionAsType(actualType: IrType, expectedType: IrType): IrExpression
 
     override fun IrExpression.useAs(type: IrType): IrExpression {
-
         val actualType = when (this) {
             is IrConstructorCall -> symbol.owner.returnType
             is IrCall -> symbol.owner.realOverrideTarget.returnType
             is IrGetField -> this.symbol.owner.type
 
             is IrTypeOperatorCall -> {
-                assert(operator == IrTypeOperator.REINTERPRET_CAST) { "Only REINTERPRET_CAST expected at this point" }
-                this.typeOperand
+                if (operator == IrTypeOperator.REINTERPRET_CAST) {
+                    this.typeOperand
+                } else {
+                    this.type
+                }
             }
 
             is IrGetValue -> {
                 val value = this.symbol.owner
-                if (value is IrValueParameter && value.isDispatchReceiver) {
-                    irBuiltIns.anyNType
+                if (value is IrValueParameter && icUtils.shouldValueParameterBeBoxed(value)) {
+                    irBuiltIns.anyType
                 } else {
                     this.type
                 }
@@ -71,12 +70,60 @@ class AutoboxingTransformer(val context: JsIrBackendContext) : AbstractValueUsag
             else -> this.type
         }
 
+        return useExpressionAsType(actualType, type)
+    }
+
+
+    private val IrFunctionAccessExpression.target: IrFunction
+        get() = when (this) {
+            is IrConstructorCall -> this.symbol.owner
+            is IrDelegatingConstructorCall -> this.symbol.owner
+            is IrCall -> this.callTarget
+            else -> TODO(this.render())
+        }
+
+    private val IrCall.callTarget: IrFunction
+        get() = symbol.owner.realOverrideTarget
+
+
+    override fun IrExpression.useAsDispatchReceiver(expression: IrFunctionAccessExpression): IrExpression {
+        return if (expression.symbol.owner.dispatchReceiverParameter?.let { icUtils.shouldValueParameterBeBoxed(it) } == true)
+            this.useAs(irBuiltIns.anyType)
+        else
+            this.useAsArgument(expression.target.dispatchReceiverParameter!!)
+    }
+
+    override fun IrExpression.useAsExtensionReceiver(expression: IrFunctionAccessExpression): IrExpression {
+        return this.useAsArgument(expression.target.extensionReceiverParameter!!)
+    }
+
+    override fun IrExpression.useAsValueArgument(
+        expression: IrFunctionAccessExpression,
+        parameter: IrValueParameter
+    ): IrExpression {
+
+        return this.useAsArgument(expression.target.valueParameters[parameter.index])
+    }
+
+
+    override fun IrExpression.useAsVarargElement(expression: IrVararg): IrExpression {
+        return this.useAs(
+            // Do not box primitive inline classes
+            if (icUtils.isTypeInlined(type) && !icUtils.isTypeInlined(expression.type) && !expression.type.isPrimitiveArray())
+                irBuiltIns.anyNType
+            else
+                expression.varargElementType
+        )
+    }
+}
+
+class AutoboxingTransformer(context: JsCommonBackendContext) : AbstractValueUsageLowering(context) {
+    override fun IrExpression.useExpressionAsType(actualType: IrType, expectedType: IrType): IrExpression {
         // // TODO: Default parameters are passed as nulls and they need not to be unboxed. Fix this
+
         if (actualType.makeNotNull().isNothing())
             return this
 
-        val expectedType = type
-
         if (actualType.isUnit() && !expectedType.isUnit()) {
             // Don't materialize Unit if value is known to be proper Unit on runtime
             if (!this.isGetUnit()) {
@@ -85,8 +132,8 @@ class AutoboxingTransformer(val context: JsIrBackendContext) : AbstractValueUsag
             }
         }
 
-        val actualInlinedClass = actualType.getInlinedClass()
-        val expectedInlinedClass = expectedType.getInlinedClass()
+        val actualInlinedClass = icUtils.getInlinedClass(actualType)
+        val expectedInlinedClass = icUtils.getInlinedClass(expectedType)
 
         // Mimicking behaviour of current JS backend
         // TODO: Revisit
@@ -97,8 +144,8 @@ class AutoboxingTransformer(val context: JsIrBackendContext) : AbstractValueUsag
 
         val function = when {
             actualInlinedClass == null && expectedInlinedClass == null -> return this
-            actualInlinedClass != null && expectedInlinedClass == null -> context.intrinsics.jsBoxIntrinsic
-            actualInlinedClass == null && expectedInlinedClass != null -> context.intrinsics.jsUnboxIntrinsic
+            actualInlinedClass != null && expectedInlinedClass == null -> icUtils.boxIntrinsic
+            actualInlinedClass == null && expectedInlinedClass != null -> icUtils.unboxIntrinsic
             else -> return this
         }
 
@@ -113,14 +160,31 @@ class AutoboxingTransformer(val context: JsIrBackendContext) : AbstractValueUsag
         }
     }
 
+    private tailrec fun IrExpression.isGetUnit(): Boolean =
+        when (this) {
+            is IrContainerExpression ->
+                when (val lastStmt = this.statements.lastOrNull()) {
+                    is IrExpression -> lastStmt.isGetUnit()
+                    else -> false
+                }
+
+            is IrGetObjectValue ->
+                this.symbol == irBuiltIns.unitClass
+
+            else -> false
+        }
+
     private fun buildSafeCall(
         arg: IrExpression,
         actualType: IrType,
         resultType: IrType,
         call: (IrExpression) -> IrExpression
     ): IrExpression {
-        if (!actualType.isNullable())
+        // Safe call is only needed if we cast from Nullable type to Nullable type.
+        // Otherwise, null value cannot occur.
+        if (!actualType.isNullable() || !resultType.isNullable())
             return call(arg)
+
         return JsIrBuilder.run {
             // TODO: Set parent of local variables
             val tmp = buildVar(actualType, parent = null, initializer = arg)
@@ -142,55 +206,4 @@ class AutoboxingTransformer(val context: JsIrBackendContext) : AbstractValueUsag
             )
         }
     }
-
-    private val IrFunctionAccessExpression.target: IrFunction
-        get() = when (this) {
-            is IrConstructorCall -> this.symbol.owner
-            is IrDelegatingConstructorCall -> this.symbol.owner
-            is IrCall -> this.callTarget
-            else -> TODO(this.render())
-        }
-
-    private val IrCall.callTarget: IrFunction
-        get() = symbol.owner.realOverrideTarget
-
-
-    override fun IrExpression.useAsDispatchReceiver(expression: IrFunctionAccessExpression): IrExpression {
-        return this.useAsArgument(expression.target.dispatchReceiverParameter!!)
-    }
-
-    override fun IrExpression.useAsExtensionReceiver(expression: IrFunctionAccessExpression): IrExpression {
-        return this.useAsArgument(expression.target.extensionReceiverParameter!!)
-    }
-
-    override fun IrExpression.useAsValueArgument(
-        expression: IrFunctionAccessExpression,
-        parameter: IrValueParameter
-    ): IrExpression {
-
-        return this.useAsArgument(expression.target.valueParameters[parameter.index])
-    }
-
-
-    override fun IrExpression.useAsVarargElement(expression: IrVararg): IrExpression {
-        return this.useAs(
-            // Do not box primitive inline classes
-            if (this.type.isInlined() && !expression.type.isInlined() && !expression.type.isPrimitiveArray())
-                irBuiltIns.anyNType
-            else
-                expression.varargElementType
-        )
-    }
-
-    private val IrValueParameter.isDispatchReceiver: Boolean
-        get() {
-            val parent = this.parent
-            if (parent is IrClass)
-                return true
-            if (parent is IrFunction && parent.dispatchReceiverParameter == this)
-                return true
-            return false
-        }
-
-}
-
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt
index 6a48e8b5cf0..dec10d32c08 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt
@@ -117,10 +117,6 @@ class BlockDecomposerTransformer(
         function = declaration
 
         with(declaration) {
-            val transformedDeclarations = declarations.map { it.transform(statementTransformer, null) as IrDeclaration }
-            declarations.clear()
-            declarations.addAll(transformedDeclarations)
-
             val transformedStatements = mutableListOf<IrStatement>()
             statements.forEach {
                 val transformer = if (it === statements.last()) expressionTransformer else statementTransformer
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BridgesConstruction.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BridgesConstruction.kt
index 67d066d6ab4..dd5a8bd9d08 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BridgesConstruction.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BridgesConstruction.kt
@@ -15,8 +15,8 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
 import org.jetbrains.kotlin.ir.backend.js.JsLoweredDeclarationOrigin
-import org.jetbrains.kotlin.ir.backend.js.utils.functionSignature
 import org.jetbrains.kotlin.ir.backend.js.utils.getJsName
+import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.builders.declarations.buildFun
 import org.jetbrains.kotlin.ir.declarations.*
@@ -45,10 +45,15 @@ import org.jetbrains.kotlin.ir.util.*
 //          }
 //
 @OptIn(ObsoleteDescriptorBasedAPI::class)
-class BridgesConstruction(val context: JsCommonBackendContext) : DeclarationTransformer {
+abstract class BridgesConstruction(val context: JsCommonBackendContext) : DeclarationTransformer {
 
     private val specialBridgeMethods = SpecialBridgeMethods(context)
 
+    abstract fun getFunctionSignature(function: IrSimpleFunction): Any
+
+    // Should dispatch receiver type be casted inside a bridge.
+    open val shouldCastDispatchReceiver: Boolean = false
+
     override fun transformFlat(declaration: IrDeclaration): List<IrDeclaration>? {
         if (declaration !is IrSimpleFunction || declaration.isStaticMethodOfClass || declaration.parent !is IrClass) return null
 
@@ -56,10 +61,6 @@ class BridgesConstruction(val context: JsCommonBackendContext) : DeclarationTran
     }
 
     private fun generateBridges(function: IrSimpleFunction): List<IrDeclaration>? {
-        // equals(Any?), hashCode(), toString() never need bridges
-        if (function.isMethodOfAny())
-            return null
-
         val (specialOverride: IrSimpleFunction?, specialOverrideInfo) =
             specialBridgeMethods.findSpecialWithOverride(function) ?: Pair(null, null)
 
@@ -83,6 +84,11 @@ class BridgesConstruction(val context: JsCommonBackendContext) : DeclarationTran
                 continue
             }
 
+            // Don't build bridges for functions with the same signature.
+            // TODO: This should be caught earlier in bridgesToGenerate
+            if (FunctionAndSignature(to.function.realOverrideTarget) == FunctionAndSignature(from.function.realOverrideTarget))
+                continue
+
             if (from.function.correspondingPropertySymbol != null && from.function.isEffectivelyExternal()) {
                 // TODO: Revisit bridges from external properties
                 continue
@@ -130,8 +136,9 @@ class BridgesConstruction(val context: JsCommonBackendContext) : DeclarationTran
         }.apply {
             parent = function.parent
             copyTypeParametersFrom(bridge)
-            copyReceiverParametersFrom(bridge)
-            valueParameters += bridge.valueParameters.map { p -> p.copyTo(this) }
+            val substitutionMap = makeTypeParameterSubstitutionMap(bridge, this)
+            copyReceiverParametersFrom(bridge, substitutionMap)
+            valueParameters += bridge.valueParameters.map { p -> p.copyTo(this, type = p.type.substitute(substitutionMap)) }
             annotations += bridge.annotations
             overriddenSymbols += delegateTo.overriddenSymbols
             overriddenSymbols += bridge.symbol
@@ -150,7 +157,13 @@ class BridgesConstruction(val context: JsCommonBackendContext) : DeclarationTran
                 }
 
                 val call = irCall(delegateTo.symbol)
-                call.dispatchReceiver = irGet(irFunction.dispatchReceiverParameter!!)
+                val dispatchReceiver = irGet(irFunction.dispatchReceiverParameter!!)
+
+                call.dispatchReceiver = if (shouldCastDispatchReceiver)
+                    irCastIfNeeded(dispatchReceiver, delegateTo.dispatchReceiverParameter!!.type)
+                else
+                    dispatchReceiver
+
                 irFunction.extensionReceiverParameter?.let {
                     call.extensionReceiver = irCastIfNeeded(irGet(it), delegateTo.extensionReceiverParameter!!.type)
                 }
@@ -171,6 +184,25 @@ class BridgesConstruction(val context: JsCommonBackendContext) : DeclarationTran
     // TODO: get rid of Unit check
     private fun IrBlockBodyBuilder.irCastIfNeeded(argument: IrExpression, type: IrType): IrExpression =
         if (argument.type.classifierOrNull == type.classifierOrNull) argument else irAs(argument, type)
+
+    // Wrapper around function that compares and hashCodes it based on signature
+    // Designed to be used as a Signature type parameter in backend.common.bridges
+    inner class FunctionAndSignature(val function: IrSimpleFunction) {
+
+        // TODO: Use type-upper-bound-based signature instead of Strings
+        // Currently strings are used for compatibility with a hack-based name generator
+
+        private val signature = getFunctionSignature(function)
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is BridgesConstruction.FunctionAndSignature) return false
+
+            return signature == other.signature
+        }
+
+        override fun hashCode(): Int = signature.hashCode()
+    }
 }
 
 // Handle for common.bridges
@@ -187,23 +219,5 @@ data class IrBasedFunctionHandle(val function: IrSimpleFunction) : FunctionHandl
         function.overriddenSymbols.map { IrBasedFunctionHandle(it.owner) }
 }
 
-// Wrapper around function that compares and hashCodes it based on signature
-// Designed to be used as a Signature type parameter in backend.common.bridges
-class FunctionAndSignature(val function: IrSimpleFunction) {
-
-    // TODO: Use type-upper-bound-based signature instead of Strings
-    // Currently strings are used for compatibility with a hack-based name generator
-
-    private val signature = functionSignature(function)
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is FunctionAndSignature) return false
-
-        return signature == other.signature
-    }
-
-    override fun hashCode(): Int = signature.hashCode()
-}
 
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt
index bf3c94fe70e..5279d00f6a4 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrSetFieldImpl
 import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.util.patchDeclarationParents
 import org.jetbrains.kotlin.ir.util.transformFlat
 import org.jetbrains.kotlin.name.Name
 
@@ -35,7 +36,7 @@ class CreateScriptFunctionsPhase(val context: CommonBackendContext) : FileLoweri
     private fun lower(irScript: IrScript): List<IrDeclaration> {
         val (startOffset, endOffset) = getFunctionBodyOffsets(irScript)
 
-        val initializeStatements = irScript.declarations
+        val initializeStatements = irScript.statements
             .filterIsInstance<IrProperty>()
             .mapNotNull { it.backingField }
             .filter { it.initializer != null }
@@ -47,7 +48,10 @@ class CreateScriptFunctionsPhase(val context: CommonBackendContext) : FileLoweri
             it.body = it.factory.createBlockBody(
                 startOffset,
                 endOffset,
-                initializeStatements.map { (field, expression) -> createIrSetField(field, expression) }
+                initializeStatements.let {
+                    if (irScript.resultProperty == null || initializeStatements.lastOrNull()?.first?.correspondingPropertySymbol != irScript.resultProperty) it
+                    else it.dropLast(1)
+                }.map { (field, expression) -> createIrSetField(field, expression) }
             )
         }
 
@@ -55,14 +59,25 @@ class CreateScriptFunctionsPhase(val context: CommonBackendContext) : FileLoweri
             it.body = it.factory.createBlockBody(
                 startOffset,
                 endOffset,
-                irScript.statements.prepareForEvaluateScriptFunction(it)
+                irScript.statements.filter { it !is IrDeclaration }
+                    .let {
+                        val lastInitializer = initializeStatements.lastOrNull()
+                        if (lastInitializer == null || irScript.resultProperty == null
+                            || lastInitializer.first.correspondingPropertySymbol != irScript.resultProperty) {
+                            it
+                        } else {
+                            it + lastInitializer.second
+                        }
+                    }.prepareForEvaluateScriptFunction(it)
             )
         }
 
         with(irScript) {
-            declarations += initializeScriptFunction
-            declarations += evaluateScriptFunction
-            statements.clear()
+            statements.removeIf { it !is IrDeclaration }
+            statements += initializeScriptFunction
+            initializeScriptFunction.patchDeclarationParents(this)
+            statements += evaluateScriptFunction
+            evaluateScriptFunction.patchDeclarationParents(this)
             statements += createCall(initializeScriptFunction)
             statements += createCall(evaluateScriptFunction)
         }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6ConstructorLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6ConstructorLowering.kt
index cdcfa1704a2..699a22179e0 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6ConstructorLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6ConstructorLowering.kt
@@ -317,7 +317,7 @@ class ES6ConstructorLowering(val context: JsIrBackendContext) : BodyLoweringPass
             if (superCall.symbol.owner.valueParameters[i].origin === ES6_INIT_BOX_PARAMETER) {
                 result += JsIrBuilder.buildGetValue(boxSymbol!!)
             } else {
-                if (arg.type.getInlinedClass() != null) {
+                if (context.inlineClassesUtils.getInlinedClass(arg.type) != null) {
                     val any = context.irBuiltIns.anyNType
                     result += JsIrBuilder.buildTypeOperator(any, IrTypeOperator.REINTERPRET_CAST, arg, any)
                 } else {
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/EnumClassLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/EnumClassLowering.kt
index 174dc295a2c..ba5e2abb355 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/EnumClassLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/EnumClassLowering.kt
@@ -17,18 +17,14 @@ import org.jetbrains.kotlin.backend.common.lower.parents
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
-import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
 import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
-import org.jetbrains.kotlin.ir.backend.js.utils.toJsArrayLiteral
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.builders.declarations.buildConstructor
 import org.jetbrains.kotlin.ir.builders.declarations.buildField
 import org.jetbrains.kotlin.ir.builders.declarations.buildFun
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
-import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrVarargImpl
-import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.makeNullable
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
@@ -36,7 +32,7 @@ import org.jetbrains.kotlin.ir.visitors.acceptVoid
 import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 import org.jetbrains.kotlin.name.Name
 
-class EnumUsageLowering(val context: JsIrBackendContext) : BodyLoweringPass {
+class EnumUsageLowering(val context: JsCommonBackendContext) : BodyLoweringPass {
     private var IrEnumEntry.getInstanceFun by context.mapping.enumEntryToGetInstanceFun
 
     override fun lower(irBody: IrBody, container: IrDeclaration) {
@@ -44,40 +40,12 @@ class EnumUsageLowering(val context: JsIrBackendContext) : BodyLoweringPass {
             override fun visitGetEnumValue(expression: IrGetEnumValue): IrExpression {
                 val enumEntry = expression.symbol.owner
                 val klass = enumEntry.parent as IrClass
-                return if (klass.isExternal) lowerExternalEnumEntry(enumEntry, klass) else lowerEnumEntry(enumEntry)
+                if (klass.isExternal) return expression
+                return lowerEnumEntry(enumEntry)
             }
         })
     }
 
-    private fun lowerExternalEnumEntry(enumEntry: IrEnumEntry, klass: IrClass) =
-        context.mapping.enumEntryToInstanceField.getOrPut(enumEntry) { createFieldForEntry(enumEntry, klass) }.let {
-            JsIrBuilder.buildGetField(it.symbol, classAsReceiver(klass), null, klass.defaultType)
-        }
-
-    private fun classAsReceiver(irClass: IrClass): IrExpression {
-        val intrinsic = context.intrinsics.jsClass
-        return JsIrBuilder.buildCall(intrinsic, context.irBuiltIns.anyType, listOf(irClass.defaultType))
-    }
-
-    private fun createFieldForEntry(entry: IrEnumEntry, irClass: IrClass): IrField =
-        context.irFactory.buildField {
-            startOffset = entry.startOffset
-            endOffset = entry.endOffset
-            origin = entry.origin
-            name = entry.name
-            type = irClass.defaultType
-            isFinal = false
-            isExternal = true
-            isStatic = true
-        }.also {
-            it.parent = irClass
-
-            // TODO need a way to emerge local declarations from BodyLoweringPass
-            stageController.unrestrictDeclarationListsAccess {
-                irClass.declarations += it
-            }
-        }
-
     private fun lowerEnumEntry(enumEntry: IrEnumEntry) =
         enumEntry.getInstanceFun!!.run { JsIrBuilder.buildCall(symbol) }
 }
@@ -313,7 +281,7 @@ class EnumClassConstructorBodyTransformer(val context: JsCommonBackendContext) :
 private val IrClass.goodEnum: Boolean
     get() = isEnumClass && !isExpect && !isEffectivelyExternal()
 
-class EnumEntryInstancesLowering(val context: JsIrBackendContext) : DeclarationTransformer {
+class EnumEntryInstancesLowering(val context: JsCommonBackendContext) : DeclarationTransformer {
 
     private var IrEnumEntry.correspondingField by context.mapping.enumEntryToCorrespondingField
 
@@ -346,7 +314,7 @@ class EnumEntryInstancesLowering(val context: JsIrBackendContext) : DeclarationT
     }
 }
 
-class EnumEntryInstancesBodyLowering(val context: JsIrBackendContext) : BodyLoweringPass {
+class EnumEntryInstancesBodyLowering(val context: JsCommonBackendContext) : BodyLoweringPass {
 
     private var IrEnumEntry.correspondingField by context.mapping.enumEntryToCorrespondingField
 
@@ -370,7 +338,7 @@ class EnumEntryInstancesBodyLowering(val context: JsIrBackendContext) : BodyLowe
     }
 }
 
-class EnumClassCreateInitializerLowering(val context: JsIrBackendContext) : DeclarationTransformer {
+class EnumClassCreateInitializerLowering(val context: JsCommonBackendContext) : DeclarationTransformer {
 
     private var IrEnumEntry.correspondingField by context.mapping.enumEntryToCorrespondingField
     private var IrClass.initEntryInstancesFun: IrSimpleFunction? by context.mapping.enumClassToInitEntryInstancesFun
@@ -431,7 +399,7 @@ class EnumClassCreateInitializerLowering(val context: JsIrBackendContext) : Decl
         }
 }
 
-class EnumEntryCreateGetInstancesFunsLowering(val context: JsIrBackendContext) : DeclarationTransformer {
+class EnumEntryCreateGetInstancesFunsLowering(val context: JsCommonBackendContext) : DeclarationTransformer {
 
     private var IrEnumEntry.correspondingField by context.mapping.enumEntryToCorrespondingField
     private var IrClass.initEntryInstancesFun: IrSimpleFunction? by context.mapping.enumClassToInitEntryInstancesFun
@@ -477,7 +445,7 @@ class EnumEntryCreateGetInstancesFunsLowering(val context: JsIrBackendContext) :
         }
 }
 
-class EnumSyntheticFunctionsLowering(val context: JsIrBackendContext) : DeclarationTransformer {
+class EnumSyntheticFunctionsLowering(val context: JsCommonBackendContext) : DeclarationTransformer {
 
     private var IrEnumEntry.getInstanceFun by context.mapping.enumEntryToGetInstanceFun
 
@@ -500,7 +468,7 @@ class EnumSyntheticFunctionsLowering(val context: JsIrBackendContext) : Declarat
         return null
     }
 
-    private val throwISESymbol = context.throwISEsymbol
+    private val throwISESymbol = context.ir.symbols.throwISE
 
     private fun createEnumValueOfBody(valueOfFun: IrFunction, irClass: IrClass): IrBlockBody {
         val nameParameter = valueOfFun.valueParameters[0]
@@ -521,26 +489,12 @@ class EnumSyntheticFunctionsLowering(val context: JsIrBackendContext) : Declarat
         }
     }
 
-    private fun List<IrExpression>.toArrayLiteral(arrayType: IrType, elementType: IrType): IrExpression {
-        val irVararg = IrVarargImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, arrayType, elementType, this)
-
-        return IrCallImpl(
-            UNDEFINED_OFFSET, UNDEFINED_OFFSET, arrayType,
-            context.intrinsics.arrayLiteral,
-            typeArgumentsCount = 0,
-            valueArgumentsCount = 1
-        ).apply {
-            putValueArgument(0, irVararg)
-        }
-    }
-
     private fun createEnumValuesBody(valuesFun: IrFunction, irClass: IrClass): IrBlockBody {
-        val backendContext = context
         return context.createIrBuilder(valuesFun.symbol).run {
             irBlockBody {
+                val instances = irClass.enumEntries.map { irCall(it.getInstanceFun!!) }
                 +irReturn(
-                    irClass.enumEntries.map { irCall(it.getInstanceFun!!) }
-                        .toJsArrayLiteral(backendContext, valuesFun.returnType, irClass.defaultType)
+                    IrVarargImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, valuesFun.returnType, irClass.defaultType, instances)
                 )
             }
         }
@@ -551,7 +505,7 @@ private val IrClass.enumEntries: List<IrEnumEntry>
     get() = declarations.filterIsInstance<IrEnumEntry>()
 
 // Should be applied recursively
-class EnumClassRemoveEntriesLowering(val context: JsIrBackendContext) : DeclarationTransformer {
+class EnumClassRemoveEntriesLowering(val context: JsCommonBackendContext) : DeclarationTransformer {
     override fun transformFlat(declaration: IrDeclaration): List<IrDeclaration>? {
         // Remove IrEnumEntry nodes from class declarations. Replace them with corresponding class declarations (if they have them).
         if (declaration is IrEnumEntry && !declaration.isExpect && !declaration.isEffectivelyExternal()) {
@@ -560,4 +514,4 @@ class EnumClassRemoveEntriesLowering(val context: JsIrBackendContext) : Declarat
 
         return null
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ExternalEnumUsagesLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ExternalEnumUsagesLowering.kt
new file mode 100644
index 00000000000..3c0cf4559c9
--- /dev/null
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ExternalEnumUsagesLowering.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.ir.backend.js.lower
+
+import org.jetbrains.kotlin.backend.common.BodyLoweringPass
+import org.jetbrains.kotlin.backend.common.getOrPut
+import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
+import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
+import org.jetbrains.kotlin.ir.builders.declarations.buildField
+import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.expressions.IrBody
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrGetEnumValue
+import org.jetbrains.kotlin.ir.util.defaultType
+import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+
+class ExternalEnumUsagesLowering(val context: JsIrBackendContext) : BodyLoweringPass {
+    override fun lower(irBody: IrBody, container: IrDeclaration) {
+        irBody.transformChildrenVoid(object : IrElementTransformerVoid() {
+            override fun visitGetEnumValue(expression: IrGetEnumValue): IrExpression {
+                val enumEntry = expression.symbol.owner
+                val klass = enumEntry.parent as IrClass
+                return if (klass.isExternal) lowerExternalEnumEntry(enumEntry, klass) else expression
+            }
+        })
+    }
+
+    private fun lowerExternalEnumEntry(enumEntry: IrEnumEntry, klass: IrClass) =
+        context.mapping.enumEntryToInstanceField.getOrPut(enumEntry) { createFieldForEntry(enumEntry, klass) }.let {
+            JsIrBuilder.buildGetField(it.symbol, classAsReceiver(klass), null, klass.defaultType)
+        }
+
+    private fun classAsReceiver(irClass: IrClass): IrExpression {
+        val intrinsic = context.intrinsics.jsClass
+        return JsIrBuilder.buildCall(intrinsic, context.irBuiltIns.anyType, listOf(irClass.defaultType))
+    }
+
+    private fun createFieldForEntry(entry: IrEnumEntry, irClass: IrClass): IrField =
+        context.irFactory.buildField {
+            startOffset = entry.startOffset
+            endOffset = entry.endOffset
+            origin = entry.origin
+            name = entry.name
+            type = irClass.defaultType
+            isFinal = false
+            isExternal = true
+            isStatic = true
+        }.also {
+            it.parent = irClass
+
+            // TODO need a way to emerge local declarations from BodyLoweringPass
+            stageController.unrestrictDeclarationListsAccess {
+                irClass.declarations += it
+            }
+        }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InvokeStaticInitializersLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InvokeStaticInitializersLowering.kt
new file mode 100644
index 00000000000..688a5965729
--- /dev/null
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InvokeStaticInitializersLowering.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.ir.backend.js.lower
+
+import org.jetbrains.kotlin.backend.common.BodyLoweringPass
+import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
+import org.jetbrains.kotlin.ir.declarations.IrConstructor
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+import org.jetbrains.kotlin.ir.expressions.IrBody
+import org.jetbrains.kotlin.ir.expressions.IrStatementContainer
+import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
+import org.jetbrains.kotlin.ir.util.companionObject
+import org.jetbrains.kotlin.ir.util.constructedClass
+import org.jetbrains.kotlin.ir.util.isEffectivelyExternal
+
+class InvokeStaticInitializersLowering(val context: JsIrBackendContext) : BodyLoweringPass {
+    override fun lower(irBody: IrBody, container: IrDeclaration) {
+        if (container !is IrConstructor) return
+
+        val irClass = container.constructedClass
+        if (irClass.isEffectivelyExternal()) {
+            return
+        }
+
+        val companionObject = irClass.companionObject() ?: return
+
+        val instance = context.mapping.objectToGetInstanceFunction[companionObject] ?: return
+
+        val getInstanceCall = IrCallImpl(irClass.startOffset, irClass.endOffset, context.irBuiltIns.unitType, instance.symbol, 0, 0)
+
+        (irBody as IrStatementContainer).statements.add(0, getInstanceCall)
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsBridgesConstruction.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsBridgesConstruction.kt
new file mode 100644
index 00000000000..1a59c7aeb7a
--- /dev/null
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsBridgesConstruction.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.ir.backend.js.lower
+
+import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
+import org.jetbrains.kotlin.ir.backend.js.utils.Signature
+import org.jetbrains.kotlin.ir.backend.js.utils.jsFunctionSignature
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+
+class JsBridgesConstruction(context: JsCommonBackendContext) : BridgesConstruction(context) {
+    override fun getFunctionSignature(function: IrSimpleFunction): Signature =
+        jsFunctionSignature(function)
+}
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsInnerClassesSupport.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsInnerClassesSupport.kt
index 36cb6555d26..245decfe249 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsInnerClassesSupport.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsInnerClassesSupport.kt
@@ -70,7 +70,6 @@ class JsInnerClassesSupport(mapping: JsMapping, private val irFactory: IrFactory
         return originalInnerClassPrimaryConstructorByClass[innerClass]
     }
 
-    @OptIn(ObsoleteDescriptorBasedAPI::class)
     private fun createInnerClassConstructorWithOuterThisParameter(oldConstructor: IrConstructor): IrConstructor {
         val irClass = oldConstructor.parent as IrClass
         val outerThisType = (irClass.parent as IrClass).defaultType
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ScriptRemoveReceiverLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ScriptRemoveReceiverLowering.kt
index 994000f5eb0..87cadb725da 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ScriptRemoveReceiverLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ScriptRemoveReceiverLowering.kt
@@ -152,7 +152,7 @@ class ScriptRemoveReceiverLowering(val context: CommonBackendContext) : FileLowe
 
         script.transformChildrenVoid(transformer)
 
-        script.declarations.forEach {
+        script.statements.forEach {
             when (it) {
                 is IrSimpleFunction -> it.dispatchReceiverParameter = null
                 is IrProperty -> {
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/StaticMembersLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/StaticMembersLowering.kt
index 856a6f68070..6d2cb831373 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/StaticMembersLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/StaticMembersLowering.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.ir.backend.js.lower
 
 import org.jetbrains.kotlin.backend.common.DeclarationTransformer
+import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
 import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
 import org.jetbrains.kotlin.ir.backend.js.export.isExported
 import org.jetbrains.kotlin.ir.declarations.*
@@ -13,7 +14,7 @@ import org.jetbrains.kotlin.ir.util.file
 import org.jetbrains.kotlin.ir.util.isEffectivelyExternal
 
 // Move static member declarations from classes to top level
-class StaticMembersLowering(val context: JsIrBackendContext) : DeclarationTransformer {
+class StaticMembersLowering(val context: JsCommonBackendContext) : DeclarationTransformer {
     override fun transformFlat(declaration: IrDeclaration): List<IrDeclaration>? {
         (declaration.parent as? IrClass)?.let { irClass ->
             val isStatic = when (declaration) {
@@ -26,11 +27,22 @@ class StaticMembersLowering(val context: JsIrBackendContext) : DeclarationTransf
             if (isStatic) {
                 // JsExport might be inherited from parent declaration which would be broken if we move it out of its parent.
                 // Marking declaration as exported explicitly.
-                if (declaration.isExported(context)) {
+                if (context is JsIrBackendContext && declaration.isExported(context)) {
                     context.additionalExportedDeclarations.add(declaration)
                 }
+                var extractedUnder = declaration
+                var newContainer = declaration.parent
+                while (newContainer is IrDeclaration && newContainer != irClass.file) {
+                    extractedUnder = newContainer
+                    newContainer = newContainer.parent
+                }
+                val insertBefore = irClass.file.declarations.indexOf(extractedUnder)
+                if (insertBefore >= 0) {
+                    irClass.file.declarations.add(insertBefore, declaration)
+                } else {
+                    irClass.file.declarations += declaration
+                }
                 declaration.parent = irClass.file
-                irClass.file.declarations += declaration
                 return listOf()
             }
         }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/TypeOperatorLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/TypeOperatorLowering.kt
index 27dc438b52d..6d4a87f077f 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/TypeOperatorLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/TypeOperatorLowering.kt
@@ -63,6 +63,8 @@ class TypeOperatorLowering(val context: JsIrBackendContext) : BodyLoweringPass {
     private val litFalse: IrExpression get() = JsIrBuilder.buildBoolean(context.irBuiltIns.booleanType, false)
     private val litNull: IrExpression get() = JsIrBuilder.buildNull(context.irBuiltIns.nothingNType)
 
+    private val icUtils = context.inlineClassesUtils
+
     override fun lower(irBody: IrBody, container: IrDeclaration) {
         irBody.transformChildren(object : IrElementTransformer<IrDeclarationParent> {
             override fun visitDeclaration(declaration: IrDeclarationBase, data: IrDeclarationParent) =
@@ -101,7 +103,7 @@ class TypeOperatorLowering(val context: JsIrBackendContext) : BodyLoweringPass {
             }
 
             private fun needBoxingOrUnboxing(fromType: IrType, toType: IrType): Boolean {
-                return ((fromType.getInlinedClass() != null) xor (toType.getInlinedClass() != null)) || (fromType.isUnit() && !toType.isUnit())
+                return ((icUtils.getInlinedClass(fromType) != null) xor (icUtils.getInlinedClass(toType) != null)) || (fromType.isUnit() && !toType.isUnit())
             }
 
             private fun IrTypeOperatorCall.wrapWithUnsafeCast(arg: IrExpression): IrExpression {
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/VarargLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/VarargLowering.kt
index 7afd3f27f1e..f8018f17c9b 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/VarargLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/VarargLowering.kt
@@ -31,6 +31,8 @@ private class VarargTransformer(
     val context: JsIrBackendContext
 ) : IrElementTransformerVoid() {
 
+    fun IrType.getInlinedClass() = context.inlineClassesUtils.getInlinedClass(this)
+
     @OptIn(ObsoleteDescriptorBasedAPI::class)
     private fun List<IrExpression>.toArrayLiteral(type: IrType, varargElementType: IrType): IrExpression {
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/JsonIntrinsics.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/JsonIntrinsics.kt
index 0147d72a3c0..cc311dd64e4 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/JsonIntrinsics.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/JsonIntrinsics.kt
@@ -6,18 +6,14 @@
 package org.jetbrains.kotlin.ir.backend.js.lower.calls
 
 import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
-import org.jetbrains.kotlin.ir.expressions.IrDynamicOperator
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
-import org.jetbrains.kotlin.ir.expressions.impl.IrDynamicOperatorExpressionImpl
 import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
 import org.jetbrains.kotlin.name.FqName
 
-
 // TODO use nativeX annotations on kotlin.js.Json instead
 class JsonIntrinsics(context: JsIrBackendContext) : NativeGetterSetterTransformer(context) {
-
-    override fun transformFunctionAccess(call: IrFunctionAccessExpression, skip: Boolean): IrExpression {
+    override fun transformFunctionAccess(call: IrFunctionAccessExpression, doNotIntrinsify: Boolean): IrExpression {
         return when (call.symbol.owner.fqNameWhenAvailable) {
             FqName("kotlin.js.Json.get") -> call.transformToIndexedRead()
             FqName("kotlin.js.Json.set") -> call.transformToIndexedWrite()
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/JsSuspendFunctionsLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/JsSuspendFunctionsLowering.kt
index d02a3bfe911..20b8c77661c 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/JsSuspendFunctionsLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/JsSuspendFunctionsLowering.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
 import org.jetbrains.kotlin.ir.symbols.IrVariableSymbol
 import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.isUnit
 import org.jetbrains.kotlin.ir.util.explicitParameters
 import org.jetbrains.kotlin.ir.util.patchDeclarationParents
 import org.jetbrains.kotlin.ir.visitors.*
@@ -225,6 +226,13 @@ class JsSuspendFunctionsLowering(ctx: JsIrBackendContext) : AbstractSuspendFunct
         return result
     }
 
+    private fun needUnboxingOrUnit(fromType: IrType, toType: IrType): Boolean {
+        val icUtils = context.inlineClassesUtils
+
+        return (icUtils.getInlinedClass(fromType) == null && icUtils.getInlinedClass(toType) != null) ||
+                (fromType.isUnit() && !toType.isUnit())
+    }
+
     override fun IrBuilderWithScope.generateDelegatedCall(expectedType: IrType, delegatingCall: IrExpression): IrExpression {
         val fromType = (delegatingCall as? IrCall)?.symbol?.owner?.returnType ?: delegatingCall.type
         if (!needUnboxingOrUnit(fromType, expectedType)) return delegatingCall
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/StateMachineBuilder.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/StateMachineBuilder.kt
index 59a7b6d25bd..2f550983b31 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/StateMachineBuilder.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/StateMachineBuilder.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.ir.backend.js.lower.coroutines
 
-import org.jetbrains.kotlin.backend.common.CommonBackendContext
 import org.jetbrains.kotlin.backend.common.ir.isElseBranch
 import org.jetbrains.kotlin.backend.common.ir.isSuspend
 import org.jetbrains.kotlin.backend.common.peek
@@ -14,6 +13,7 @@ import org.jetbrains.kotlin.backend.common.push
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
 import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
 import org.jetbrains.kotlin.ir.backend.js.utils.isPure
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.isNothing
 import org.jetbrains.kotlin.ir.types.isUnit
 import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols
-import org.jetbrains.kotlin.ir.util.getInlinedClass
 import org.jetbrains.kotlin.ir.visitors.*
 
 class SuspendState(type: IrType) {
@@ -69,7 +68,7 @@ class DispatchPointTransformer(val action: (SuspendState) -> IrExpression) : IrE
 
 class StateMachineBuilder(
     private val suspendableNodes: MutableSet<IrElement>,
-    val context: CommonBackendContext,
+    val context: JsCommonBackendContext,
     val function: IrFunctionSymbol,
     private val rootLoop: IrLoop,
     private val exceptionSymbolGetter: IrSimpleFunction,
@@ -279,7 +278,7 @@ class StateMachineBuilder(
         if (expression.isSuspend) {
             val result = lastExpression()
             val expectedType = expression.symbol.owner.returnType
-            val isInlineClassExpected = expectedType.getInlinedClass() != null
+            val isInlineClassExpected = context.inlineClassesUtils.getInlinedClass(expectedType) != null
             val continueState = SuspendState(unit)
             val unboxState = if (isInlineClassExpected) SuspendState(unit) else null
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/SuspendLoweringUtils.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/SuspendLoweringUtils.kt
index 5d9806d720e..10b5c24d95c 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/SuspendLoweringUtils.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/SuspendLoweringUtils.kt
@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.ir.symbols.IrReturnableBlockSymbol
 import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.isUnit
-import org.jetbrains.kotlin.ir.util.getInlinedClass
 import org.jetbrains.kotlin.ir.visitors.*
 
 object COROUTINE_ROOT_LOOP : IrStatementOriginImpl("COROUTINE_ROOT_LOOP")
@@ -106,9 +105,4 @@ class LiveLocalsTransformer(
             JsIrBuilder.buildComposite(declaration.type)
         }
     }
-}
-
-internal fun needUnboxingOrUnit(fromType: IrType, toType: IrType): Boolean {
-    return (fromType.getInlinedClass() == null && toType.getInlinedClass() != null) ||
-            (fromType.isUnit() && !toType.isUnit())
 }
\ No newline at end of file
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt
index 7ba9b9c1803..1bbe466cf31 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt
@@ -52,8 +52,11 @@ class IrDeclarationToJsTransformer : BaseIrElementToJsNodeTransformer<JsStatemen
 
     override fun visitScript(irScript: IrScript, context: JsGenerationContext): JsStatement {
         return JsGlobalBlock().apply {
-            statements += irScript.declarations.map { it.accept(this@IrDeclarationToJsTransformer, context) }
-            statements += irScript.statements.map { it.accept(IrElementToJsStatementTransformer(), context) }
+            irScript.statements.forEach {
+                statements +=
+                    if (it is IrDeclaration) it.accept(this@IrDeclarationToJsTransformer, context)
+                    else it.accept(IrElementToJsStatementTransformer(), context)
+            }
         }
     }
 }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIntrinsicTransformers.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIntrinsicTransformers.kt
index 20b6497b1cd..004be491487 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIntrinsicTransformers.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIntrinsicTransformers.kt
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.types.classifierOrFail
 import org.jetbrains.kotlin.ir.util.getInlineClassBackingField
-import org.jetbrains.kotlin.ir.util.getInlinedClass
 import org.jetbrains.kotlin.ir.util.isEffectivelyExternal
 import org.jetbrains.kotlin.js.backend.ast.*
 
@@ -27,6 +26,7 @@ typealias IrCallTransformer = (IrCall, context: JsGenerationContext) -> JsExpres
 
 class JsIntrinsicTransformers(backendContext: JsIrBackendContext) {
     private val transformers: Map<IrSymbol, IrCallTransformer>
+    val icUtils = backendContext.inlineClassesUtils
 
     init {
         val intrinsics = backendContext.intrinsics
@@ -188,14 +188,14 @@ class JsIntrinsicTransformers(backendContext: JsIrBackendContext) {
 
             add(intrinsics.jsBoxIntrinsic) { call, context ->
                 val arg = translateCallArguments(call, context).single()
-                val inlineClass = call.getTypeArgument(0)!!.getInlinedClass()!!
+                val inlineClass = icUtils.getInlinedClass(call.getTypeArgument(0)!!)!!
                 val constructor = inlineClass.declarations.filterIsInstance<IrConstructor>().single { it.isPrimary }
                 JsNew(context.getNameForConstructor(constructor).makeRef(), listOf(arg))
             }
 
             add(intrinsics.jsUnboxIntrinsic) { call, context ->
                 val arg = translateCallArguments(call, context).single()
-                val inlineClass = call.getTypeArgument(1)!!.getInlinedClass()!!
+                val inlineClass = icUtils.getInlinedClass(call.getTypeArgument(1)!!)!!
                 val field = getInlineClassBackingField(inlineClass)
                 val fieldName = context.getNameForField(field)
                 JsNameRef(fieldName, arg)
@@ -235,7 +235,7 @@ class JsIntrinsicTransformers(backendContext: JsIrBackendContext) {
                 val value = args[1]
                 jsAssignment(JsNameRef(Namer.SHARED_BOX_V, box), value)
             }
-            add(intrinsics.jsUndefined) { call: IrCall, context: JsGenerationContext ->
+            add(intrinsics.jsUndefined) { _, _ ->
                 JsPrefixOperation(JsUnaryOperator.VOID, JsIntLiteral(1))
             }
         }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrTypeUtils.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrTypeUtils.kt
index f980575bfb4..04dab5665ce 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrTypeUtils.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrTypeUtils.kt
@@ -5,11 +5,14 @@
 
 package org.jetbrains.kotlin.ir.backend.js.utils
 
+import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
+import org.jetbrains.kotlin.ir.symbols.IrScriptSymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
+import org.jetbrains.kotlin.ir.util.getInlineClassUnderlyingType
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
 
@@ -38,3 +41,40 @@ private fun IrClassifierSymbol.asString() = when (this) {
     is IrClassSymbol -> this.owner.fqNameWhenAvailable!!.asString()
     else -> error("Unexpected kind of IrClassifierSymbol: " + javaClass.typeName)
 }
+
+/**
+ * Returns inline class for given class or null of type is not inlined
+ */
+fun IrType.getJsInlinedClass(): IrClass? {
+    if (this is IrSimpleType) {
+        val erased = erase(this) ?: return null
+        if (erased.isInline) {
+            if (this.isMarkedNullable()) {
+                var fieldType: IrType
+                var fieldInlinedClass = erased
+                while (true) {
+                    fieldType = getInlineClassUnderlyingType(fieldInlinedClass)
+                    if (fieldType.isMarkedNullable()) {
+                        return null
+                    }
+
+                    fieldInlinedClass = fieldType.getJsInlinedClass() ?: break
+                }
+            }
+
+            return erased
+        }
+    }
+    return null
+}
+
+tailrec fun erase(type: IrType): IrClass? {
+    val classifier = type.classifierOrFail
+
+    return when (classifier) {
+        is IrClassSymbol -> classifier.owner
+        is IrTypeParameterSymbol -> erase(classifier.owner.superTypes.first())
+        is IrScriptSymbol -> null
+        else -> error(classifier)
+    }
+}
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/JsInlineClassesUtils.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/JsInlineClassesUtils.kt
new file mode 100644
index 00000000000..1fc4b7caa88
--- /dev/null
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/JsInlineClassesUtils.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.ir.backend.js.utils
+
+import org.jetbrains.kotlin.ir.backend.js.InlineClassesUtils
+import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.types.IrSimpleType
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.isMarkedNullable
+import org.jetbrains.kotlin.ir.util.getInlineClassUnderlyingType
+
+class JsInlineClassesUtils(val context: JsIrBackendContext) : InlineClassesUtils {
+    override fun isTypeInlined(type: IrType): Boolean {
+        return getInlinedClass(type) != null
+    }
+
+    override fun getInlinedClass(type: IrType): IrClass? =
+        type.getJsInlinedClass()
+
+    override fun isClassInlineLike(klass: IrClass): Boolean =
+        klass.isInline
+
+    override val boxIntrinsic: IrSimpleFunctionSymbol
+        get() = context.intrinsics.jsBoxIntrinsic
+
+    override val unboxIntrinsic: IrSimpleFunctionSymbol
+        get() = context.intrinsics.jsUnboxIntrinsic
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
index 8d5550bed4f..74f4522f30a 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
@@ -104,7 +104,7 @@ fun fieldSignature(field: IrField): Signature {
     return BackingFieldSignature(field)
 }
 
-fun functionSignature(declaration: IrFunction): Signature {
+fun jsFunctionSignature(declaration: IrFunction): Signature {
     require(!declaration.isStaticMethodOfClass)
     require(declaration.dispatchReceiverParameter != null)
 
@@ -143,7 +143,7 @@ fun functionSignature(declaration: IrFunction): Signature {
     declaration.returnType.let {
         // Return type is only used in signature for inline class and Unit types because
         // they are binary incompatible with supertypes.
-        if (it.isInlined() || it.isUnit()) {
+        if (it.getJsInlinedClass() != null || it.isUnit()) {
             nameBuilder.append("_ret$${it.asString()}")
         }
     }
@@ -186,10 +186,12 @@ class NameTables(
             for (declaration in p.declarations) {
                 generateNamesForTopLevelDecl(declaration)
                 if (declaration is IrScript) {
-                    for (memberDecl in declaration.declarations) {
-                        generateNamesForTopLevelDecl(memberDecl)
-                        if (memberDecl is IrClass) {
-                            classDeclaration += memberDecl
+                    for (memberDecl in declaration.statements) {
+                        if (memberDecl is IrDeclaration) {
+                            generateNamesForTopLevelDecl(memberDecl)
+                            if (memberDecl is IrClass) {
+                                classDeclaration += memberDecl
+                            }
                         }
                     }
                 }
@@ -284,7 +286,7 @@ class NameTables(
     }
 
     private fun generateNameForMemberFunction(declaration: IrSimpleFunction) {
-        when (val signature = functionSignature(declaration)) {
+        when (val signature = jsFunctionSignature(declaration)) {
             is StableNameSignature -> memberNames.declareStableName(signature, signature.name)
             is ParameterTypeBasedSignature -> memberNames.declareFreshName(signature, signature.suggestedName)
         }
@@ -333,7 +335,7 @@ class NameTables(
     }
 
     fun getNameForMemberFunction(function: IrSimpleFunction): String {
-        val signature = functionSignature(function)
+        val signature = jsFunctionSignature(function)
         val name = memberNames.names[signature] ?: mappedNames[mapToKey(signature)]
 
         // TODO Add a compiler flag, which enables this behaviour
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/misc.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/misc.kt
index f38e9748761..3b88272b7ba 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/misc.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/misc.kt
@@ -79,4 +79,14 @@ fun IrExpression?.isPure(anyVariable: Boolean, checkFields: Boolean = true): Boo
     }
 
     return false
-}
\ No newline at end of file
+}
+
+val IrValueDeclaration.isDispatchReceiver: Boolean
+    get() {
+        val parent = this.parent
+        if (parent is IrClass)
+            return true
+        if (parent is IrFunction && parent.dispatchReceiverParameter == this)
+            return true
+        return false
+    }
\ No newline at end of file
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/DeclarationOrigins.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/DeclarationOrigins.kt
index e0fbc650e86..df9079d9a83 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/DeclarationOrigins.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/DeclarationOrigins.kt
@@ -18,7 +18,6 @@ interface JvmLoweredDeclarationOrigin : IrDeclarationOrigin {
     object DEFAULT_IMPLS_BRIDGE_FOR_COMPATIBILITY : IrDeclarationOriginImpl("DEFAULT_IMPLS_BRIDGE_FOR_COMPATIBILITY")
     object DEFAULT_IMPLS_BRIDGE_TO_SYNTHETIC : IrDeclarationOriginImpl("DEFAULT_IMPLS_BRIDGE_TO_SYNTHETIC", isSynthetic = true)
     object DEFAULT_IMPLS_BRIDGE_FOR_COMPATIBILITY_SYNTHETIC : IrDeclarationOriginImpl("DEFAULT_IMPLS_BRIDGE_FOR_COMPATIBILITY_SYNTHETIC", isSynthetic = true)
-    object MULTIFILE_BRIDGE : IrDeclarationOriginImpl("MULTIFILE_BRIDGE")
     object FIELD_FOR_OUTER_THIS : IrDeclarationOriginImpl("FIELD_FOR_OUTER_THIS")
     object LAMBDA_IMPL : IrDeclarationOriginImpl("LAMBDA_IMPL")
     object FUNCTION_REFERENCE_IMPL : IrDeclarationOriginImpl("FUNCTION_REFERENCE_IMPL", isSynthetic = true)
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt
index 31f2605bdf8..712701eabee 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrFunctionReference
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.types.IrType
-import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.SymbolTable
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi2ir.PsiErrorBuilder
@@ -52,27 +51,26 @@ class JvmBackendContext(
     irModuleFragment: IrModuleFragment,
     private val symbolTable: SymbolTable,
     val phaseConfig: PhaseConfig,
-    // If the JVM fqname of a class differs from what is implied by its parent, e.g. if it's a file class
-    // annotated with @JvmPackageName, the correct name is recorded here.
-    val classNameOverride: MutableMap<IrClass, JvmClassName>,
+    val generatorExtensions: JvmGeneratorExtensions,
     val serializerFactory: MetadataSerializerFactory
 ) : CommonBackendContext {
-    override val transformedFunction: MutableMap<IrFunctionSymbol, IrSimpleFunctionSymbol>
-        get() = TODO("not implemented")
+    // If the JVM fqname of a class differs from what is implied by its parent, e.g. if it's a file class
+    // annotated with @JvmPackageName, the correct name is recorded here.
+    val classNameOverride: MutableMap<IrClass, JvmClassName>
+        get() = generatorExtensions.classNameOverride
 
     override val extractedLocalClasses: MutableSet<IrClass> = hashSetOf()
 
     override val irFactory: IrFactory = IrFactoryImpl
 
     override val scriptMode: Boolean = false
-    override val lateinitNullableFields = mutableMapOf<IrField, IrField>()
 
     override val builtIns = state.module.builtIns
     val typeMapper = IrTypeMapper(this)
     val methodSignatureMapper = MethodSignatureMapper(this)
 
     internal val innerClassesSupport = JvmInnerClassesSupport(irFactory)
-    internal val cachedDeclarations = JvmCachedDeclarations(this, methodSignatureMapper, state.languageVersionSettings)
+    internal val cachedDeclarations = JvmCachedDeclarations(this, state.languageVersionSettings)
 
     override val mapping: Mapping = DefaultMapping()
 
@@ -107,6 +105,16 @@ class JvmBackendContext(
     internal val hiddenConstructors = mutableMapOf<IrConstructor, IrConstructor>()
 
     internal val collectionStubComputer = CollectionStubComputer(this)
+
+    private val overridesWithoutStubs = HashMap<IrSimpleFunction, List<IrSimpleFunctionSymbol>>()
+
+    fun recordOverridesWithoutStubs(function: IrSimpleFunction) {
+        overridesWithoutStubs[function] = function.overriddenSymbols.toList()
+    }
+
+    fun getOverridesWithoutStubs(function: IrSimpleFunction): List<IrSimpleFunctionSymbol> =
+        overridesWithoutStubs.getOrElse(function) { function.overriddenSymbols }
+
     internal val bridgeLoweringCache = BridgeLowering.BridgeLoweringCache(this)
     internal val functionsWithSpecialBridges: MutableSet<IrFunction> = HashSet()
 
@@ -120,9 +128,11 @@ class JvmBackendContext(
     val suspendFunctionOriginalToView = mutableMapOf<IrFunction, IrFunction>()
     val fakeContinuation: IrExpression = createFakeContinuation(this)
 
+    val jvmStaticObjectFunctionToStaticFunctionMap = mutableMapOf<IrSimpleFunction, IrSimpleFunction>()
+
     val staticDefaultStubs = mutableMapOf<IrSimpleFunctionSymbol, IrSimpleFunction>()
 
-    val inlineClassReplacements = MemoizedInlineClassReplacements(state.functionsWithInlineClassReturnTypesMangled, irFactory)
+    val inlineClassReplacements = MemoizedInlineClassReplacements(state.functionsWithInlineClassReturnTypesMangled, irFactory, this)
 
     internal fun referenceClass(descriptor: ClassDescriptor): IrClassSymbol =
         symbolTable.lazyWrapper.referenceClass(descriptor)
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt
deleted file mode 100644
index c0c93b6ee15..00000000000
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.jvm
-
-import org.jetbrains.kotlin.backend.common.CodegenUtil
-import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
-import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl
-import org.jetbrains.kotlin.backend.common.ir.BuiltinSymbolsBase
-import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
-import org.jetbrains.kotlin.backend.jvm.codegen.ClassCodegen
-import org.jetbrains.kotlin.backend.jvm.codegen.DescriptorMetadataSerializer
-import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry
-import org.jetbrains.kotlin.backend.jvm.serialization.JvmIdSignatureDescriptor
-import org.jetbrains.kotlin.codegen.state.GenerationState
-import org.jetbrains.kotlin.config.JVMConfigurationKeys
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
-import org.jetbrains.kotlin.descriptors.konan.KlibModuleOrigin
-import org.jetbrains.kotlin.idea.MainFunctionDetector
-import org.jetbrains.kotlin.ir.backend.jvm.serialization.EmptyLoggingContext
-import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmIrLinker
-import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmManglerDesc
-import org.jetbrains.kotlin.ir.builders.TranslationPluginContext
-import org.jetbrains.kotlin.ir.declarations.IrClass
-import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
-import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
-import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.descriptors.IrFunctionFactory
-import org.jetbrains.kotlin.ir.linkage.IrProvider
-import org.jetbrains.kotlin.ir.types.defaultType
-import org.jetbrains.kotlin.ir.util.*
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
-import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
-import org.jetbrains.kotlin.psi2ir.PsiSourceManager
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.CleanableBindingContext
-
-object JvmBackendFacade {
-    fun doGenerateFiles(files: Collection<KtFile>, state: GenerationState, phaseConfig: PhaseConfig) {
-        val extensions = JvmGeneratorExtensions()
-        val mangler = JvmManglerDesc(MainFunctionDetector(state.bindingContext, state.languageVersionSettings))
-        val psi2ir = Psi2IrTranslator(state.languageVersionSettings, Psi2IrConfiguration())
-        val symbolTable = SymbolTable(JvmIdSignatureDescriptor(mangler), IrFactoryImpl, JvmNameProvider)
-        val psi2irContext = psi2ir.createGeneratorContext(state.module, state.bindingContext, symbolTable, extensions)
-        val pluginExtensions = IrGenerationExtension.getInstances(state.project)
-        val functionFactory = IrFunctionFactory(psi2irContext.irBuiltIns, symbolTable)
-        psi2irContext.irBuiltIns.functionFactory = functionFactory
-
-        val stubGenerator = DeclarationStubGenerator(
-            psi2irContext.moduleDescriptor, symbolTable, psi2irContext.irBuiltIns.languageVersionSettings, extensions
-        )
-        val frontEndContext = object : TranslationPluginContext {
-            override val moduleDescriptor: ModuleDescriptor
-                get() = psi2irContext.moduleDescriptor
-            override val bindingContext: BindingContext
-                get() = psi2irContext.bindingContext
-            override val symbolTable: ReferenceSymbolTable
-                get() = symbolTable
-            override val typeTranslator: TypeTranslator
-                get() = psi2irContext.typeTranslator
-            override val irBuiltIns: IrBuiltIns
-                get() = psi2irContext.irBuiltIns
-        }
-        val irLinker = JvmIrLinker(
-            psi2irContext.moduleDescriptor,
-            EmptyLoggingContext,
-            psi2irContext.irBuiltIns,
-            symbolTable,
-            functionFactory,
-            frontEndContext,
-            stubGenerator,
-            mangler
-        )
-
-        val pluginContext by lazy {
-            psi2irContext.run {
-                val symbols = BuiltinSymbolsBase(irBuiltIns, moduleDescriptor.builtIns, symbolTable.lazyWrapper)
-                IrPluginContextImpl(
-                    moduleDescriptor, bindingContext, languageVersionSettings, symbolTable, typeTranslator, irBuiltIns, irLinker, symbols
-                )
-            }
-        }
-
-        for (extension in pluginExtensions) {
-            psi2ir.addPostprocessingStep { module ->
-                val old = stubGenerator.unboundSymbolGeneration
-                try {
-                    stubGenerator.unboundSymbolGeneration = true
-                    extension.generate(module, pluginContext)
-                } finally {
-                    stubGenerator.unboundSymbolGeneration = old
-                }
-            }
-        }
-
-        val dependencies = psi2irContext.moduleDescriptor.allDependencyModules.map {
-            val kotlinLibrary = (it.getCapability(KlibModuleOrigin.CAPABILITY) as? DeserializedKlibModuleOrigin)?.library
-            irLinker.deserializeIrModuleHeader(it, kotlinLibrary)
-        }
-        val irProviders = listOf(irLinker)
-
-        val irModuleFragment = psi2ir.generateModuleFragment(psi2irContext, files, irProviders, pluginExtensions, expectDescriptorToSymbol = null)
-        irLinker.postProcess()
-
-        stubGenerator.unboundSymbolGeneration = true
-
-        // We need to compile all files we reference in Klibs
-        irModuleFragment.files.addAll(dependencies.flatMap { it.files })
-
-        if (!state.configuration.getBoolean(JVMConfigurationKeys.DO_NOT_CLEAR_BINDING_CONTEXT)) {
-            val originalBindingContext = state.originalFrontendBindingContext as? CleanableBindingContext
-                ?: error("BindingContext should be cleanable in JVM IR to avoid leaking memory: ${state.originalFrontendBindingContext}")
-            originalBindingContext.clear()
-        }
-
-        doGenerateFilesInternal(
-            state, irModuleFragment, psi2irContext.symbolTable, psi2irContext.sourceManager, phaseConfig,
-            irProviders, extensions, ::DescriptorMetadataSerializer
-        )
-    }
-
-    internal fun doGenerateFilesInternal(
-        state: GenerationState,
-        irModuleFragment: IrModuleFragment,
-        symbolTable: SymbolTable,
-        sourceManager: PsiSourceManager,
-        phaseConfig: PhaseConfig,
-        irProviders: List<IrProvider>,
-        extensions: JvmGeneratorExtensions,
-        serializerFactory: MetadataSerializerFactory,
-    ) {
-        val context = JvmBackendContext(
-            state, sourceManager, irModuleFragment.irBuiltins, irModuleFragment,
-            symbolTable, phaseConfig, extensions.classNameOverride, serializerFactory
-        )
-        /* JvmBackendContext creates new unbound symbols, have to resolve them. */
-        ExternalDependenciesGenerator(symbolTable, irProviders, state.languageVersionSettings).generateUnboundSymbolsAsDependencies()
-
-        state.mapInlineClass = { descriptor ->
-            context.typeMapper.mapType(context.referenceClass(descriptor).defaultType)
-        }
-
-        JvmLower(context).lower(irModuleFragment)
-
-        for (generateMultifileFacade in listOf(true, false)) {
-            for (irFile in irModuleFragment.files) {
-                // Generate multifile facades first, to compute and store JVM signatures of const properties which are later used
-                // when serializing metadata in the multifile parts.
-                // TODO: consider dividing codegen itself into separate phases (bytecode generation, metadata serialization) to avoid this
-                val isMultifileFacade = irFile.fileEntry is MultifileFacadeFileEntry
-                if (isMultifileFacade != generateMultifileFacade) continue
-
-                try {
-                    for (loweredClass in irFile.declarations) {
-                        if (loweredClass !is IrClass) {
-                            throw AssertionError("File-level declaration should be IrClass after JvmLower, got: " + loweredClass.render())
-                        }
-                        ClassCodegen.getOrCreate(loweredClass, context).generate()
-                    }
-                } catch (e: Throwable) {
-                    CodegenUtil.reportBackendException(e, "code generation", irFile.fileEntry.name)
-                }
-            }
-        }
-        // TODO: split classes into groups connected by inline calls; call this after every group
-        //       and clear `JvmBackendContext.classCodegens`
-        state.afterIndependentPart()
-    }
-}
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt
index 49da18d87ad..8c9a7ec941b 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt
@@ -8,10 +8,9 @@ package org.jetbrains.kotlin.backend.jvm
 import org.jetbrains.kotlin.backend.common.ir.copyParameterDeclarationsFrom
 import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
 import org.jetbrains.kotlin.backend.common.ir.createStaticFunctionWithReceivers
-import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
-import org.jetbrains.kotlin.backend.jvm.codegen.MethodSignatureMapper
 import org.jetbrains.kotlin.backend.jvm.codegen.isJvmInterface
 import org.jetbrains.kotlin.backend.jvm.ir.copyCorrespondingPropertyFrom
+import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder
 import org.jetbrains.kotlin.backend.jvm.ir.replaceThisByStaticReference
 import org.jetbrains.kotlin.builtins.CompanionObjectMapping
 import org.jetbrains.kotlin.builtins.isMappedIntrinsicCompanionObjectClassId
@@ -34,7 +33,6 @@ import org.jetbrains.kotlin.resolve.deprecation.DeprecationResolver
 
 class JvmCachedDeclarations(
     private val context: JvmBackendContext,
-    private val methodSignatureMapper: MethodSignatureMapper,
     private val languageVersionSettings: LanguageVersionSettings
 ) {
     private val singletonFieldDeclarations = HashMap<IrSymbolOwner, IrField>()
@@ -122,11 +120,21 @@ class JvmCachedDeclarations(
                 // It is an error to annotate only some of the fields of an interface companion with
                 // @JvmField, so checking the current field only should be enough.
                 val hasJvmField = oldField.hasAnnotation(JvmAbi.JVM_FIELD_ANNOTATION_FQ_NAME)
-                parent = if (oldParent.isCompanion && (!oldParent.parentAsClass.isJvmInterface || hasJvmField))
-                    oldParent.parentAsClass
-                else
-                    oldParent
-                annotations += oldField.annotations
+                if (oldParent.isCompanion && (!oldParent.parentAsClass.isJvmInterface || hasJvmField)) {
+                    parent = oldParent.parentAsClass
+                    annotations = if (DescriptorVisibilities.isPrivate(oldParent.visibility)) {
+                        context.createJvmIrBuilder(this.symbol).run {
+                            filterOutAnnotations(
+                                DeprecationResolver.JAVA_DEPRECATED,
+                                oldField.annotations
+                            ) + irCall(irSymbols.javaLangDeprecatedConstructorWithDeprecatedFlag)
+                        }
+                    } else oldField.annotations
+                } else {
+                    parent = oldParent
+                    annotations = oldField.annotations
+                }
+
                 initializer = oldField.initializer
                     ?.replaceThisByStaticReference(this@JvmCachedDeclarations, oldParent, oldParent.thisReceiver!!)
                     ?.patchDeclarationParents(this) as IrExpressionBody?
@@ -142,9 +150,8 @@ class JvmCachedDeclarations(
         return defaultImplsMethods.getOrPut(interfaceFun) {
             val defaultImpls = getDefaultImplsClass(interfaceFun.parentAsClass)
 
-            val name = Name.identifier(methodSignatureMapper.mapFunctionName(interfaceFun))
             context.irFactory.createStaticFunctionWithReceivers(
-                defaultImpls, name, interfaceFun,
+                defaultImpls, interfaceFun.name, interfaceFun,
                 dispatchReceiverType = parent.defaultType,
                 // If `interfaceFun` is not a real implementation, then we're generating stubs in a descendant
                 // interface's DefaultImpls. For example,
@@ -179,11 +186,12 @@ class JvmCachedDeclarations(
                 isFakeOverride = false,
                 typeParametersFromContext = parent.typeParameters
             ).also {
+                it.copyCorrespondingPropertyFrom(interfaceFun)
                 if (it.origin == JvmLoweredDeclarationOrigin.DEFAULT_IMPLS_BRIDGE_FOR_COMPATIBILITY &&
                     !it.annotations.hasAnnotation(DeprecationResolver.JAVA_DEPRECATED)
                 ) {
-                    this@JvmCachedDeclarations.context.createIrBuilder(it.symbol).run {
-                        it.annotations += irCall(this@JvmCachedDeclarations.context.ir.symbols.javaLangDeprecatedConstructor)
+                    context.createJvmIrBuilder(it.symbol).run {
+                        it.annotations += irCall(irSymbols.javaLangDeprecatedConstructorWithDeprecatedFlag)
                     }
                 }
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt
index 9402c6867ee..a2efe1faecf 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt
@@ -65,11 +65,10 @@ class JvmGeneratorExtensions(private val generateFacades: Boolean = true) : Gene
             IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB
 
     override fun generateFacadeClass(irFactory: IrFactory, source: DeserializedContainerSource): IrClass? {
-        if (!generateFacades) return null
-        val jvmPackagePartSource = source as? JvmPackagePartSource ?: return null
-        val facadeName = jvmPackagePartSource.facadeClassName ?: jvmPackagePartSource.className
+        if (!generateFacades || source !is JvmPackagePartSource) return null
+        val facadeName = source.facadeClassName ?: source.className
         return irFactory.buildClass {
-            origin = IrDeclarationOrigin.FILE_CLASS
+            origin = if (source.facadeClassName != null) IrDeclarationOrigin.JVM_MULTIFILE_CLASS else IrDeclarationOrigin.FILE_CLASS
             name = facadeName.fqNameForTopLevelClassMaybeWithDollars.shortName()
         }.also {
             it.createParameterDeclarations()
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt
index 5e536293cca..ce9cea31c30 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt
@@ -1,40 +1,175 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.backend.jvm
 
+import org.jetbrains.kotlin.backend.common.CodegenUtil
+import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
+import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl
+import org.jetbrains.kotlin.backend.common.ir.BuiltinSymbolsBase
 import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
+import org.jetbrains.kotlin.backend.jvm.codegen.ClassCodegen
+import org.jetbrains.kotlin.backend.jvm.codegen.DescriptorMetadataSerializer
+import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry
+import org.jetbrains.kotlin.backend.jvm.serialization.JvmIdSignatureDescriptor
 import org.jetbrains.kotlin.codegen.CodegenFactory
-import org.jetbrains.kotlin.codegen.MultifileClassCodegen
-import org.jetbrains.kotlin.codegen.PackageCodegen
-import org.jetbrains.kotlin.codegen.PackageCodegenImpl
 import org.jetbrains.kotlin.codegen.state.GenerationState
-import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
+import org.jetbrains.kotlin.descriptors.konan.KlibModuleOrigin
+import org.jetbrains.kotlin.idea.MainFunctionDetector
+import org.jetbrains.kotlin.ir.backend.jvm.serialization.EmptyLoggingContext
+import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmIrLinker
+import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmManglerDesc
+import org.jetbrains.kotlin.ir.builders.TranslationPluginContext
+import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
+import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.descriptors.IrFunctionFactory
-import org.jetbrains.kotlin.ir.util.SymbolTable
-import org.jetbrains.kotlin.ir.util.generateTypicalIrProviderList
-import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.ir.linkage.IrProvider
+import org.jetbrains.kotlin.ir.types.defaultType
+import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
+import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
 import org.jetbrains.kotlin.psi2ir.PsiSourceManager
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.CleanableBindingContext
 
 class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory {
-
     override fun generateModule(state: GenerationState, files: Collection<KtFile>) {
-        JvmBackendFacade.doGenerateFiles(files, state, phaseConfig)
+        val extensions = JvmGeneratorExtensions()
+        val mangler = JvmManglerDesc(MainFunctionDetector(state.bindingContext, state.languageVersionSettings))
+        val psi2ir = Psi2IrTranslator(state.languageVersionSettings, Psi2IrConfiguration())
+        val symbolTable = SymbolTable(JvmIdSignatureDescriptor(mangler), IrFactoryImpl, JvmNameProvider)
+        val psi2irContext = psi2ir.createGeneratorContext(state.module, state.bindingContext, symbolTable, extensions)
+        val pluginExtensions = IrGenerationExtension.getInstances(state.project)
+        val functionFactory = IrFunctionFactory(psi2irContext.irBuiltIns, symbolTable)
+        psi2irContext.irBuiltIns.functionFactory = functionFactory
+
+        val stubGenerator = DeclarationStubGenerator(
+            psi2irContext.moduleDescriptor, symbolTable, psi2irContext.irBuiltIns.languageVersionSettings, extensions
+        )
+        val frontEndContext = object : TranslationPluginContext {
+            override val moduleDescriptor: ModuleDescriptor
+                get() = psi2irContext.moduleDescriptor
+            override val bindingContext: BindingContext
+                get() = psi2irContext.bindingContext
+            override val symbolTable: ReferenceSymbolTable
+                get() = symbolTable
+            override val typeTranslator: TypeTranslator
+                get() = psi2irContext.typeTranslator
+            override val irBuiltIns: IrBuiltIns
+                get() = psi2irContext.irBuiltIns
+        }
+        val irLinker = JvmIrLinker(
+            psi2irContext.moduleDescriptor,
+            EmptyLoggingContext,
+            psi2irContext.irBuiltIns,
+            symbolTable,
+            functionFactory,
+            frontEndContext,
+            stubGenerator,
+            mangler
+        )
+
+        val pluginContext by lazy {
+            psi2irContext.run {
+                val symbols = BuiltinSymbolsBase(irBuiltIns, moduleDescriptor.builtIns, symbolTable.lazyWrapper)
+                IrPluginContextImpl(
+                    moduleDescriptor, bindingContext, languageVersionSettings, symbolTable, typeTranslator, irBuiltIns, irLinker, symbols
+                )
+            }
+        }
+
+        for (extension in pluginExtensions) {
+            psi2ir.addPostprocessingStep { module ->
+                val old = stubGenerator.unboundSymbolGeneration
+                try {
+                    stubGenerator.unboundSymbolGeneration = true
+                    extension.generate(module, pluginContext)
+                } finally {
+                    stubGenerator.unboundSymbolGeneration = old
+                }
+            }
+        }
+
+        val dependencies = psi2irContext.moduleDescriptor.allDependencyModules.map {
+            val kotlinLibrary = (it.getCapability(KlibModuleOrigin.CAPABILITY) as? DeserializedKlibModuleOrigin)?.library
+            irLinker.deserializeIrModuleHeader(it, kotlinLibrary)
+        }
+        val irProviders = listOf(irLinker)
+
+        val irModuleFragment = psi2ir.generateModuleFragment(psi2irContext, files, irProviders, pluginExtensions, expectDescriptorToSymbol = null)
+        irLinker.postProcess()
+
+        stubGenerator.unboundSymbolGeneration = true
+
+        // We need to compile all files we reference in Klibs
+        irModuleFragment.files.addAll(dependencies.flatMap { it.files })
+
+        if (!state.configuration.getBoolean(JVMConfigurationKeys.DO_NOT_CLEAR_BINDING_CONTEXT)) {
+            val originalBindingContext = state.originalFrontendBindingContext as? CleanableBindingContext
+                ?: error("BindingContext should be cleanable in JVM IR to avoid leaking memory: ${state.originalFrontendBindingContext}")
+            originalBindingContext.clear()
+        }
+
+        doGenerateFilesInternal(
+            state, irModuleFragment, psi2irContext.symbolTable, psi2irContext.sourceManager, phaseConfig,
+            irProviders, extensions, ::DescriptorMetadataSerializer
+        )
+    }
+
+    internal fun doGenerateFilesInternal(
+        state: GenerationState,
+        irModuleFragment: IrModuleFragment,
+        symbolTable: SymbolTable,
+        sourceManager: PsiSourceManager,
+        phaseConfig: PhaseConfig,
+        irProviders: List<IrProvider>,
+        extensions: JvmGeneratorExtensions,
+        serializerFactory: MetadataSerializerFactory,
+    ) {
+        val context = JvmBackendContext(
+            state, sourceManager, irModuleFragment.irBuiltins, irModuleFragment,
+            symbolTable, phaseConfig, extensions, serializerFactory
+        )
+        /* JvmBackendContext creates new unbound symbols, have to resolve them. */
+        ExternalDependenciesGenerator(symbolTable, irProviders, state.languageVersionSettings).generateUnboundSymbolsAsDependencies()
+
+        state.mapInlineClass = { descriptor ->
+            context.typeMapper.mapType(context.referenceClass(descriptor).defaultType)
+        }
+
+        JvmLower(context).lower(irModuleFragment)
+
+        for (generateMultifileFacade in listOf(true, false)) {
+            for (irFile in irModuleFragment.files) {
+                // Generate multifile facades first, to compute and store JVM signatures of const properties which are later used
+                // when serializing metadata in the multifile parts.
+                // TODO: consider dividing codegen itself into separate phases (bytecode generation, metadata serialization) to avoid this
+                val isMultifileFacade = irFile.fileEntry is MultifileFacadeFileEntry
+                if (isMultifileFacade != generateMultifileFacade) continue
+
+                try {
+                    for (loweredClass in irFile.declarations) {
+                        if (loweredClass !is IrClass) {
+                            throw AssertionError("File-level declaration should be IrClass after JvmLower, got: " + loweredClass.render())
+                        }
+                        ClassCodegen.getOrCreate(loweredClass, context).generate()
+                    }
+                } catch (e: Throwable) {
+                    CodegenUtil.reportBackendException(e, "code generation", irFile.fileEntry.name)
+                }
+            }
+        }
+        // TODO: split classes into groups connected by inline calls; call this after every group
+        //       and clear `JvmBackendContext.classCodegens`
+        state.afterIndependentPart()
     }
 
     fun generateModuleInFrontendIRMode(
@@ -50,26 +185,8 @@ class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory
             irModuleFragment.descriptor, irModuleFragment.irBuiltins, symbolTable, extensions = extensions
         )
 
-        JvmBackendFacade.doGenerateFilesInternal(
+        doGenerateFilesInternal(
             state, irModuleFragment, symbolTable, sourceManager, phaseConfig, irProviders, extensions, serializerFactory
         )
     }
-
-    override fun createPackageCodegen(state: GenerationState, files: Collection<KtFile>, fqName: FqName): PackageCodegen {
-        val impl = PackageCodegenImpl(state, files, fqName)
-
-        return object : PackageCodegen {
-            override fun generate() {
-                JvmBackendFacade.doGenerateFiles(files, state, phaseConfig)
-            }
-
-            override fun getPackageFragment(): PackageFragmentDescriptor {
-                return impl.packageFragment
-            }
-        }
-    }
-
-    override fun createMultifileClassCodegen(state: GenerationState, files: Collection<KtFile>, fqName: FqName): MultifileClassCodegen {
-        TODO()
-    }
 }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt
index a439309d96c..7f0b08e9b79 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt
@@ -389,6 +389,7 @@ val jvmPhases = NamedCompilerPhase(
     lower = validateIrBeforeLowering then
             processOptionalAnnotationsPhase then
             expectDeclarationsRemovingPhase then
+            scriptsToClassesPhase then
             fileClassPhase then
             performByIrFile(lower = jvmFilePhases) then
             generateMultifileFacadesPhase then
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt
index c6cfeb0c1b4..9124cc6d687 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt
@@ -17,8 +17,8 @@ import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAM
 import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_CREATE_METHOD_NAME
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.builders.declarations.*
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
@@ -208,12 +208,13 @@ class JvmSymbols(
             klass.addFunction("desiredAssertionStatus", irBuiltIns.booleanType)
         }
 
-    private val javaLangDeprecated: IrClassSymbol =
-        createClass(FqName("java.lang.Deprecated")) { klass ->
+    private val javaLangDeprecatedWithDeprecatedFlag: IrClassSymbol =
+        createClass(FqName("java.lang.Deprecated"), classKind = ClassKind.ANNOTATION_CLASS) { klass ->
             klass.addConstructor { isPrimary = true }
         }
 
-    val javaLangDeprecatedConstructor = javaLangDeprecated.constructors.single()
+    // This annotations also implies ACC_DEPRECATED flag in generated bytecode
+    val javaLangDeprecatedConstructorWithDeprecatedFlag = javaLangDeprecatedWithDeprecatedFlag.constructors.single()
 
     private val javaLangAssertionError: IrClassSymbol =
         createClass(FqName("java.lang.AssertionError"), classModality = Modality.OPEN) { klass ->
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
index 9a24f4083e0..94096187b51 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry
 import org.jetbrains.kotlin.backend.jvm.lower.buildAssertionsDisabledField
 import org.jetbrains.kotlin.backend.jvm.lower.hasAssertionsDisabledField
-import org.jetbrains.kotlin.builtins.StandardNames
-import org.jetbrains.kotlin.codegen.*
+import org.jetbrains.kotlin.codegen.DescriptorAsmUtil
 import org.jetbrains.kotlin.codegen.inline.*
+import org.jetbrains.kotlin.codegen.writeKotlinMetadata
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.metadata.jvm.serialization.JvmStringTable
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.resolve.jvm.annotations.JVM_SYNTHETIC_ANNOTATION_FQ_NAME
@@ -281,7 +280,7 @@ class ClassCodegen private constructor(
             if (field.origin == IrDeclarationOrigin.PROPERTY_DELEGATE) null
             else context.methodSignatureMapper.mapFieldSignature(field)
         val fieldName = field.name.asString()
-        val flags = field.computeFieldFlags(state.languageVersionSettings)
+        val flags = field.computeFieldFlags(context, state.languageVersionSettings)
         val fv = visitor.newField(
             field.descriptorOrigin, flags, fieldName, fieldType.descriptor,
             fieldSignature, (field.initializer?.expression as? IrConst<*>)?.value
@@ -447,7 +446,8 @@ class ClassCodegen private constructor(
 
 private val IrClass.flags: Int
     get() = origin.flags or getVisibilityAccessFlagForClass() or
-            (if (annotations.hasAnnotation(StandardNames.FqNames.deprecated)) Opcodes.ACC_DEPRECATED else 0) or
+            (if (isAnnotatedWithDeprecated) Opcodes.ACC_DEPRECATED else 0) or
+            (if (hasAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME)) Opcodes.ACC_SYNTHETIC else 0) or
             when {
                 isAnnotationClass -> Opcodes.ACC_ANNOTATION or Opcodes.ACC_INTERFACE or Opcodes.ACC_ABSTRACT
                 isInterface -> Opcodes.ACC_INTERFACE or Opcodes.ACC_ABSTRACT
@@ -455,11 +455,12 @@ private val IrClass.flags: Int
                 else -> Opcodes.ACC_SUPER or modality.flags
             }
 
-private fun IrField.computeFieldFlags(languageVersionSettings: LanguageVersionSettings): Int =
+private fun IrField.computeFieldFlags(context: JvmBackendContext, languageVersionSettings: LanguageVersionSettings): Int =
     origin.flags or visibility.flags or
-            (correspondingPropertySymbol?.owner?.callableDeprecationFlags ?: 0) or
-            (if (shouldHaveSpecialDeprecationFlag()) Opcodes.ACC_DEPRECATED else 0) or
-            (if (annotations.hasAnnotation(KOTLIN_DEPRECATED)) Opcodes.ACC_DEPRECATED else 0) or
+            (if (isDeprecatedCallable ||
+                correspondingPropertySymbol?.owner?.isDeprecatedCallable == true ||
+                shouldHaveSpecialDeprecationFlag(context)
+            ) Opcodes.ACC_DEPRECATED else 0) or
             (if (isFinal) Opcodes.ACC_FINAL else 0) or
             (if (isStatic) Opcodes.ACC_STATIC else 0) or
             (if (hasAnnotation(VOLATILE_ANNOTATION_FQ_NAME)) Opcodes.ACC_VOLATILE else 0) or
@@ -474,12 +475,8 @@ private fun IrField.isPrivateCompanionFieldInInterface(languageVersionSettings:
             parentAsClass.isJvmInterface &&
             DescriptorVisibilities.isPrivate(parentAsClass.companionObject()!!.visibility)
 
-private val JAVA_LANG_DEPRECATED = FqName("java.lang.Deprecated")
-private val KOTLIN_DEPRECATED = FqName("kotlin.Deprecated")
-
-fun IrField.shouldHaveSpecialDeprecationFlag(): Boolean {
-    return origin == IrDeclarationOrigin.FIELD_FOR_OBJECT_INSTANCE &&
-            annotations.hasAnnotation(JAVA_LANG_DEPRECATED)
+fun IrField.shouldHaveSpecialDeprecationFlag(context: JvmBackendContext): Boolean {
+    return annotations.any { it.symbol == context.ir.symbols.javaLangDeprecatedConstructorWithDeprecatedFlag }
 }
 
 private val IrDeclarationOrigin.flags: Int
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
index 11052d390b0..85851b064f8 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.ir.isStaticInlineClassReplacement
 import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.InlineClassAbi
 import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.unboxInlineClass
+import org.jetbrains.kotlin.backend.jvm.lower.isMultifileBridge
 import org.jetbrains.kotlin.backend.jvm.lower.suspendFunctionOriginal
 import org.jetbrains.kotlin.codegen.ClassBuilder
 import org.jetbrains.kotlin.codegen.coroutines.CoroutineTransformerMethodVisitor
@@ -143,7 +144,6 @@ internal fun IrFunction.shouldContainSuspendMarkers(): Boolean = !isInvokeSuspen
         // These are tail-call bridges and do not require any bytecode modifications.
         origin != IrDeclarationOrigin.FUNCTION_FOR_DEFAULT_PARAMETER &&
         origin != JvmLoweredDeclarationOrigin.JVM_OVERLOADS_WRAPPER &&
-        origin != JvmLoweredDeclarationOrigin.MULTIFILE_BRIDGE &&
         origin != JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR &&
         origin != JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR_FOR_HIDDEN_CONSTRUCTOR &&
         origin != JvmLoweredDeclarationOrigin.DEFAULT_IMPLS_BRIDGE &&
@@ -153,6 +153,7 @@ internal fun IrFunction.shouldContainSuspendMarkers(): Boolean = !isInvokeSuspen
         origin != IrDeclarationOrigin.BRIDGE &&
         origin != IrDeclarationOrigin.BRIDGE_SPECIAL &&
         origin != IrDeclarationOrigin.DELEGATED_MEMBER &&
+        !isMultifileBridge() &&
         !isInvokeOfSuspendCallableReference() &&
         !isBridgeToSuspendImplMethod() &&
         !isStaticInlineClassReplacementDelegatingCall()
@@ -199,4 +200,4 @@ internal fun IrFunction.originalReturnTypeOfSuspendFunctionReturningUnboxedInlin
         } != false) return null
     // Don't box other inline classes
     return returnType
-}
\ No newline at end of file
+}
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
index c9ed1bfcc97..d525bb4b723 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
@@ -14,10 +14,11 @@ import org.jetbrains.kotlin.backend.jvm.intrinsics.JavaClassProperty
 import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry
 import org.jetbrains.kotlin.backend.jvm.lower.constantValue
 import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.unboxInlineClass
+import org.jetbrains.kotlin.backend.jvm.lower.isMultifileBridge
 import org.jetbrains.kotlin.backend.jvm.lower.suspendFunctionOriginal
 import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.codegen.AsmUtil.*
-import org.jetbrains.kotlin.codegen.DescriptorAsmUtil.*
+import org.jetbrains.kotlin.codegen.DescriptorAsmUtil.getNameForReceiverParameter
 import org.jetbrains.kotlin.codegen.coroutines.SuspensionPointKind
 import org.jetbrains.kotlin.codegen.coroutines.generateCoroutineSuspendedCheck
 import org.jetbrains.kotlin.codegen.inline.*
@@ -47,7 +48,8 @@ import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes
-import org.jetbrains.kotlin.resolve.jvm.AsmTypes.*
+import org.jetbrains.kotlin.resolve.jvm.AsmTypes.JAVA_STRING_TYPE
+import org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
 import org.jetbrains.kotlin.types.TypeSystemCommonBackendContext
@@ -213,8 +215,14 @@ class ExpressionCodegen(
     fun generate() {
         mv.visitCode()
         val startLabel = markNewLabel()
+        if (irFunction.isMultifileBridge()) {
+            // Multifile bridges need to have line number 1 to be filtered out by the intellij debugging filters.
+            mv.visitLineNumber(1, startLabel)
+        }
         val info = BlockInfo()
-        val body = irFunction.body!!
+        val body = irFunction.body
+            ?: error("Function has no body: ${irFunction.render()}")
+
         generateNonNullAssertions()
         generateFakeContinuationConstructorIfNeeded()
         val result = body.accept(this, info)
@@ -273,23 +281,24 @@ class ExpressionCodegen(
         if (state.isParamAssertionsDisabled)
             return
 
-        val notCallableFromJava = inlinedInto != null ||
-                (DescriptorVisibilities.isPrivate(irFunction.visibility) && !(irFunction is IrSimpleFunction && irFunction.isOperator)) ||
-                irFunction.origin.isSynthetic ||
-                // TODO: refine this condition to not generate nullability assertions on parameters
-                //       corresponding to captured variables and anonymous object super constructor arguments
-                (irFunction is IrConstructor && irFunction.parentAsClass.isAnonymousObject) ||
-                // TODO: Implement this as a lowering, so that we can more easily exclude generated methods.
-                irFunction.origin == JvmLoweredDeclarationOrigin.INLINE_CLASS_GENERATED_IMPL_METHOD ||
-                // Although these are accessible from Java, the functions they bridge to already have the assertions.
-                irFunction.origin == IrDeclarationOrigin.BRIDGE_SPECIAL ||
-                irFunction.origin == JvmLoweredDeclarationOrigin.DEFAULT_IMPLS_BRIDGE ||
-                irFunction.origin == JvmLoweredDeclarationOrigin.JVM_STATIC_WRAPPER ||
-                irFunction.origin == JvmLoweredDeclarationOrigin.MULTIFILE_BRIDGE ||
-                irFunction.parentAsClass.origin == JvmLoweredDeclarationOrigin.CONTINUATION_CLASS ||
-                irFunction.parentAsClass.origin == JvmLoweredDeclarationOrigin.SUSPEND_LAMBDA
-
-        if (notCallableFromJava)
+        if (inlinedInto != null ||
+            (DescriptorVisibilities.isPrivate(irFunction.visibility) && !(irFunction is IrSimpleFunction && irFunction.isOperator)) ||
+            irFunction.origin.isSynthetic ||
+            // TODO: refine this condition to not generate nullability assertions on parameters
+            //       corresponding to captured variables and anonymous object super constructor arguments
+            (irFunction is IrConstructor &&
+                    (irFunction.parentAsClass.isAnonymousObject ||
+                            irFunction.parentAsClass.origin == IrDeclarationOrigin.GENERATED_SAM_IMPLEMENTATION)) ||
+            // TODO: Implement this as a lowering, so that we can more easily exclude generated methods.
+            irFunction.origin == JvmLoweredDeclarationOrigin.INLINE_CLASS_GENERATED_IMPL_METHOD ||
+            // Although these are accessible from Java, the functions they bridge to already have the assertions.
+            irFunction.origin == IrDeclarationOrigin.BRIDGE_SPECIAL ||
+            irFunction.origin == JvmLoweredDeclarationOrigin.DEFAULT_IMPLS_BRIDGE ||
+            irFunction.origin == JvmLoweredDeclarationOrigin.JVM_STATIC_WRAPPER ||
+            irFunction.parentAsClass.origin == JvmLoweredDeclarationOrigin.CONTINUATION_CLASS ||
+            irFunction.parentAsClass.origin == JvmLoweredDeclarationOrigin.SUSPEND_LAMBDA ||
+            irFunction.isMultifileBridge()
+        )
             return
 
         // Do not generate non-null checks for suspend functions. When resumed the arguments
@@ -299,7 +308,12 @@ class ExpressionCodegen(
             return
 
         irFunction.extensionReceiverParameter?.let { generateNonNullAssertion(it) }
-        irFunction.valueParameters.forEach(::generateNonNullAssertion)
+
+        // Private operator functions don't have null checks on value parameters,
+        // see `DescriptorAsmUtil.genNotNullAssertionsForParameters`.
+        if (!DescriptorVisibilities.isPrivate(irFunction.visibility) || irFunction !is IrSimpleFunction || !irFunction.isOperator) {
+            irFunction.valueParameters.forEach(::generateNonNullAssertion)
+        }
     }
 
     private fun generateNonNullAssertion(param: IrValueParameter) {
@@ -406,8 +420,11 @@ class ExpressionCodegen(
         visitStatementContainer(expression, data)
 
     override fun visitCall(expression: IrCall, data: BlockInfo): PromisedValue {
-        classCodegen.context.irIntrinsics.getIntrinsic(expression.symbol)
-            ?.invoke(expression, this, data)?.let { return it }
+        val intrinsic = classCodegen.context.irIntrinsics.getIntrinsic(expression.symbol)
+        if (intrinsic != null) {
+            intrinsic.invoke(expression, this, data)
+                ?.let { return it }
+        }
 
         val callee = expression.symbol.owner
         require(callee.parent is IrClass) { "Unhandled intrinsic in ExpressionCodegen: ${callee.render()}" }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
index b1ffc94f952..4e8b58e86ae 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.backend.jvm.codegen
 
+import org.jetbrains.kotlin.backend.common.ir.allOverridden
 import org.jetbrains.kotlin.backend.common.ir.ir2string
 import org.jetbrains.kotlin.backend.common.lower.BOUND_RECEIVER_PARAMETER
 import org.jetbrains.kotlin.backend.common.lower.BOUND_VALUE_PARAMETER
@@ -144,40 +145,55 @@ class FunctionCodegen(
 
     private fun IrFunction.calculateMethodFlags(): Int {
         if (origin == IrDeclarationOrigin.FUNCTION_FOR_DEFAULT_PARAMETER) {
-            return getVisibilityForDefaultArgumentStub() or Opcodes.ACC_SYNTHETIC or functionDeprecationFlags.let {
-                if (this is IrConstructor) it else it or Opcodes.ACC_STATIC
-            }
+            return getVisibilityForDefaultArgumentStub() or Opcodes.ACC_SYNTHETIC or
+                    (if (isDeprecatedFunction) Opcodes.ACC_DEPRECATED else 0) or
+                    (if (this is IrConstructor) 0 else Opcodes.ACC_STATIC)
         }
 
-        val isVararg = valueParameters.lastOrNull()?.varargElementType != null
-        val isBridge = origin == IrDeclarationOrigin.BRIDGE || origin == IrDeclarationOrigin.BRIDGE_SPECIAL
+        val isVararg = valueParameters.lastOrNull()?.varargElementType != null && !isBridge()
         val modalityFlag = when ((this as? IrSimpleFunction)?.modality) {
             Modality.FINAL -> when {
                 origin == JvmLoweredDeclarationOrigin.CLASS_STATIC_INITIALIZER -> 0
                 origin == IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER -> 0
                 parentAsClass.isInterface && body != null -> 0
-                parentAsClass.isAnnotationClass && !isStatic -> Opcodes.ACC_ABSTRACT
+                parentAsClass.isAnnotationClass -> if (isStatic) 0 else Opcodes.ACC_ABSTRACT
                 else -> Opcodes.ACC_FINAL
             }
             Modality.ABSTRACT -> Opcodes.ACC_ABSTRACT
             // TODO transform interface modality on lowering to DefaultImpls
             else -> if (parentAsClass.isJvmInterface && body == null) Opcodes.ACC_ABSTRACT else 0
         }
-        val isSynthetic = origin.isSynthetic || hasAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME) ||
-                (isSuspend && DescriptorVisibilities.isPrivate(visibility) && !isInline) || isReifiable()
+        val isSynthetic = origin.isSynthetic ||
+                hasAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME) ||
+                (isSuspend && DescriptorVisibilities.isPrivate(visibility) && !isInline) ||
+                isReifiable() ||
+                isDeprecatedHidden()
+
         val isStrict = hasAnnotation(STRICTFP_ANNOTATION_FQ_NAME)
         val isSynchronized = hasAnnotation(SYNCHRONIZED_ANNOTATION_FQ_NAME)
 
-        return getVisibilityAccessFlag() or modalityFlag or functionDeprecationFlags or
+        return getVisibilityAccessFlag() or modalityFlag or
+                (if (isDeprecatedFunction) Opcodes.ACC_DEPRECATED else 0) or
                 (if (isStatic) Opcodes.ACC_STATIC else 0) or
                 (if (isVararg) Opcodes.ACC_VARARGS else 0) or
                 (if (isExternal) Opcodes.ACC_NATIVE else 0) or
-                (if (isBridge) Opcodes.ACC_BRIDGE else 0) or
+                (if (isBridge()) Opcodes.ACC_BRIDGE else 0) or
                 (if (isSynthetic) Opcodes.ACC_SYNTHETIC else 0) or
                 (if (isStrict) Opcodes.ACC_STRICT else 0) or
                 (if (isSynchronized) Opcodes.ACC_SYNCHRONIZED else 0)
     }
 
+    private fun IrFunction.isDeprecatedHidden(): Boolean {
+        val mightBeDeprecated = if (this is IrSimpleFunction) {
+            allOverridden(true).any {
+                it.isAnnotatedWithDeprecated || it.correspondingPropertySymbol?.owner?.isAnnotatedWithDeprecated == true
+            }
+        } else {
+            isAnnotatedWithDeprecated
+        }
+        return mightBeDeprecated && context.state.deprecationProvider.isDeprecatedHidden(toIrBasedDescriptor())
+    }
+
     private fun getThrownExceptions(function: IrFunction): List<String>? {
         if (context.state.languageVersionSettings.supportsFeature(LanguageFeature.DoNotGenerateThrowsForDelegatedKotlinMembers) &&
             function.origin == IrDeclarationOrigin.DELEGATED_MEMBER
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrTypeMapper.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrTypeMapper.kt
index 0c633f0ec7a..03c0bf9a014 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrTypeMapper.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrTypeMapper.kt
@@ -52,44 +52,52 @@ class IrTypeMapper(private val context: JvmBackendContext) : KotlinTypeMapperBas
                 error("Unknown descriptor: $classifier")
         }
 
-    fun classInternalName(irClass: IrClass): String = getClassInternalName(irClass.symbol)
+    private fun computeClassInternalName(irClass: IrClass): StringBuilder {
+        val shortName = SpecialNames.safeIdentifier(irClass.name).identifier
 
-    override fun getClassInternalName(typeConstructor: TypeConstructorMarker): String {
-        val irClass = (typeConstructor as IrClassSymbol).owner
-        fun report(): Nothing {
-            error(
-                "Local class should have its name computed in InventNamesForLocalClasses: ${irClass.fqNameWhenAvailable}\n" +
-                        "Ensure that any lowering that transforms elements with local class info (classes, function references) " +
-                        "invokes `copyAttributes` on the transformed element."
-            )
+        when (val parent = irClass.parent) {
+            is IrPackageFragment ->
+                return StringBuilder().apply {
+                    val fqName = parent.fqName
+                    if (!fqName.isRoot) {
+                        append(fqName.asString().replace('.', '/')).append("/")
+                    }
+                    append(shortName)
+                }
+            is IrClass ->
+                return computeClassInternalName(parent).append("$").append(shortName)
+            is IrFunction ->
+                if (parent.isSuspend && parent.parentAsClass.origin == JvmLoweredDeclarationOrigin.DEFAULT_IMPLS) {
+                    return computeClassInternalName(parent.parentAsClass.parentAsClass)
+                        .append("$").append(parent.name.asString())
+                }
         }
 
-        context.getLocalClassType(irClass)?.internalName?.let { return it }
+        val localClassType = context.getLocalClassType(irClass)
+        if (localClassType != null) {
+            return StringBuilder(localClassType.internalName)
+        }
 
+        error(
+            "Local class should have its name computed in InventNamesForLocalClasses: ${irClass.fqNameWhenAvailable}\n" +
+                    "Ensure that any lowering that transforms elements with local class info (classes, function references) " +
+                    "invokes `copyAttributes` on the transformed element."
+        )
+    }
+
+    fun classInternalName(irClass: IrClass): String {
+        context.getLocalClassType(irClass)?.internalName?.let { return it }
         context.classNameOverride[irClass]?.let { return it.internalName }
 
-        val className = SpecialNames.safeIdentifier(irClass.name).identifier
-
-        val internalName = when (val parent = irClass.parent) {
-            is IrPackageFragment -> {
-                val fqName = parent.fqName
-                val prefix = if (fqName.isRoot) "" else fqName.asString().replace('.', '/') + "/"
-                prefix + className
-            }
-            is IrClass -> {
-                getClassInternalName(parent.symbol) + "$" + className
-            }
-            is IrFunction -> {
-                if (parent.isSuspend && parent.parentAsClass.origin == JvmLoweredDeclarationOrigin.DEFAULT_IMPLS) {
-                    val interfaceClass = parent.parentAsClass.parent as IrClass
-                    getClassInternalName(interfaceClass.symbol) + "$" + parent.name.asString()
-                } else report()
-            }
-            else -> report()
-        }
-        return JvmCodegenUtil.sanitizeNameIfNeeded(internalName, context.state.languageVersionSettings)
+        return JvmCodegenUtil.sanitizeNameIfNeeded(
+            computeClassInternalName(irClass).toString(),
+            context.state.languageVersionSettings
+        )
     }
 
+    override fun getClassInternalName(typeConstructor: TypeConstructorMarker): String =
+        classInternalName((typeConstructor as IrClassSymbol).owner)
+
     fun writeFormalTypeParameters(irParameters: List<IrTypeParameter>, sw: JvmSignatureWriter) {
         if (sw.skipGenericSignature()) return
         with(KotlinTypeMapper) {
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt
index 216d93e55bd..5ad6d6c6fd8 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.codegen.state.JVM_SUPPRESS_WILDCARDS_ANNOTATION_FQ_N
 import org.jetbrains.kotlin.codegen.state.extractTypeMappingModeFromAnnotation
 import org.jetbrains.kotlin.codegen.state.isMethodWithDeclarationSiteWildcardsFqName
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyClass
 import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyFunction
@@ -257,7 +258,9 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
         val signature = sw.makeJvmMethodSignature(mapFunctionName(function, skipSpecial))
 
         val specialSignatureInfo =
-            with(BuiltinMethodsWithSpecialGenericSignature) { function.toIrBasedDescriptor().getSpecialSignatureInfo() }
+            with(BuiltinMethodsWithSpecialGenericSignature) {
+                function.toIrBasedDescriptorWithOriginalOverrides().getSpecialSignatureInfo()
+            }
 
         // Old back-end doesn't patch generic signatures if corresponding function had special bridges.
         // See org.jetbrains.kotlin.codegen.FunctionCodegen#hasSpecialBridgeMethod and its usage.
@@ -272,6 +275,29 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
         return signature
     }
 
+    private fun IrFunction.toIrBasedDescriptorWithOriginalOverrides(): FunctionDescriptor =
+        when (this) {
+            is IrConstructor ->
+                toIrBasedDescriptor()
+            is IrSimpleFunction ->
+                if (isPropertyAccessor)
+                    toIrBasedDescriptor()
+                else
+                    IrBasedSimpleFunctionDescriptorWithOriginalOverrides(this, context)
+            else ->
+                throw AssertionError("Unexpected function kind: $this")
+        }
+
+    private class IrBasedSimpleFunctionDescriptorWithOriginalOverrides(
+        owner: IrSimpleFunction,
+        private val context: JvmBackendContext
+    ) : IrBasedSimpleFunctionDescriptor(owner) {
+        override fun getOverriddenDescriptors(): List<FunctionDescriptor> =
+            context.getOverridesWithoutStubs(owner).map {
+                IrBasedSimpleFunctionDescriptorWithOriginalOverrides(it.owner, context)
+            }
+    }
+
     // Boxing is only necessary for 'remove(E): Boolean' of a MutableCollection<Int> implementation.
     // Otherwise this method might clash with 'remove(I): E' defined in the java.util.List JDK interface (mapped to kotlin 'removeAt').
     internal fun shouldBoxSingleValueParameterForSpecialCaseOfRemove(irFunction: IrFunction): Boolean {
@@ -362,7 +388,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
     private fun mapOverriddenSpecialBuiltinIfNeeded(caller: IrFunction, callee: IrFunction, superCall: Boolean): JvmMethodSignature? {
         // Do not remap special builtin methods when called from a bridge. The bridges are there to provide the
         // remapped name or signature and forward to the actually declared method.
-        if (caller.origin == IrDeclarationOrigin.BRIDGE || caller.origin == IrDeclarationOrigin.BRIDGE_SPECIAL) return null
+        if (caller.isBridge()) return null
         // Do not remap calls to static replacements of inline class methods, since they have completely different signatures.
         if (callee.isStaticInlineClassReplacement) return null
         val overriddenSpecialBuiltinFunction =
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt
index 1d5f54635bb..c7daf2809d6 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.dump
 import org.jetbrains.kotlin.ir.util.isTrueConst
 import org.jetbrains.org.objectweb.asm.Label
+import org.jetbrains.org.objectweb.asm.Type
 import java.util.*
 
 // TODO: eliminate the temporary variable
@@ -367,7 +368,8 @@ class SwitchGenerator(private val expression: IrWhen, private val data: BlockInf
             // information for the subject as the `when` line number has already been
             // emitted.
             codegen.noLineNumberScope {
-                subject.accept(codegen, data).materialize()
+                val subjectValue = subject.accept(codegen, data)
+                subjectValue.materializeAt(Type.INT_TYPE, subjectValue.irType)
             }
             genIntSwitch(cases)
         }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
index 15f7676b55b..7ce12403cc1 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
@@ -14,16 +14,19 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry
 import org.jetbrains.kotlin.builtins.StandardNames.FqNames
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
-import org.jetbrains.kotlin.codegen.*
+import org.jetbrains.kotlin.codegen.AsmUtil
+import org.jetbrains.kotlin.codegen.FrameMapBase
+import org.jetbrains.kotlin.codegen.OwnerKind
+import org.jetbrains.kotlin.codegen.SourceInfo
+import org.jetbrains.kotlin.codegen.classFileContainsMethod
 import org.jetbrains.kotlin.codegen.inline.SourceMapper
 import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.expressions.IrGetEnumValue
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
@@ -43,6 +46,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
+import org.jetbrains.org.objectweb.asm.commons.Method
 
 class IrFrameMap : FrameMapBase<IrSymbol>() {
     private val typeMap = mutableMapOf<IrSymbol, Type>()
@@ -57,8 +61,8 @@ class IrFrameMap : FrameMapBase<IrSymbol>() {
         return super.leave(key)
     }
 
-    fun typeOf(symbol: IrSymbol): Type =
-        typeMap[symbol] ?: error("No mapping for symbol: ${symbol.owner.render()}")
+    fun typeOf(symbol: IrSymbol): Type = typeMap[symbol]
+        ?: error("No mapping for symbol: ${symbol.owner.render()}")
 }
 
 internal val IrFunction.isStatic
@@ -90,7 +94,6 @@ fun JvmBackendContext.getSourceMapper(declaration: IrClass): SourceMapper {
     val fileEntry = sourceManager.getFileEntry(declaration.fileParent)
     // NOTE: apparently inliner requires the source range to cover the
     //       whole file the class is declared in rather than the class only.
-    // TODO: revise
     val endLineNumber = when (fileEntry) {
         is MultifileFacadeFileEntry -> 0
         else -> fileEntry?.getSourceRangeInfo(0, fileEntry.maxOffset)?.endLineNumber ?: 0
@@ -169,21 +172,16 @@ fun IrDeclarationWithVisibility.getVisibilityAccessFlag(kind: OwnerKind? = null)
 }
 
 private fun IrDeclarationWithVisibility.specialCaseVisibility(kind: OwnerKind?): Int? {
-//    if (JvmCodegenUtil.isNonIntrinsicPrivateCompanionObjectInInterface(memberDescriptor)) {
-//        return ACC_PUBLIC
-//    }
     if (this is IrClass && DescriptorVisibilities.isPrivate(visibility) && isCompanion && hasInterfaceParent()) {
         // TODO: non-intrinsic
         return Opcodes.ACC_PUBLIC
     }
 
-//    if (memberDescriptor is FunctionDescriptor && isInlineClassWrapperConstructor(memberDescriptor, kind))
     if (this is IrConstructor && parentAsClass.isInline && kind === OwnerKind.IMPLEMENTATION) {
         return Opcodes.ACC_PRIVATE
     }
 
-//    if (memberDescriptor.isEffectivelyInlineOnly()) {
-    if (this is IrFunction && isReifiable()) {
+    if (this is IrFunction && (isReifiable() || isBridge())) {
         return Opcodes.ACC_PUBLIC
     }
 
@@ -191,58 +189,20 @@ private fun IrDeclarationWithVisibility.specialCaseVisibility(kind: OwnerKind?):
         return Opcodes.ACC_PRIVATE
     }
 
-//    if (memberVisibility === Visibilities.LOCAL && memberDescriptor is CallableMemberDescriptor) {
     if (visibility === DescriptorVisibilities.LOCAL && this is IrFunction) {
         return Opcodes.ACC_PUBLIC
     }
 
-//    if (isEnumEntry(memberDescriptor)) {
     if (this is IrClass && this.kind === ClassKind.ENUM_ENTRY) {
         return AsmUtil.NO_FLAG_PACKAGE_PRIVATE
     }
 
-//    These ones should be public anyway after ToArrayLowering.
-//    if (memberDescriptor.isToArrayFromCollection()) {
-//        return ACC_PUBLIC
-//    }
-
-//    if (memberDescriptor is ConstructorDescriptor && isAnonymousObject(memberDescriptor.containingDeclaration)) {
-//        return getVisibilityAccessFlagForAnonymous(memberDescriptor.containingDeclaration as ClassDescriptor)
-//    }
-//    if (this is IrConstructor && parentAsClass.isAnonymousObject) {
-//        return parentAsClass.getVisibilityAccessFlagForAnonymous()
-//    }
-
-//    TODO: when is this applicable?
-//    if (memberDescriptor is SyntheticJavaPropertyDescriptor) {
-//        return getVisibilityAccessFlag((memberDescriptor as SyntheticJavaPropertyDescriptor).getMethod)
-//    }
-
-
-//    if (memberDescriptor is PropertyAccessorDescriptor) {
-//        val property = memberDescriptor.correspondingProperty
-//        if (property is SyntheticJavaPropertyDescriptor) {
-//            val method = (if (memberDescriptor === property.getGetter())
-//                (property as SyntheticJavaPropertyDescriptor).getMethod
-//            else
-//                (property as SyntheticJavaPropertyDescriptor).setMethod)
-//                ?: error("No get/set method in SyntheticJavaPropertyDescriptor: $property")
-//            return getVisibilityAccessFlag(method)
-//        }
-//    }
     if (this is IrField && correspondingPropertySymbol?.owner?.isExternal == true) {
         val method = correspondingPropertySymbol?.owner?.getter ?: correspondingPropertySymbol?.owner?.setter
         ?: error("No get/set method in SyntheticJavaPropertyDescriptor: ${ir2string(correspondingPropertySymbol?.owner)}")
         return method.getVisibilityAccessFlag()
     }
 
-//    if (memberDescriptor is CallableDescriptor && memberVisibility === Visibilities.PROTECTED) {
-//        for (overridden in DescriptorUtils.getAllOverriddenDescriptors(memberDescriptor as CallableDescriptor)) {
-//            if (isJvmInterface(overridden.containingDeclaration)) {
-//                return ACC_PUBLIC
-//            }
-//        }
-//    }
     if (this is IrSimpleFunction && visibility === DescriptorVisibilities.PROTECTED &&
         allOverridden().any { it.parentAsClass.isJvmInterface }
     ) {
@@ -257,14 +217,6 @@ private fun IrDeclarationWithVisibility.specialCaseVisibility(kind: OwnerKind?):
         return AsmUtil.NO_FLAG_PACKAGE_PRIVATE
     }
 
-//  Should be taken care of in IR
-//    if (memberDescriptor is AccessorForCompanionObjectInstanceFieldDescriptor) {
-//        return NO_FLAG_PACKAGE_PRIVATE
-//    }
-
-//    return if (memberDescriptor is ConstructorDescriptor && isEnumEntry(containingDeclaration)) {
-//        NO_FLAG_PACKAGE_PRIVATE
-//    } else null
     if (this is IrConstructor && parentAsClass.kind === ClassKind.ENUM_ENTRY) {
         return AsmUtil.NO_FLAG_PACKAGE_PRIVATE
     }
@@ -304,6 +256,8 @@ fun IrFunction.isInlineOnly() =
 
 fun IrFunction.isReifiable() = typeParameters.any { it.isReified }
 
+internal fun IrFunction.isBridge() = origin == IrDeclarationOrigin.BRIDGE || origin == IrDeclarationOrigin.BRIDGE_SPECIAL
+
 // Borrowed with modifications from ImplementationBodyCodegen.java
 
 private val KOTLIN_MARKER_INTERFACES: Map<FqName, String> = run {
@@ -388,16 +342,11 @@ fun IrClass.isOptionalAnnotationClass(): Boolean =
     isAnnotationClass &&
             hasAnnotation(ExpectedActualDeclarationChecker.OPTIONAL_EXPECTATION_FQ_NAME)
 
-val IrDeclaration.callableDeprecationFlags: Int
-    get() {
-        val annotation = annotations.findAnnotation(FqNames.deprecated)
-            ?: return if ((this as? IrDeclaration)?.origin == JvmLoweredDeclarationOrigin.DEFAULT_IMPLS_BRIDGE_FOR_COMPATIBILITY)
-                Opcodes.ACC_DEPRECATED
-            else 0
-        val isHidden = (annotation.getValueArgument(2) as? IrGetEnumValue)?.symbol?.owner
-            ?.name?.asString() == DeprecationLevel.HIDDEN.name
-        return Opcodes.ACC_DEPRECATED or if (isHidden) Opcodes.ACC_SYNTHETIC else 0
-    }
+val IrDeclaration.isAnnotatedWithDeprecated: Boolean
+    get() = annotations.hasAnnotation(FqNames.deprecated)
+
+val IrDeclaration.isDeprecatedCallable: Boolean
+    get() = isAnnotatedWithDeprecated || origin == JvmLoweredDeclarationOrigin.DEFAULT_IMPLS_BRIDGE_FOR_COMPATIBILITY
 
 // We can't check for JvmLoweredDeclarationOrigin.SYNTHETIC_METHOD_FOR_PROPERTY_ANNOTATIONS because for interface methods
 // moved to DefaultImpls, origin is changed to DEFAULT_IMPLS
@@ -405,12 +354,19 @@ val IrDeclaration.callableDeprecationFlags: Int
 val IrFunction.isSyntheticMethodForProperty: Boolean
     get() = name.asString().endsWith(JvmAbi.ANNOTATED_PROPERTY_METHOD_NAME_SUFFIX)
 
-val IrFunction.functionDeprecationFlags: Int
-    get() {
-        val originFlags = if (isSyntheticMethodForProperty) Opcodes.ACC_DEPRECATED else 0
-        val propertyFlags = (this as? IrSimpleFunction)?.correspondingPropertySymbol?.owner?.callableDeprecationFlags ?: 0
-        return originFlags or propertyFlags or callableDeprecationFlags
-    }
+val IrFunction.isDeprecatedFunction: Boolean
+    get() = isSyntheticMethodForProperty || isDeprecatedCallable ||
+            (this as? IrSimpleFunction)?.correspondingPropertySymbol?.owner?.isDeprecatedCallable == true ||
+            isAccessorForDeprecatedPropertyImplementedByDelegation
+
+private val IrFunction.isAccessorForDeprecatedPropertyImplementedByDelegation: Boolean
+    get() =
+        origin == IrDeclarationOrigin.DELEGATED_MEMBER &&
+                this is IrSimpleFunction &&
+                correspondingPropertySymbol != null &&
+                overriddenSymbols.any {
+                    it.owner.correspondingPropertySymbol?.owner?.isDeprecatedCallable == true
+                }
 
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 val IrDeclaration.psiElement: PsiElement?
@@ -422,3 +378,13 @@ val IrMemberAccessExpression<*>.psiElement: PsiElement?
 
 fun IrSimpleType.isRawType(): Boolean =
     hasAnnotation(JvmGeneratorExtensions.RAW_TYPE_ANNOTATION_FQ_NAME)
+
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+internal fun classFileContainsMethod(function: IrFunction, context: JvmBackendContext, name: String): Boolean? {
+    val originalDescriptor = context.methodSignatureMapper.mapSignatureWithGeneric(function).asmMethod.descriptor
+    val descriptor = if (function.isSuspend)
+        listOf(*Type.getArgumentTypes(originalDescriptor), Type.getObjectType("kotlin/coroutines/Continuation"))
+            .joinToString(prefix = "(", postfix = ")", separator = "") + AsmTypes.OBJECT_TYPE
+    else originalDescriptor
+    return classFileContainsMethod(function.descriptor, context.state, Method(name, descriptor))
+}
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrUtils.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrUtils.kt
index afa12be2cf5..49bee0473a2 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrUtils.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrUtils.kt
@@ -17,8 +17,8 @@ import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.unboxInlineClass
 import org.jetbrains.kotlin.codegen.inline.coroutines.FOR_INLINE_SUFFIX
 import org.jetbrains.kotlin.config.JvmDefaultMode
 import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.deserialization.PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
+import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.types.*
@@ -307,10 +308,10 @@ fun firstSuperMethodFromKotlin(
     override: IrSimpleFunction,
     implementation: IrSimpleFunction
 ): IrSimpleFunctionSymbol {
-    return override.overriddenSymbols.first {
+    return override.overriddenSymbols.firstOrNull {
         val owner = it.owner
         owner.modality != Modality.ABSTRACT && owner.overrides(implementation)
-    }
+    } ?: error("No super method found for: ${override.render()}")
 }
 
 // MethodSignatureMapper uses the corresponding property of a function to determine correct names
@@ -319,11 +320,12 @@ fun IrSimpleFunction.copyCorrespondingPropertyFrom(source: IrSimpleFunction) {
     val property = source.correspondingPropertySymbol?.owner ?: return
     val target = this
 
-    correspondingPropertySymbol = factory.buildProperty() {
+    correspondingPropertySymbol = factory.buildProperty {
         name = property.name
         updateFrom(property)
     }.apply {
         parent = target.parent
+        annotations = property.annotations
         when {
             source.isGetter -> getter = target
             source.isSetter -> setter = target
@@ -347,4 +349,48 @@ val IrDeclaration.isStaticInlineClassReplacement: Boolean
 
 fun IrDeclaration.isFromJava(): Boolean =
     origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB ||
-            parent is IrDeclaration && (parent as IrDeclaration).isFromJava()
\ No newline at end of file
+            parent is IrDeclaration && (parent as IrDeclaration).isFromJava()
+
+val IrType.upperBound: IrType
+    get() = erasedUpperBound.symbol.starProjectedType
+
+fun IrType.eraseToScope(scopeOwner: IrTypeParametersContainer): IrType = eraseToScope(collectVisibleTypeParameters(scopeOwner))
+
+fun IrType.eraseToScope(visibleTypeParameters: Set<IrTypeParameter>): IrType {
+    require(this is IrSimpleType) { error("Unexpected IrType kind: ${render()}") }
+    return when (classifier) {
+        is IrClassSymbol -> IrSimpleTypeImpl(classifier, hasQuestionMark, arguments.map { it.eraseToScope(visibleTypeParameters) }, annotations)
+        is IrTypeParameterSymbol -> if (classifier.owner in visibleTypeParameters) this else upperBound
+        else -> error("unknown IrType classifier kind: ${classifier.owner.render()}")
+    }
+}
+
+private fun IrTypeArgument.eraseToScope(visibleTypeParameters: Set<IrTypeParameter>): IrTypeArgument = when (this) {
+    is IrStarProjection -> this
+    is IrTypeProjection -> makeTypeProjection(type.eraseToScope(visibleTypeParameters), variance)
+    else -> error("unknown type projection kind: ${render()}")
+}
+
+fun collectVisibleTypeParameters(scopeOwner: IrTypeParametersContainer): Set<IrTypeParameter> =
+    generateSequence(scopeOwner) { current ->
+        val parent = current.parent as? IrTypeParametersContainer
+        parent.takeUnless { parent is IrClass && current is IrClass && !current.isInner && !current.isLocal }
+    }
+        .flatMap { it.typeParameters }
+        .toSet()
+
+fun IrClassSymbol.rawType(context: JvmBackendContext): IrSimpleType {
+    // On the IR backend we represent raw types as star projected types with a special synthetic annotation.
+    // See `TypeTranslator.translateTypeAnnotations`.
+    val rawTypeAnnotation = IrConstructorCallImpl.fromSymbolOwner(
+        context.generatorExtensions.rawTypeAnnotationConstructor!!.constructedClassType,
+        context.generatorExtensions.rawTypeAnnotationConstructor.symbol
+    )
+
+    return IrSimpleTypeImpl(
+        this,
+        hasQuestionMark = false,
+        arguments = owner.typeParameters.map { IrStarProjectionImpl },
+        annotations = listOf(rawTypeAnnotation)
+    )
+}
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt
index e097fe6dcf8..489d4131b10 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt
@@ -382,7 +382,8 @@ private fun IrFunction.createSuspendFunctionStub(context: JvmBackendContext): Ir
 
         function.copyAttributes(this)
         function.copyTypeParametersFrom(this)
-        function.copyReceiverParametersFrom(this)
+        val substitutionMap = makeTypeParameterSubstitutionMap(this, function)
+        function.copyReceiverParametersFrom(this, substitutionMap)
 
         if (origin != JvmLoweredDeclarationOrigin.DEFAULT_IMPLS_BRIDGE) {
             function.overriddenSymbols +=
@@ -393,11 +394,15 @@ private fun IrFunction.createSuspendFunctionStub(context: JvmBackendContext): Ir
         // TODO: It would be nice if AddContinuationLowering could insert the continuation argument before default stub generation.
         val index = valueParameters.firstOrNull { it.origin == IrDeclarationOrigin.MASK_FOR_DEFAULT_FUNCTION }?.index
             ?: valueParameters.size
-        function.valueParameters += valueParameters.take(index).map { it.copyTo(function, index = it.index) }
+        function.valueParameters += valueParameters.take(index).map {
+            it.copyTo(function, index = it.index, type = it.type.substitute(substitutionMap))
+        }
         function.addValueParameter(
-            SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME, continuationType(context), JvmLoweredDeclarationOrigin.CONTINUATION_CLASS
+            SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME, continuationType(context).substitute(substitutionMap), JvmLoweredDeclarationOrigin.CONTINUATION_CLASS
         )
-        function.valueParameters += valueParameters.drop(index).map { it.copyTo(function, index = it.index + 1) }
+        function.valueParameters += valueParameters.drop(index).map {
+            it.copyTo(function, index = it.index + 1, type = it.type.substitute(substitutionMap))
+        }
     }
 }
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt
index 216685ff19a..8bc3ef29a5e 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.backend.common.lower.*
 import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
+import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.codegen.ASSERTIONS_DISABLED_FIELD_NAME
 import org.jetbrains.kotlin.config.JVMAssertionsMode
@@ -145,11 +146,11 @@ fun IrClass.buildAssertionsDisabledField(backendContext: JvmBackendContext, topL
         type = backendContext.irBuiltIns.booleanType
         isFinal = true
         isStatic = true
-    }.apply {
-        parent = this@buildAssertionsDisabledField
-        initializer = backendContext.createIrBuilder(this@buildAssertionsDisabledField.symbol).run {
-            at(this@apply)
-            irExprBody(irNot(irCall(backendContext.ir.symbols.desiredAssertionStatus).apply {
+    }.also { field ->
+        field.parent = this
+        field.initializer = backendContext.createJvmIrBuilder(this.symbol).run {
+            at(field)
+            irExprBody(irNot(irCall(irSymbols.desiredAssertionStatus).apply {
                 dispatchReceiver = getJavaClass(backendContext, topLevelClass)
             }))
         }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt
index bbddfb696d4..32cedb790c0 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt
@@ -15,13 +15,12 @@ import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.codegen.isJvmInterface
-import org.jetbrains.kotlin.backend.jvm.ir.copyCorrespondingPropertyFrom
-import org.jetbrains.kotlin.backend.jvm.ir.eraseTypeParameters
-import org.jetbrains.kotlin.backend.jvm.ir.isFromJava
-import org.jetbrains.kotlin.backend.jvm.ir.isJvmAbstract
+import org.jetbrains.kotlin.backend.jvm.ir.*
 import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.unboxInlineClass
+import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
@@ -351,9 +350,12 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass
         //
         // This can still break binary compatibility, but it matches the behavior of the JVM backend.
         if (irFunction.isFakeOverride) {
-            irFunction.overriddenSymbols.asSequence().map { it.owner }.filter { !it.isJvmAbstract(context.state.jvmDefaultMode) }
+            irFunction.overriddenSymbols.asSequence()
+                .map { it.owner }.filter { !it.isJvmAbstract(context.state.jvmDefaultMode) }
                 .forEach { override ->
-                    override.allOverridden().mapTo(blacklist) { it.jvmMethod }
+                    override.allOverridden()
+                        .filter { !it.isFakeOverride }
+                        .mapTo(blacklist) { it.jvmMethod }
                 }
         }
 
@@ -407,16 +409,31 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass
             overriddenSymbols = irFunction.overriddenSymbols.toList()
         }
 
+    private fun getBridgeVisibility(bridge: Bridge): DescriptorVisibility {
+        // Even though kotlin.Cloneable#clone() is protected, corresponding bridge is 'public' in JVM.
+        if (bridge.overridden.name.asString() == "clone" &&
+            bridge.overridden.parentAsClass.hasEqualFqName(StandardNames.FqNames.cloneable.toSafe())
+        ) {
+            return DescriptorVisibilities.PUBLIC
+        }
+
+        val overriddenVisibility = bridge.overridden.visibility
+        // Internal functions can be overridden by non-internal functions, which changes their names since the names of internal
+        // functions are mangled. In order to avoid mangling the name twice we reset the visibility for bridges to internal
+        // functions to public and use the mangled name directly.
+        return if (overriddenVisibility == DescriptorVisibilities.INTERNAL)
+            DescriptorVisibilities.PUBLIC
+        else
+            overriddenVisibility
+    }
+
     private fun IrClass.addBridge(bridge: Bridge, target: IrSimpleFunction): IrSimpleFunction =
         addFunction {
             startOffset = this@addBridge.startOffset
             endOffset = this@addBridge.startOffset
             modality = Modality.OPEN
             origin = IrDeclarationOrigin.BRIDGE
-            // Internal functions can be overridden by non-internal functions, which changes their names since the names of internal
-            // functions are mangled. In order to avoid mangling the name twice we reset the visibility for bridges to internal
-            // functions to public and use the mangled name directly.
-            visibility = bridge.overridden.visibility.takeUnless { it == DescriptorVisibilities.INTERNAL } ?: DescriptorVisibilities.PUBLIC
+            visibility = getBridgeVisibility(bridge)
             name = Name.identifier(bridge.signature.name)
             returnType = bridge.overridden.returnType.eraseTypeParameters()
             isSuspend = bridge.overridden.isSuspend
@@ -442,7 +459,8 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass
             modality = if (specialBridge.isFinal) Modality.FINAL else Modality.OPEN
             origin = if (specialBridge.isSynthetic) IrDeclarationOrigin.BRIDGE else IrDeclarationOrigin.BRIDGE_SPECIAL
             name = Name.identifier(specialBridge.signature.name)
-            returnType = specialBridge.substitutedReturnType ?: specialBridge.overridden.returnType.eraseTypeParameters()
+            returnType = specialBridge.substitutedReturnType?.eraseToScope(target.parentAsClass)
+                ?: specialBridge.overridden.returnType.eraseTypeParameters()
         }.apply {
             context.functionsWithSpecialBridges.add(target)
 
@@ -531,26 +549,30 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass
         from: IrSimpleFunction,
         substitutedParameterTypes: List<IrType>? = null
     ) {
+        val visibleTypeParameters = collectVisibleTypeParameters(this)
         // This is a workaround for a bug affecting fake overrides. Sometimes we encounter fake overrides
         // with dispatch receivers pointing at a superclass instead of the current class.
         dispatchReceiverParameter = irClass.thisReceiver?.copyTo(this, type = irClass.defaultType)
-        extensionReceiverParameter = from.extensionReceiverParameter?.copyWithTypeErasure(this)
+        extensionReceiverParameter = from.extensionReceiverParameter?.copyWithTypeErasure(this, visibleTypeParameters)
         valueParameters = if (substitutedParameterTypes != null) {
             from.valueParameters.zip(substitutedParameterTypes).map { (param, type) ->
-                param.copyWithTypeErasure(this, type)
+                param.copyWithTypeErasure(this, visibleTypeParameters, type)
             }
         } else {
-            from.valueParameters.map { it.copyWithTypeErasure(this) }
+            from.valueParameters.map { it.copyWithTypeErasure(this, visibleTypeParameters) }
         }
     }
 
-    private fun IrValueParameter.copyWithTypeErasure(target: IrSimpleFunction, substitutedType: IrType? = null): IrValueParameter =
-        copyTo(
-            target, IrDeclarationOrigin.BRIDGE,
-            type = (substitutedType ?: type.eraseTypeParameters()),
-            // Currently there are no special bridge methods with vararg parameters, so we don't track substituted vararg element types.
-            varargElementType = varargElementType?.eraseTypeParameters()
-        )
+    private fun IrValueParameter.copyWithTypeErasure(
+        target: IrSimpleFunction,
+        visibleTypeParameters: Set<IrTypeParameter>,
+        substitutedType: IrType? = null
+    ): IrValueParameter = copyTo(
+        target, IrDeclarationOrigin.BRIDGE,
+        type = (substitutedType?.eraseToScope(visibleTypeParameters) ?: type.eraseTypeParameters()),
+        // Currently there are no special bridge methods with vararg parameters, so we don't track substituted vararg element types.
+        varargElementType = varargElementType?.eraseToScope(visibleTypeParameters)
+    )
 
     private fun IrBuilderWithScope.delegatingCall(
         bridge: IrSimpleFunction,
@@ -559,10 +581,10 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass
     ) = irCastIfNeeded(irCall(target, origin = IrStatementOrigin.BRIDGE_DELEGATION, superQualifierSymbol = superQualifierSymbol).apply {
         for ((param, targetParam) in bridge.explicitParameters.zip(target.explicitParameters)) {
             putArgument(targetParam, irGet(param).let { argument ->
-                if (param == bridge.dispatchReceiverParameter) argument else irCastIfNeeded(argument, targetParam.type)
+                if (param == bridge.dispatchReceiverParameter) argument else irCastIfNeeded(argument, targetParam.type.upperBound)
             })
         }
-    }, bridge.returnType)
+    }, bridge.returnType.upperBound)
 
     private fun IrBuilderWithScope.irCastIfNeeded(expression: IrExpression, to: IrType): IrExpression =
         if (expression.type == to || to.isAny() || to.isNullableAny()) expression else irImplicitCast(expression, to)
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CollectionStubMethodLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CollectionStubMethodLowering.kt
index 0e95b83175f..66a88db287d 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CollectionStubMethodLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CollectionStubMethodLowering.kt
@@ -66,19 +66,26 @@ internal class CollectionStubMethodLowering(val context: JvmBackendContext) : Cl
         for (stub in methodStubsToGenerate) {
             val stubNameAndArity = stub.nameAndArity
             val relevantMembers = nonAbstractMethodsByNameAndArity[stubNameAndArity].orEmpty()
-            val existingOverrides = relevantMembers.filter { isOverriddenBy(stub, it) }
+            val existingOverrides = relevantMembers.filter { isEffectivelyOverriddenBy(stub, it) }
 
             if (existingOverrides.isNotEmpty()) {
-                // In the case that we find a defined method that matches the stub signature,
-                // we add the overridden symbols to that defined method,
-                // so that bridge lowering can still generate correct bridge for that method.
-                existingOverrides.forEach { it.overriddenSymbols += stub.overriddenSymbols }
+                existingOverrides.forEach {
+                    // In the case that we find a defined method that matches the stub signature,
+                    // we add the overridden symbols to that defined method,
+                    // so that bridge lowering can still generate correct bridge for that method.
+                    // However, we still need to keep track of the original overrides
+                    // so that special built-in signature mapping doesn't confuse it with a method
+                    // that actually requires signature patching.
+                    context.recordOverridesWithoutStubs(it)
+                    it.overriddenSymbols += stub.overriddenSymbols
+                }
                 // We don't add a throwing stub if it's effectively overridden by an existing function.
                 continue
             }
 
             // Generated stub might still override some abstract member(s), which affects resulting method signature.
-            val overriddenAbstractMethods = abstractMethodsByNameAndArity[stubNameAndArity].orEmpty().filter { isOverriddenBy(it, stub) }
+            val overriddenAbstractMethods = abstractMethodsByNameAndArity[stubNameAndArity].orEmpty()
+                .filter { isEffectivelyOverriddenBy(it, stub) }
             stub.overriddenSymbols += overriddenAbstractMethods.map { it.symbol }
 
             // Some stub members require special handling.
@@ -121,8 +128,6 @@ internal class CollectionStubMethodLowering(val context: JvmBackendContext) : Cl
                 else ->
                     irClass.declarations.add(stub)
             }
-
-
         }
     }
 
@@ -196,7 +201,7 @@ internal class CollectionStubMethodLowering(val context: JvmBackendContext) : Cl
                 }
         }
 
-    private fun isOverriddenBy(superFun: IrSimpleFunction, overridingFun: IrSimpleFunction): Boolean {
+    private fun isEffectivelyOverriddenBy(superFun: IrSimpleFunction, overridingFun: IrSimpleFunction): Boolean {
         // Function 'f0' is overridden by function 'f1' if all of the following conditions are met,
         // assuming type parameter Ti of 'f1' is "equal" to type parameter Si of 'f0':
         //  - names are same;
@@ -301,34 +306,69 @@ internal class CollectionStubMethodLowering(val context: JvmBackendContext) : Cl
 
     // Compute stubs that should be generated, compare based on signature
     private fun generateRelevantStubMethods(irClass: IrClass): List<IrSimpleFunction> {
-        fun createStubFuns(stubs: StubsForCollectionClass): List<IrSimpleFunction> {
-            val (readOnlyClass, mutableClass, candidatesForStubs) = stubs
-            val substitutionMap = computeSubstitutionMap(readOnlyClass.owner, mutableClass.owner, irClass)
-            return candidatesForStubs.map { function ->
-                createStubMethod(function, irClass, substitutionMap)
-            }
-        }
+        val classStubFuns = collectionStubComputer.stubsForCollectionClasses(irClass)
+            .flatMap { createStubFuns(irClass, it) }
 
-        val classStubs = collectionStubComputer.stubsForCollectionClasses(irClass)
-
-        val superClassesStubs = irClass.superClass?.run {
-            superClassChain.flatMap { superClass ->
-                collectionStubComputer.stubsForCollectionClasses(superClass)
-            }.toList()
-        } ?: emptyList()
-
-        val relevantStubs =
-            classStubs.filter { (readOnlyClass) ->
-                classStubs.none { readOnlyClass != it.readOnlyClass && it.readOnlyClass.isSubtypeOfClass(readOnlyClass) } &&
-                        superClassesStubs.none { it.readOnlyClass == readOnlyClass }
-            }
-
-        val classStubFuns = relevantStubs.flatMap { createStubFuns(it) }
-        val superClassStubSignatures = superClassesStubs.flatMap { createStubFuns(it) }.mapTo(HashSet()) { it.toJvmSignature() }
+        val superClassStubSignatures = computeStubsForSuperClasses(irClass)
+            .flatMap { createStubFuns(irClass, it) }
+            .mapTo(HashSet()) { it.toJvmSignature() }
 
         return classStubFuns.filter { it.toJvmSignature() !in superClassStubSignatures }
     }
 
+    private fun createStubFuns(irClass: IrClass, stubs: StubsForCollectionClass): List<IrSimpleFunction> {
+        val (readOnlyClass, mutableClass, candidatesForStubs) = stubs
+        val substitutionMap = computeSubstitutionMap(readOnlyClass.owner, mutableClass.owner, irClass)
+        return candidatesForStubs.map { function ->
+            createStubMethod(function, irClass, substitutionMap)
+        }
+    }
+
+    private fun computeStubsForSuperClasses(irClass: IrClass): List<StubsForCollectionClass> {
+        val immediateSuperClass = irClass.superClass ?: return emptyList()
+        return immediateSuperClass.superClassChain
+            .flatMap { superClass -> computeStubsForSuperClass(superClass) }
+            .toList()
+    }
+
+    private class FilteredStubsForCollectionClass(
+        override val readOnlyClass: IrClassSymbol,
+        override val mutableClass: IrClassSymbol,
+        override val candidatesForStubs: Collection<IrSimpleFunction>
+    ) : StubsForCollectionClass
+
+    private fun computeStubsForSuperClass(superClass: IrClass): List<StubsForCollectionClass> {
+        val superClassStubs = collectionStubComputer.stubsForCollectionClasses(superClass)
+
+        if (superClass.modality != Modality.ABSTRACT) return superClassStubs
+
+        // An abstract superclass might contain an abstract function declaration that effectively overrides a stub to be generated,
+        // and thus have no non-abstract stub.
+        // This calculation happens for each abstract class multiple times. TODO memoize.
+
+        val abstractFunsByNameAndArity = superClass.functions
+            .filter { !it.isFakeOverride && it.modality == Modality.ABSTRACT }
+            .groupBy { it.nameAndArity }
+
+        if (abstractFunsByNameAndArity.isEmpty()) return superClassStubs
+
+        return superClassStubs.map {
+            val (readOnlyClass, mutableClass, candidatesForStubs) = it
+            // NB here we should build a stub in substitution context of the given superclass.
+            // Resulting stub can be different from a stub created in substitution context of the "current" class
+            // in case of (partially) specialized generic superclass.
+            val substitutionMap = computeSubstitutionMap(readOnlyClass.owner, mutableClass.owner, superClass)
+            val filteredCandidates = candidatesForStubs.filter { candidateFun ->
+                val stubMethod = createStubMethod(candidateFun, superClass, substitutionMap)
+                val stubNameAndArity = stubMethod.nameAndArity
+                abstractFunsByNameAndArity[stubNameAndArity].orEmpty().none { abstractFun ->
+                    isEffectivelyOverriddenBy(stubMethod, abstractFun)
+                }
+            }
+            FilteredStubsForCollectionClass(readOnlyClass, mutableClass, filteredCandidates)
+        }
+    }
+
     private fun Collection<IrType>.findMostSpecificTypeForClass(classifier: IrClassSymbol): IrType {
         val types = this.filter { it.classifierOrNull == classifier }
         if (types.isEmpty()) error("No supertype of $classifier in $this")
@@ -346,85 +386,95 @@ internal class CollectionStubMethodLowering(val context: JvmBackendContext) : Cl
         get() = generateSequence(this) { it.superClass }
 }
 
-
-internal class StubsForCollectionClass(
-    val readOnlyClass: IrClassSymbol,
+internal interface StubsForCollectionClass {
+    val readOnlyClass: IrClassSymbol
     val mutableClass: IrClassSymbol
-) {
-    // Old back-end generates stubs for 'class A : C', where
-    //  'C' is some "read-only collection" interface from kotlin.collections,
-    //  'MC' is a corresponding "mutable collection" interface from kotlin.collections,
-    // by building fake overrides for a special 'class X : A(), MC'
-    // and taking fake overrides that override members from 'MC'.
-    //
-    // Here we are looking at this problem from a slightly different angle:
-    // we select suitable member functions 'f' in 'MC' that might potentially require stubs (we are here!),
-    // and then we generate stubs for functions 'f' that are not effectively overridden by members of 'A'
-    // (this happens in the lowering itself).
-    //
-    // In order for this to be equivalent to the old back-end approach,
-    // we should take 'f' in 'MC' such that any of the following conditions is true:
-    //  - 'f' is declared in 'MC' - that is, 'f' itself is not a fake override;
-    //  - 'f' is abstract and doesn't override anything from 'C'.
-    //
-    // NB1 it also covers default methods from JDK collection classes case
-    // (since that's the only way a member function in 'MC' might be non-abstract).
-    //
-    // NB2 the scheme of stub method generation in the old back-end depends too much on
-    // which particular declarations are present in 'MC'.
-    // Some of these declarations are redundant from the stub generation point of view -
-    // for example, 'kotlin.collections.MutableListIterator' contains the following (redundant) declarations:
-    //      override fun next(): T
-    //      override fun hasNext(): Boolean
-    // which cause stubs for 'next' and 'hasNext' to be generated in a 'abstract class A<T> : ListIterator<T>'.
-    // See https://youtrack.jetbrains.com/issue/KT-36724.
-    // In the ideal world, it should be enough to check that
-    // the given member function 'f' from 'MC' doesn't override anything from 'C'.
-    val candidatesForStubs: Collection<IrSimpleFunction> by lazy {
-        mutableClass.functions
-            .map { it.owner }
-            .filter { memberFun ->
-                !memberFun.isFakeOverride ||
-                        (memberFun.modality == Modality.ABSTRACT && memberFun.overriddenSymbols.none { overriddenFun ->
-                            overriddenFun.owner.parentAsClass.symbol == readOnlyClass
-                        })
-            }
-            .toHashSet()
-    }
-
-    operator fun component1() = readOnlyClass
-    operator fun component2() = mutableClass
-    operator fun component3() = candidatesForStubs
+    val candidatesForStubs: Collection<IrSimpleFunction>
 }
 
+internal operator fun StubsForCollectionClass.component1() = readOnlyClass
+internal operator fun StubsForCollectionClass.component2() = mutableClass
+internal operator fun StubsForCollectionClass.component3() = candidatesForStubs
 
 internal class CollectionStubComputer(val context: JvmBackendContext) {
 
+    private class LazyStubsForCollectionClass(
+        override val readOnlyClass: IrClassSymbol,
+        override val mutableClass: IrClassSymbol
+    ) : StubsForCollectionClass {
+        override val candidatesForStubs: Collection<IrSimpleFunction> by lazy {
+            // Old back-end generates stubs for 'class A : C', where
+            //  'C' is some "read-only collection" interface from kotlin.collections,
+            //  'MC' is a corresponding "mutable collection" interface from kotlin.collections,
+            // by building fake overrides for a special 'class X : A(), MC'
+            // and taking fake overrides that override members from 'MC'.
+            //
+            // Here we are looking at this problem from a slightly different angle:
+            // we select suitable member functions 'f' in 'MC' that might potentially require stubs (we are here!),
+            // and then we generate stubs for functions 'f' that are not effectively overridden by members of 'A'
+            // (this happens in the lowering itself).
+            //
+            // In order for this to be equivalent to the old back-end approach,
+            // we should take 'f' in 'MC' such that any of the following conditions is true:
+            //  - 'f' is declared in 'MC' - that is, 'f' itself is not a fake override;
+            //  - 'f' is abstract and doesn't override anything from 'C'.
+            //
+            // NB1 it also covers default methods from JDK collection classes case
+            // (since that's the only way a member function in 'MC' might be non-abstract).
+            //
+            // NB2 the scheme of stub method generation in the old back-end depends too much on
+            // which particular declarations are present in 'MC'.
+            // Some of these declarations are redundant from the stub generation point of view -
+            // for example, 'kotlin.collections.MutableListIterator' contains the following (redundant) declarations:
+            //      override fun next(): T
+            //      override fun hasNext(): Boolean
+            // which cause stubs for 'next' and 'hasNext' to be generated in a 'abstract class A<T> : ListIterator<T>'.
+            // See https://youtrack.jetbrains.com/issue/KT-36724.
+            // In the ideal world, it should be enough to check that
+            // the given member function 'f' from 'MC' doesn't override anything from 'C'.
+
+            mutableClass.functions
+                .map { it.owner }
+                .filter { memberFun ->
+                    !memberFun.isFakeOverride ||
+                            (memberFun.modality == Modality.ABSTRACT && memberFun.overriddenSymbols.none { overriddenFun ->
+                                overriddenFun.owner.parentAsClass.symbol == readOnlyClass
+                            })
+                }
+                .toHashSet()
+        }
+    }
+
     private val preComputedStubs: Collection<StubsForCollectionClass> by lazy {
         with(context.ir.symbols) {
             listOf(
-                collection to mutableCollection,
-                set to mutableSet,
-                list to mutableList,
-                map to mutableMap,
-                mapEntry to mutableMapEntry,
-                iterable to mutableIterable,
-                iterator to mutableIterator,
-                listIterator to mutableListIterator
-            ).map { (readOnlyClass, mutableClass) ->
-                StubsForCollectionClass(readOnlyClass, mutableClass)
-            }
+                LazyStubsForCollectionClass(collection, mutableCollection),
+                LazyStubsForCollectionClass(set, mutableSet),
+                LazyStubsForCollectionClass(list, mutableList),
+                LazyStubsForCollectionClass(map, mutableMap),
+                LazyStubsForCollectionClass(mapEntry, mutableMapEntry),
+                LazyStubsForCollectionClass(iterable, mutableIterable),
+                LazyStubsForCollectionClass(iterator, mutableIterator),
+                LazyStubsForCollectionClass(listIterator, mutableListIterator)
+            )
         }
     }
 
-    private val stubsCache = mutableMapOf<IrClass, Collection<StubsForCollectionClass>>()
+    private val stubsCache = mutableMapOf<IrClass, List<StubsForCollectionClass>>()
 
-    fun stubsForCollectionClasses(irClass: IrClass): Collection<StubsForCollectionClass> =
+    fun stubsForCollectionClasses(irClass: IrClass): List<StubsForCollectionClass> =
         stubsCache.getOrPut(irClass) {
-            if (irClass.isFromJava()) emptySet()
-            else preComputedStubs.filter { (readOnlyClass, mutableClass) ->
-                !irClass.symbol.isSubtypeOfClass(mutableClass) &&
-                        irClass.superTypes.any { it.isSubtypeOfClass(readOnlyClass) }
-            }
+            computeStubsForCollectionClasses(irClass)
         }
+
+    private fun computeStubsForCollectionClasses(irClass: IrClass): List<StubsForCollectionClass> {
+        if (irClass.isFromJava()) return emptyList()
+        val stubs = preComputedStubs.filter { (readOnlyClass, mutableClass) ->
+            !irClass.symbol.isSubtypeOfClass(mutableClass) &&
+                    irClass.superTypes.any { it.isSubtypeOfClass(readOnlyClass) }
+        }
+        return stubs.filter { (readOnlyClass) ->
+            stubs.none { readOnlyClass != it.readOnlyClass && it.readOnlyClass.isSubtypeOfClass(readOnlyClass) }
+        }
+    }
 }
\ No newline at end of file
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt
index c5044cb907b..020956c48a5 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt
@@ -50,7 +50,7 @@ internal val fileClassPhase = makeIrModulePhase(
     stickyPostconditions = setOf(::checkAllFileLevelDeclarationsAreClasses)
 )
 
-private fun checkAllFileLevelDeclarationsAreClasses(irModuleFragment: IrModuleFragment) {
+internal fun checkAllFileLevelDeclarationsAreClasses(irModuleFragment: IrModuleFragment) {
     assert(irModuleFragment.files.all { irFile ->
         irFile.declarations.all { it is IrClass }
     })
@@ -62,10 +62,11 @@ private class FileClassLowering(val context: JvmBackendContext) : FileLoweringPa
         val fileClassMembers = ArrayList<IrDeclaration>()
 
         irFile.declarations.forEach {
-            if (it is IrClass)
-                classes.add(it)
-            else
-                fileClassMembers.add(it)
+            when (it) {
+                is IrScript -> {}
+                is IrClass -> classes.add(it)
+                else -> fileClassMembers.add(it)
+            }
         }
 
         // TODO FirMetadataSource.File
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt
index a70771eee1b..6d0dbba4d4b 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt
@@ -366,12 +366,13 @@ internal class FunctionReferenceLowering(private val context: JvmBackendContext)
         private fun createInvokeMethod(receiverVar: IrValueDeclaration?): IrSimpleFunction =
             functionReferenceClass.addFunction {
                 setSourceRange(if (isLambda) callee else irFunctionReference)
-                name = if (callee.returnType.erasedUpperBound.isInline && context.state.functionsWithInlineClassReturnTypesMangled) {
-                    // For functions with inline class return type we need to mangle the invoke method.
-                    // Otherwise, bridge lowering may fail to generate bridges for inline class types erasing to Any.
-                    val suffix = InlineClassAbi.returnHashSuffix(callee)
-                    Name.identifier("${superMethod.owner.name.asString()}-${suffix}")
-                } else superMethod.owner.name
+                name =
+                    if (samSuperType == null && callee.returnType.erasedUpperBound.isInline && context.state.functionsWithInlineClassReturnTypesMangled) {
+                        // For functions with inline class return type we need to mangle the invoke method.
+                        // Otherwise, bridge lowering may fail to generate bridges for inline class types erasing to Any.
+                        val suffix = InlineClassAbi.hashReturnSuffix(callee)
+                        Name.identifier("${superMethod.owner.name.asString()}-${suffix}")
+                    } else superMethod.owner.name
                 returnType = callee.returnType
                 isSuspend = callee.isSuspend
             }.apply {
@@ -401,8 +402,8 @@ internal class FunctionReferenceLowering(private val context: JvmBackendContext)
             body = context.createJvmIrBuilder(symbol, startOffset, endOffset).run {
                 var unboundIndex = 0
                 irExprBody(irCall(callee).apply {
-                    for ((typeParameter, typeArgument) in typeArgumentsMap) {
-                        putTypeArgument(typeParameter.owner.index, typeArgument)
+                    for (typeParameter in irFunctionReference.symbol.owner.allTypeParameters) {
+                        putTypeArgument(typeParameter.index, typeArgumentsMap[typeParameter.symbol])
                     }
 
                     for (parameter in callee.explicitParameters) {
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt
index cf56cd002d8..cab6684f634 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.backend.common.phaser.makeCustomPhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.codegen.fileParent
+import org.jetbrains.kotlin.backend.jvm.codegen.isSyntheticMethodForProperty
 import org.jetbrains.kotlin.config.JvmAnalysisFlags
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.Modality
@@ -27,6 +28,7 @@ import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
 import org.jetbrains.kotlin.ir.builders.declarations.buildClass
 import org.jetbrains.kotlin.ir.builders.declarations.buildFun
+import org.jetbrains.kotlin.ir.builders.declarations.buildProperty
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
 import org.jetbrains.kotlin.ir.expressions.*
@@ -39,7 +41,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
-import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.inline.INLINE_ONLY_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 
@@ -116,7 +117,7 @@ private fun generateMultifileFacades(
         }.apply {
             parent = file
             createImplicitParameterDeclarationWithWrappedDescriptor()
-            origin = IrDeclarationOrigin.FILE_CLASS
+            origin = IrDeclarationOrigin.JVM_MULTIFILE_CLASS
             if (jvmClassName.packageFqName != kotlinPackageFqName) {
                 context.classNameOverride[this] = jvmClassName
             }
@@ -140,18 +141,23 @@ private fun generateMultifileFacades(
             context.multifileFacadeForPart[partClass.attributeOwnerId as IrClass] = jvmClassName
             context.multifileFacadeClassForPart[partClass.attributeOwnerId as IrClass] = facadeClass
 
-            moveFieldsOfConstProperties(partClass, facadeClass)
-
+            val correspondingProperties = CorrespondingPropertyCache(context, facadeClass)
             for (member in partClass.declarations) {
-                if (member is IrSimpleFunction &&
-                    !member.hasAnnotation(INLINE_ONLY_ANNOTATION_FQ_NAME)
-                ) {
-                    val newMember = member.createMultifileDelegateIfNeeded(context, facadeClass, shouldGeneratePartHierarchy)
-                    if (newMember != null) {
-                        functionDelegates[member] = newMember
-                    }
+                if (member !is IrSimpleFunction) continue
+
+                val correspondingProperty = member.correspondingPropertySymbol?.owner
+                if (member.hasAnnotation(INLINE_ONLY_ANNOTATION_FQ_NAME) ||
+                    correspondingProperty?.hasAnnotation(INLINE_ONLY_ANNOTATION_FQ_NAME) == true
+                ) continue
+
+                val newMember =
+                    member.createMultifileDelegateIfNeeded(context, facadeClass, correspondingProperties, shouldGeneratePartHierarchy)
+                if (newMember != null) {
+                    functionDelegates[member] = newMember
                 }
             }
+
+            moveFieldsOfConstProperties(partClass, facadeClass, correspondingProperties)
         }
 
         file
@@ -180,11 +186,16 @@ private fun modifyMultifilePartsForHierarchy(context: JvmBackendContext, parts:
     return parts.last()
 }
 
-private fun moveFieldsOfConstProperties(partClass: IrClass, facadeClass: IrClass) {
+private fun moveFieldsOfConstProperties(partClass: IrClass, facadeClass: IrClass, correspondingProperties: CorrespondingPropertyCache) {
     partClass.declarations.transformFlat { member ->
         if (member is IrField && member.shouldMoveToFacade()) {
             member.patchDeclarationParents(facadeClass)
             facadeClass.declarations.add(member)
+            member.correspondingPropertySymbol?.let { oldPropertySymbol ->
+                val newProperty = correspondingProperties.getOrCopyProperty(oldPropertySymbol.owner)
+                member.correspondingPropertySymbol = newProperty.symbol
+                newProperty.backingField = member
+            }
             emptyList()
         } else null
     }
@@ -198,25 +209,33 @@ private fun IrField.shouldMoveToFacade(): Boolean {
 private fun IrSimpleFunction.createMultifileDelegateIfNeeded(
     context: JvmBackendContext,
     facadeClass: IrClass,
+    correspondingProperties: CorrespondingPropertyCache,
     shouldGeneratePartHierarchy: Boolean
 ): IrSimpleFunction? {
     val target = this
 
-    if (DescriptorVisibilities.isPrivate(visibility) ||
+    val originalVisibility = context.mapping.defaultArgumentsOriginalFunction[this]?.visibility ?: visibility
+
+    if (DescriptorVisibilities.isPrivate(originalVisibility) ||
         name == StaticInitializersLowering.clinitName ||
-        origin == JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR
+        origin == JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR ||
+        // $annotations methods in the facade are only needed for const properties.
+        (isSyntheticMethodForProperty && (metadata as? MetadataSource.Property)?.isConst != true)
     ) return null
 
     val function = context.irFactory.buildFun {
         updateFrom(target)
         isFakeOverride = shouldGeneratePartHierarchy
-        name = if (shouldGeneratePartHierarchy) {
-            target.name
-        } else {
-            // Generating a bridge. If the bridge is targeting a property getter
-            // we need to take care to get the name right. The bridge is not a
-            // property getter itself.
-            Name.identifier(context.methodSignatureMapper.mapFunctionName(target))
+        name = target.name
+    }
+
+    val targetProperty = correspondingPropertySymbol?.owner
+    if (targetProperty != null) {
+        val newProperty = correspondingProperties.getOrCopyProperty(targetProperty)
+        function.correspondingPropertySymbol = newProperty.symbol
+        when (target.valueParameters.size) {
+            0 -> newProperty.getter = function
+            1 -> newProperty.setter = function
         }
     }
 
@@ -230,7 +249,6 @@ private fun IrSimpleFunction.createMultifileDelegateIfNeeded(
         function.body = null
         function.overriddenSymbols = listOf(symbol)
     } else {
-        function.origin = JvmLoweredDeclarationOrigin.MULTIFILE_BRIDGE
         function.overriddenSymbols = overriddenSymbols.toList()
         function.body = context.createIrBuilder(function.symbol).irBlockBody {
             +irReturn(irCall(target).also { call ->
@@ -250,6 +268,23 @@ private fun IrSimpleFunction.createMultifileDelegateIfNeeded(
     return function
 }
 
+private class CorrespondingPropertyCache(private val context: JvmBackendContext, private val facadeClass: IrClass) {
+    private var cache: MutableMap<IrProperty, IrProperty>? = null
+
+    fun getOrCopyProperty(from: IrProperty): IrProperty {
+        val cache = cache ?: mutableMapOf<IrProperty, IrProperty>().also { cache = it }
+        return cache.getOrPut(from) {
+            context.irFactory.buildProperty {
+                updateFrom(from)
+                name = from.name
+            }.apply {
+                parent = facadeClass
+                copyAnnotationsFrom(from)
+            }
+        }
+    }
+}
+
 private class UpdateFunctionCallSites(
     private val functionDelegates: MutableMap<IrSimpleFunction, IrSimpleFunction>
 ) : FileLoweringPass, IrElementTransformer<IrFunction?> {
@@ -261,7 +296,7 @@ private class UpdateFunctionCallSites(
         super.visitFunction(declaration, declaration)
 
     override fun visitCall(expression: IrCall, data: IrFunction?): IrElement {
-        if (data?.origin == JvmLoweredDeclarationOrigin.MULTIFILE_BRIDGE)
+        if (data != null && data.isMultifileBridge())
             return super.visitCall(expression, data)
 
         val newFunction = functionDelegates[expression.symbol.owner]
@@ -318,3 +353,6 @@ private class UpdateConstantFacadePropertyReferences(
         ) facadeClass else null
     }
 }
+
+internal fun IrFunction.isMultifileBridge(): Boolean =
+    (parent as? IrClass)?.origin == IrDeclarationOrigin.JVM_MULTIFILE_CLASS
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InheritedDefaultMethodsOnClassesLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InheritedDefaultMethodsOnClassesLowering.kt
index 85e169f3ac5..795c0545088 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InheritedDefaultMethodsOnClassesLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InheritedDefaultMethodsOnClassesLowering.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.backend.jvm.lower
 import org.jetbrains.kotlin.backend.common.ClassLoweringPass
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
+import org.jetbrains.kotlin.backend.common.ir.allOverridden
 import org.jetbrains.kotlin.backend.common.ir.isMethodOfAny
 import org.jetbrains.kotlin.backend.common.ir.passTypeArgumentsFrom
 import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
@@ -16,19 +17,17 @@ import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.codegen.isJvmInterface
 import org.jetbrains.kotlin.backend.jvm.ir.*
+import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.config.JvmDefaultMode
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.deserialization.PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.builders.irBlockBody
 import org.jetbrains.kotlin.ir.builders.irCall
 import org.jetbrains.kotlin.ir.builders.irGet
 import org.jetbrains.kotlin.ir.builders.irReturn
-import org.jetbrains.kotlin.ir.declarations.IrClass
-import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
-import org.jetbrains.kotlin.ir.declarations.IrFile
-import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrTypeOperator
@@ -46,14 +45,45 @@ internal val inheritedDefaultMethodsOnClassesPhase = makeIrFilePhase(
 private class InheritedDefaultMethodsOnClassesLowering(val context: JvmBackendContext) : ClassLoweringPass {
     override fun lower(irClass: IrClass) {
         if (!irClass.isJvmInterface) {
-            irClass.declarations.transformInPlace { declaration ->
-                (declaration as? IrSimpleFunction)?.findInterfaceImplementation(context.state.jvmDefaultMode)?.let { implementation ->
-                    generateDelegationToDefaultImpl(implementation, declaration)
-                } ?: declaration
+            irClass.declarations.transformInPlace {
+                transformMemberDeclaration(it)
             }
         }
     }
 
+    private fun transformMemberDeclaration(declaration: IrDeclaration): IrDeclaration {
+        if (declaration !is IrSimpleFunction) return declaration
+
+        if (declaration.isFakeOverride && declaration.name.asString() == "clone") {
+            val overriddenFunctions = declaration.allOverridden(false)
+            val cloneFun = overriddenFunctions.find { it.parentAsClass.hasEqualFqName(StandardNames.FqNames.cloneable.toSafe()) }
+            if (cloneFun != null && overriddenFunctions.all { it.isFakeOverride || it == cloneFun }) {
+                return generateCloneImplementation(declaration, cloneFun)
+            }
+        }
+
+        val implementation = declaration.findInterfaceImplementation(context.state.jvmDefaultMode)
+            ?: return declaration
+        return generateDelegationToDefaultImpl(implementation, declaration)
+    }
+
+    private fun generateCloneImplementation(fakeOverride: IrSimpleFunction, cloneFun: IrSimpleFunction): IrSimpleFunction {
+        assert(fakeOverride.isFakeOverride)
+        val irFunction = context.cachedDeclarations.getDefaultImplsRedirection(fakeOverride)
+        val irClass = fakeOverride.parentAsClass
+        val classStartOffset = irClass.startOffset
+        context.createJvmIrBuilder(irFunction.symbol, classStartOffset, classStartOffset).apply {
+            irFunction.body = irBlockBody {
+                +irReturn(
+                    irCall(cloneFun, origin = null, superQualifierSymbol = cloneFun.parentAsClass.symbol).apply {
+                        dispatchReceiver = irGet(irFunction.dispatchReceiverParameter!!)
+                    }
+                )
+            }
+        }
+        return irFunction
+    }
+
     private fun generateDelegationToDefaultImpl(
         interfaceImplementation: IrSimpleFunction,
         classOverride: IrSimpleFunction
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt
index 102a6e23472..18b41f8add2 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.backend.common.ir.passTypeArgumentsFrom
 import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
 import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
+import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.hasMangledParameters
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
@@ -42,6 +43,9 @@ private class JvmDefaultConstructorLowering(val context: JvmBackendContext) : Cl
         if (DescriptorVisibilities.isPrivate(primaryConstructor.visibility))
             return
 
+        if (primaryConstructor.hasMangledParameters)
+            return
+
         if (primaryConstructor.valueParameters.isEmpty() || !primaryConstructor.valueParameters.all { it.hasDefaultValue() })
             return
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt
index a06311f4e95..4e95b29f535 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt
@@ -13,6 +13,8 @@ import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
 import org.jetbrains.kotlin.backend.common.lower.irBlockBody
 import org.jetbrains.kotlin.backend.common.lower.loops.forLoopsPhase
 import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
+import org.jetbrains.kotlin.backend.common.pop
+import org.jetbrains.kotlin.backend.common.push
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.*
@@ -121,7 +123,9 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
 
     private fun transformSimpleFunctionFlat(function: IrSimpleFunction, replacement: IrSimpleFunction): List<IrDeclaration> {
         replacement.valueParameters.forEach { it.transformChildrenVoid() }
+        allScopes.push(createScope(function))
         replacement.body = function.body?.transform(this, null)?.patchDeclarationParents(replacement)
+        allScopes.pop()
         replacement.copyAttributes(function)
 
         // Don't create a wrapper for functions which are only used in an unboxed context
@@ -131,9 +135,9 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
         val bridgeFunction = createBridgeDeclaration(
             function,
             when {
-                // If the original function has signature which need mangling we still need to replace
-                // it with a mangled version.
-                !function.isFakeOverride && function.signatureRequiresMangling() ->
+                // If the original function has signature which need mangling we still need to replace it with a mangled version.
+                (!function.isFakeOverride || function.findInterfaceImplementation(context.state.jvmDefaultMode) != null) &&
+                        function.signatureRequiresMangling() ->
                     replacement.name
                 // Since we remove the corresponding property symbol from the bridge we need to resolve getter/setter
                 // names at this point.
@@ -277,15 +281,16 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
         if (expression.origin == InlineClassAbi.UNMANGLED_FUNCTION_REFERENCE)
             return super.visitFunctionReference(expression)
 
-        val function = context.inlineClassReplacements.getReplacementFunction(expression.symbol.owner)
+        val function = expression.symbol.owner
+        val replacement = context.inlineClassReplacements.getReplacementFunction(function)
             ?: return super.visitFunctionReference(expression)
 
         return IrFunctionReferenceImpl(
             expression.startOffset, expression.endOffset, expression.type,
-            function.symbol, function.typeParameters.size,
-            function.valueParameters.size, expression.reflectionTarget, expression.origin
+            replacement.symbol, replacement.typeParameters.size,
+            replacement.valueParameters.size, expression.reflectionTarget, expression.origin
         ).apply {
-            buildReplacement(expression.symbol.owner, expression, function)
+            buildReplacement(function, expression, replacement)
         }.copyAttributes(expression)
     }
 
@@ -293,10 +298,14 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
         val function = expression.symbol.owner
         val replacement = context.inlineClassReplacements.getReplacementFunction(function)
             ?: return super.visitFunctionAccess(expression)
-        return context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol, expression.startOffset, expression.endOffset)
-            .irCall(replacement, expression.origin, expression.safeAs<IrCall>()?.superQualifierSymbol).apply {
-                buildReplacement(function, expression, replacement)
-            }
+
+        return IrCallImpl(
+            expression.startOffset, expression.endOffset, function.returnType.substitute(expression.typeSubstitutionMap),
+            replacement.symbol, replacement.typeParameters.size, replacement.valueParameters.size,
+            expression.origin, (expression as? IrCall)?.superQualifierSymbol
+        ).apply {
+            buildReplacement(function, expression, replacement)
+        }
     }
 
     private fun coerceInlineClasses(argument: IrExpression, from: IrType, to: IrType) =
@@ -374,9 +383,13 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
         when {
             // Getting the underlying field of an inline class merely changes the IR type,
             // since the underlying representations are the same.
-            expression.symbol.owner.isInlineClassFieldGetter -> {
-                val arg = expression.dispatchReceiver!!.transform(this, null)
-                coerceInlineClasses(arg, expression.symbol.owner.dispatchReceiverParameter!!.type, expression.type)
+            expression.symbol.owner.isInlineClassFieldGetter -> when (val ctor = findInitBlockOrConstructorImpl()) {
+                InitBlockOrConstructorImpl.InitBlock -> super.visitCall(expression)
+                is InitBlockOrConstructorImpl.ConstructorImpl -> getConstructorImplArgumentValue(ctor, expression.type)
+                else -> {
+                    val arg = expression.dispatchReceiver!!.transform(this, null)
+                    coerceInlineClasses(arg, expression.symbol.owner.dispatchReceiverParameter!!.type, expression.type)
+                }
             }
             // Specialize calls to equals when the left argument is a value of inline class type.
             expression.isSpecializedInlineClassEqEq -> {
@@ -389,6 +402,24 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
                 super.visitCall(expression)
         }
 
+    private fun getConstructorImplArgumentValue(ctor: InitBlockOrConstructorImpl.ConstructorImpl, expectedType: IrType): IrExpression {
+        val arg: IrValueParameter = ctor.irElement.valueParameters.single()
+        return coerceInlineClasses(IrGetValueImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, arg.symbol), arg.type, expectedType)
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun findInitBlockOrConstructorImpl(): InitBlockOrConstructorImpl? {
+        for (scope in allScopes.reversed()) {
+            val irElement = scope.irElement
+            when {
+                irElement is IrAnonymousInitializer -> return InitBlockOrConstructorImpl.InitBlock
+                irElement is IrFunction && irElement.origin == JvmLoweredDeclarationOrigin.STATIC_INLINE_CLASS_CONSTRUCTOR ->
+                    return InitBlockOrConstructorImpl.ConstructorImpl(irElement)
+            }
+        }
+        return null
+    }
+
     private val IrCall.isSpecializedInlineClassEqEq: Boolean
         get() {
             // Note that reference equality (x === y) is not allowed on values of inline class type,
@@ -451,6 +482,13 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
                 it.type, it.symbol, expression.origin
             )
         }
+        val owner = expression.symbol.owner
+        if (owner is IrValueParameter && (owner.parent as? IrClass)?.isInline == true && owner.origin == IrDeclarationOrigin.INSTANCE_RECEIVER) {
+            val ctor = findInitBlockOrConstructorImpl()
+            if (ctor is InitBlockOrConstructorImpl.ConstructorImpl) {
+                return getConstructorImplArgumentValue(ctor, expression.type)
+            }
+        }
         return super.visitGetValue(expression)
     }
 
@@ -491,13 +529,24 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
         // Add a static bridge method to the primary constructor.
         // This is a placeholder for null-checks and default arguments.
         val function = context.inlineClassReplacements.getReplacementFunction(irConstructor)!!
+
+        val initBlocks = irClass.declarations.filterIsInstance<IrAnonymousInitializer>()
+
         function.valueParameters.forEach { it.transformChildrenVoid() }
         with(context.createIrBuilder(function.symbol)) {
-            val argument = function.valueParameters[0]
-            function.body = irExprBody(
-                coerceInlineClasses(irGet(argument), argument.type, function.returnType)
-            )
+            val argument: IrValueParameter = function.valueParameters[0]
+            function.body = irBlockBody {
+                for (initBlock in initBlocks) {
+                    for (stmt in initBlock.body.statements) {
+                        +stmt
+                    }
+                }
+                +irReturn(coerceInlineClasses(irGet(argument), argument.type, function.returnType))
+            }
         }
+        function.accept(this, null)
+        irClass.declarations.removeAll(initBlocks)
+
         irClass.declarations += function
     }
 
@@ -544,3 +593,8 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
         irClass.declarations += function
     }
 }
+
+private sealed class InitBlockOrConstructorImpl {
+    object InitBlock : InitBlockOrConstructorImpl()
+    class ConstructorImpl(val irElement: IrFunction) : InitBlockOrConstructorImpl()
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt
index b2742527f55..f90d7bce15b 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt
@@ -10,13 +10,20 @@ import org.jetbrains.kotlin.backend.common.lower.SingleAbstractMethodLowering
 import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound
+import org.jetbrains.kotlin.backend.jvm.ir.rawType
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.builders.declarations.IrFunctionBuilder
+import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
+import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.expressions.IrTypeOperatorCall
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.getClass
 import org.jetbrains.kotlin.ir.util.defaultType
 import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 internal val singleAbstractMethodPhase = makeIrFilePhase(
     ::JvmSingleAbstractMethodLowering,
@@ -25,12 +32,31 @@ internal val singleAbstractMethodPhase = makeIrFilePhase(
 )
 
 private class JvmSingleAbstractMethodLowering(context: JvmBackendContext) : SingleAbstractMethodLowering(context) {
+    // The JVM BE produces inline SAM wrappers both in the scope of an inline function as well as in the scope
+    // of an inline lambda. Compare with `SamWrapperClasses.getSamWrapperClass`.
+    override val inInlineFunctionScope: Boolean
+        get() = allScopes.any { scope ->
+            scope.irElement.safeAs<IrFunction>()?.let {
+                it.isInline || it.origin == IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA
+            } ?: false
+        }
+
     override fun getWrapperVisibility(expression: IrTypeOperatorCall, scopes: List<ScopeWithIr>) =
         if (inInlineFunctionScope) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY
 
     override fun getSuperTypeForWrapper(typeOperand: IrType): IrType =
         typeOperand.erasedUpperBound.defaultType
 
+    override fun getWrappedFunctionType(klass: IrClass): IrType =
+        klass.symbol.rawType(context as JvmBackendContext)
+
+    // The constructor of a SAM wrapper is non-synthetic and should not have line numbers.
+    // Otherwise the debugger will try to step into it.
+    override fun IrFunctionBuilder.setConstructorSourceRange(createFor: IrElement) {
+        startOffset = UNDEFINED_OFFSET
+        endOffset = UNDEFINED_OFFSET
+    }
+
     private val IrType.isKotlinFunInterface: Boolean
         get() = getClass()?.origin != IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt
index a1c0d7be115..81cf15b7cd3 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt
@@ -17,8 +17,8 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.ir.copyCorrespondingPropertyFrom
 import org.jetbrains.kotlin.backend.jvm.ir.isInCurrentModule
 import org.jetbrains.kotlin.backend.jvm.ir.replaceThisByStaticReference
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.builders.declarations.addFunction
 import org.jetbrains.kotlin.ir.builders.declarations.buildFun
 import org.jetbrains.kotlin.ir.builders.irCall
@@ -127,36 +127,62 @@ private class CompanionObjectJvmStaticLowering(val context: JvmBackendContext) :
         }
 }
 
-private class SingletonObjectJvmStaticLowering(
-    val context: JvmBackendContext
-) : ClassLoweringPass {
+private class SingletonObjectJvmStaticLowering(val context: JvmBackendContext) : ClassLoweringPass {
     override fun lower(irClass: IrClass) {
         if (!irClass.isObject || irClass.isCompanion) return
 
-        irClass.declarations.filter(::isJvmStaticFunction).forEach {
-            val jvmStaticFunction = it as IrSimpleFunction
+        val jvmStaticFunctionsToReplace = irClass.declarations.filter {
             // dispatch receiver parameter is already null for synthetic property annotation methods
-            jvmStaticFunction.dispatchReceiverParameter?.let { oldDispatchReceiverParameter ->
-                jvmStaticFunction.dispatchReceiverParameter = null
-                jvmStaticFunction.body = jvmStaticFunction.body?.replaceThisByStaticReference(
-                    context.cachedDeclarations,
-                    irClass,
-                    oldDispatchReceiverParameter
-                )
-            }
+            isJvmStaticFunction(it) && it is IrSimpleFunction && it.dispatchReceiverParameter != null
+        }
+        jvmStaticFunctionsToReplace.forEach { function ->
+            val replacement = createReplacement(context, function as IrSimpleFunction)
+            // Set dispatch receiver parameter for body move operation.
+            replacement.dispatchReceiverParameter = function.dispatchReceiverParameter
+            replacement.body = function.moveBodyTo(replacement)?.replaceThisByStaticReference(
+                context.cachedDeclarations,
+                irClass,
+                function.dispatchReceiverParameter!!
+            )
+            // Clear dispatch receiver parameter again after body move operation.
+            replacement.dispatchReceiverParameter = null
+            irClass.declarations.remove(function)
+            irClass.declarations.add(replacement)
         }
     }
-
 }
 
+private fun createReplacement(
+    context: JvmBackendContext,
+    jvmStaticFunction: IrSimpleFunction
+): IrSimpleFunction =
+    context.jvmStaticObjectFunctionToStaticFunctionMap.getOrPut(jvmStaticFunction) {
+        val irClass = jvmStaticFunction.parentAsClass
+        val newFunction = context.irFactory.buildFun {
+            updateFrom(jvmStaticFunction)
+            name = jvmStaticFunction.name
+            returnType = jvmStaticFunction.returnType
+        }.apply {
+            parent = irClass
+            copyTypeParametersFrom(jvmStaticFunction)
+            copyAnnotationsFrom(jvmStaticFunction)
+            extensionReceiverParameter = jvmStaticFunction.extensionReceiverParameter?.copyTo(this)
+            valueParameters = jvmStaticFunction.valueParameters.map { it.copyTo(this) }
+            copyAttributes(jvmStaticFunction)
+            copyCorrespondingPropertyFrom(jvmStaticFunction)
+            metadata = jvmStaticFunction.metadata
+        }
+        context.jvmStaticObjectFunctionToStaticFunctionMap[jvmStaticFunction] = newFunction
+        newFunction
+    }
+
+
 private fun IrFunction.isJvmStaticInSingleton(): Boolean {
     val parentClass = parent as? IrClass ?: return false
     return isJvmStaticFunction(this) && parentClass.isObject && !parentClass.isCompanion
 }
 
-private class MakeCallsStatic(
-    val context: JvmBackendContext
-) : IrElementTransformerVoid() {
+private class MakeCallsStatic(val context: JvmBackendContext) : IrElementTransformerVoid() {
     override fun visitCall(expression: IrCall): IrExpression {
         if (expression.symbol.owner.isJvmStaticInSingleton() && expression.dispatchReceiver != null) {
             // Imported functions do not have their receiver parameter nulled by SingletonObjectJvmStaticLowering,
@@ -165,7 +191,9 @@ private class MakeCallsStatic(
             val callee = expression.symbol.owner
             val newCallee = if (!callee.isInCurrentModule()) {
                 callee.copyRemovingDispatchReceiver()       // TODO: cache these
-            } else callee
+            } else {
+                createReplacement(context, callee)
+            }
 
             return context.createIrBuilder(expression.symbol, expression.startOffset, expression.endOffset).irBlock(expression) {
                 // OldReceiver has to be evaluated for its side effects.
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt
index b2ee70f6065..03a733beb6e 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt
@@ -124,8 +124,8 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex
             name = Name.identifier("main")
             visibility = DescriptorVisibilities.PUBLIC
             returnType = context.irBuiltIns.unitType
-            modality = Modality.FINAL
-            this.origin = JvmLoweredDeclarationOrigin.GENERATED_EXTENDED_MAIN
+            modality = Modality.OPEN
+            origin = JvmLoweredDeclarationOrigin.GENERATED_EXTENDED_MAIN
         }.apply {
             val args = addValueParameter {
                 name = Name.identifier("args")
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MoveCompanionObjectFieldsLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MoveCompanionObjectFieldsLowering.kt
index d6815d20c8e..17f77b52e3e 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MoveCompanionObjectFieldsLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MoveCompanionObjectFieldsLowering.kt
@@ -7,13 +7,16 @@ package org.jetbrains.kotlin.backend.jvm.lower
 
 import org.jetbrains.kotlin.backend.common.ClassLoweringPass
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
 import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
+import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder
 import org.jetbrains.kotlin.backend.jvm.ir.replaceThisByStaticReference
 import org.jetbrains.kotlin.backend.jvm.propertiesPhase
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.builders.declarations.addProperty
 import org.jetbrains.kotlin.ir.builders.declarations.buildField
+import org.jetbrains.kotlin.ir.builders.irCall
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrAnonymousInitializerImpl
 import org.jetbrains.kotlin.ir.expressions.*
@@ -21,10 +24,12 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrExpressionBodyImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrSetFieldImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrAnonymousInitializerSymbolImpl
+import org.jetbrains.kotlin.ir.util.filterOutAnnotations
 import org.jetbrains.kotlin.ir.util.isObject
 import org.jetbrains.kotlin.ir.util.parentAsClass
 import org.jetbrains.kotlin.ir.util.patchDeclarationParents
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
+import org.jetbrains.kotlin.resolve.deprecation.DeprecationResolver
 
 internal val moveOrCopyCompanionObjectFieldsPhase = makeIrFilePhase(
     ::MoveOrCopyCompanionObjectFieldsLowering,
@@ -124,6 +129,13 @@ private class MoveOrCopyCompanionObjectFieldsLowering(val context: JvmBackendCon
                 initializer = with(oldField.initializer!!) {
                     IrExpressionBodyImpl(startOffset, endOffset, (expression as IrConst<*>).copy())
                 }
+
+                if (oldProperty.parentAsClass.visibility == DescriptorVisibilities.PRIVATE) {
+                    context.createJvmIrBuilder(this.symbol).run {
+                        annotations = filterOutAnnotations(DeprecationResolver.JAVA_DEPRECATED, annotations) +
+                                irCall(irSymbols.javaLangDeprecatedConstructorWithDeprecatedFlag)
+                    }
+                }
             }
         }
 }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ObjectClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ObjectClassLowering.kt
index 94e29163406..5f2b38ec88f 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ObjectClassLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ObjectClassLowering.kt
@@ -7,17 +7,23 @@ package org.jetbrains.kotlin.backend.jvm.lower
 
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
-import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
 import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
+import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.irCall
 import org.jetbrains.kotlin.ir.builders.irExprBody
 import org.jetbrains.kotlin.ir.builders.irGetField
-import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.declarations.IrDeclarationContainer
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.util.constructors
+import org.jetbrains.kotlin.ir.util.filterOutAnnotations
+import org.jetbrains.kotlin.ir.util.isObject
+import org.jetbrains.kotlin.resolve.deprecation.DeprecationResolver
 
 internal val objectClassPhase = makeIrFilePhase(
     ::ObjectClassLowering,
@@ -71,9 +77,10 @@ private class ObjectClassLowering(val context: JvmBackendContext) : IrElementTra
         if (!context.state.languageVersionSettings.supportsFeature(LanguageFeature.ProperVisibilityForCompanionObjectInstanceField) &&
             (irClass.visibility == DescriptorVisibilities.PRIVATE || irClass.visibility == DescriptorVisibilities.PROTECTED)
         ) {
-            context.createIrBuilder(irClass.symbol).run {
-                publicInstanceField.annotations +=
-                    irCall(this@ObjectClassLowering.context.ir.symbols.javaLangDeprecatedConstructor)
+            context.createJvmIrBuilder(irClass.symbol).run {
+                publicInstanceField.annotations =
+                    filterOutAnnotations(DeprecationResolver.JAVA_DEPRECATED, publicInstanceField.annotations) +
+                            irCall(irSymbols.javaLangDeprecatedConstructorWithDeprecatedFlag)
             }
         }
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ResolveInlineCalls.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ResolveInlineCalls.kt
index a9a12d9521a..b077900832c 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ResolveInlineCalls.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ResolveInlineCalls.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.backend.jvm.lower
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
 import org.jetbrains.kotlin.backend.common.phaser.makeIrModulePhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
-import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.codegen.isInlineFunctionCall
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrFunction
@@ -40,7 +39,7 @@ class ResolveInlineCalls(val context: JvmBackendContext) : IrElementTransformerV
         val maybeFakeOverrideOfMultiFileBridge = expression.symbol.owner as? IrSimpleFunction
             ?: return super.visitCall(expression)
         val resolved =
-            maybeFakeOverrideOfMultiFileBridge.resolveMultiFileFacades() ?: maybeFakeOverrideOfMultiFileBridge.resolveFakeOverride()
+            maybeFakeOverrideOfMultiFileBridge.resolveMultiFileFacadeMember() ?: maybeFakeOverrideOfMultiFileBridge.resolveFakeOverride()
             ?: return super.visitCall(expression)
         return super.visitCall(with(expression) {
             IrCallImpl(
@@ -69,8 +68,6 @@ class ResolveInlineCalls(val context: JvmBackendContext) : IrElementTransformerV
         })
     }
 
-    private fun IrFunction.resolveMultiFileFacades(): IrSimpleFunction? =
-        if (origin == JvmLoweredDeclarationOrigin.MULTIFILE_BRIDGE) {
-            context.multifileFacadeMemberToPartMember[this]
-        } else null
+    private fun IrFunction.resolveMultiFileFacadeMember(): IrSimpleFunction? =
+        if (isMultifileBridge()) context.multifileFacadeMemberToPartMember[this] else null
 }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt
new file mode 100644
index 00000000000..81472cabd43
--- /dev/null
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt
@@ -0,0 +1,434 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.jvm.lower
+
+import org.jetbrains.kotlin.backend.common.ir.copyTo
+import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.common.phaser.makeCustomPhase
+import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
+import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.IrStatement
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.builders.*
+import org.jetbrains.kotlin.ir.builders.declarations.*
+import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.declarations.impl.*
+import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor
+import org.jetbrains.kotlin.ir.expressions.*
+import org.jetbrains.kotlin.ir.expressions.impl.*
+import org.jetbrains.kotlin.ir.symbols.*
+import org.jetbrains.kotlin.ir.symbols.impl.IrAnonymousInitializerSymbolImpl
+import org.jetbrains.kotlin.ir.transformStatement
+import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.Name
+
+internal val scriptsToClassesPhase = makeCustomPhase<JvmBackendContext, IrModuleFragment>(
+    name = "ScriptsToClasses",
+    description = "Put script declarations into classes",
+    op = { context, input ->
+        ScriptsToClassesLowering(context).lower(input)
+   }
+)
+
+
+private class ScriptsToClassesLowering(val context: JvmBackendContext) {
+
+    fun lower(module: IrModuleFragment) {
+        val scriptsToClasses = mutableMapOf<IrScript, IrClass>()
+
+        for (irFile in module.files) {
+            val iterator = irFile.declarations.listIterator()
+            while (iterator.hasNext()) {
+                val declaration = iterator.next()
+                if (declaration is IrScript) {
+                    val scriptClass = prepareScriptClass(irFile, declaration)
+                    scriptsToClasses[declaration] = scriptClass
+                    iterator.set(scriptClass)
+                }
+            }
+        }
+
+        val symbolRemapper = ScriptsToClassesSymbolRemapper(scriptsToClasses)
+
+        for ((irScript, irScriptClass) in scriptsToClasses) {
+            finalizeScriptClass(irScriptClass, irScript, symbolRemapper)
+        }
+    }
+
+    private fun prepareScriptClass(irFile: IrFile, irScript: IrScript): IrClass {
+        val fileEntry = irFile.fileEntry
+        return context.irFactory.buildClass {
+            startOffset = 0
+            endOffset = fileEntry.maxOffset
+            origin = IrDeclarationOrigin.SCRIPT_CLASS
+            name = irScript.name
+            kind = ClassKind.CLASS
+            visibility = DescriptorVisibilities.PUBLIC
+            modality = Modality.FINAL
+        }.also { irScriptClass ->
+            irScriptClass.superTypes += context.irBuiltIns.anyType
+            irScriptClass.parent = irFile
+        }
+    }
+
+    private fun finalizeScriptClass(irScriptClass: IrClass, irScript: IrScript, symbolRemapper: ScriptsToClassesSymbolRemapper) {
+        val typeRemapper = SimpleTypeRemapper(symbolRemapper)
+        val scriptTransformer = ScriptToClassTransformer(irScript, irScriptClass, symbolRemapper, typeRemapper)
+        irScriptClass.thisReceiver = irScript.thisReceiver.run {
+            transform(scriptTransformer, null)
+        }
+
+        irScriptClass.addConstructor {
+            isPrimary = true
+        }.also { irConstructor ->
+
+            fun addConstructorParameter(valueParameter: IrValueParameter, createCorrespondingProperty: Boolean) {
+                valueParameter.type = typeRemapper.remapType(valueParameter.type)
+                if (valueParameter.varargElementType != null) {
+                    valueParameter.varargElementType = typeRemapper.remapType(valueParameter.varargElementType!!)
+                }
+                irConstructor.valueParameters = irConstructor.valueParameters + valueParameter
+                if (createCorrespondingProperty) {
+                    irScriptClass.addSimplePropertyFrom(
+                        valueParameter,
+                        IrExpressionBodyImpl(
+                            IrGetValueImpl(
+                                valueParameter.startOffset, valueParameter.endOffset,
+                                valueParameter.type,
+                                valueParameter.symbol,
+                                IrStatementOrigin.INITIALIZE_PROPERTY_FROM_PARAMETER
+                            )
+                        )
+                    )
+                }
+            }
+
+            irScript.explicitCallParameters.forEach { addConstructorParameter(it, true) }
+            irScript.implicitReceiversParameters.forEach { addConstructorParameter(it, false) }
+            irScript.providedProperties.forEach { addConstructorParameter(it.first, false) }
+
+            irConstructor.body = context.createIrBuilder(irConstructor.symbol).irBlockBody {
+                +irDelegatingConstructorCall(context.irBuiltIns.anyClass.owner.constructors.single())
+                +IrInstanceInitializerCallImpl(
+                    irScript.startOffset, irScript.endOffset,
+                    irScriptClass.symbol,
+                    context.irBuiltIns.unitType
+                )
+            }
+        }
+        var hasMain = false
+        irScript.statements.forEach { scriptStatement ->
+            when (scriptStatement) {
+                is IrVariable -> irScriptClass.addSimplePropertyFrom(scriptStatement)
+                is IrDeclaration -> {
+                    val copy = scriptStatement.transform(scriptTransformer, null) as IrDeclaration
+                    irScriptClass.declarations.add(copy)
+                    // temporary way to avoid name clashes
+                    // TODO: remove as soon as main generation become an explicit configuration option
+                    if (copy is IrSimpleFunction && copy.name.asString() == "main") {
+                        hasMain = true
+                    }
+                }
+                else -> {
+                    val transformedStatement = scriptStatement.transformStatement(scriptTransformer)
+                    irScriptClass.addAnonymousInitializer().also { irInitializer ->
+                        irInitializer.body =
+                            context.createIrBuilder(irInitializer.symbol).irBlockBody {
+                                if (transformedStatement is IrComposite) {
+                                    for (statement in transformedStatement.statements)
+                                        +statement
+                                } else {
+                                    +transformedStatement
+                                }
+                            }
+                    }
+                }
+            }
+        }
+        if (!hasMain) {
+            irScriptClass.addScriptMainFun()
+        }
+
+        irScriptClass.annotations += (irScriptClass.parent as IrFile).annotations
+        irScriptClass.metadata = (irScriptClass.parent as IrFile).metadata
+
+        irScript.resultProperty?.owner?.let { irResultProperty ->
+            context.state.scriptSpecific.resultFieldName = irResultProperty.name.identifier
+            context.state.scriptSpecific.resultTypeString = irResultProperty.backingField?.type?.render()
+        }
+    }
+
+    private val scriptingJvmPackage by lazy(LazyThreadSafetyMode.PUBLICATION) {
+        IrExternalPackageFragmentImpl.createEmptyExternalPackageFragment(context.state.module, FqName("kotlin.script.experimental.jvm"))
+    }
+
+    private fun IrClass.addScriptMainFun() {
+        val javaLangClass = context.ir.symbols.javaLangClass
+        val kClassJava = context.ir.symbols.kClassJava
+
+        val scriptRunnerPackageClass: IrClassSymbol = context.irFactory.buildClass {
+            name = Name.identifier("RunnerKt")
+            kind = ClassKind.CLASS
+            modality = Modality.FINAL
+            isInline = false
+        }.apply {
+            parent = scriptingJvmPackage
+            createImplicitParameterDeclarationWithWrappedDescriptor()
+            addFunction("runCompiledScript", context.irBuiltIns.unitType, isStatic = true).apply {
+                addValueParameter("scriptClass", javaLangClass.starProjectedType)
+                addValueParameter {
+                    name = Name.identifier("args")
+                    type = context.irBuiltIns.arrayClass.typeWith(context.irBuiltIns.stringType)
+                    origin = IrDeclarationOrigin.DEFINED
+                    varargElementType = context.irBuiltIns.anyNType
+                }
+            }
+        }.symbol
+
+        val scriptRunHelper: IrSimpleFunctionSymbol =
+            scriptRunnerPackageClass.functions.single { it.owner.name.asString() == "runCompiledScript" }
+
+        val scriptClassRef = IrClassReferenceImpl(
+            startOffset, endOffset, context.irBuiltIns.kClassClass.starProjectedType, context.irBuiltIns.kClassClass, this.defaultType
+        )
+
+        addFunction {
+            name = Name.identifier("main")
+            visibility = DescriptorVisibilities.PUBLIC
+            returnType = context.irBuiltIns.unitType
+            modality = Modality.FINAL
+        }.also { mainFun ->
+            val args = mainFun.addValueParameter {
+                name = Name.identifier("args")
+                type = context.irBuiltIns.arrayClass.typeWith(context.irBuiltIns.stringType)
+            }
+            mainFun.body = context.createIrBuilder(mainFun.symbol).run {
+                irExprBody(
+                    irCall(scriptRunHelper).apply {
+                        putValueArgument(
+                            0,
+                            irGet(javaLangClass.starProjectedType, null, kClassJava.owner.getter!!.symbol).apply {
+                                extensionReceiver = scriptClassRef
+                            }
+                        )
+                        putValueArgument(
+                            1,
+                            IrGetValueImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, args.type, args.symbol)
+                        )
+                    }
+                )
+            }
+        }
+    }
+
+    private fun IrClass.addSimplePropertyFrom(
+        from: IrValueDeclaration,
+        initializer: IrExpressionBodyImpl? = null
+    ) {
+        addProperty {
+            updateFrom(from)
+            name = from.name
+        }.also { property ->
+            property.backingField = context.irFactory.buildField {
+                name = from.name
+                type = from.type
+                visibility = DescriptorVisibilities.PROTECTED
+            }.also { field ->
+                field.parent = this
+                if (initializer != null) {
+                    field.initializer = initializer
+                }
+
+                property.addSimpleFieldGetter(from.type, this, field)
+            }
+        }
+    }
+
+    private fun IrProperty.addSimpleFieldGetter(type: IrType, irScriptClass: IrClass, field: IrField) =
+        addGetter {
+            returnType = type
+        }.apply {
+            dispatchReceiverParameter = irScriptClass.thisReceiver!!.copyTo(this)
+            body = IrBlockBodyImpl(
+                UNDEFINED_OFFSET, UNDEFINED_OFFSET, listOf(
+                    IrReturnImpl(
+                        UNDEFINED_OFFSET, UNDEFINED_OFFSET,
+                        context.irBuiltIns.nothingType,
+                        symbol,
+                        IrGetFieldImpl(
+                            UNDEFINED_OFFSET, UNDEFINED_OFFSET,
+                            field.symbol,
+                            type,
+                            IrGetValueImpl(
+                                UNDEFINED_OFFSET, UNDEFINED_OFFSET,
+                                dispatchReceiverParameter!!.type,
+                                dispatchReceiverParameter!!.symbol
+                            )
+                        )
+                    )
+                )
+            )
+        }
+}
+
+private class ScriptToClassTransformer(
+    val irScript: IrScript,
+    val irScriptClass: IrClass,
+    val symbolRemapper: SymbolRemapper,
+    val typeRemapper: TypeRemapper
+) : IrElementTransformerVoid() {
+
+    private fun IrType.remapType() = typeRemapper.remapType(this)
+
+    private fun IrDeclaration.transformParent() {
+        if (parent == irScript) {
+            parent = irScriptClass
+        }
+    }
+
+    private fun IrMutableAnnotationContainer.transformAnnotations() {
+        annotations = annotations.transform()
+    }
+
+    private inline fun <reified T : IrElement> T.transform() =
+        transform(this@ScriptToClassTransformer, null) as T
+
+    private inline fun <reified T : IrElement> List<T>.transform() =
+        map { it.transform() }
+
+    private fun <T : IrFunction> T.transformFunctionChildren(): T =
+        apply {
+            transformAnnotations()
+            typeRemapper.withinScope(this) {
+                dispatchReceiverParameter = dispatchReceiverParameter?.transform()
+                extensionReceiverParameter = extensionReceiverParameter?.transform()
+                returnType = returnType.remapType()
+                valueParameters = valueParameters.transform()
+                body = body?.transform()
+            }
+        }
+
+    private fun IrTypeParameter.remapSuperTypes(): IrTypeParameter = apply {
+        superTypes = superTypes.map { it.remapType() }
+    }
+
+    private fun unexpectedElement(element: IrElement): Nothing =
+        throw IllegalArgumentException("Unsupported element type: $element")
+
+    override fun visitElement(element: IrElement): IrElement = unexpectedElement(element)
+
+    override fun visitModuleFragment(declaration: IrModuleFragment): IrModuleFragment = unexpectedElement(declaration)
+    override fun visitExternalPackageFragment(declaration: IrExternalPackageFragment) = unexpectedElement(declaration)
+    override fun visitFile(declaration: IrFile): IrFile = unexpectedElement(declaration)
+    override fun visitScript(declaration: IrScript): IrStatement = unexpectedElement(declaration)
+
+    override fun visitDeclaration(declaration: IrDeclarationBase): IrStatement = declaration.apply {
+        transformParent()
+        transformAnnotations()
+        transformChildren(this@ScriptToClassTransformer, null)
+    }
+
+    override fun visitClass(declaration: IrClass): IrClass = declaration.apply {
+        superTypes = superTypes.map {
+            it.remapType()
+        }
+        visitDeclaration(declaration)
+    }
+
+    override fun visitSimpleFunction(declaration: IrSimpleFunction): IrSimpleFunction = declaration.apply {
+        transformParent()
+        transformFunctionChildren()
+//        transformChildren(this@ScriptToClassTransformer, null)
+    }
+
+    override fun visitConstructor(declaration: IrConstructor): IrConstructor = declaration.apply {
+        transformParent()
+        transformFunctionChildren()
+    }
+
+    override fun visitVariable(declaration: IrVariable): IrVariable = declaration.apply {
+        type = type.remapType()
+        visitDeclaration(declaration)
+    }
+
+    override fun visitTypeParameter(declaration: IrTypeParameter): IrTypeParameter = declaration.apply {
+        remapSuperTypes()
+        visitDeclaration(declaration)
+    }
+
+    override fun visitValueParameter(declaration: IrValueParameter): IrValueParameter = declaration.apply {
+        type = type.remapType()
+        varargElementType = varargElementType?.remapType()
+        visitDeclaration(declaration)
+    }
+
+    override fun visitTypeAlias(declaration: IrTypeAlias): IrTypeAlias = declaration.apply {
+        expandedType = expandedType.remapType()
+        visitDeclaration(declaration)
+    }
+
+    override fun visitVararg(expression: IrVararg): IrVararg = expression.apply {
+        type = type.remapType()
+        varargElementType = varargElementType.remapType()
+        transformChildren(this@ScriptToClassTransformer, null)
+    }
+
+    override fun visitSpreadElement(spread: IrSpreadElement): IrSpreadElement = spread.apply {
+        transformChildren(this@ScriptToClassTransformer, null)
+    }
+
+    override fun visitExpression(expression: IrExpression): IrExpression = expression.apply {
+        type = type.remapType()
+        transformChildren(this@ScriptToClassTransformer, null)
+    }
+
+    override fun visitClassReference(expression: IrClassReference): IrClassReference = expression.apply {
+        type = type.remapType()
+        classType = classType.remapType()
+        transformChildren(this@ScriptToClassTransformer, null)
+    }
+
+    override fun visitTypeOperator(expression: IrTypeOperatorCall): IrTypeOperatorCall = expression.apply {
+        type = type.remapType()
+        typeOperand = typeOperand.remapType()
+        transformChildren(this@ScriptToClassTransformer, null)
+    }
+
+    override fun visitMemberAccess(expression: IrMemberAccessExpression<*>): IrExpression = expression.apply {
+        for (i in 0 until typeArgumentsCount) {
+            putTypeArgument(i, getTypeArgument(i)?.remapType())
+        }
+        visitExpression(expression)
+    }
+}
+
+private class ScriptsToClassesSymbolRemapper(
+    val scriptsToClasses: Map<IrScript, IrClass>
+) : SymbolRemapper.Empty() {
+    override fun getReferencedClassifier(symbol: IrClassifierSymbol): IrClassifierSymbol =
+        (symbol.owner as? IrScript)?.let { scriptsToClasses[it] }?.symbol ?: symbol
+}
+
+private inline fun IrClass.addAnonymousInitializer(builder: IrFunctionBuilder.() -> Unit = {}): IrAnonymousInitializer =
+    IrFunctionBuilder().run {
+        builder()
+        returnType = defaultType
+        IrAnonymousInitializerImpl(
+            startOffset, endOffset, origin,
+            IrAnonymousInitializerSymbolImpl(WrappedClassDescriptor())
+        )
+    }.also { anonymousInitializer ->
+        declarations.add(anonymousInitializer)
+        anonymousInitializer.parent = this@addAnonymousInitializer
+    }
+
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SingletonReferencesLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SingletonReferencesLowering.kt
index e1a3e5186c4..155eaa07db6 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SingletonReferencesLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SingletonReferencesLowering.kt
@@ -52,13 +52,6 @@ private class SingletonReferencesLowering(val context: JvmBackendContext) : File
     }
 
     override fun visitGetObjectValue(expression: IrGetObjectValue): IrExpression {
-        // When in an instance method of the object, use the dispatch receiver. Do not use the dispatch
-        // receiver in the constructor, as in the case of an `object` the only way it can be used is
-        // in a super constructor call argument (=> it has JVM type "uninitialized this" and is not usable)
-        // while for a `companion object` all initializers are in `<clinit>` and have no receiver at all.
-        thisOfClass(expression.symbol.owner, false)?.let {
-            return IrGetValueImpl(expression.startOffset, expression.endOffset, it.symbol)
-        }
         val instanceField = if (allScopes.any { it.irElement == expression.symbol.owner })
             context.cachedDeclarations.getPrivateFieldForObjectInstance(expression.symbol.owner) // Constructor or static method.
         else
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SuspendLambdaLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SuspendLambdaLowering.kt
index cd8a5d8afe8..a634a30136f 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SuspendLambdaLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SuspendLambdaLowering.kt
@@ -74,12 +74,23 @@ private fun IrFunction.capturesCrossinline(): Boolean {
 
 internal abstract class SuspendLoweringUtils(protected val context: JvmBackendContext) {
     protected fun IrClass.addFunctionOverride(
-        function: IrSimpleFunction, startOffset: Int = UNDEFINED_OFFSET, endOffset: Int = UNDEFINED_OFFSET
-    ): IrSimpleFunction =
-        addFunction(function.name.asString(), function.returnType, startOffset = startOffset, endOffset = endOffset).apply {
+        function: IrSimpleFunction,
+        startOffset: Int = UNDEFINED_OFFSET,
+        endOffset: Int = UNDEFINED_OFFSET,
+    ): IrSimpleFunction {
+        val overriddenType = superTypes.single { it.classifierOrFail == function.parentAsClass.symbol }
+        val typeSubstitution = (overriddenType.classifierOrFail.owner as IrClass).typeParameters
+            .map { it.symbol }
+            .zip((overriddenType as IrSimpleType).arguments.map { (it as IrTypeProjection).type }) // No star projections in this lowering
+            .toMap()
+        return addFunction(
+            function.name.asString(), function.returnType.substitute(typeSubstitution),
+            startOffset = startOffset, endOffset = endOffset
+        ).apply {
             overriddenSymbols = listOf(function.symbol)
-            valueParameters = function.valueParameters.map { it.copyTo(this) }
+            valueParameters = function.valueParameters.map { it.copyTo(this, type = it.type.substitute(typeSubstitution)) }
         }
+    }
 
     protected fun IrClass.addFunctionOverride(
         function: IrSimpleFunction,
@@ -178,7 +189,7 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
             val createToOverride = suspendLambda.symbol.functions.singleOrNull {
                 it.owner.valueParameters.size == arity + 1 && it.owner.name.asString() == "create"
             }
-            val invokeSuspend = addInvokeSuspendForLambda(function, parametersFields)
+            val invokeSuspend = addInvokeSuspendForLambda(function, suspendLambda, parametersFields)
             if (function.capturesCrossinline()) {
                 addInvokeSuspendForInlineForLambda(invokeSuspend)
             }
@@ -192,11 +203,11 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
             context.suspendLambdaToOriginalFunctionMap[attributeOwnerId as IrFunctionReference] = function
         }
 
-    private fun IrClass.addInvokeSuspendForLambda(irFunction: IrFunction, fields: List<IrField>): IrSimpleFunction {
-        val superMethod = context.ir.symbols.suspendLambdaClass.functions.single {
-            it.owner.name.asString() == INVOKE_SUSPEND_METHOD_NAME && it.owner.valueParameters.size == 1 &&
-                    it.owner.valueParameters[0].type.isKotlinResult()
-        }.owner
+    private fun IrClass.addInvokeSuspendForLambda(irFunction: IrFunction, suspendLambda: IrClass, fields: List<IrField>): IrSimpleFunction {
+        val superMethod = suspendLambda.functions.single {
+            it.name.asString() == INVOKE_SUSPEND_METHOD_NAME && it.valueParameters.size == 1 &&
+                    it.valueParameters[0].type.isKotlinResult()
+        }
         return addFunctionOverride(superMethod, irFunction.startOffset, irFunction.endOffset).apply {
             body = irFunction.moveBodyTo(this, mapOf())?.transform(object : IrElementTransformerVoid() {
                 override fun visitGetValue(expression: IrGetValue): IrExpression {
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TailCallOptimizationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TailCallOptimizationLowering.kt
index b71915e08e5..8512380fe71 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TailCallOptimizationLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TailCallOptimizationLowering.kt
@@ -39,7 +39,7 @@ private class TailCallOptimizationLowering(private val context: JvmBackendContex
             override fun visitCall(expression: IrCall, data: TailCallOptimizationData?): IrExpression {
                 val transformed = super.visitCall(expression, data) as IrExpression
                 return if (data == null || expression !in data.tailCalls) transformed else IrReturnImpl(
-                    expression.startOffset, expression.endOffset, context.irBuiltIns.nothingType, data.function.symbol,
+                    data.function.endOffset, data.function.endOffset, context.irBuiltIns.nothingType, data.function.symbol,
                     if (data.returnsUnit) transformed.coerceToUnit() else transformed
                 )
             }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt
index 6b7c69ddab9..e272e123bfa 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
 import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.util.isInlined
 import org.jetbrains.kotlin.ir.util.render
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
@@ -125,10 +126,15 @@ private class TypeOperatorLowering(private val context: JvmBackendContext) : Fil
                         IrStatementOrigin.SAFE_CALL,
                         irType = context.irBuiltIns.anyNType
                     ) { valueSymbol ->
+                        val thenPart =
+                            if (valueSymbol.owner.type.isInlined())
+                                lowerCast(irGet(valueSymbol.owner), expression.typeOperand)
+                            else
+                                irGet(valueSymbol.owner)
                         irIfThenElse(
                             expression.type,
                             lowerInstanceOf(irGet(valueSymbol.owner), expression.typeOperand.makeNotNull()),
-                            irGet(valueSymbol.owner),
+                            thenPart,
                             irNull(expression.type)
                         )
                     }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt
index 204849bdb18..0ade294322a 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt
@@ -7,12 +7,15 @@ package org.jetbrains.kotlin.backend.jvm.lower.inlineclasses
 
 import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound
 import org.jetbrains.kotlin.builtins.StandardNames
+import org.jetbrains.kotlin.codegen.state.InfoForMangling
+import org.jetbrains.kotlin.codegen.state.collectFunctionSignatureForManglingSuffix
 import org.jetbrains.kotlin.codegen.state.md5base64
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrStatementOriginImpl
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.load.java.JvmAbi
+import org.jetbrains.kotlin.name.FqNameUnsafe
 import org.jetbrains.kotlin.name.Name
 
 /**
@@ -62,7 +65,7 @@ object InlineClassAbi {
      * Returns a mangled name for a function taking inline class arguments
      * to avoid clashes between overloaded methods.
      */
-    fun mangledNameFor(irFunction: IrFunction, mangleReturnTypes: Boolean): Name {
+    fun mangledNameFor(irFunction: IrFunction, mangleReturnTypes: Boolean, useOldMangleRules: Boolean): Name {
         if (irFunction is IrConstructor) {
             // Note that we might drop this convention and use standard mangling for constructors too, see KT-37186.
             assert(irFunction.constructedClass.isInline) {
@@ -71,17 +74,7 @@ object InlineClassAbi {
             return Name.identifier("constructor-impl")
         }
 
-        val suffix = when {
-            irFunction.fullValueParameterList.any { it.type.requiresMangling } ->
-                hashSuffix(irFunction)
-            mangleReturnTypes && irFunction.hasMangledReturnType ->
-                returnHashSuffix(irFunction)
-            (irFunction.parent as? IrClass)?.isInline == true &&
-                    irFunction.origin != IrDeclarationOrigin.IR_BUILTINS_STUB ->
-                "impl"
-            else ->
-                return irFunction.name
-        }
+        val suffix = hashSuffix(irFunction, mangleReturnTypes, useOldMangleRules) ?: return irFunction.name
 
         val base = when {
             irFunction.isGetter ->
@@ -97,30 +90,54 @@ object InlineClassAbi {
         return Name.identifier("$base-$suffix")
     }
 
+    private fun hashSuffix(
+        irFunction: IrFunction,
+        mangleReturnTypes: Boolean,
+        useOldMangleRules: Boolean,
+        alwaysMangleReturnType: Boolean = false
+    ): String? {
+        val signatureForMangling = collectFunctionSignatureForManglingSuffix(
+            useOldManglingRules = useOldMangleRules,
+            requiresFunctionNameManglingForParameterTypes = irFunction.fullValueParameterList.any { it.type.requiresMangling },
+            fqNamesForMangling = irFunction.fullValueParameterList.map {
+                it.type.asInfoForMangling()
+            } + listOfNotNull(
+                // The JVM backend computes mangled names after creating suspend function views, but before default argument
+                // stub insertion. It would be nice if this part of the continuation lowering happened earlier in the pipeline.
+                // TODO: Move suspend function view creation before JvmInlineClassLowering.
+                if (irFunction.isSuspend)
+                    InfoForMangling(FqNameUnsafe("kotlin.coroutines.Continuation"), isInline = false, isNullable = false)
+                else null
+            ),
+            returnTypeInfo = if (alwaysMangleReturnType || (mangleReturnTypes && irFunction.hasMangledReturnType)) {
+                irFunction.returnType.asInfoForMangling()
+            } else null
+        )
+
+        return when {
+            signatureForMangling != null -> md5base64(signatureForMangling)
+            (irFunction.parent as? IrClass)?.isInline == true && irFunction.origin != IrDeclarationOrigin.IR_BUILTINS_STUB -> "impl"
+            else -> null
+        }
+    }
+
+    fun hashReturnSuffix(irFunction: IrFunction): String =
+        hashSuffix(
+            irFunction,
+            mangleReturnTypes = true,
+            useOldMangleRules = false,
+            alwaysMangleReturnType = true
+        )!!
+
+    private fun IrType.asInfoForMangling(): InfoForMangling =
+        InfoForMangling(
+            erasedUpperBound.fqNameWhenAvailable!!.toUnsafe(),
+            isInline = getClass()?.isInline == true,
+            isNullable = isNullable()
+        )
+
     private val IrFunction.propertyName: Name
         get() = (this as IrSimpleFunction).correspondingPropertySymbol!!.owner.name
-
-    fun returnHashSuffix(irFunction: IrFunction) =
-        md5base64(":${irFunction.returnType.eraseToString()}")
-
-    private fun hashSuffix(irFunction: IrFunction): String {
-        val signatureElementsForMangling =
-            irFunction.fullValueParameterList.mapTo(mutableListOf()) { it.type.eraseToString() }
-        if (irFunction.isSuspend) {
-            // The JVM backend computes mangled names after creating suspend function views, but before default argument
-            // stub insertion. It would be nice if this part of the continuation lowering happened earlier in the pipeline.
-            // TODO: Move suspend function view creation before JvmInlineClassLowering.
-            signatureElementsForMangling += "Lkotlin.coroutines.Continuation;"
-        }
-        return md5base64(signatureElementsForMangling.joinToString())
-    }
-
-    private fun IrType.eraseToString() = buildString {
-        append('L')
-        append(erasedUpperBound.fqNameWhenAvailable!!)
-        if (isNullable()) append('?')
-        append(';')
-    }
 }
 
 internal val IrType.requiresMangling: Boolean
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt
index 469cf1e0994..677b7260343 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt
@@ -9,10 +9,13 @@ import org.jetbrains.kotlin.backend.common.ir.copyTo
 import org.jetbrains.kotlin.backend.common.ir.copyTypeParameters
 import org.jetbrains.kotlin.backend.common.ir.copyTypeParametersFrom
 import org.jetbrains.kotlin.backend.common.ir.createDispatchReceiverParameter
+import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
+import org.jetbrains.kotlin.backend.jvm.codegen.classFileContainsMethod
 import org.jetbrains.kotlin.backend.jvm.ir.isStaticInlineClassReplacement
 import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.InlineClassAbi.mangledNameFor
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
@@ -33,7 +36,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 /**
  * Keeps track of replacement functions and inline class box/unbox functions.
  */
-class MemoizedInlineClassReplacements(private val mangleReturnTypes: Boolean, private val irFactory: IrFactory) {
+class MemoizedInlineClassReplacements(
+    private val mangleReturnTypes: Boolean,
+    private val irFactory: IrFactory,
+    private val context: JvmBackendContext
+) {
     private val storageManager = LockBasedStorageManager("inline-class-replacements")
     private val propertyMap = mutableMapOf<IrPropertySymbol, IrProperty>()
 
@@ -215,11 +222,19 @@ class MemoizedInlineClassReplacements(private val mangleReturnTypes: Boolean, pr
         if (noFakeOverride) {
             isFakeOverride = false
         }
-        name = mangledNameFor(function, mangleReturnTypes)
+        val useOldManglingScheme = context.state.useOldManglingSchemeForFunctionsWithInlineClassesInSignatures
+        name = mangledNameFor(function, mangleReturnTypes, useOldManglingScheme)
+        if (
+            !useOldManglingScheme &&
+            name.asString().contains("-") &&
+            classFileContainsMethod(function, context, name.asString()) == false
+        ) {
+            name = mangledNameFor(function, mangleReturnTypes, true)
+        }
         returnType = function.returnType
     }.apply {
         parent = function.parent
-        annotations += function.annotations
+        annotations = function.annotations
         copyTypeParameters(function.allTypeParameters)
         if (function.metadata != null) {
             metadata = function.metadata
@@ -237,6 +252,7 @@ class MemoizedInlineClassReplacements(private val mangleReturnTypes: Boolean, pr
                     }.apply {
                         parent = propertySymbol.owner.parent
                         copyAttributes(propertySymbol.owner)
+                        annotations = propertySymbol.owner.annotations
                     }
                 }
                 correspondingPropertySymbol = property.symbol
diff --git a/compiler/ir/backend.wasm/build.gradle.kts b/compiler/ir/backend.wasm/build.gradle.kts
index cc9386c3abc..745f12242a5 100644
--- a/compiler/ir/backend.wasm/build.gradle.kts
+++ b/compiler/ir/backend.wasm/build.gradle.kts
@@ -12,9 +12,11 @@ dependencies {
     compile(project(":compiler:ir.backend.common"))
     compile(project(":compiler:ir.serialization.common"))
     compile(project(":compiler:ir.serialization.js"))
+    compile(project(":compiler:ir.tree.persistent"))
     compile(project(":js:js.ast"))
     compile(project(":js:js.frontend"))
     compile(project(":compiler:backend.js"))
+    compile(project(":wasm:wasm.ir"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmBackendContext.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmBackendContext.kt
index 6e6d12b703a..c69f3afc285 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmBackendContext.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmBackendContext.kt
@@ -7,24 +7,29 @@ package org.jetbrains.kotlin.backend.wasm
 
 import org.jetbrains.kotlin.backend.common.ir.Ir
 import org.jetbrains.kotlin.backend.common.ir.Symbols
+import org.jetbrains.kotlin.backend.common.ir.addChild
+import org.jetbrains.kotlin.backend.wasm.lower.WasmSharedVariablesManager
+import org.jetbrains.kotlin.backend.wasm.utils.WasmInlineClassesUtils
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor
 import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.SourceManager
+import org.jetbrains.kotlin.ir.SourceRangeInfo
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
 import org.jetbrains.kotlin.ir.backend.js.JsMapping
-import org.jetbrains.kotlin.ir.backend.js.JsSharedVariablesManager
 import org.jetbrains.kotlin.ir.backend.js.lower.JsInnerClassesSupport
+import org.jetbrains.kotlin.ir.builders.declarations.buildFun
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
+import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
 import org.jetbrains.kotlin.ir.declarations.persistent.PersistentIrFactory
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
-import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
-import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.DescriptorlessExternalPackageFragmentSymbol
-import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.SymbolTable
 import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.Name
 
 class WasmBackendContext(
     val module: ModuleDescriptor,
@@ -37,16 +42,16 @@ class WasmBackendContext(
     override val builtIns = module.builtIns
     override var inVerbosePhase: Boolean = false
     override val scriptMode = false
-    override val transformedFunction = mutableMapOf<IrFunctionSymbol, IrSimpleFunctionSymbol>()
-    override val lateinitNullableFields = mutableMapOf<IrField, IrField>()
     override val extractedLocalClasses: MutableSet<IrClass> = hashSetOf()
     override val irFactory: IrFactory = PersistentIrFactory
 
     // Place to store declarations excluded from code generation
-    val excludedDeclarations: IrPackageFragment by lazy {
+    private val excludedDeclarations = mutableMapOf<FqName, IrPackageFragment>()
+
+    fun getExcludedPackageFragment(fqName: FqName): IrPackageFragment = excludedDeclarations.getOrPut(fqName) {
         IrExternalPackageFragmentImpl(
             DescriptorlessExternalPackageFragmentSymbol(),
-            FqName("kotlin")
+            fqName
         )
     }
 
@@ -54,14 +59,44 @@ class WasmBackendContext(
 
     val innerClassesSupport = JsInnerClassesSupport(mapping, irFactory)
 
-    val objectToGetInstanceFunction = mutableMapOf<IrClassSymbol, IrSimpleFunction>()
     override val internalPackageFqn = FqName("kotlin.wasm")
 
-    private val internalPackageFragment = IrExternalPackageFragmentImpl.createEmptyExternalPackageFragment(
-        builtIns.builtInsModule, FqName("kotlin.wasm.internal")
-    )
+    private val internalPackageFragmentDescriptor = EmptyPackageFragmentDescriptor(builtIns.builtInsModule, FqName("kotlin.wasm.internal"))
+    // TODO: Merge with JS IR Backend context lazy file
+    val internalPackageFragment by lazy {
+        IrFileImpl(object : SourceManager.FileEntry {
+            override val name = "<implicitDeclarations>"
+            override val maxOffset = UNDEFINED_OFFSET
 
-    override val sharedVariablesManager = JsSharedVariablesManager(TODO("..."))
+            override fun getSourceRangeInfo(beginOffset: Int, endOffset: Int) =
+                SourceRangeInfo(
+                    "",
+                    UNDEFINED_OFFSET,
+                    UNDEFINED_OFFSET,
+                    UNDEFINED_OFFSET,
+                    UNDEFINED_OFFSET,
+                    UNDEFINED_OFFSET,
+                    UNDEFINED_OFFSET
+                )
+
+            override fun getLineNumber(offset: Int) = UNDEFINED_OFFSET
+            override fun getColumnNumber(offset: Int) = UNDEFINED_OFFSET
+        }, internalPackageFragmentDescriptor).also {
+            irModuleFragment.files += it
+        }
+    }
+
+
+    val startFunction = irFactory.buildFun {
+        name = Name.identifier("startFunction")
+        returnType = irBuiltIns.unitType
+    }.apply {
+        body = irFactory.createBlockBody(UNDEFINED_OFFSET, UNDEFINED_OFFSET)
+        internalPackageFragment.addChild(this)
+    }
+
+    override val sharedVariablesManager =
+        WasmSharedVariablesManager(this, irBuiltIns, internalPackageFragment)
 
     val wasmSymbols: WasmSymbols = WasmSymbols(this@WasmBackendContext, symbolTable)
     override val ir = object : Ir<WasmBackendContext>(this, irModuleFragment) {
@@ -69,6 +104,8 @@ class WasmBackendContext(
         override fun shouldGenerateHandlerParameterForDefaultBodyFun() = true
     }
 
+    override val inlineClassesUtils = WasmInlineClassesUtils(wasmSymbols)
+
     override fun log(message: () -> String) {
         /*TODO*/
         if (inVerbosePhase) print(message())
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt
index d661effa94a..56b32d80129 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt
@@ -5,23 +5,17 @@
 
 package org.jetbrains.kotlin.backend.wasm
 
-import org.jetbrains.kotlin.backend.common.ClassLoweringPass
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
-import org.jetbrains.kotlin.backend.common.lower
 import org.jetbrains.kotlin.backend.common.lower.*
 import org.jetbrains.kotlin.backend.common.lower.inline.FunctionInlining
+import org.jetbrains.kotlin.backend.common.lower.loops.ForLoopsLowering
 import org.jetbrains.kotlin.backend.common.phaser.*
-import org.jetbrains.kotlin.backend.common.runOnFilePostfix
-import org.jetbrains.kotlin.backend.wasm.lower.BuiltInsLowering
-import org.jetbrains.kotlin.backend.wasm.lower.WasmBlockDecomposerLowering
-import org.jetbrains.kotlin.backend.wasm.lower.excludeDeclarationsFromCodegen
+import org.jetbrains.kotlin.backend.wasm.lower.*
 import org.jetbrains.kotlin.ir.backend.js.lower.*
 import org.jetbrains.kotlin.ir.backend.js.lower.inline.RemoveInlineFunctionsWithReifiedTypeParametersLowering
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 import org.jetbrains.kotlin.ir.util.patchDeclarationParents
 
-private fun ClassLoweringPass.runOnFilesPostfix(moduleFragment: IrModuleFragment) = moduleFragment.files.forEach { runOnFilePostfix(it) }
-
 private fun makeWasmModulePhase(
     lowering: (WasmBackendContext) -> FileLoweringPass,
     name: String,
@@ -60,6 +54,12 @@ private val expectDeclarationsRemovingPhase = makeWasmModulePhase(
     description = "Remove expect declaration from module fragment"
 )
 
+private val stringConstructorLowering = makeWasmModulePhase(
+    ::SimpleStringConcatenationLowering,
+    name = "StringConcatenation",
+    description = "String concatenation lowering"
+)
+
 private val lateinitNullableFieldsPhase = makeWasmModulePhase(
     ::NullableFieldsForLateinitCreationLowering,
     name = "LateinitNullableFields",
@@ -86,12 +86,6 @@ private val provisionalFunctionExpressionPhase = makeWasmModulePhase(
     description = "Transform IrFunctionExpression to a local function reference"
 )
 
-private val arrayConstructorPhase = makeWasmModulePhase(
-    ::ArrayConstructorLowering,
-    name = "ArrayConstructor",
-    description = "Transform `Array(size) { index -> value }` into a loop"
-)
-
 private val functionInliningPhase = makeCustomWasmModulePhase(
     { context, module ->
         FunctionInlining(context).inline(module)
@@ -112,7 +106,7 @@ private val removeInlineFunctionsWithReifiedTypeParametersLoweringPhase = makeWa
 private val tailrecLoweringPhase = makeWasmModulePhase(
     ::TailrecLowering,
     name = "TailrecLowering",
-    description = "Replace `tailrec` callsites with equivalent loop"
+    description = "Replace `tailrec` call sites with equivalent loop"
 )
 
 private val enumClassConstructorLoweringPhase = makeWasmModulePhase(
@@ -121,6 +115,62 @@ private val enumClassConstructorLoweringPhase = makeWasmModulePhase(
     description = "Transform Enum Class into regular Class"
 )
 
+private val enumClassConstructorBodyLoweringPhase = makeWasmModulePhase(
+    ::EnumClassConstructorBodyTransformer,
+    name = "EnumClassConstructorBodyLowering",
+    description = "Transform Enum Class into regular Class"
+)
+
+
+private val enumEntryInstancesLoweringPhase = makeWasmModulePhase(
+    ::EnumEntryInstancesLowering,
+    name = "EnumEntryInstancesLowering",
+    description = "Create instance variable for each enum entry initialized with `null`",
+    prerequisite = setOf(enumClassConstructorLoweringPhase)
+)
+
+private val enumEntryInstancesBodyLoweringPhase = makeWasmModulePhase(
+    ::EnumEntryInstancesBodyLowering,
+    name = "EnumEntryInstancesBodyLowering",
+    description = "Insert enum entry field initialization into corresponding class constructors",
+    prerequisite = setOf(enumEntryInstancesLoweringPhase)
+)
+
+private val enumClassCreateInitializerLoweringPhase = makeWasmModulePhase(
+    ::EnumClassCreateInitializerLowering,
+    name = "EnumClassCreateInitializerLowering",
+    description = "Create initializer for enum entries",
+    prerequisite = setOf(enumClassConstructorLoweringPhase)
+)
+
+private val enumEntryCreateGetInstancesFunsLoweringPhase = makeWasmModulePhase(
+    ::EnumEntryCreateGetInstancesFunsLowering,
+    name = "EnumEntryCreateGetInstancesFunsLowering",
+    description = "Create enumEntry_getInstance functions",
+    prerequisite = setOf(enumClassConstructorLoweringPhase)
+)
+
+private val enumSyntheticFunsLoweringPhase = makeWasmModulePhase(
+    ::EnumSyntheticFunctionsLowering,
+    name = "EnumSyntheticFunctionsLowering",
+    description = "Implement `valueOf` and `values`",
+    prerequisite = setOf(enumClassConstructorLoweringPhase)
+)
+
+private val enumUsageLoweringPhase = makeWasmModulePhase(
+    ::EnumUsageLowering,
+    name = "EnumUsageLowering",
+    description = "Replace enum access with invocation of corresponding function",
+    prerequisite = setOf(enumEntryCreateGetInstancesFunsLoweringPhase)
+)
+
+private val enumEntryRemovalLoweringPhase = makeWasmModulePhase(
+    ::EnumClassRemoveEntriesLowering,
+    name = "EnumEntryRemovalLowering",
+    description = "Replace enum entry with corresponding class",
+    prerequisite = setOf(enumUsageLoweringPhase)
+)
+
 
 private val sharedVariablesLoweringPhase = makeWasmModulePhase(
     ::SharedVariablesLowering,
@@ -128,6 +178,12 @@ private val sharedVariablesLoweringPhase = makeWasmModulePhase(
     description = "Box captured mutable variables"
 )
 
+private val callableReferencePhase = makeWasmModulePhase(
+    ::WasmCallableReferenceLowering,
+    name = "WasmCallableReferenceLowering",
+    description = "Handle callable references"
+)
+
 private val localDelegatedPropertiesLoweringPhase = makeWasmModulePhase(
     { LocalDelegatedPropertiesLowering() },
     name = "LocalDelegatedPropertiesLowering",
@@ -183,7 +239,7 @@ private val defaultArgumentPatchOverridesPhase = makeWasmModulePhase(
 private val defaultParameterInjectorPhase = makeWasmModulePhase(
     { context -> DefaultParameterInjector(context, skipExternalMethods = true) },
     name = "DefaultParameterInjector",
-    description = "Replace callsite with default parameters with corresponding stub function",
+    description = "Replace call site with default parameters with corresponding stub function",
     prerequisite = setOf(innerClassesLoweringPhase)
 )
 
@@ -193,18 +249,6 @@ private val defaultParameterCleanerPhase = makeWasmModulePhase(
     description = "Clean default parameters up"
 )
 
-//private val jsDefaultCallbackGeneratorPhase = makeJsModulePhase(
-//    ::JsDefaultCallbackGenerator,
-//    name = "JsDefaultCallbackGenerator",
-//    description = "Build binding for super calls with default parameters"
-//)
-
-//private val varargLoweringPhase = makeJsModulePhase(
-//    ::VarargLowering,
-//    name = "VarargLowering",
-//    description = "Lower vararg arguments"
-//)
-
 private val propertiesLoweringPhase = makeWasmModulePhase(
     { PropertiesLowering() },
     name = "PropertiesLowering",
@@ -254,7 +298,7 @@ private val returnableBlockLoweringPhase = makeWasmModulePhase(
 )
 
 private val bridgesConstructionPhase = makeWasmModulePhase(
-    ::BridgesConstruction,
+    ::WasmBridgesConstruction,
     name = "BridgesConstruction",
     description = "Generate bridges"
 )
@@ -271,65 +315,57 @@ private val inlineClassUsageLoweringPhase = makeWasmModulePhase(
     description = "Handle inline class usages"
 )
 
-//private val autoboxingTransformerPhase = makeJsModulePhase(
-//    ::AutoboxingTransformer,
-//    name = "AutoboxingTransformer",
-//    description = "Insert box/unbox intrinsics"
-//)
-
-private val blockDecomposerLoweringPhase = makeCustomWasmModulePhase(
-    { context, module ->
-        WasmBlockDecomposerLowering(context).lower(module)
-        module.patchDeclarationParents()
-    },
-    name = "BlockDecomposerLowering",
-    description = "Transform statement-like-expression nodes into pure-statement to make it easily transform into JS"
+private val autoboxingTransformerPhase = makeWasmModulePhase(
+    { context -> AutoboxingTransformer(context) },
+    name = "AutoboxingTransformer",
+    description = "Insert box/unbox intrinsics"
+)
+
+private val wasmNullSpecializationLowering = makeWasmModulePhase(
+    { context -> WasmNullCoercingLowering(context) },
+    name = "WasmNullCoercingLowering",
+    description = "Specialize assigning Nothing? values to other types."
+)
+
+private val staticMembersLoweringPhase = makeWasmModulePhase(
+    ::StaticMembersLowering,
+    name = "StaticMembersLowering",
+    description = "Move static member declarations to top-level"
+)
+
+private val wasmVarargExpressionLoweringPhase = makeWasmModulePhase(
+    ::WasmVarargExpressionLowering,
+    name = "WasmVarargExpressionLowering",
+    description = "Lower varargs"
+)
+
+private val wasmThrowDebugLoweringPhase = makeWasmModulePhase(
+    ::WasmThrowDebugLowering,
+    name = "WasmThrowDebugLowering",
+    description = "Instrument throws with debug print information"
+)
+
+private val fieldInitializersLoweringPhase = makeWasmModulePhase(
+    ::FieldInitializersLowering,
+    name = "FieldInitializersLowering",
+    description = "Move field initializers to start function"
+)
+
+private val builtInsLoweringPhase0 = makeWasmModulePhase(
+    ::BuiltInsLowering,
+    name = "BuiltInsLowering0",
+    description = "Lower IR builtins 0"
 )
 
-//private val classReferenceLoweringPhase = makeJsModulePhase(
-//    ::ClassReferenceLowering,
-//    name = "ClassReferenceLowering",
-//    description = "Handle class references"
-//)
-//
-//private val primitiveCompanionLoweringPhase = makeJsModulePhase(
-//    ::PrimitiveCompanionLowering,
-//    name = "PrimitiveCompanionLowering",
-//    description = "Replace common companion object access with platform one"
-//)
-//
-//private val constLoweringPhase = makeJsModulePhase(
-//    ::ConstLowering,
-//    name = "ConstLowering",
-//    description = "Wrap Long and Char constants into constructor invocation"
-//)
-//
-//private val callsLoweringPhase = makeJsModulePhase(
-//    ::CallsLowering,
-//    name = "CallsLowering",
-//    description = "Handle intrinsics"
-//)
-//
-//private val testGenerationPhase = makeJsModulePhase(
-//    ::TestGenerator,
-//    name = "TestGenerationLowering",
-//    description = "Generate invocations to kotlin.test suite and test functions"
-//)
-//
-//private val staticMembersLoweringPhase = makeWasmModulePhase(
-//    ::StaticMembersLowering,
-//    name = "StaticMembersLowering",
-//    description = "Move static member declarations to top-level"
-//)
 
 private val builtInsLoweringPhase = makeWasmModulePhase(
     ::BuiltInsLowering,
     name = "BuiltInsLowering",
-    description = "Lower IR buildins"
+    description = "Lower IR builtins"
 )
 
 private val objectDeclarationLoweringPhase = makeWasmModulePhase(
-    ::ObjectUsageLowering,
+    ::ObjectDeclarationLowering,
     name = "ObjectDeclarationLowering",
     description = "Create lazy object instance generator functions"
 )
@@ -340,26 +376,58 @@ private val objectUsageLoweringPhase = makeWasmModulePhase(
     description = "Transform IrGetObjectValue into instance generator call"
 )
 
+private val typeOperatorLoweringPhase = makeWasmModulePhase(
+    ::WasmTypeOperatorLowering,
+    name = "TypeOperatorLowering",
+    description = "Lower IrTypeOperator with corresponding logic"
+)
+
+private val genericReturnTypeLowering = makeWasmModulePhase(
+    ::GenericReturnTypeLowering,
+    name = "GenericReturnTypeLowering",
+    description = "Cast calls to functions with generic return types"
+)
+
+private val eraseVirtualDispatchReceiverParametersTypes = makeWasmModulePhase(
+    ::EraseVirtualDispatchReceiverParametersTypes,
+    name = "EraseVirtualDispatchReceiverParametersTypes",
+    description = "Erase types of virtual dispatch receivers to Any"
+)
+
+private val virtualDispatchReceiverExtractionPhase = makeWasmModulePhase(
+    ::VirtualDispatchReceiverExtraction,
+    name = "VirtualDispatchReceiverExtraction",
+    description = "Eliminate side-effects in dispatch receivers of virtual function calls"
+)
+
+private val forLoopsLoweringPhase = makeWasmModulePhase(
+    ::ForLoopsLowering,
+    name = "ForLoopsLowering",
+    description = "[Optimization] For loops lowering"
+)
+
 val wasmPhases = NamedCompilerPhase(
     name = "IrModuleLowering",
     description = "IR module lowering",
     lower = validateIrBeforeLowering then
             excludeDeclarationsFromCodegenPhase then
             expectDeclarationsRemovingPhase then
-            provisionalFunctionExpressionPhase then
 
             // TODO: Need some helpers from stdlib
             // arrayConstructorPhase then
 
             functionInliningPhase then
+            provisionalFunctionExpressionPhase then
             lateinitNullableFieldsPhase then
             lateinitDeclarationLoweringPhase then
             lateinitUsageLoweringPhase then
             tailrecLoweringPhase then
 
             enumClassConstructorLoweringPhase then
+            enumClassConstructorBodyLoweringPhase then
 
             sharedVariablesLoweringPhase then
+            callableReferencePhase then
             localDelegatedPropertiesLoweringPhase then
             localDeclarationsLoweringPhase then
             localClassExtractionPhase then
@@ -373,68 +441,55 @@ val wasmPhases = NamedCompilerPhase(
             initializersCleanupLoweringPhase then
             // Common prefix ends
 
-            builtInsLoweringPhase then
-
-//            TODO: Commonize enumEntryToGetInstanceFunction
-//                  Commonize array literal creation
-//                  Extract external enum lowering to JS part
-//
-//            enumClassLoweringPhase then
-//            enumUsageLoweringPhase then
-
+            enumEntryInstancesLoweringPhase then
+            enumEntryInstancesBodyLoweringPhase then
+            enumClassCreateInitializerLoweringPhase then
+            enumEntryCreateGetInstancesFunsLoweringPhase then
+            enumSyntheticFunsLoweringPhase then
+            enumUsageLoweringPhase then
+            enumEntryRemovalLoweringPhase then
 
 //            TODO: Requires stdlib
 //            suspendFunctionsLoweringPhase then
 
+            stringConstructorLowering then
             returnableBlockLoweringPhase then
 
-//            TODO: Callable reference lowering is too JS specific.
-//                  Should we reuse JVM or Native lowering?
-//            callableReferenceLoweringPhase then
+            forLoopsLoweringPhase then
 
             defaultArgumentStubGeneratorPhase then
             defaultArgumentPatchOverridesPhase then
             defaultParameterInjectorPhase then
             defaultParameterCleanerPhase then
-
-//          TODO: Investigate
-//            jsDefaultCallbackGeneratorPhase then
-
             removeInlineFunctionsWithReifiedTypeParametersLoweringPhase then
 
-
-//            TODO: Varargs are too platform-specific. Reimplement.
-//            varargLoweringPhase then
-
-//            TODO: Investigate exception proposal
+//            TODO:
 //            multipleCatchesLoweringPhase then
-
-            bridgesConstructionPhase then
-
-//            TODO: Reimplement
-//            typeOperatorLoweringPhase then
-
-//            TODO: Reimplement
-//            secondaryConstructorLoweringPhase then
-//            secondaryFactoryInjectorLoweringPhase then
-
-//            TODO: Reimplement
 //            classReferenceLoweringPhase then
 
+            wasmVarargExpressionLoweringPhase then
             inlineClassDeclarationLoweringPhase then
             inlineClassUsageLoweringPhase then
 
-//            TODO: Commonize box/unbox intrinsics
-//            autoboxingTransformerPhase then
-
-            blockDecomposerLoweringPhase then
-
-//            TODO: Reimplement
-//            constLoweringPhase then
-
+            eraseVirtualDispatchReceiverParametersTypes then
+            bridgesConstructionPhase then
             objectDeclarationLoweringPhase then
-            objectUsageLoweringPhase then
-//            staticMembersLoweringPhase then
+            fieldInitializersLoweringPhase then
+            genericReturnTypeLowering then
 
+            // Replace builtins before autoboxing
+            builtInsLoweringPhase0 then
+
+            autoboxingTransformerPhase then
+            objectUsageLoweringPhase then
+            typeOperatorLoweringPhase then
+
+            // Clean up built-ins after type operator lowering
+            builtInsLoweringPhase then
+
+            virtualDispatchReceiverExtractionPhase then
+            wasmThrowDebugLoweringPhase then
+            staticMembersLoweringPhase then
+            wasmNullSpecializationLowering then
             validateIrAfterLowering
 )
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt
index 898b676e80f..9c7d24dc128 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt
@@ -7,10 +7,12 @@ package org.jetbrains.kotlin.backend.wasm
 
 import org.jetbrains.kotlin.backend.common.ir.Symbols
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.ir.builders.declarations.addFunction
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
@@ -18,24 +20,26 @@ import org.jetbrains.kotlin.ir.util.SymbolTable
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
+import org.jetbrains.kotlin.util.OperatorNameConventions
 
 class WasmSymbols(
     context: WasmBackendContext,
     private val symbolTable: SymbolTable
 ) : Symbols<WasmBackendContext>(context, context.irBuiltIns, symbolTable) {
 
-    override val throwNullPointerException
-        get() = TODO()
-    override val throwNoWhenBranchMatchedException
-        get() = TODO()
-    override val throwTypeCastException
-        get() = TODO()
-    override val throwUninitializedPropertyAccessException
-        get() = TODO()
+    private val wasmInternalPackage: PackageViewDescriptor =
+        context.module.getPackage(FqName("kotlin.wasm.internal"))
+
+    override val throwNullPointerException = getInternalFunction("THROW_NPE")
+    override val throwISE = getInternalFunction("THROW_ISE")
+    override val throwNoWhenBranchMatchedException = throwISE
+    override val throwTypeCastException = getInternalFunction("THROW_CCE")
+    override val throwUninitializedPropertyAccessException =
+        getInternalFunction("throwUninitializedPropertyAccessException")
+    override val defaultConstructorMarker =
+        getIrClass(FqName("kotlin.wasm.internal.DefaultConstructorMarker"))
     override val throwKotlinNothingValueException: IrSimpleFunctionSymbol
         get() = TODO()
-    override val defaultConstructorMarker
-        get() = TODO()
     override val stringBuilder
         get() = TODO()
     override val copyRangeTo: Map<ClassDescriptor, IrSimpleFunctionSymbol>
@@ -47,7 +51,7 @@ class WasmSymbols(
     override val getContinuation
         get() = TODO()
     override val coroutineContextGetter by lazy {
-        context.irFactory.addFunction(context.excludedDeclarations) {
+        context.irFactory.addFunction(context.getExcludedPackageFragment(FqName("kotlin.excluded"))) {
             name = Name.identifier("coroutineContextGetter\$Stub")
         }.symbol
     }
@@ -62,7 +66,9 @@ class WasmSymbols(
     override val functionAdapter: IrClassSymbol
         get() = TODO()
 
-    private val wasmInternalPackage = context.module.getPackage(FqName("kotlin.wasm.internal"))
+    val wasmUnreachable = getInternalFunction("wasm_unreachable")
+    val wasmFloatNaN = getInternalFunction("wasm_float_nan")
+    val wasmDoubleNaN = getInternalFunction("wasm_double_nan")
 
     val equalityFunctions = mapOf(
         context.irBuiltIns.booleanType to getInternalFunction("wasm_i32_eq"),
@@ -71,12 +77,16 @@ class WasmSymbols(
         context.irBuiltIns.charType to getInternalFunction("wasm_i32_eq"),
         context.irBuiltIns.intType to getInternalFunction("wasm_i32_eq"),
         context.irBuiltIns.longType to getInternalFunction("wasm_i64_eq"),
+        context.irBuiltIns.stringType to getInternalFunction("wasm_string_eq")
+    )
+
+    val floatEqualityFunctions = mapOf(
         context.irBuiltIns.floatType to getInternalFunction("wasm_f32_eq"),
         context.irBuiltIns.doubleType to getInternalFunction("wasm_f64_eq")
     )
 
-    private fun wasmString(classfier: IrClassifierSymbol): String = with(context.irBuiltIns) {
-        when (classfier) {
+    private fun wasmPrimitiveTypeName(classifier: IrClassifierSymbol): String = with(context.irBuiltIns) {
+        when (classifier) {
             booleanClass, byteClass, shortClass, charClass, intClass -> "i32"
             floatClass -> "f32"
             doubleClass -> "f64"
@@ -85,23 +95,66 @@ class WasmSymbols(
         }
     }
 
-    val irBuiltInsToWasmIntrinsics = context.irBuiltIns.run {
-        mapOf(
+    val comparisonBuiltInsToWasmIntrinsics = context.irBuiltIns.run {
+        listOf(
             lessFunByOperandType to "lt",
             lessOrEqualFunByOperandType to "le",
             greaterOrEqualFunByOperandType to "ge",
             greaterFunByOperandType to "gt"
         ).map { (typeToBuiltIn, wasmOp) ->
             typeToBuiltIn.map { (type, builtin) ->
-                val wasmType = wasmString(type)
+                val wasmType = wasmPrimitiveTypeName(type)
                 val markSign = if (wasmType == "i32" || wasmType == "i64") "_s" else ""
                 builtin to getInternalFunction("wasm_${wasmType}_$wasmOp$markSign")
             }
         }.flatten().toMap()
     }
 
+    val booleanAnd = getInternalFunction("wasm_i32_and")
+    val refEq = getInternalFunction("wasm_ref_eq")
+    val refIsNull = getInternalFunction("wasm_ref_is_null")
+    val intToLong = getInternalFunction("wasm_i64_extend_i32_s")
+
+    val wasmRefCast = getInternalFunction("wasm_ref_cast")
+
+    val boxIntrinsic: IrSimpleFunctionSymbol = getInternalFunction("boxIntrinsic")
+    val unboxIntrinsic: IrSimpleFunctionSymbol = getInternalFunction("unboxIntrinsic")
+
     val stringGetLiteral = getInternalFunction("stringLiteral")
 
+    val wasmClassId = getInternalFunction("wasmClassId")
+    val wasmInterfaceId = getInternalFunction("wasmInterfaceId")
+
+    val getVirtualMethodId = getInternalFunction("getVirtualMethodId")
+    val getInterfaceMethodId = getInternalFunction("getInterfaceMethodId")
+
+    val isSubClass = getInternalFunction("isSubClass")
+    val isInterface = getInternalFunction("isInterface")
+
+    val nullableEquals = getInternalFunction("nullableEquals")
+    val ensureNotNull = getInternalFunction("ensureNotNull")
+    val anyNtoString = getInternalFunction("anyNtoString")
+
+    val nullableFloatIeee754Equals = getInternalFunction("nullableFloatIeee754Equals")
+    val nullableDoubleIeee754Equals = getInternalFunction("nullableDoubleIeee754Equals")
+
+    val wasmThrow = getInternalFunction("wasmThrow")
+
+    private val functionNInterfaces = (0..22).map { arity ->
+        getIrClass(FqName("kotlin.wasm.internal.Function$arity"))
+    }
+
+    val functionNInvokeMethods by lazy {
+        functionNInterfaces.map { interfaceSymbol ->
+            interfaceSymbol.owner.declarations.filterIsInstance<IrSimpleFunction>().single { method ->
+                method.name == OperatorNameConventions.INVOKE
+            }.symbol
+        }
+    }
+
+    override fun functionN(n: Int): IrClassSymbol =
+        functionNInterfaces[n]
+
     private fun findClass(memberScope: MemberScope, name: Name): ClassDescriptor =
         memberScope.getContributedClassifier(name, NoLookupLocation.FROM_BACKEND) as ClassDescriptor
 
@@ -117,7 +170,7 @@ class WasmSymbols(
     internal fun getProperty(fqName: FqName): PropertyDescriptor =
         findProperty(context.module.getPackage(fqName.parent()).memberScope, fqName.shortName()).single()
 
-    internal fun getInternalFunction(name: String): IrSimpleFunctionSymbol {
+    private fun getInternalFunction(name: String): IrSimpleFunctionSymbol {
         val tmp = findFunctions(wasmInternalPackage.memberScope, Name.identifier(name)).single()
         return symbolTable.referenceSimpleFunction(tmp)
     }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmAstToWat.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmAstToWat.kt
deleted file mode 100644
index 0b6ec521ad3..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmAstToWat.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.ast
-
-import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
-
-// TODO: Abstract out S-expression part of dumping?
-
-fun WasmInstruction.toWat(ident: String = ""): String =
-    "$ident($mnemonic${immediate.toWat()}${operands.joinToString("") { " " + it.toWat("") }})"
-
-fun WasmImmediate.toWat(): String = when (this) {
-    WasmImmediate.None -> ""
-    is WasmImmediate.DeclarationReference -> " $$name"
-    // SpiderMonkey jsshell won't parse Uppercase letters in literals
-    is WasmImmediate.LiteralValue<*> -> " $value".toLowerCaseAsciiOnly()
-}
-
-fun wasmModuleToWat(module: WasmModule): String =
-    "(module\n${module.fields.joinToString("") { wasmModuleFieldToWat(it) + "\n" }})"
-
-fun wasmFunctionToWat(function: WasmFunction): String {
-    val watId = "$${function.name}"
-    val watImport = function.importPair?.let { importPair ->
-        " (import ${toWasString(importPair.module)} ${toWasString(importPair.name)})"
-    } ?: ""
-    val watLocals = function.locals.joinToString("") { "   " + wasmLocalToWat(it) + "\n" }
-    val watParameters = function.parameters.joinToString("") { " " + wasmParameterToWat(it, function.importPair == null) }
-    val watResult = function.returnType?.let { type -> " (result ${type.mnemonic})" } ?: ""
-    val watBody = function.instructions.joinToString("") { it.toWat("    ") + "\n" }
-    return "  (func $watId$watImport$watParameters$watResult\n$watLocals$watBody  )"
-}
-
-fun wasmParameterToWat(parameter: WasmParameter, includeName: Boolean): String {
-    val name = if (includeName) " $${parameter.name}" else ""
-    return "(param$name ${parameter.type.mnemonic})"
-}
-
-fun wasmLocalToWat(local: WasmLocal): String =
-    local.run { "(local $$name ${type.mnemonic})" }
-
-fun wasmGlobalToWat(global: WasmGlobal): String {
-    val watMut = if (global.isMutable) "mut " else ""
-    val watInit = global.init?.toWat("") ?: ""
-    return global.run { "  (global $$name ($watMut${type.mnemonic}) $watInit)" }
-}
-
-fun wasmExportToWat(export: WasmExport): String =
-    export.run { "  (export \"$exportedName\" (${kind.keyword} $$wasmName))" }
-
-fun wasmModuleFieldToWat(moduleField: WasmModuleField): String =
-    when (moduleField) {
-        is WasmFunction -> wasmFunctionToWat(moduleField)
-        is WasmGlobal -> wasmGlobalToWat(moduleField)
-        is WasmExport -> wasmExportToWat(moduleField)
-        is WasmModuleFieldList -> moduleField.fields.joinToString("") { wasmModuleFieldToWat(it) + "\n" }
-    }
-
-fun toWasString(s: String): String {
-    // TODO: escape characters according to
-    //  https://webassembly.github.io/spec/core/text/values.html#strings
-    return "\"" + s + "\""
-}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmDeclarations.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmDeclarations.kt
deleted file mode 100644
index 8d0cc6ec4a6..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmDeclarations.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.ast
-
-import org.jetbrains.kotlin.backend.wasm.utils.WasmImportPair
-
-class WasmModule(
-    val fields: List<WasmModuleField>
-)
-
-sealed class WasmModuleField
-
-class WasmModuleFieldList(
-    val fields: List<WasmModuleField>
-) : WasmModuleField()
-
-class WasmFunction(
-    val name: String,
-    val parameters: List<WasmParameter>,
-    val returnType: WasmValueType?,
-    val locals: List<WasmLocal>,
-    val instructions: List<WasmInstruction>,
-    val importPair: WasmImportPair?
-) : WasmModuleField()
-
-class WasmParameter(
-    val name: String,
-    val type: WasmValueType
-)
-
-class WasmLocal(
-    val name: String,
-    val type: WasmValueType
-)
-
-class WasmGlobal(
-    val name: String,
-    val type: WasmValueType,
-    val isMutable: Boolean,
-    val init: WasmInstruction?
-) : WasmModuleField()
-
-class WasmExport(
-    val wasmName: String,
-    val exportedName: String,
-    val kind: Kind
-) : WasmModuleField() {
-    enum class Kind(val keyword: String) {
-        FUNCTION("func"),
-        GLOBAL("global")
-    }
-}
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmInstructions.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmInstructions.kt
deleted file mode 100644
index 59c6f28c1e3..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmInstructions.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.ast
-
-
-sealed class WasmImmediate {
-    object None : WasmImmediate()
-    class DeclarationReference(val name: String) : WasmImmediate()
-    class LiteralValue<T : Number>(val value: T) : WasmImmediate()
-}
-
-sealed class WasmInstruction(
-    val mnemonic: String,
-    val immediate: WasmImmediate = WasmImmediate.None,
-    val operands: List<WasmInstruction> = emptyList()
-)
-
-class WasmSimpleInstruction(mnemonic: String, operands: List<WasmInstruction>) :
-    WasmInstruction(mnemonic, operands = operands)
-
-class WasmNop : WasmInstruction("nop")
-
-class WasmReturn(values: List<WasmInstruction>) :
-    WasmInstruction("return", operands = values)
-
-class WasmDrop(instructions: List<WasmInstruction>) :
-    WasmInstruction("drop", operands = instructions)
-
-class WasmCall(name: String, operands: List<WasmInstruction>) :
-    WasmInstruction("call", WasmImmediate.DeclarationReference(name), operands)
-
-class WasmGetLocal(name: String) :
-    WasmInstruction("get_local", WasmImmediate.DeclarationReference(name))
-
-class WasmGetGlobal(name: String) :
-    WasmInstruction("get_global", WasmImmediate.DeclarationReference(name))
-
-class WasmSetGlobal(name: String, value: WasmInstruction) :
-    WasmInstruction("set_global", WasmImmediate.DeclarationReference(name), listOf(value))
-
-class WasmSetLocal(name: String, value: WasmInstruction) :
-    WasmInstruction("set_local", WasmImmediate.DeclarationReference(name), listOf(value))
-
-class WasmIf(condition: WasmInstruction, thenInstructions: WasmThen?, elseInstruction: WasmElse?) :
-    WasmInstruction("if", operands = listOfNotNull(condition, thenInstructions, elseInstruction))
-
-class WasmThen(inst: WasmInstruction) :
-    WasmInstruction("then", operands = listOf(inst))
-
-class WasmElse(inst: WasmInstruction) :
-    WasmInstruction("else", operands = listOf(inst))
-
-class WasmBlock(instructions: List<WasmInstruction>) :
-    WasmInstruction("block", operands = instructions)
-
-sealed class WasmConst<KotlinType : Number, WasmType : WasmValueType>(value: KotlinType, type: WasmType) :
-    WasmInstruction(type.mnemonic + ".const", WasmImmediate.LiteralValue<KotlinType>(value))
-
-class WasmI32Const(value: Int) : WasmConst<Int, WasmI32>(value, WasmI32)
-class WasmI64Const(value: Long) : WasmConst<Long, WasmI64>(value, WasmI64)
-class WasmF32Const(value: Float) : WasmConst<Float, WasmF32>(value, WasmF32)
-class WasmF64Const(value: Double) : WasmConst<Double, WasmF64>(value, WasmF64)
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmTypes.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmTypes.kt
deleted file mode 100644
index a31df5ef6de..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ast/WasmTypes.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.ast
-
-sealed class WasmValueType(val mnemonic: String)
-
-object WasmI32 : WasmValueType("i32")
-object WasmI64 : WasmValueType("i64")
-object WasmF32 : WasmValueType("f32")
-object WasmF64 : WasmValueType("f64")
-
-object WasmAnyRef : WasmValueType("anyref")
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/BaseTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/BaseTransformer.kt
deleted file mode 100644
index 8ea16a07b6d..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/BaseTransformer.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.codegen
-
-import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.backend.js.utils.TODO
-import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
-
-interface BaseTransformer<out R, in D> : IrElementVisitor<R, D> {
-    override fun visitElement(element: IrElement, data: D): R {
-        TODO(element)
-    }
-}
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/DeclarationTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/DeclarationTransformer.kt
deleted file mode 100644
index d59251cf660..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/DeclarationTransformer.kt
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.codegen
-
-import org.jetbrains.kotlin.backend.wasm.ast.*
-import org.jetbrains.kotlin.backend.wasm.utils.getWasmImportAnnotation
-import org.jetbrains.kotlin.backend.wasm.utils.getWasmInstructionAnnotation
-import org.jetbrains.kotlin.backend.wasm.utils.hasExcludedFromCodegenAnnotation
-import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.types.*
-import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
-import org.jetbrains.kotlin.ir.util.isAnnotationClass
-import org.jetbrains.kotlin.ir.util.isFakeOverride
-import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
-import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
-
-class DeclarationTransformer : BaseTransformer<WasmModuleField?, WasmCodegenContext> {
-    override fun visitSimpleFunction(declaration: IrSimpleFunction, data: WasmCodegenContext): WasmModuleField? {
-        if (declaration.hasExcludedFromCodegenAnnotation())
-            return null
-        if (declaration.getWasmInstructionAnnotation() != null)
-            return null
-        if (declaration.isFakeOverride)
-            return null
-        // Virtual functions are not supported yet
-        if (declaration.origin == IrDeclarationOrigin.BRIDGE)
-            return null
-
-        // Collect local variables
-        val localNames = wasmNameTable<IrValueDeclaration>()
-
-        val wasmName = data.getGlobalName(declaration)
-
-        val irParameters = declaration.run {
-            listOfNotNull(dispatchReceiverParameter, extensionReceiverParameter) + valueParameters
-        }
-
-        val wasmParameters = irParameters.map { parameter ->
-            val name = localNames.declareFreshName(parameter, parameter.name.asString())
-            WasmParameter(name, data.transformType(parameter.type))
-        }
-
-        val wasmReturnType = when {
-            declaration.returnType.isUnit() -> null
-            else -> data.transformType(declaration.returnType)
-        }
-
-        val importedName = declaration.getWasmImportAnnotation()
-        if (importedName != null) {
-            data.imports.add(
-                WasmFunction(
-                    name = wasmName,
-                    parameters = wasmParameters,
-                    returnType = wasmReturnType,
-                    locals = emptyList(),
-                    instructions = emptyList(),
-                    importPair = importedName
-                )
-            )
-            return null
-        }
-
-        val body = declaration.body
-            ?: error("Function ${declaration.fqNameWhenAvailable} without a body")
-
-        data.localNames = localNames.names
-        val locals = mutableListOf<WasmLocal>()
-        body.acceptChildrenVoid(object : IrElementVisitorVoid {
-            override fun visitElement(element: IrElement) {
-                element.acceptChildrenVoid(this)
-            }
-
-            override fun visitVariable(declaration: IrVariable) {
-                val name = localNames.declareFreshName(declaration, declaration.name.asString())
-                locals += WasmLocal(name, data.transformType(declaration.type))
-                super.visitVariable(declaration)
-            }
-        })
-
-        return WasmFunction(
-            name = wasmName,
-            parameters = wasmParameters,
-            returnType = wasmReturnType,
-            locals = locals,
-            instructions = bodyToWasmInstructionList(body, data),
-            importPair = null
-        )
-    }
-
-    override fun visitConstructor(declaration: IrConstructor, data: WasmCodegenContext): WasmModuleField? {
-        TODO()
-    }
-
-    override fun visitClass(declaration: IrClass, data: WasmCodegenContext): WasmModuleField? {
-        if (declaration.isAnnotationClass) return null
-        if (declaration.hasExcludedFromCodegenAnnotation()) return null
-
-        val wasmMembers = declaration.declarations.mapNotNull { member ->
-            when (member) {
-                is IrSimpleFunction -> this.visitSimpleFunction(member, data)
-                else -> null
-            }
-        }
-
-        return WasmModuleFieldList(wasmMembers)
-    }
-
-    override fun visitField(declaration: IrField, data: WasmCodegenContext): WasmModuleField {
-        return WasmGlobal(
-            name = data.getGlobalName(declaration),
-            type = data.transformType(declaration.type),
-            isMutable = true,
-            // TODO: move non-constexpr initializers out
-            init = declaration.initializer?.let {
-                expressionToWasmInstruction(it.expression, data)
-            }
-        )
-    }
-}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ExpressionTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ExpressionTransformer.kt
deleted file mode 100644
index ec311c771b7..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ExpressionTransformer.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.codegen
-
-import org.jetbrains.kotlin.backend.common.ir.isElseBranch
-import org.jetbrains.kotlin.backend.wasm.ast.*
-import org.jetbrains.kotlin.backend.wasm.utils.getWasmInstructionAnnotation
-import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
-import org.jetbrains.kotlin.ir.declarations.IrVariable
-import org.jetbrains.kotlin.ir.expressions.*
-import org.jetbrains.kotlin.ir.types.isUnit
-import org.jetbrains.kotlin.ir.util.dump
-
-class ExpressionTransformer : BaseTransformer<WasmInstruction, WasmCodegenContext> {
-    override fun visitVararg(expression: IrVararg, data: WasmCodegenContext): WasmInstruction {
-        TODO("Support arrays")
-    }
-
-    override fun visitExpressionBody(body: IrExpressionBody, data: WasmCodegenContext): WasmInstruction =
-        body.expression.accept(this, data)
-
-    override fun visitFunctionReference(expression: IrFunctionReference, data: WasmCodegenContext): WasmInstruction {
-        TODO("?")
-    }
-
-    override fun <T> visitConst(expression: IrConst<T>, data: WasmCodegenContext): WasmInstruction {
-        return when (val kind = expression.kind) {
-            is IrConstKind.Null -> TODO()
-            is IrConstKind.String -> {
-                val value = kind.valueOf(expression)
-                val index = data.stringLiterals.size
-                data.stringLiterals.add(value)
-                val funName = data.getGlobalName(data.backendContext.wasmSymbols.stringGetLiteral.owner)
-                val operand = WasmI32Const(index)
-                WasmCall(funName, listOf(operand))
-            }
-            is IrConstKind.Boolean -> WasmI32Const(if (kind.valueOf(expression)) 1 else 0)
-            is IrConstKind.Byte -> WasmI32Const(kind.valueOf(expression).toInt())
-            is IrConstKind.Short -> WasmI32Const(kind.valueOf(expression).toInt())
-            is IrConstKind.Int -> WasmI32Const(kind.valueOf(expression))
-            is IrConstKind.Long -> WasmI64Const(kind.valueOf(expression))
-            is IrConstKind.Char -> WasmI32Const(kind.valueOf(expression).toInt())
-            is IrConstKind.Float -> WasmF32Const(kind.valueOf(expression))
-            is IrConstKind.Double -> WasmF64Const(kind.valueOf(expression))
-        }
-    }
-
-    override fun visitStringConcatenation(expression: IrStringConcatenation, data: WasmCodegenContext): WasmInstruction {
-        TODO("Implement kotlin.String")
-    }
-
-    override fun visitGetField(expression: IrGetField, data: WasmCodegenContext): WasmInstruction {
-        val fieldName = data.getGlobalName(expression.symbol.owner)
-        if (expression.receiver != null)
-            TODO("Support member fields")
-
-        return WasmGetGlobal(fieldName)
-    }
-
-    override fun visitGetValue(expression: IrGetValue, data: WasmCodegenContext): WasmInstruction =
-        WasmGetLocal(data.getLocalName(expression.symbol.owner))
-
-    override fun visitGetObjectValue(expression: IrGetObjectValue, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrGetObjectValue")
-    }
-
-    override fun visitSetField(expression: IrSetField, data: WasmCodegenContext): WasmInstruction {
-        val fieldName = data.getGlobalName(expression.symbol.owner)
-        if (expression.receiver != null)
-            TODO("Support member fields")
-
-        val value = expression.value.accept(this, data)
-        return WasmSetGlobal(fieldName, value)
-    }
-
-    override fun visitSetValue(expression: IrSetValue, data: WasmCodegenContext): WasmInstruction {
-        val fieldName = data.getLocalName(expression.symbol.owner)
-        val value = expression.value.accept(this, data)
-        return WasmSetLocal(fieldName, value)
-    }
-
-    override fun visitConstructorCall(expression: IrConstructorCall, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrConstructorCall")
-    }
-
-    override fun visitCall(expression: IrCall, data: WasmCodegenContext): WasmInstruction {
-        val function = expression.symbol.owner.realOverrideTarget
-        val valueArgs = (0 until expression.valueArgumentsCount).mapNotNull { expression.getValueArgument(it) }
-        val irArguments = listOfNotNull(expression.dispatchReceiver, expression.extensionReceiver) + valueArgs
-        val wasmArguments = irArguments.map { expressionToWasmInstruction(it, data) }
-
-        val wasmInstruction = function.getWasmInstructionAnnotation()
-        if (wasmInstruction != null) {
-            if (wasmInstruction == "nop") {
-                return wasmArguments.single()
-            }
-            return WasmSimpleInstruction(wasmInstruction, wasmArguments)
-        }
-
-        val name = data.getGlobalName(function)
-        return WasmCall(name, wasmArguments)
-    }
-
-    override fun visitTypeOperator(expression: IrTypeOperatorCall, data: WasmCodegenContext): WasmInstruction {
-        val wasmArgument = expressionToWasmInstruction(expression.argument, data)
-        if (expression.operator == IrTypeOperator.IMPLICIT_COERCION_TO_UNIT) {
-            return wasmArgument
-        }
-        TODO("IrTypeOperatorCall:\n ${expression.dump()}")
-    }
-
-    override fun visitGetEnumValue(expression: IrGetEnumValue, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrGetEnumValue")
-    }
-
-    override fun visitBlockBody(body: IrBlockBody, data: WasmCodegenContext): WasmInstruction {
-        TODO()
-    }
-
-    override fun visitContainerExpression(expression: IrContainerExpression, data: WasmCodegenContext): WasmInstruction {
-        val expressions = expression.statements.map { it.accept(this, data) }
-
-        if (!expression.type.isUnit())
-            return WasmBlock(expressions + listOf(WasmDrop(emptyList())))
-
-        return WasmBlock(expressions)
-    }
-
-    override fun visitExpression(expression: IrExpression, data: WasmCodegenContext): WasmInstruction {
-        return expressionToWasmInstruction(expression, data)
-    }
-
-    override fun visitBreak(jump: IrBreak, data: WasmCodegenContext): WasmInstruction {
-        TODO()
-    }
-
-    override fun visitContinue(jump: IrContinue, data: WasmCodegenContext): WasmInstruction {
-        TODO()
-    }
-
-    override fun visitReturn(expression: IrReturn, data: WasmCodegenContext): WasmInstruction {
-        if (expression.value.type.isUnit()) return WasmReturn(emptyList())
-
-        return WasmReturn(listOf(expressionToWasmInstruction(expression.value, data)))
-    }
-
-    override fun visitThrow(expression: IrThrow, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrThrow")
-    }
-
-    override fun visitVariable(declaration: IrVariable, data: WasmCodegenContext): WasmInstruction {
-        val init = declaration.initializer ?: return WasmNop()
-        val varName = data.getLocalName(declaration)
-        return WasmSetLocal(varName, expressionToWasmInstruction(init, data))
-    }
-
-    override fun visitDelegatingConstructorCall(expression: IrDelegatingConstructorCall, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrDelegatingConstructorCall")
-    }
-
-    override fun visitInstanceInitializerCall(expression: IrInstanceInitializerCall, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrInstanceInitializerCall")
-    }
-
-    override fun visitTry(aTry: IrTry, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrTry")
-    }
-
-    override fun visitWhen(expression: IrWhen, data: WasmCodegenContext): WasmInstruction {
-        return expression.branches.foldRight(null) { br: IrBranch, inst: WasmInstruction? ->
-            val body = expressionToWasmInstruction(br.result, data)
-            if (isElseBranch(br)) body
-            else {
-                val condition = expressionToWasmInstruction(br.condition, data)
-                WasmIf(condition, WasmThen(body), inst?.let { WasmElse(inst) })
-            }
-        }!!
-    }
-
-    override fun visitWhileLoop(loop: IrWhileLoop, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrWhileLoop")
-    }
-
-    override fun visitDoWhileLoop(loop: IrDoWhileLoop, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrDoWhileLoop")
-    }
-
-    override fun visitSyntheticBody(body: IrSyntheticBody, data: WasmCodegenContext): WasmInstruction {
-        TODO("IrSyntheticBody")
-    }
-
-    override fun visitDynamicMemberExpression(expression: IrDynamicMemberExpression, data: WasmCodegenContext): WasmInstruction =
-        error("Dynamic operators are not supported for WASM target")
-
-    override fun visitDynamicOperatorExpression(expression: IrDynamicOperatorExpression, data: WasmCodegenContext): WasmInstruction =
-        error("Dynamic operators are not supported for WASM target")
-}
-
-fun expressionToWasmInstruction(expression: IrExpression, context: WasmCodegenContext): WasmInstruction {
-    return expression.accept(ExpressionTransformer(), context)
-}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ModuleTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ModuleTransformer.kt
deleted file mode 100644
index adb5dbf50c9..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ModuleTransformer.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.codegen
-
-import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
-import org.jetbrains.kotlin.backend.wasm.WasmCompilerResult
-import org.jetbrains.kotlin.backend.wasm.ast.WasmExport
-import org.jetbrains.kotlin.backend.wasm.ast.WasmModule
-import org.jetbrains.kotlin.backend.wasm.ast.wasmModuleToWat
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.jsAssignment
-import org.jetbrains.kotlin.ir.backend.js.utils.sanitizeName
-import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
-import org.jetbrains.kotlin.js.backend.ast.JsArrayLiteral
-import org.jetbrains.kotlin.js.backend.ast.JsBlock
-import org.jetbrains.kotlin.js.backend.ast.JsNameRef
-import org.jetbrains.kotlin.js.backend.ast.JsStringLiteral
-import org.jetbrains.kotlin.utils.addIfNotNull
-
-class IrModuleToWasm(private val backendContext: WasmBackendContext) {
-    fun generateModule(module: IrModuleFragment): WasmCompilerResult {
-        val nameTable = generateWatTopLevelNames(module.files)
-        val context = WasmCodegenContext(nameTable, backendContext)
-        val irDeclarations = module.files.flatMap { it.declarations }
-        val wasmDeclarations = irDeclarations.mapNotNull { it.accept(DeclarationTransformer(), context) }
-        val exports = generateExports(module, context)
-
-
-        val wasmModule = WasmModule(context.imports + wasmDeclarations + exports)
-        val wat = wasmModuleToWat(wasmModule)
-        return WasmCompilerResult(wat, generateStringLiteralsSupport(context.stringLiterals))
-    }
-
-    private fun generateStringLiteralsSupport(literals: List<String>): String {
-        return JsBlock(
-            jsAssignment(
-                JsNameRef("stringLiterals", "runtime"),
-                JsArrayLiteral(literals.map { JsStringLiteral(it) })
-            ).makeStmt()
-        ).toString()
-    }
-
-    private fun generateExports(module: IrModuleFragment, context: WasmCodegenContext): List<WasmExport> {
-        val exports = mutableListOf<WasmExport>()
-        for (file in module.files) {
-            for (declaration in file.declarations) {
-                exports.addIfNotNull(generateExport(declaration, context))
-            }
-        }
-        return exports
-    }
-
-    private fun generateExport(declaration: IrDeclaration, context: WasmCodegenContext): WasmExport? {
-        if (declaration !is IrDeclarationWithVisibility ||
-            declaration !is IrDeclarationWithName ||
-            declaration !is IrSimpleFunction ||
-            declaration.visibility != DescriptorVisibilities.PUBLIC
-        ) {
-            return null
-        }
-
-        if (!declaration.isExported(context))
-            return null
-
-        val internalName = context.getGlobalName(declaration)
-        val exportedName = sanitizeName(declaration.name.identifier)
-
-        return WasmExport(
-            wasmName = internalName,
-            exportedName = exportedName,
-            kind = WasmExport.Kind.FUNCTION
-        )
-    }
-
-}
-
-fun IrFunction.isExported(context: WasmCodegenContext): Boolean =
-    fqNameWhenAvailable in context.backendContext.additionalExportedDeclarations
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/NameTable.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/NameTable.kt
deleted file mode 100644
index 8369181580d..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/NameTable.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.codegen
-
-import org.jetbrains.kotlin.backend.common.ir.isTopLevel
-import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.backend.js.utils.*
-import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
-import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
-import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
-
-fun <T> wasmNameTable() = NameTable<T>(sanitizer = ::sanitizeWatIdentifier)
-
-fun generateWatTopLevelNames(packages: List<IrPackageFragment>): Map<IrDeclarationWithName, String> {
-    val names = wasmNameTable<IrDeclarationWithName>()
-
-    fun nameTopLevelDecl(declaration: IrDeclarationWithName) {
-        val suggestedName = declaration.fqNameWhenAvailable?.toString()
-            ?: "fqname???" + declaration.name.asString()
-        names.declareFreshName(declaration, suggestedName)
-    }
-
-    for (p in packages) {
-        p.acceptChildrenVoid(object : IrElementVisitorVoid {
-            override fun visitElement(element: IrElement) {
-                element.acceptChildrenVoid(this)
-            }
-
-            override fun visitSimpleFunction(declaration: IrSimpleFunction) {
-                nameTopLevelDecl(declaration)
-                super.visitSimpleFunction(declaration)
-            }
-
-            override fun visitField(declaration: IrField) {
-                if (declaration.isTopLevel)
-                    nameTopLevelDecl(declaration)
-                super.visitField(declaration)
-            }
-        })
-    }
-
-    return names.names
-}
-
-fun sanitizeWatIdentifier(ident: String): String {
-    if (ident.isEmpty())
-        return "_"
-    if (ident.all(::isValidWatIdentifier))
-        return ident
-    return ident.map { if (isValidWatIdentifier(it)) it else "_" }.joinToString("")
-}
-
-// https://webassembly.github.io/spec/core/text/values.html#text-id
-fun isValidWatIdentifier(c: Char): Boolean =
-    c in '0'..'9' || c in 'A'..'Z' || c in 'a'..'z'
-            // TODO: SpiderMonkey js shell can't parse some of the
-            //  permitted identifiers: '?', '<'
-            // || c in "!#$%&′*+-./:<=>?@\\^_`|~"
-            || c in "$.@_"
-
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/StatementTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/StatementTransformer.kt
deleted file mode 100644
index 13776fb2694..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/StatementTransformer.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.codegen
-
-import org.jetbrains.kotlin.backend.wasm.ast.WasmInstruction
-import org.jetbrains.kotlin.backend.wasm.ast.WasmNop
-import org.jetbrains.kotlin.backend.wasm.ast.WasmSetLocal
-import org.jetbrains.kotlin.ir.IrStatement
-import org.jetbrains.kotlin.ir.declarations.IrVariable
-import org.jetbrains.kotlin.ir.expressions.*
-
-class StatementTransformer : BaseTransformer<WasmInstruction, WasmCodegenContext> {
-    override fun visitVariable(declaration: IrVariable, data: WasmCodegenContext): WasmInstruction {
-        val init = declaration.initializer ?: return WasmNop()
-        val varName = data.getLocalName(declaration)
-        return WasmSetLocal(varName, expressionToWasmInstruction(init, data))
-    }
-
-    override fun visitExpression(expression: IrExpression, data: WasmCodegenContext): WasmInstruction {
-        return expressionToWasmInstruction(expression, data)
-    }
-}
-
-fun statementToWasmInstruction(statement: IrStatement, context: WasmCodegenContext): WasmInstruction {
-    return statement.accept(StatementTransformer(), context)
-}
-
-fun bodyToWasmInstructionList(body: IrBody, context: WasmCodegenContext): List<WasmInstruction> {
-    if (body is IrBlockBody) {
-        return body.statements.map { statementToWasmInstruction(it, context) }
-    } else TODO()
-}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/TypeTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/TypeTransformer.kt
deleted file mode 100644
index 26e8959961a..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/TypeTransformer.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.codegen
-
-import org.jetbrains.kotlin.backend.wasm.ast.*
-import org.jetbrains.kotlin.ir.types.*
-import org.jetbrains.kotlin.ir.util.render
-
-
-fun WasmCodegenContext.transformType(irType: IrType): WasmValueType =
-    when {
-        irType.isBoolean() -> WasmI32
-        irType.isByte() -> WasmI32
-        irType.isShort() -> WasmI32
-        irType.isInt() -> WasmI32
-        irType.isLong() -> WasmI64
-        irType.isChar() -> WasmI32
-        irType.isFloat() -> WasmF32
-        irType.isDouble() -> WasmF64
-        irType.isString() -> WasmAnyRef
-        irType.isAny() || irType.isNullableAny() -> WasmAnyRef
-        else ->
-            TODO("Unsupported type: ${irType.render()}")
-    }
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/WasmCodegenContext.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/WasmCodegenContext.kt
deleted file mode 100644
index 21218fc17be..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/WasmCodegenContext.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.codegen
-
-import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
-import org.jetbrains.kotlin.backend.wasm.ast.WasmModuleField
-import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName
-import org.jetbrains.kotlin.ir.declarations.IrValueDeclaration
-import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
-
-class WasmCodegenContext(
-    private val topLevelNames: Map<IrDeclarationWithName, String>,
-    val backendContext: WasmBackendContext
-) {
-    val imports = mutableListOf<WasmModuleField>()
-    var localNames: Map<IrValueDeclaration, String> = emptyMap()
-    val stringLiterals = mutableListOf<String>()
-
-    fun getGlobalName(declaration: IrDeclarationWithName): String =
-        topLevelNames[declaration]
-            ?: error("Can't find name for ${declaration.fqNameWhenAvailable}")
-
-    fun getLocalName(declaration: IrValueDeclaration): String =
-        localNames[declaration]
-            ?: error("Can't find local name for ${declaration.fqNameWhenAvailable}")
-}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/compiler.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/compiler.kt
index 968eb6635ef..a0ab3d1db13 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/compiler.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/compiler.kt
@@ -9,7 +9,9 @@ import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.analyzer.AbstractAnalyzerWithCompilerReport
 import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
 import org.jetbrains.kotlin.backend.common.phaser.invokeToplevel
-import org.jetbrains.kotlin.backend.wasm.codegen.IrModuleToWasm
+import org.jetbrains.kotlin.backend.wasm.ir2wasm.WasmModuleFragmentGenerator
+import org.jetbrains.kotlin.backend.wasm.ir2wasm.WasmCompiledModuleFragment
+import org.jetbrains.kotlin.backend.wasm.ir2wasm.generateStringLiteralsSupport
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.ir.backend.js.MainModule
@@ -22,12 +24,15 @@ import org.jetbrains.kotlin.library.KotlinLibrary
 import org.jetbrains.kotlin.library.resolver.KotlinLibraryResolveResult
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.wasm.ir.convertors.WasmIrToBinary
+import org.jetbrains.kotlin.wasm.ir.convertors.WasmIrToText
+import java.io.ByteArrayOutputStream
 
-data class WasmCompilerResult(val wat: String, val js: String)
+class WasmCompilerResult(val wat: String, val js: String, val wasm: ByteArray)
 
 fun compileWasm(
     project: Project,
-    files: List<KtFile>,
+    mainModule: MainModule,
     analyzer: AbstractAnalyzerWithCompilerReport,
     configuration: CompilerConfiguration,
     phaseConfig: PhaseConfig,
@@ -37,21 +42,26 @@ fun compileWasm(
 ): WasmCompilerResult {
     val (moduleFragment, dependencyModules, irBuiltIns, symbolTable, deserializer) =
         loadIr(
-            project, MainModule.SourceFiles(files), analyzer, configuration, allDependencies, friendDependencies,
+            project, mainModule, analyzer, configuration, allDependencies, friendDependencies,
             PersistentIrFactory
         )
 
+    val allModules = when (mainModule) {
+        is MainModule.SourceFiles -> dependencyModules + listOf(moduleFragment)
+        is MainModule.Klib -> dependencyModules
+    }
+
     val moduleDescriptor = moduleFragment.descriptor
     val context = WasmBackendContext(moduleDescriptor, irBuiltIns, symbolTable, moduleFragment, exportedDeclarations, configuration)
 
     // Load declarations referenced during `context` initialization
-    dependencyModules.forEach {
+    allModules.forEach {
         val irProviders = generateTypicalIrProviderList(it.descriptor, irBuiltIns, symbolTable, deserializer)
         ExternalDependenciesGenerator(symbolTable, irProviders, configuration.languageVersionSettings)
             .generateUnboundSymbolsAsDependencies()
     }
 
-    val irFiles = dependencyModules.flatMap { it.files } + moduleFragment.files
+    val irFiles = allModules.flatMap { it.files }
 
     moduleFragment.files.clear()
     moduleFragment.files += irFiles
@@ -60,9 +70,93 @@ fun compileWasm(
     val irProviders = generateTypicalIrProviderList(moduleDescriptor, irBuiltIns, symbolTable, deserializer)
     ExternalDependenciesGenerator(symbolTable, irProviders, configuration.languageVersionSettings).generateUnboundSymbolsAsDependencies()
     moduleFragment.patchDeclarationParents()
-    deserializer.postProcess()
 
     wasmPhases.invokeToplevel(phaseConfig, context, moduleFragment)
 
-    return IrModuleToWasm(context).generateModule(moduleFragment)
+    val compiledWasmModule = WasmCompiledModuleFragment()
+    val codeGenerator = WasmModuleFragmentGenerator(context, compiledWasmModule)
+    codeGenerator.generateModule(moduleFragment)
+
+    val linkedModule = compiledWasmModule.linkWasmCompiledFragments()
+    val watGenerator = WasmIrToText()
+    watGenerator.appendWasmModule(linkedModule)
+    val wat = watGenerator.toString()
+
+    val js = compiledWasmModule.generateJs()
+
+    val os = ByteArrayOutputStream()
+    WasmIrToBinary(os, linkedModule).appendWasmModule()
+    val byteArray = os.toByteArray()
+
+    return WasmCompilerResult(
+        wat = wat,
+        js = js,
+        wasm = byteArray
+    )
+}
+
+
+fun WasmCompiledModuleFragment.generateJs(): String {
+    val runtime = """
+    const runtime = {
+        String_getChar(str, index) {
+            return str.charCodeAt(index);
+        },
+
+        String_compareTo(str1, str2) {
+            if (str1 > str2) return 1;
+            if (str1 < str2) return -1;
+            return 0;
+        },
+
+        String_equals(str, other) {
+            return str === other;
+        },
+
+        String_subsequence(str, startIndex, endIndex) {
+            return str.substring(startIndex, endIndex);
+        },
+
+        String_getLiteral(index) {
+            return runtime.stringLiterals[index];
+        },
+
+        coerceToString(value) {
+            return String(value);
+        },
+
+        Char_toString(char) {
+            return String.fromCharCode(char)
+        },
+
+        JsArray_new(size) {
+            return new Array(size);
+        },
+
+        JsArray_get(array, index) {
+            return array[index];
+        },
+
+        JsArray_set(array, index, value) {
+            array[index] = value;
+        },
+
+        JsArray_getSize(array) {
+            return array.length;
+        },
+
+        identity(x) {
+            return x;
+        },
+
+        println(value) {
+            console.log(">>>  " + value)
+        }
+    };
+    """.trimIndent()
+
+    val jsCode =
+        "\nconst js_code = {${jsFuns.joinToString(",\n") { "\"" + it.importName + "\" : " + it.jsCode }}};"
+
+    return runtime + generateStringLiteralsSupport(stringLiterals) + jsCode
 }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
new file mode 100644
index 00000000000..8e4e8701f5a
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
@@ -0,0 +1,492 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:OptIn(ExperimentalUnsignedTypes::class)
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.backend.common.ir.isElseBranch
+import org.jetbrains.kotlin.backend.common.ir.isOverridable
+import org.jetbrains.kotlin.backend.common.ir.returnType
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.backend.wasm.WasmSymbols
+import org.jetbrains.kotlin.backend.wasm.lower.wasmSignature
+import org.jetbrains.kotlin.backend.wasm.utils.*
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.IrStatement
+import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
+import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
+import org.jetbrains.kotlin.ir.expressions.*
+import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.util.defaultType
+import org.jetbrains.kotlin.ir.util.getInlineClassBackingField
+import org.jetbrains.kotlin.ir.util.isInterface
+import org.jetbrains.kotlin.ir.util.parentAsClass
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
+import org.jetbrains.kotlin.ir.visitors.acceptVoid
+import org.jetbrains.kotlin.wasm.ir.*
+
+class BodyGenerator(val context: WasmFunctionCodegenContext) : IrElementVisitorVoid {
+    val body: WasmExpressionBuilder = context.bodyGen
+
+    // Shortcuts
+    private val backendContext: WasmBackendContext = context.backendContext
+    private val wasmSymbols: WasmSymbols = backendContext.wasmSymbols
+    private val irBuiltIns: IrBuiltIns = backendContext.irBuiltIns
+
+    override fun visitElement(element: IrElement) {
+        error("Unexpected element of type ${element::class}")
+    }
+
+    override fun <T> visitConst(expression: IrConst<T>) {
+        when (val kind = expression.kind) {
+            is IrConstKind.Null -> generateDefaultInitializerForType(context.transformType(expression.type), body)
+            is IrConstKind.Boolean -> body.buildConstI32(if (kind.valueOf(expression)) 1 else 0)
+            is IrConstKind.Byte -> body.buildConstI32(kind.valueOf(expression).toInt())
+            is IrConstKind.Short -> body.buildConstI32(kind.valueOf(expression).toInt())
+            is IrConstKind.Int -> body.buildConstI32(kind.valueOf(expression))
+            is IrConstKind.Long -> body.buildConstI64(kind.valueOf(expression))
+            is IrConstKind.Char -> body.buildConstI32(kind.valueOf(expression).toInt())
+            is IrConstKind.Float -> body.buildConstF32(kind.valueOf(expression))
+            is IrConstKind.Double -> body.buildConstF64(kind.valueOf(expression))
+            is IrConstKind.String -> {
+                body.buildConstI32Symbol(context.referenceStringLiteral(kind.valueOf(expression)))
+                body.buildCall(context.referenceFunction(wasmSymbols.stringGetLiteral))
+            }
+            else -> error("Unknown constant kind")
+        }
+    }
+
+    override fun visitGetField(expression: IrGetField) {
+        val field: IrField = expression.symbol.owner
+        val receiver: IrExpression? = expression.receiver
+        if (receiver != null) {
+            generateExpression(receiver)
+            if (backendContext.inlineClassesUtils.isClassInlineLike(field.parentAsClass)) {
+                // Unboxed inline class instance is already represented as backing field.
+                // Doing nothing.
+            } else {
+                generateInstanceFieldAccess(field)
+            }
+        } else {
+            body.buildGetGlobal(context.referenceGlobal(field.symbol))
+        }
+    }
+
+    private fun generateInstanceFieldAccess(field: IrField) {
+        body.buildStructGet(
+            context.referenceStructType(field.parentAsClass.symbol),
+            context.getStructFieldRef(field)
+        )
+    }
+
+    override fun visitSetField(expression: IrSetField) {
+        val field = expression.symbol.owner
+        val receiver = expression.receiver
+
+        if (receiver != null) {
+            generateExpression(receiver)
+            generateExpression(expression.value)
+            body.buildStructSet(
+                struct = context.referenceStructType(field.parentAsClass.symbol),
+                fieldId = context.getStructFieldRef(field),
+            )
+        } else {
+            generateExpression(expression.value)
+            body.buildSetGlobal(context.referenceGlobal(expression.symbol))
+        }
+    }
+
+    override fun visitGetValue(expression: IrGetValue) {
+        body.buildGetLocal(context.referenceLocal(expression.symbol))
+    }
+
+    override fun visitSetValue(expression: IrSetValue) {
+        generateExpression(expression.value)
+        body.buildSetLocal(context.referenceLocal(expression.symbol))
+    }
+
+    override fun visitCall(expression: IrCall) {
+        generateCall(expression)
+    }
+
+    override fun visitConstructorCall(expression: IrConstructorCall) {
+        val klass: IrClass = expression.symbol.owner.parentAsClass
+
+        if (backendContext.inlineClassesUtils.isClassInlineLike(klass)) {
+            // Unboxed instance is just a constructor argument.
+            generateExpression(expression.getValueArgument(0)!!)
+            return
+        }
+
+        val wasmStruct: WasmSymbol<WasmStructDeclaration> = context.referenceStructType(klass.symbol)
+        val wasmClassId = context.referenceClassId(klass.symbol)
+
+        val irFields: List<IrField> = klass.allFields(backendContext.irBuiltIns)
+
+        irFields.forEachIndexed { index, field ->
+            if (index == 0)
+                body.buildConstI32Symbol(wasmClassId)
+            else
+                generateDefaultInitializerForType(context.transformType(field.type), body)
+        }
+
+        body.buildGetGlobal(context.referenceClassRTT(klass.symbol))
+        body.buildStructNew(wasmStruct)
+        generateCall(expression)
+    }
+
+    override fun visitDelegatingConstructorCall(expression: IrDelegatingConstructorCall) {
+        val klass = context.irFunction.parentAsClass
+
+        // Don't delegate constructors of Any to Any.
+        if (klass.defaultType.isAny()) {
+            return
+        }
+
+        body.buildGetLocal(context.referenceLocal(0))  // this parameter
+        generateCall(expression)
+    }
+
+    private fun generateCall(call: IrFunctionAccessExpression) {
+        // Box intrinsic has an additional klass ID argument.
+        // Processing it separately
+        if (call.symbol == wasmSymbols.boxIntrinsic) {
+            val toType = call.getTypeArgument(0)!!
+            val klass = toType.erasedUpperBound!!
+            val structTypeName = context.referenceStructType(klass.symbol)
+            val klassId = context.referenceClassId(klass.symbol)
+
+            body.buildConstI32Symbol(klassId)
+            generateExpression(call.getValueArgument(0)!!)
+            body.buildGetGlobal(context.referenceClassRTT(klass.symbol))
+            body.buildStructNew(structTypeName)
+            return
+        }
+
+        call.dispatchReceiver?.let { generateExpression(it) }
+        call.extensionReceiver?.let { generateExpression(it) }
+        for (i in 0 until call.valueArgumentsCount) {
+            generateExpression(call.getValueArgument(i)!!)
+        }
+
+        val function: IrFunction = call.symbol.owner.realOverrideTarget
+
+        if (tryToGenerateIntrinsicCall(call, function)) {
+            return
+        }
+
+        val isSuperCall = call is IrCall && call.superQualifierSymbol != null
+        if (function is IrSimpleFunction && function.isOverridable && !isSuperCall) {
+            // Generating index for indirect call
+            val klass = function.parentAsClass
+            if (!klass.isInterface) {
+                val classMetadata = context.getClassMetadata(klass.symbol)
+                val vfSlot = classMetadata.virtualMethods.map { it.function }.indexOf(function)
+                // Dispatch receiver should be simple and without side effects at this point
+                // TODO: Verify
+                generateExpression(call.dispatchReceiver!!)
+                body.buildConstI32(vfSlot)
+                body.buildCall(context.referenceFunction(wasmSymbols.getVirtualMethodId))
+            } else {
+                val signatureId = context.referenceSignatureId(function.wasmSignature(backendContext.irBuiltIns))
+                generateExpression(call.dispatchReceiver!!)
+                body.buildConstI32Symbol(signatureId)
+                body.buildCall(context.referenceFunction(wasmSymbols.getInterfaceMethodId))
+            }
+
+            body.buildCallIndirect(
+                symbol = context.referenceFunctionType(function.symbol)
+            )
+        } else {
+            // Static function call
+            body.buildCall(context.referenceFunction(function.symbol))
+        }
+
+        // Return types of imported functions cannot have concrete struct/array references.
+        // Non-primitive return types are represented as eqref which need to be casted back to expected type on call site.
+        if (function.getWasmImportAnnotation() != null || function.getJsFunAnnotation() != null) {
+            val resT = context.transformResultType(function.returnType)
+            if (resT is WasmRefNullType) {
+                generateTypeRTT(function.returnType)
+                body.buildRefCast(fromType = WasmEqRef, toType = resT)
+            }
+        }
+    }
+
+    private fun generateTypeRTT(type: IrType) {
+        val rtClass = type.erasedUpperBound?.symbol ?: context.backendContext.irBuiltIns.anyClass
+        body.buildGetGlobal(context.referenceClassRTT(rtClass))
+    }
+
+    // Return true if generated.
+    // Assumes call arguments are already on the stack
+    private fun tryToGenerateIntrinsicCall(
+        call: IrFunctionAccessExpression,
+        function: IrFunction
+    ): Boolean {
+        if (tryToGenerateWasmOpIntrinsicCall(function)) {
+            return true
+        }
+
+        when (function.symbol) {
+            wasmSymbols.wasmClassId -> {
+                val klass = call.getTypeArgument(0)!!.getClass()
+                    ?: error("No class given for wasmClassId intrinsic")
+                assert(!klass.isInterface)
+                body.buildConstI32Symbol(context.referenceClassId(klass.symbol))
+            }
+
+            wasmSymbols.wasmInterfaceId -> {
+                val irInterface = call.getTypeArgument(0)!!.getClass()
+                    ?: error("No interface given for wasmInterfaceId intrinsic")
+                assert(irInterface.isInterface)
+                body.buildConstI32Symbol(context.referenceInterfaceId(irInterface.symbol))
+            }
+
+            wasmSymbols.wasmRefCast -> {
+                val fromType = call.getTypeArgument(0)!!
+                val toType = call.getTypeArgument(1)!!
+                generateTypeRTT(toType)
+                body.buildRefCast(context.transformType(fromType), context.transformType(toType))
+            }
+
+            wasmSymbols.wasmFloatNaN -> {
+                body.buildConstF32(Float.NaN)
+            }
+            wasmSymbols.wasmDoubleNaN -> {
+                body.buildConstF64(Double.NaN)
+            }
+
+            wasmSymbols.unboxIntrinsic -> {
+                val fromType = call.getTypeArgument(0)!!
+
+                if (fromType.isNothing()) {
+                    body.buildUnreachable()
+                    // TODO: Investigate why?
+                    return true
+                }
+
+                // Workaround test codegen/box/elvis/nullNullOk.kt
+                if (fromType.makeNotNull().isNothing()) {
+                    body.buildUnreachable()
+                    return true
+                }
+
+                val toType = call.getTypeArgument(1)!!
+                val klass: IrClass = backendContext.inlineClassesUtils.getInlinedClass(toType)!!
+                val field = getInlineClassBackingField(klass)
+
+                generateTypeRTT(toType)
+                body.buildRefCast(context.transformType(fromType), context.transformBoxedType(toType))
+                generateInstanceFieldAccess(field)
+            }
+            else -> {
+                return false
+            }
+        }
+        return true
+    }
+
+    override fun visitContainerExpression(expression: IrContainerExpression) {
+        val statements = expression.statements
+        if (statements.isEmpty()) return
+
+        statements.dropLast(1).forEach {
+            statementToWasmInstruction(it)
+        }
+
+        if (expression.type != irBuiltIns.unitType) {
+            generateExpression(statements.last() as IrExpression)
+        } else {
+            statementToWasmInstruction(statements.last())
+        }
+    }
+
+    override fun visitBreak(jump: IrBreak) {
+        body.buildBr(context.referenceLoopLevel(jump.loop, LoopLabelType.BREAK))
+    }
+
+    override fun visitContinue(jump: IrContinue) {
+        body.buildBr(context.referenceLoopLevel(jump.loop, LoopLabelType.CONTINUE))
+    }
+
+    override fun visitReturn(expression: IrReturn) {
+        generateExpression(expression.value)
+
+        // FIXME: Hack for "returning" Unit from functions with generic return type.
+        //        Common case -- lambdas returning unit.
+        if (expression.value.type == irBuiltIns.unitType &&
+            expression.returnTargetSymbol.owner.returnType(backendContext) != irBuiltIns.unitType
+        ) {
+            val irReturnType = expression.returnTargetSymbol.owner.returnType(backendContext)
+
+            if (irReturnType != irBuiltIns.unitType) {
+                generateDefaultInitializerForType(context.transformType(irReturnType), body)
+            }
+        }
+
+        body.buildInstr(WasmOp.RETURN)
+    }
+
+    override fun visitWhen(expression: IrWhen) {
+        if (expression.type == irBuiltIns.unitType) {
+            var ifCount = 0
+            for (branch in expression.branches) {
+                if (!isElseBranch(branch)) {
+                    generateExpression(branch.condition)
+                    body.buildIf(label = null, resultType = null)
+                    statementToWasmInstruction(branch.result)
+                    body.buildElse()
+                    ifCount++
+                } else {
+                    statementToWasmInstruction(branch.result)
+                    break
+                }
+            }
+
+            repeat(ifCount) { body.buildEnd() }
+            return
+        }
+
+        val resultType = context.transformBlockResultType(expression.type)
+        var ifCount = 0
+        for (branch in expression.branches) {
+            if (!isElseBranch(branch)) {
+                generateExpression(branch.condition)
+                body.buildIf(null, resultType)
+                generateExpression(branch.result)
+                if (expression.type == irBuiltIns.nothingType) {
+                    body.buildUnreachable()
+                }
+                body.buildElse()
+                ifCount++
+            } else {
+                generateExpression(branch.result)
+                if (expression.type == irBuiltIns.nothingType) {
+                    body.buildUnreachable()
+                }
+                break
+            }
+        }
+
+        repeat(ifCount) { body.buildEnd() }
+    }
+
+    override fun visitDoWhileLoop(loop: IrDoWhileLoop) {
+        // (loop $LABEL
+        //     (block $BREAK_LABEL
+        //         (block $CONTINUE_LABEL <LOOP BODY>)
+        //         (br_if $LABEL          <CONDITION>)))
+
+        val label = loop.label
+
+        body.buildLoop(label)
+        val wasmLoop = body.numberOfNestedBlocks
+
+        body.buildBlock("BREAK_$label")
+        val wasmBreakBlock = body.numberOfNestedBlocks
+
+        body.buildBlock("CONTINUE_$label")
+        val wasmContinueBlock = body.numberOfNestedBlocks
+
+        context.defineLoopLevel(loop, LoopLabelType.BREAK, wasmBreakBlock)
+        context.defineLoopLevel(loop, LoopLabelType.CONTINUE, wasmContinueBlock)
+
+        loop.body?.let { statementToWasmInstruction(it) }
+        body.buildEnd()
+        generateExpression(loop.condition)
+        body.buildBrIf(wasmLoop)
+        body.buildEnd()
+        body.buildEnd()
+    }
+
+    override fun visitWhileLoop(loop: IrWhileLoop) {
+        // (loop $CONTINUE_LABEL
+        //     (block $BREAK_LABEL
+        //         (br_if $BREAK_LABEL (i32.eqz <CONDITION>))
+        //         <LOOP_BODY>
+        //         (br $CONTINUE_LABEL)))
+
+        val label = loop.label
+
+        body.buildLoop(label)
+        val wasmLoop = body.numberOfNestedBlocks
+
+        body.buildBlock("BREAK_$label")
+        val wasmBreakBlock = body.numberOfNestedBlocks
+
+        context.defineLoopLevel(loop, LoopLabelType.BREAK, wasmBreakBlock)
+        context.defineLoopLevel(loop, LoopLabelType.CONTINUE, wasmLoop)
+
+        generateExpression(loop.condition)
+        body.buildInstr(WasmOp.I32_EQZ)
+        body.buildBrIf(wasmBreakBlock)
+        loop.body?.let {
+            statementToWasmInstruction(it)
+        }
+        body.buildBr(wasmLoop)
+        body.buildEnd()
+        body.buildEnd()
+    }
+
+    fun generateExpression(expression: IrExpression) {
+        expression.acceptVoid(this)
+
+        if (expression.type == irBuiltIns.nothingType) {
+            body.buildUnreachable()
+        }
+    }
+
+    fun statementToWasmInstruction(statement: IrStatement) {
+        if (statement is IrVariable) {
+            context.defineLocal(statement.symbol)
+            val init = statement.initializer ?: return
+            generateExpression(init)
+            val varName = context.referenceLocal(statement.symbol)
+            body.buildSetLocal(varName)
+            return
+        }
+
+        generateExpression(statement as IrExpression)
+
+        if (statement.type != irBuiltIns.unitType && statement.type != irBuiltIns.nothingType) {
+            body.buildInstr(WasmOp.DROP)
+        }
+    }
+
+    // Return true if function is recognized as intrinsic.
+    fun tryToGenerateWasmOpIntrinsicCall(function: IrFunction): Boolean {
+        if (function.hasWasmReinterpretAnnotation()) {
+            return true
+        }
+
+        val opString = function.getWasmOpAnnotation()
+        if (opString != null) {
+            val op = WasmOp.valueOf(opString)
+            var immediates = emptyArray<WasmImmediate>()
+            when (op.immediates.size) {
+                0 -> {
+                }
+                1 -> {
+                    when (val imm = op.immediates[0]) {
+                        WasmImmediateKind.MEM_ARG ->
+                            immediates = arrayOf(WasmImmediate.MemArg(0u, 0u))
+                        else ->
+                            error("Immediate $imm is unsupported")
+                    }
+                }
+                else ->
+                    error("Op $opString is unsupported")
+            }
+            body.buildInstr(op, *immediates)
+            return true
+        }
+
+        return false
+    }
+}
+
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/ClassInfo.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/ClassInfo.kt
new file mode 100644
index 00000000000..32f55adec0d
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/ClassInfo.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.backend.common.ir.isOverridableOrOverrides
+import org.jetbrains.kotlin.backend.wasm.lower.WasmSignature
+import org.jetbrains.kotlin.backend.wasm.lower.wasmSignature
+import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+import org.jetbrains.kotlin.ir.declarations.IrField
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
+import org.jetbrains.kotlin.ir.types.classifierOrFail
+import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
+import org.jetbrains.kotlin.ir.util.isInterface
+
+class ClassMetadata(
+    val klass: IrClass,
+    val superClass: ClassMetadata?,
+    irBuiltIns: IrBuiltIns
+) {
+    // List of all fields including fields of super classes
+    // In Wasm order
+    val fields: List<IrField> =
+        superClass?.fields.orEmpty() + klass.declarations.filterIsInstance<IrField>()
+
+    // Implemented interfaces in no particular order
+    val interfaces: List<IrClass> = klass.allSuperInterfaces()
+
+    // Virtual methods in Wasm order
+    // TODO: Collect interface methods separately
+    val virtualMethods: List<VirtualMethodMetadata> = run {
+        val virtualFunctions =
+            klass.declarations
+                .filterVirtualFunctions()
+                .map {
+                    VirtualMethodMetadata(
+                        it,
+                        it.wasmSignature(irBuiltIns)
+                    )
+                }
+
+        val signatureToVirtualFunction = virtualFunctions.associateBy { it.signature }
+
+        val superSignatures = superClass?.virtualMethodsSignatures.orEmpty()
+
+        val newVirtualMethods = virtualFunctions.filter { it.signature !in superSignatures }
+        val superVirtualMethods = superClass?.virtualMethods.orEmpty().map {
+            signatureToVirtualFunction[it.signature] ?: it
+        }
+        val orderedVirtualFunctions = superVirtualMethods + newVirtualMethods
+
+        orderedVirtualFunctions
+    }
+
+    init {
+        val signatureToFunctions = mutableMapOf<WasmSignature, MutableList<IrSimpleFunction>>()
+        for (vm in virtualMethods) {
+            signatureToFunctions.getOrPut(vm.signature) { mutableListOf() }.add(vm.function)
+        }
+
+        for ((sig, functions) in signatureToFunctions) {
+            if (functions.size > 1) {
+                val funcList = functions.joinToString { " ---- ${it.fqNameWhenAvailable} \n" }
+                // TODO: Check in FE
+                error(
+                    "Class ${klass.fqNameWhenAvailable} has ${functions.size} methods with the same signature $sig\n $funcList"
+                )
+            }
+        }
+    }
+
+    private val virtualMethodsSignatures: Set<WasmSignature> =
+        virtualMethods.map { it.signature }.toSet()
+}
+
+class VirtualMethodMetadata(
+    val function: IrSimpleFunction,
+    val signature: WasmSignature
+)
+
+fun IrClass.allSuperInterfaces(): List<IrClass> =
+    superTypes.map {
+        it.classifierOrFail.owner as IrClass
+    }.flatMap {
+        (if (it.isInterface) listOf(it) else emptyList()) + it.allSuperInterfaces()
+    }
+
+fun List<IrDeclaration>.filterVirtualFunctions(): List<IrSimpleFunction> =
+    asSequence()
+        .filterIsInstance<IrSimpleFunction>()
+        .filter { it.dispatchReceiverParameter != null }
+        .map { it.realOverrideTarget }
+        .filter { it.isOverridableOrOverrides }
+        .distinct()
+        .toList()
+
+fun IrClass.getSuperClass(builtIns: IrBuiltIns): IrClass? =
+    when (this) {
+        builtIns.anyClass.owner -> null
+        else -> {
+            superTypes
+                .map { it.classifierOrFail.owner as IrClass }
+                .singleOrNull { !it.isInterface } ?: builtIns.anyClass.owner
+        }
+    }
+
+fun IrClass.allFields(builtIns: IrBuiltIns): List<IrField> =
+    getSuperClass(builtIns)?.allFields(builtIns).orEmpty() + declarations.filterIsInstance<IrField>()
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/ConstantData.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/ConstantData.kt
new file mode 100644
index 00000000000..d427e77b11d
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/ConstantData.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.wasm.ir.WasmSymbol
+
+// Representation of constant data in Wasm memory
+
+sealed class ConstantDataElement {
+    abstract val sizeInBytes: Int
+    abstract fun dump(indent: String = "", startAddress: Int = 0): String
+    abstract fun toBytes(): ByteArray
+}
+
+private fun addressToString(address: Int): String =
+    address.toString().padEnd(6, ' ')
+
+class ConstantDataIntField(val name: String, val value: WasmSymbol<Int>) : ConstantDataElement() {
+    constructor(name: String, value: Int) : this(name, WasmSymbol(value))
+
+    override fun toBytes(): ByteArray = value.owner.toLittleEndianBytes()
+
+    override fun dump(indent: String, startAddress: Int): String {
+        return "${addressToString(startAddress)}: $indent i32   : ${value.owner}    ;; $name\n"
+    }
+
+    override val sizeInBytes: Int = 4
+}
+
+class ConstantDataIntArray(val name: String, val value: List<WasmSymbol<Int>>) : ConstantDataElement() {
+    override fun toBytes(): ByteArray {
+        return value.fold(byteArrayOf()) { acc, el -> acc + el.owner.toLittleEndianBytes() }
+    }
+
+    override fun dump(indent: String, startAddress: Int): String {
+        if (value.isEmpty()) return ""
+        return "${addressToString(startAddress)}: $indent i32[] : ${value.map { it.owner }.toIntArray().contentToString()}   ;; $name\n"
+    }
+
+    override val sizeInBytes: Int = value.size * 4
+}
+
+class ConstantDataStruct(val name: String, val elements: List<ConstantDataElement>) : ConstantDataElement() {
+    override fun toBytes(): ByteArray {
+        return elements.fold(byteArrayOf()) { acc, el -> acc + el.toBytes() }
+    }
+
+    override fun dump(indent: String, startAddress: Int): String {
+        var res = "$indent;; $name\n"
+        var elemStartAddr = startAddress
+
+        for (el in elements) {
+            res += el.dump("$indent  ", elemStartAddr)
+            elemStartAddr += el.sizeInBytes
+        }
+
+        return res
+    }
+
+    override val sizeInBytes: Int = elements.map { it.sizeInBytes }.sum()
+}
+
+fun Int.toLittleEndianBytes(): ByteArray {
+    return ByteArray(4) {
+        (this ushr (it * 8)).toByte()
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt
new file mode 100644
index 00000000000..0535998afd0
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt
@@ -0,0 +1,332 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.backend.common.ir.isOverridableOrOverrides
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.backend.wasm.lower.wasmSignature
+import org.jetbrains.kotlin.backend.wasm.utils.*
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
+import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
+import org.jetbrains.kotlin.ir.expressions.IrBlockBody
+import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
+import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
+import org.jetbrains.kotlin.ir.visitors.acceptVoid
+import org.jetbrains.kotlin.wasm.ir.*
+
+class DeclarationGenerator(val context: WasmModuleCodegenContext) : IrElementVisitorVoid {
+
+    // Shortcuts
+    private val backendContext: WasmBackendContext = context.backendContext
+    private val irBuiltIns: IrBuiltIns = backendContext.irBuiltIns
+
+    override fun visitElement(element: IrElement) {
+        error("Unexpected element of type ${element::class}")
+    }
+
+    override fun visitTypeAlias(declaration: IrTypeAlias) {
+        // Type aliases are not material
+    }
+
+    private fun jsCodeName(declaration: IrFunction): String {
+        return declaration.fqNameWhenAvailable!!.asString() + "_" + (declaration as IrSimpleFunction).wasmSignature(irBuiltIns).hashCode()
+    }
+
+    override fun visitFunction(declaration: IrFunction) {
+        // Inline class constructors are currently empty
+        if (declaration is IrConstructor && backendContext.inlineClassesUtils.isClassInlineLike(declaration.parentAsClass))
+            return
+
+        val jsCode = declaration.getJsFunAnnotation()
+        val importedName = if (jsCode != null) {
+            val jsCodeName = jsCodeName(declaration)
+            context.addJsFun(jsCodeName, jsCode)
+            WasmImportPair("js_code", jsCodeName(declaration))
+        } else {
+            declaration.getWasmImportAnnotation()
+        }
+
+        val isIntrinsic = declaration.hasWasmReinterpretAnnotation() || declaration.getWasmOpAnnotation() != null
+        if (isIntrinsic) {
+            return
+        }
+
+        if (declaration.isFakeOverride)
+            return
+
+        // Generate function type
+        val watName = declaration.fqNameWhenAvailable.toString()
+        val irParameters = declaration.getEffectiveValueParameters()
+        val wasmFunctionType =
+            WasmFunctionType(
+                name = watName,
+                parameterTypes = irParameters.map {
+                    val t = context.transformValueParameterType(it)
+                    if (importedName != null && t is WasmRefNullType) {
+                        WasmEqRef
+                    } else {
+                        t
+                    }
+                },
+                resultTypes = listOfNotNull(
+                    context.transformResultType(declaration.returnType).let {
+                        if (importedName != null && it is WasmRefNullType) WasmEqRef else it
+                    }
+                )
+            )
+        context.defineFunctionType(declaration.symbol, wasmFunctionType)
+
+        if (declaration is IrSimpleFunction) {
+            if (declaration.modality == Modality.ABSTRACT) return
+            if (declaration.isOverridableOrOverrides) {
+                // Register function as virtual, meaning this function
+                // will be stored Wasm table and could be called indirectly.
+                context.registerVirtualFunction(declaration.symbol)
+            }
+        }
+
+        assert(declaration == declaration.realOverrideTarget) {
+            "Sanity check that $declaration is a real function that can be used in calls"
+        }
+
+        if (importedName != null) {
+            // Imported functions don't have bodies. Declaring the signature:
+            context.defineFunction(
+                declaration.symbol,
+                WasmFunction.Imported(watName, wasmFunctionType, importedName)
+            )
+            // TODO: Support re-export of imported functions.
+            return
+        }
+
+        val function = WasmFunction.Defined(watName, wasmFunctionType)
+        val functionCodegenContext = WasmFunctionCodegenContextImpl(
+            declaration,
+            function,
+            backendContext,
+            context
+        )
+
+        for (irParameter in irParameters) {
+            functionCodegenContext.defineLocal(irParameter.symbol)
+        }
+
+        val exprGen = functionCodegenContext.bodyGen
+        val bodyBuilder = BodyGenerator(functionCodegenContext)
+
+        when (val body = declaration.body) {
+            is IrBlockBody ->
+                for (statement in body.statements) {
+                    bodyBuilder.statementToWasmInstruction(statement)
+                }
+
+            is IrExpressionBody ->
+                bodyBuilder.generateExpression(body.expression)
+
+            else -> error("Unexpected body $body")
+        }
+
+        // Return implicit this from constructions to avoid extra tmp
+        // variables on constructor call sites.
+        // TODO: Redesign construction scheme.
+        if (declaration is IrConstructor) {
+            exprGen.buildGetLocal(/*implicit this*/ function.locals[0])
+            exprGen.buildInstr(WasmOp.RETURN)
+        }
+
+        // Add unreachable if function returns something but not as a last instruction.
+        if (wasmFunctionType.resultTypes.isNotEmpty() && declaration.body is IrBlockBody) {
+            // TODO: Add unreachable only if needed
+            exprGen.buildUnreachable()
+        }
+
+        context.defineFunction(declaration.symbol, function)
+
+        if (declaration == backendContext.startFunction)
+            context.setStartFunction(function)
+
+        if (declaration.isExported(backendContext)) {
+            context.addExport(
+                WasmExport.Function(
+                    field = function,
+                    // TODO: Add ability to specify exported name.
+                    name = declaration.name.identifier
+                )
+            )
+        }
+    }
+
+    override fun visitClass(declaration: IrClass) {
+        if (declaration.isAnnotationClass) return
+        val symbol = declaration.symbol
+
+        if (declaration.isInterface) {
+            context.registerInterface(symbol)
+        } else {
+            val nameStr = declaration.fqNameWhenAvailable.toString()
+            val structType = WasmStructDeclaration(
+                name = nameStr,
+                fields = declaration.allFields(irBuiltIns).map {
+                    WasmStructFieldDeclaration(
+                        name = it.name.toString(),
+                        type = context.transformType(it.type),
+                        isMutable = true
+                    )
+                }
+            )
+
+            context.defineStructType(symbol, structType)
+
+            var depth = 2
+            val metadata = context.getClassMetadata(symbol)
+            var subMetadata = metadata
+            while (true) {
+                subMetadata = subMetadata.superClass ?: break
+                depth++
+            }
+
+            val initBody = mutableListOf<WasmInstr>()
+            val wasmExpressionGenerator = WasmIrExpressionBuilder(initBody)
+
+            val superClass = metadata.superClass
+            if (superClass != null) {
+                val superRTT = context.referenceClassRTT(superClass.klass.symbol)
+                wasmExpressionGenerator.buildGetGlobal(superRTT)
+            } else {
+                wasmExpressionGenerator.buildRttCanon(WasmRefType(WasmHeapType.Simple.Eq))
+            }
+
+            wasmExpressionGenerator.buildRttSub(
+                WasmRefType(WasmHeapType.Type(WasmSymbol(structType)))
+            )
+
+            val rtt = WasmGlobal(
+                name = "rtt_of_$nameStr",
+                isMutable = false,
+                type = WasmRtt(depth, WasmHeapType.Type(WasmSymbol(structType))),
+                init = initBody
+            )
+
+            context.defineRTT(symbol, rtt)
+            context.registerClass(symbol)
+            context.generateTypeInfo(symbol, binaryDataStruct(metadata))
+        }
+
+        for (member in declaration.declarations) {
+            member.acceptVoid(this)
+        }
+    }
+
+    private fun binaryDataStruct(classMetadata: ClassMetadata): ConstantDataStruct {
+        val invalidIndex = -1
+        val superClass = classMetadata.superClass?.klass
+
+        val superClassSymbol: WasmSymbol<Int> =
+            superClass?.let { context.referenceClassId(it.symbol) } ?: WasmSymbol(invalidIndex)
+
+        val superTypeField =
+            ConstantDataIntField("Super class", superClassSymbol)
+
+        val interfacesArray = ConstantDataIntArray(
+            "data",
+            classMetadata.interfaces.map { context.referenceInterfaceId(it.symbol) }
+        )
+        val interfacesArraySize = ConstantDataIntField(
+            "size",
+            interfacesArray.value.size
+        )
+
+        val implementedInterfacesArrayWithSize = ConstantDataStruct(
+            "Implemented interfaces array",
+            listOf(interfacesArraySize, interfacesArray)
+        )
+
+        val vtableSizeField = ConstantDataIntField(
+            "V-table length",
+            classMetadata.virtualMethods.size
+        )
+
+        val vtableArray = ConstantDataIntArray(
+            "V-table",
+            classMetadata.virtualMethods.map {
+                if (it.function.modality == Modality.ABSTRACT) {
+                    WasmSymbol(invalidIndex)
+                } else {
+                    context.referenceVirtualFunctionId(it.function.symbol)
+                }
+            }
+        )
+
+        val signaturesArray = ConstantDataIntArray(
+            "Signatures",
+            classMetadata.virtualMethods.map {
+                if (it.function.modality == Modality.ABSTRACT) {
+                    WasmSymbol(invalidIndex)
+                } else {
+                    context.referenceSignatureId(it.signature)
+                }
+            }
+        )
+
+        return ConstantDataStruct(
+            "Class TypeInfo: ${classMetadata.klass.fqNameWhenAvailable} ",
+            listOf(
+                superTypeField,
+                vtableSizeField,
+                vtableArray,
+                signaturesArray,
+                implementedInterfacesArrayWithSize,
+            )
+        )
+    }
+
+    override fun visitField(declaration: IrField) {
+        // Member fields are generated as part of struct type
+        if (!declaration.isStatic) return
+
+        val wasmType = context.transformType(declaration.type)
+
+        val initBody = mutableListOf<WasmInstr>()
+        val wasmExpressionGenerator = WasmIrExpressionBuilder(initBody)
+        generateDefaultInitializerForType(wasmType, wasmExpressionGenerator)
+
+        val global = WasmGlobal(
+            name = declaration.fqNameWhenAvailable.toString(),
+            type = wasmType,
+            isMutable = true,
+            // All globals are currently initialized in start function
+            init = initBody
+        )
+
+        context.defineGlobal(declaration.symbol, global)
+    }
+}
+
+
+fun generateDefaultInitializerForType(type: WasmType, g: WasmExpressionBuilder) = when (type) {
+    WasmI32 -> g.buildConstI32(0)
+    WasmI1 -> g.buildConstI32(0)
+    WasmI64 -> g.buildConstI64(0)
+    WasmF32 -> g.buildConstF32(0f)
+    WasmF64 -> g.buildConstF64(0.0)
+    is WasmRefNullType -> g.buildRefNull(type.heapType)
+    is WasmExternRef -> g.buildRefNull(WasmHeapType.Simple.Extern)
+    WasmUnreachableType -> error("Unreachable type can't be initialized")
+    else -> error("Unknown value type ${type.name}")
+}
+
+fun IrFunction.getEffectiveValueParameters(): List<IrValueParameter> {
+    val implicitThis = if (this is IrConstructor) parentAsClass.thisReceiver!! else null
+    return listOfNotNull(implicitThis, dispatchReceiverParameter, extensionReceiverParameter) + valueParameters
+}
+
+fun IrFunction.isExported(context: WasmBackendContext): Boolean =
+    visibility == DescriptorVisibilities.PUBLIC && fqNameWhenAvailable in context.additionalExportedDeclarations
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/JsHelpers.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/JsHelpers.kt
new file mode 100644
index 00000000000..ce94c92dbf6
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/JsHelpers.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.jsAssignment
+import org.jetbrains.kotlin.js.backend.ast.JsArrayLiteral
+import org.jetbrains.kotlin.js.backend.ast.JsBlock
+import org.jetbrains.kotlin.js.backend.ast.JsNameRef
+import org.jetbrains.kotlin.js.backend.ast.JsStringLiteral
+
+fun generateStringLiteralsSupport(literals: List<String>): String {
+    return JsBlock(
+        jsAssignment(
+            JsNameRef("stringLiterals", "runtime"),
+            JsArrayLiteral(literals.map { JsStringLiteral(it) })
+        ).makeStmt()
+    ).toString()
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt
new file mode 100644
index 00000000000..584a710f37b
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.wasm.ir.*
+import org.jetbrains.kotlin.backend.wasm.utils.hasWasmForeignAnnotation
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.classOrNull
+import org.jetbrains.kotlin.ir.types.classifierOrNull
+import org.jetbrains.kotlin.ir.types.getClass
+import org.jetbrains.kotlin.ir.util.getInlineClassUnderlyingType
+import org.jetbrains.kotlin.ir.util.isInterface
+
+class WasmTypeTransformer(
+    val context: WasmBaseCodegenContext,
+    val builtIns: IrBuiltIns
+) {
+    fun IrType.toWasmResultType(): WasmType? =
+        when (this) {
+            builtIns.unitType,
+            builtIns.nothingType ->
+                null
+
+            else ->
+                toWasmValueType()
+        }
+
+    fun IrType.toWasmBlockResultType(): WasmType? =
+        when (this) {
+            builtIns.unitType ->
+                null
+
+            // TODO: Lower blocks with Nothing type?
+            builtIns.nothingType ->
+                WasmUnreachableType
+
+            else ->
+                toWasmValueType()
+        }
+
+    fun IrType.toStructType(): WasmType =
+        WasmRefNullType(WasmHeapType.Type(context.referenceStructType(erasedUpperBound?.symbol ?: builtIns.anyClass)))
+
+    fun IrType.toBoxedInlineClassType(): WasmType =
+        toStructType()
+
+    fun IrType.toWasmValueType(): WasmType =
+        when (this) {
+            builtIns.booleanType,
+            builtIns.byteType,
+            builtIns.shortType,
+            builtIns.intType,
+            builtIns.charType ->
+                WasmI32
+
+            builtIns.longType ->
+                WasmI64
+
+            builtIns.floatType ->
+                WasmF32
+
+            builtIns.doubleType ->
+                WasmF64
+
+            builtIns.stringType ->
+                WasmExternRef
+
+            builtIns.nothingNType ->
+                WasmExternRef
+
+            // Value will not be created. Just using a random Wasm type.
+            builtIns.nothingType ->
+                WasmExternRef
+
+            else -> {
+                val klass = this.getClass()
+                val ic = context.backendContext.inlineClassesUtils.getInlinedClass(this)
+
+                if (klass != null && klass.hasWasmForeignAnnotation()) {
+                    WasmExternRef
+                } else if (ic != null) {
+                    getInlineClassUnderlyingType(ic).toWasmValueType()
+                } else {
+                    this.toStructType()
+                }
+            }
+        }
+}
+
+
+// Return null if upper bound is Any
+val IrTypeParameter.erasedUpperBound: IrClass?
+    get() {
+        // Pick the (necessarily unique) non-interface upper bound if it exists
+        for (type in superTypes) {
+            return type.erasedUpperBound ?: continue
+        }
+
+        return null
+    }
+
+val IrType.erasedUpperBound: IrClass?
+    get() = when (val classifier = classifierOrNull) {
+        is IrClassSymbol -> classifier.owner
+        is IrTypeParameterSymbol -> classifier.owner.erasedUpperBound
+        else -> throw IllegalStateException()
+    }.let {
+        if (it?.isInterface == true) null
+        else it
+    }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmBaseCodegenContext.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmBaseCodegenContext.kt
new file mode 100644
index 00000000000..13ea4f95b2e
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmBaseCodegenContext.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.wasm.ir.*
+import org.jetbrains.kotlin.backend.wasm.lower.WasmSignature
+import org.jetbrains.kotlin.ir.declarations.IrField
+import org.jetbrains.kotlin.ir.declarations.IrValueParameter
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.IrFieldSymbol
+import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.types.IrType
+
+interface WasmBaseCodegenContext {
+    val backendContext: WasmBackendContext
+
+    fun referenceFunction(irFunction: IrFunctionSymbol): WasmSymbol<WasmFunction>
+    fun referenceGlobal(irField: IrFieldSymbol): WasmSymbol<WasmGlobal>
+    fun referenceStructType(irClass: IrClassSymbol): WasmSymbol<WasmStructDeclaration>
+    fun referenceFunctionType(irFunction: IrFunctionSymbol): WasmSymbol<WasmFunctionType>
+
+    fun referenceClassId(irClass: IrClassSymbol): WasmSymbol<Int>
+    fun referenceInterfaceId(irInterface: IrClassSymbol): WasmSymbol<Int>
+    fun referenceVirtualFunctionId(irFunction: IrSimpleFunctionSymbol): WasmSymbol<Int>
+    fun referenceClassRTT(irClass: IrClassSymbol): WasmSymbol<WasmGlobal>
+
+    fun referenceSignatureId(signature: WasmSignature): WasmSymbol<Int>
+
+    fun referenceStringLiteral(string: String): WasmSymbol<Int>
+
+    fun transformType(irType: IrType): WasmType
+    fun transformBoxedType(irType: IrType): WasmType
+    fun transformValueParameterType(irValueParameter: IrValueParameter): WasmType
+    fun transformResultType(irType: IrType): WasmType?
+    fun transformBlockResultType(irType: IrType): WasmType?
+
+
+    fun getStructFieldRef(field: IrField): WasmSymbol<Int>
+    fun getClassMetadata(irClass: IrClassSymbol): ClassMetadata
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmCompiledModuleFragment.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmCompiledModuleFragment.kt
new file mode 100644
index 00000000000..bb8e8842606
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmCompiledModuleFragment.kt
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.wasm.ir.*
+import org.jetbrains.kotlin.backend.wasm.lower.WasmSignature
+import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName
+import org.jetbrains.kotlin.ir.declarations.IrExternalPackageFragment
+import org.jetbrains.kotlin.ir.symbols.*
+import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
+import org.jetbrains.kotlin.ir.util.getPackageFragment
+
+class WasmCompiledModuleFragment {
+    val functions =
+        ReferencableAndDefinable<IrFunctionSymbol, WasmFunction>()
+    val globals =
+        ReferencableAndDefinable<IrFieldSymbol, WasmGlobal>()
+    val functionTypes =
+        ReferencableAndDefinable<IrFunctionSymbol, WasmFunctionType>()
+    val structTypes =
+        ReferencableAndDefinable<IrClassSymbol, WasmStructDeclaration>()
+    val classIds =
+        ReferencableElements<IrClassSymbol, Int>()
+    val interfaceId =
+        ReferencableElements<IrClassSymbol, Int>()
+    val virtualFunctionId =
+        ReferencableElements<IrFunctionSymbol, Int>()
+    val signatureId =
+        ReferencableElements<WasmSignature, Int>()
+    val stringLiteralId =
+        ReferencableElements<String, Int>()
+
+    val runtimeTypes =
+        ReferencableAndDefinable<IrClassSymbol, WasmGlobal>()
+
+    val classes = mutableListOf<IrClassSymbol>()
+    val interfaces = mutableListOf<IrClassSymbol>()
+    val virtualFunctions = mutableListOf<IrSimpleFunctionSymbol>()
+    val signatures = LinkedHashSet<WasmSignature>()
+    val stringLiterals = mutableListOf<String>()
+
+    val typeInfo =
+        ReferencableAndDefinable<IrClassSymbol, ConstantDataElement>()
+    val exports = mutableListOf<WasmExport<*>>()
+
+    class JsCodeSnippet(val importName: String, val jsCode: String)
+
+    val jsFuns = mutableListOf<JsCodeSnippet>()
+
+    var startFunction: WasmFunction? = null
+
+    open class ReferencableElements<Ir, Wasm : Any> {
+        val unbound = mutableMapOf<Ir, WasmSymbol<Wasm>>()
+        fun reference(ir: Ir): WasmSymbol<Wasm> {
+            val declaration = (ir as? IrSymbol)?.owner as? IrDeclarationWithName
+            if (declaration != null) {
+                val packageFragment = declaration.getPackageFragment()
+                    ?: error("Referencing declaration without package fragment ${declaration.fqNameWhenAvailable}")
+                if (packageFragment is IrExternalPackageFragment) {
+                    error("Referencing declaration without package fragment ${declaration.fqNameWhenAvailable}")
+                }
+            }
+            return unbound.getOrPut(ir) { WasmSymbol() }
+        }
+    }
+
+    class ReferencableAndDefinable<Ir, Wasm : Any> : ReferencableElements<Ir, Wasm>() {
+        fun define(ir: Ir, wasm: Wasm) {
+            if (ir in defined)
+                error("Trying to redefine element: IR: $ir Wasm: $wasm")
+
+            elements += wasm
+            defined[ir] = wasm
+            wasmToIr[wasm] = ir
+        }
+
+        val defined = LinkedHashMap<Ir, Wasm>()
+        val elements = mutableListOf<Wasm>()
+
+        val wasmToIr = mutableMapOf<Wasm, Ir>()
+    }
+
+    @OptIn(ExperimentalUnsignedTypes::class)
+    fun linkWasmCompiledFragments(): WasmModule {
+        bind(functions.unbound, functions.defined)
+        bind(globals.unbound, globals.defined)
+        bind(functionTypes.unbound, functionTypes.defined)
+        bind(structTypes.unbound, structTypes.defined)
+        bind(runtimeTypes.unbound, runtimeTypes.defined)
+
+        val klassIds = mutableMapOf<IrClassSymbol, Int>()
+        var classId = 0
+        for (typeInfoElement in typeInfo.elements) {
+            val ir = typeInfo.wasmToIr.getValue(typeInfoElement)
+            klassIds[ir] = classId
+            classId += typeInfoElement.sizeInBytes
+        }
+
+        bind(classIds.unbound, klassIds)
+        bindIndices(virtualFunctionId.unbound, virtualFunctions)
+        bindIndices(signatureId.unbound, signatures.toList())
+        bindIndices(interfaceId.unbound, interfaces)
+        bindIndices(stringLiteralId.unbound, stringLiterals)
+
+        val data = typeInfo.elements.map {
+            val ir = typeInfo.wasmToIr.getValue(it)
+            val id = klassIds.getValue(ir)
+            val offset = mutableListOf<WasmInstr>()
+            WasmIrExpressionBuilder(offset).buildConstI32(id)
+            WasmData(WasmDataMode.Active(0, offset), it.toBytes())
+        }
+
+        val logTypeInfo = false
+        if (logTypeInfo) {
+            println("Signatures: ")
+            for ((index, signature: WasmSignature) in signatures.withIndex()) {
+                println("  -- $index $signature")
+            }
+
+            println("Interfaces: ")
+            for ((index, iface: IrClassSymbol) in interfaces.withIndex()) {
+                println("  -- $index ${iface.owner.fqNameWhenAvailable}")
+            }
+
+            println("Virtual functions: ")
+            for ((index, vf: IrSimpleFunctionSymbol) in virtualFunctions.withIndex()) {
+                println("  -- $index ${vf.owner.fqNameWhenAvailable}")
+            }
+
+            println(
+                ConstantDataStruct("typeInfo", typeInfo.elements).dump("", 0)
+            )
+        }
+
+        val table = WasmTable(
+            limits = WasmLimits(virtualFunctions.size.toUInt(), virtualFunctions.size.toUInt()),
+            elementType = WasmFuncRef,
+        )
+
+        val offsetExpr = mutableListOf<WasmInstr>()
+        WasmIrExpressionBuilder(offsetExpr).buildConstI32(0)
+
+        val elements = WasmElement(
+            WasmFuncRef,
+            values = virtualFunctions.map {
+                WasmTable.Value.Function(functions.defined.getValue(it))
+            },
+            WasmElement.Mode.Active(table, offsetExpr)
+        )
+
+        val typeInfoSize = classId
+        val memorySizeInPages = (typeInfoSize / 65_536) + 1
+        val memory = WasmMemory(WasmLimits(memorySizeInPages.toUInt(), memorySizeInPages.toUInt()))
+
+        val importedFunctions = functions.elements.filterIsInstance<WasmFunction.Imported>()
+
+        // Sorting by depth for a valid init order
+        val sortedRttGlobals = runtimeTypes.elements.sortedBy { (it.type as WasmRtt).depth }
+
+        val module = WasmModule(
+            functionTypes = functionTypes.elements,
+            structs = structTypes.elements,
+            importsInOrder = importedFunctions,
+            importedFunctions = importedFunctions,
+            definedFunctions = functions.elements.filterIsInstance<WasmFunction.Defined>(),
+            tables = listOf(table),
+            memories = listOf(memory),
+            globals = globals.elements + sortedRttGlobals,
+            exports = exports,
+            startFunction = startFunction!!,
+            elements = listOf(elements),
+            data = data
+        )
+        module.calculateIds()
+        return module
+    }
+}
+
+fun <IrSymbolType, WasmDeclarationType : Any, WasmSymbolType : WasmSymbol<WasmDeclarationType>> bind(
+    unbound: Map<IrSymbolType, WasmSymbolType>,
+    defined: Map<IrSymbolType, WasmDeclarationType>
+) {
+    unbound.forEach { (irSymbol, wasmSymbol) ->
+        if (irSymbol !in defined)
+            error("Can't link symbol ${irSymbolDebugDump(irSymbol)}")
+        wasmSymbol.bind(defined.getValue(irSymbol))
+    }
+}
+
+private fun irSymbolDebugDump(symbol: Any?): String =
+    when (symbol) {
+        is IrFunctionSymbol -> "function ${symbol.owner.fqNameWhenAvailable}"
+        is IrClassSymbol -> "class ${symbol.owner.fqNameWhenAvailable}"
+        else -> symbol.toString()
+    }
+
+fun <IrSymbolType> bindIndices(
+    unbound: Map<IrSymbolType, WasmSymbol<Int>>,
+    ordered: List<IrSymbolType>
+) {
+    unbound.forEach { (irSymbol, wasmSymbol) ->
+        val index = ordered.indexOf(irSymbol)
+        if (index == -1)
+            error("Can't link symbol with indices ${irSymbolDebugDump(irSymbol)}")
+        wasmSymbol.bind(index)
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContext.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContext.kt
new file mode 100644
index 00000000000..86a4023f250
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContext.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.expressions.IrLoop
+import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
+import org.jetbrains.kotlin.wasm.ir.WasmExpressionBuilder
+import org.jetbrains.kotlin.wasm.ir.WasmInstr
+import org.jetbrains.kotlin.wasm.ir.WasmLocal
+
+enum class LoopLabelType { BREAK, CONTINUE }
+
+interface WasmFunctionCodegenContext : WasmBaseCodegenContext {
+    val irFunction: IrFunction
+
+    fun defineLocal(irValueDeclaration: IrValueSymbol)
+    fun referenceLocal(irValueDeclaration: IrValueSymbol): WasmLocal
+    fun referenceLocal(index: Int): WasmLocal
+
+    fun defineLoopLevel(irLoop: IrLoop, labelType: LoopLabelType, level: Int)
+    fun referenceLoopLevel(irLoop: IrLoop, labelType: LoopLabelType): Int
+
+    val bodyGen: WasmExpressionBuilder
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContextImpl.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContextImpl.kt
new file mode 100644
index 00000000000..fad8a5ef160
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContextImpl.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.declarations.IrValueParameter
+import org.jetbrains.kotlin.ir.expressions.IrLoop
+import org.jetbrains.kotlin.ir.symbols.IrValueParameterSymbol
+import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
+import org.jetbrains.kotlin.wasm.ir.*
+
+class WasmFunctionCodegenContextImpl(
+    override val irFunction: IrFunction,
+    private val wasmFunction: WasmFunction.Defined,
+    override val backendContext: WasmBackendContext,
+    private val referencing: WasmBaseCodegenContext
+) : WasmBaseCodegenContext by referencing,
+    WasmFunctionCodegenContext {
+    override val bodyGen: WasmExpressionBuilder =
+        WasmIrExpressionBuilder(wasmFunction.instructions)
+
+    private val wasmLocals = LinkedHashMap<IrValueSymbol, WasmLocal>()
+    private val loopLevels = LinkedHashMap<Pair<IrLoop, LoopLabelType>, Int>()
+
+    override fun defineLocal(irValueDeclaration: IrValueSymbol) {
+        assert(irValueDeclaration !in wasmLocals) { "Redefinition of local" }
+
+        val owner = irValueDeclaration.owner
+        val wasmLocal = WasmLocal(
+            wasmFunction.locals.size,
+            owner.name.asString(),
+            if (owner is IrValueParameter) transformValueParameterType(owner) else transformType(owner.type),
+            isParameter = irValueDeclaration is IrValueParameterSymbol
+        )
+
+        wasmLocals[irValueDeclaration] = wasmLocal
+        wasmFunction.locals += wasmLocal
+    }
+
+    override fun referenceLocal(irValueDeclaration: IrValueSymbol): WasmLocal {
+        return wasmLocals.getValue(irValueDeclaration)
+    }
+
+    override fun referenceLocal(index: Int): WasmLocal {
+        return wasmFunction.locals[index]
+    }
+
+    override fun defineLoopLevel(irLoop: IrLoop, labelType: LoopLabelType, level: Int) {
+        val loopKey = Pair(irLoop, labelType)
+        assert(loopKey !in loopLevels) { "Redefinition of loop" }
+        loopLevels[loopKey] = level
+    }
+
+    override fun referenceLoopLevel(irLoop: IrLoop, labelType: LoopLabelType): Int {
+        return loopLevels.getValue(Pair(irLoop, labelType))
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContext.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContext.kt
new file mode 100644
index 00000000000..b0d380faa42
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContext.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.wasm.ir.*
+import org.jetbrains.kotlin.backend.wasm.ir2wasm.ConstantDataElement
+import org.jetbrains.kotlin.backend.wasm.ir2wasm.WasmBaseCodegenContext
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.IrFieldSymbol
+import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+
+/**
+ * Interface for generating WebAssembly module.
+ */
+interface WasmModuleCodegenContext : WasmBaseCodegenContext {
+    fun defineFunction(irFunction: IrFunctionSymbol, wasmFunction: WasmFunction)
+    fun defineGlobal(irField: IrFieldSymbol, wasmGlobal: WasmGlobal)
+    fun defineStructType(irClass: IrClassSymbol, wasmStruct: WasmStructDeclaration)
+    fun defineRTT(irClass: IrClassSymbol, wasmGlobal: WasmGlobal)
+    fun defineFunctionType(irFunction: IrFunctionSymbol, wasmFunctionType: WasmFunctionType)
+    fun addJsFun(importName: String, jsCode: String)
+
+    fun setStartFunction(wasmFunction: WasmFunction)
+    fun addExport(wasmExport: WasmExport<*>)
+
+    fun registerVirtualFunction(irFunction: IrSimpleFunctionSymbol)
+    fun registerInterface(irInterface: IrClassSymbol)
+    fun registerClass(irClass: IrClassSymbol)
+
+    fun generateTypeInfo(irClass: IrClassSymbol, typeInfo: ConstantDataElement)
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContextImpl.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContextImpl.kt
new file mode 100644
index 00000000000..7759bd5834f
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContextImpl.kt
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.wasm.ir.*
+import org.jetbrains.kotlin.backend.wasm.lower.WasmSignature
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.ir.declarations.IrField
+import org.jetbrains.kotlin.ir.declarations.IrValueParameter
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.IrFieldSymbol
+import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.defaultType
+import org.jetbrains.kotlin.ir.types.isNothing
+import org.jetbrains.kotlin.ir.util.isFunction
+import org.jetbrains.kotlin.ir.util.parentAsClass
+
+
+class WasmModuleCodegenContextImpl(
+    override val backendContext: WasmBackendContext,
+    private val wasmFragment: WasmCompiledModuleFragment
+) : WasmModuleCodegenContext {
+    private val typeTransformer =
+        WasmTypeTransformer(this, backendContext.irBuiltIns)
+
+    override fun transformType(irType: IrType): WasmType {
+        return with(typeTransformer) { irType.toWasmValueType() }
+    }
+
+    override fun transformBoxedType(irType: IrType): WasmType {
+        return with(typeTransformer) { irType.toBoxedInlineClassType() }
+    }
+
+    override fun transformValueParameterType(irValueParameter: IrValueParameter): WasmType {
+        return with(typeTransformer) {
+            if (context.backendContext.inlineClassesUtils.shouldValueParameterBeBoxed(irValueParameter)) {
+                irValueParameter.type.toBoxedInlineClassType()
+            } else {
+                irValueParameter.type.toWasmValueType()
+            }
+        }
+    }
+
+    override fun transformResultType(irType: IrType): WasmType? {
+        return with(typeTransformer) { irType.toWasmResultType() }
+    }
+
+    override fun transformBlockResultType(irType: IrType): WasmType? {
+        return with(typeTransformer) { irType.toWasmBlockResultType() }
+    }
+
+    override fun referenceStringLiteral(string: String): WasmSymbol<Int> {
+        wasmFragment.stringLiterals.add(string)
+        return wasmFragment.stringLiteralId.reference(string)
+    }
+
+    override fun generateTypeInfo(irClass: IrClassSymbol, typeInfo: ConstantDataElement) {
+        wasmFragment.typeInfo.define(irClass, typeInfo)
+    }
+
+    override fun setStartFunction(wasmFunction: WasmFunction) {
+        wasmFragment.startFunction = wasmFunction
+    }
+
+    override fun addExport(wasmExport: WasmExport<*>) {
+        wasmFragment.exports += wasmExport
+    }
+
+    override fun registerVirtualFunction(irFunction: IrSimpleFunctionSymbol) {
+        wasmFragment.virtualFunctions += irFunction
+    }
+
+    override fun registerInterface(irInterface: IrClassSymbol) {
+        wasmFragment.interfaces += irInterface
+    }
+
+    override fun registerClass(irClass: IrClassSymbol) {
+        wasmFragment.classes += irClass
+    }
+
+    override fun defineFunction(irFunction: IrFunctionSymbol, wasmFunction: WasmFunction) {
+        wasmFragment.functions.define(irFunction, wasmFunction)
+    }
+
+    override fun defineGlobal(irField: IrFieldSymbol, wasmGlobal: WasmGlobal) {
+        wasmFragment.globals.define(irField, wasmGlobal)
+    }
+
+    override fun defineStructType(irClass: IrClassSymbol, wasmStruct: WasmStructDeclaration) {
+        wasmFragment.structTypes.define(irClass, wasmStruct)
+    }
+
+    override fun defineRTT(irClass: IrClassSymbol, wasmGlobal: WasmGlobal) {
+        wasmFragment.runtimeTypes.define(irClass, wasmGlobal)
+    }
+
+    override fun defineFunctionType(irFunction: IrFunctionSymbol, wasmFunctionType: WasmFunctionType) {
+        wasmFragment.functionTypes.define(irFunction, wasmFunctionType)
+    }
+
+    private val classMetadataCache = mutableMapOf<IrClassSymbol, ClassMetadata>()
+    override fun getClassMetadata(irClass: IrClassSymbol): ClassMetadata =
+        classMetadataCache.getOrPut(irClass) {
+            val superClass = irClass.owner.getSuperClass(backendContext.irBuiltIns)
+            val superClassMetadata = superClass?.let { getClassMetadata(it.symbol) }
+            ClassMetadata(
+                irClass.owner,
+                superClassMetadata,
+                backendContext.irBuiltIns
+            )
+        }
+
+    override fun referenceFunction(irFunction: IrFunctionSymbol): WasmSymbol<WasmFunction> =
+        wasmFragment.functions.reference(irFunction)
+
+    override fun referenceGlobal(irField: IrFieldSymbol): WasmSymbol<WasmGlobal> =
+        wasmFragment.globals.reference(irField)
+
+    override fun referenceStructType(irClass: IrClassSymbol): WasmSymbol<WasmStructDeclaration> {
+        val type = irClass.defaultType
+        require(!type.isNothing()) {
+            "Can't reference Nothing type"
+        }
+        return wasmFragment.structTypes.reference(irClass)
+    }
+
+    override fun referenceClassRTT(irClass: IrClassSymbol): WasmSymbol<WasmGlobal> =
+        wasmFragment.runtimeTypes.reference(irClass)
+
+    override fun referenceFunctionType(irFunction: IrFunctionSymbol): WasmSymbol<WasmFunctionType> =
+        wasmFragment.functionTypes.reference(irFunction)
+
+    override fun referenceClassId(irClass: IrClassSymbol): WasmSymbol<Int> =
+        wasmFragment.classIds.reference(irClass)
+
+    override fun referenceInterfaceId(irInterface: IrClassSymbol): WasmSymbol<Int> {
+        // HACK to substitute kotlin.Function5 with kotlin.wasm.internal.Function5
+        val defaultType = irInterface.defaultType
+        if (defaultType.isFunction()) {
+            val n = irInterface.owner.typeParameters.size - 1
+            return wasmFragment.interfaceId.reference(backendContext.wasmSymbols.functionN(n))
+        }
+        return wasmFragment.interfaceId.reference(irInterface)
+    }
+
+    override fun referenceVirtualFunctionId(irFunction: IrSimpleFunctionSymbol): WasmSymbol<Int> {
+        if (irFunction.owner.modality == Modality.ABSTRACT)
+            error("Abstract functions are not stored in table")
+        return wasmFragment.virtualFunctionId.reference(irFunction)
+    }
+
+    override fun referenceSignatureId(signature: WasmSignature): WasmSymbol<Int> {
+        wasmFragment.signatures.add(signature)
+        return wasmFragment.signatureId.reference(signature)
+    }
+
+    override fun getStructFieldRef(field: IrField): WasmSymbol<Int> {
+        val klass = field.parentAsClass
+        val metadata = getClassMetadata(klass.symbol)
+        val fieldId = metadata.fields.indexOf(field)
+        return WasmSymbol(fieldId)
+    }
+
+    override fun addJsFun(importName: String, jsCode: String) {
+        wasmFragment.jsFuns +=
+            WasmCompiledModuleFragment.JsCodeSnippet(importName = importName, jsCode = jsCode)
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt
new file mode 100644
index 00000000000..77a6c8a64c8
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.ir2wasm
+
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
+import org.jetbrains.kotlin.ir.declarations.IrPackageFragment
+import org.jetbrains.kotlin.ir.visitors.acceptVoid
+
+class WasmModuleFragmentGenerator(
+    backendContext: WasmBackendContext,
+    wasmModuleFragment: WasmCompiledModuleFragment
+) {
+    private val declarationGenerator =
+        DeclarationGenerator(
+            WasmModuleCodegenContextImpl(
+                backendContext,
+                wasmModuleFragment
+            )
+        )
+
+    fun generateModule(irModuleFragment: IrModuleFragment) {
+        for (irFile in irModuleFragment.files) {
+            generatePackageFragment(irFile)
+        }
+    }
+
+    fun generatePackageFragment(irPackageFragment: IrPackageFragment) {
+        for (irDeclaration in irPackageFragment.declarations) {
+            generateDeclaration(irDeclaration)
+        }
+    }
+
+    fun generateDeclaration(irDeclaration: IrDeclaration) {
+        irDeclaration.acceptVoid(declarationGenerator)
+    }
+}
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BlockDecomposerLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BlockDecomposerLowering.kt
deleted file mode 100644
index 33e411a2e42..00000000000
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BlockDecomposerLowering.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.backend.wasm.lower
-
-import org.jetbrains.kotlin.ir.backend.js.lower.AbstractBlockDecomposerLowering
-import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
-import org.jetbrains.kotlin.ir.expressions.IrExpression
-
-class WasmBlockDecomposerLowering(val context: WasmBackendContext) : AbstractBlockDecomposerLowering(context) {
-    override fun unreachableExpression(): IrExpression = TODO()
-}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt
index b688091510e..3f5e9397025 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt
@@ -6,40 +6,139 @@
 package org.jetbrains.kotlin.backend.wasm.lower
 
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
+import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
 import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.ir.backend.js.utils.isEqualsInheritedFromAny
+import org.jetbrains.kotlin.ir.builders.irCall
+import org.jetbrains.kotlin.ir.builders.irComposite
+import org.jetbrains.kotlin.ir.builders.irInt
 import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.expressions.IrCall
-import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.getClass
+import org.jetbrains.kotlin.ir.types.isNullable
+import org.jetbrains.kotlin.ir.util.functions
 import org.jetbrains.kotlin.ir.util.irCall
-import org.jetbrains.kotlin.ir.util.render
-import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
+import org.jetbrains.kotlin.ir.util.isFunction
+import org.jetbrains.kotlin.ir.util.isNullConst
 import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+import org.jetbrains.kotlin.util.OperatorNameConventions
 
 class BuiltInsLowering(val context: WasmBackendContext) : FileLoweringPass {
     private val irBuiltins = context.irBuiltIns
     private val symbols = context.wasmSymbols
 
-    fun transformCall(call: IrCall): IrExpression {
+    private fun IrType.findEqualsMethod(): IrSimpleFunction {
+        val klass = getClass() ?: irBuiltins.anyClass.owner
+        return klass.functions.single { it.isEqualsInheritedFromAny() }
+    }
+
+    fun transformCall(
+        call: IrCall,
+        builder: DeclarationIrBuilder
+    ): IrExpression {
         when (val symbol = call.symbol) {
-            irBuiltins.eqeqSymbol, irBuiltins.eqeqeqSymbol, in irBuiltins.ieee754equalsFunByOperandType.values -> {
+            irBuiltins.ieee754equalsFunByOperandType[irBuiltins.floatClass] -> {
+                if (call.getValueArgument(0)!!.type.isNullable() || call.getValueArgument(1)!!.type.isNullable()) {
+                    return irCall(call, symbols.nullableFloatIeee754Equals)
+                }
+                return irCall(call, symbols.floatEqualityFunctions.getValue(irBuiltins.floatType))
+            }
+            irBuiltins.ieee754equalsFunByOperandType[irBuiltins.doubleClass] -> {
+                if (call.getValueArgument(0)!!.type.isNullable() || call.getValueArgument(1)!!.type.isNullable()) {
+                    return irCall(call, symbols.nullableDoubleIeee754Equals)
+                }
+                return irCall(call, symbols.floatEqualityFunctions.getValue(irBuiltins.doubleType))
+            }
+            irBuiltins.eqeqSymbol -> {
+                val lhs = call.getValueArgument(0)!!
+                val rhs = call.getValueArgument(1)!!
+                val lhsType = lhs.type
+                val rhsType = rhs.type
+                if (lhsType == rhsType) {
+                    val newSymbol = symbols.equalityFunctions[lhsType]
+                    if (newSymbol != null) {
+                        return irCall(call, newSymbol)
+                    }
+                }
+                if (lhs.isNullConst()) {
+                    return builder.irCall(symbols.refIsNull).apply { putValueArgument(0, rhs) }
+                }
+                if (rhs.isNullConst()) {
+                    return builder.irCall(symbols.refIsNull).apply { putValueArgument(0, lhs) }
+                }
+                if (!lhsType.isNullable()) {
+                    return irCall(call, lhsType.findEqualsMethod().symbol, argumentsAsReceivers = true)
+                }
+                return irCall(call, symbols.nullableEquals)
+            }
+
+            irBuiltins.eqeqeqSymbol -> {
                 val type = call.getValueArgument(0)!!.type
-                val newSymbol = symbols.equalityFunctions[type]
-                    ?: error("Unsupported equality operator with type: ${type.render()}")
+                val newSymbol = symbols.equalityFunctions[type] ?: symbols.floatEqualityFunctions[type] ?: symbols.refEq
                 return irCall(call, newSymbol)
             }
-            in symbols.irBuiltInsToWasmIntrinsics.keys -> {
-                val newSymbol = symbols.irBuiltInsToWasmIntrinsics[symbol]!!
+
+            irBuiltins.checkNotNullSymbol -> {
+                return irCall(call, symbols.ensureNotNull).also {
+                    it.putTypeArgument(0, call.type)
+                }
+            }
+            in symbols.comparisonBuiltInsToWasmIntrinsics.keys -> {
+                val newSymbol = symbols.comparisonBuiltInsToWasmIntrinsics[symbol]!!
                 return irCall(call, newSymbol)
             }
+
+            // TODO: Implement
+            irBuiltins.noWhenBranchMatchedExceptionSymbol ->
+                return builder.irCall(symbols.wasmUnreachable, irBuiltins.nothingType)
+
+            // TODO: Implement
+            irBuiltins.illegalArgumentExceptionSymbol ->
+                return builder.irCall(symbols.wasmUnreachable, irBuiltins.nothingType)
+
+            irBuiltins.dataClassArrayMemberHashCodeSymbol -> {
+                // TODO: Implement
+                return builder.irComposite {
+                    +call.getValueArgument(0)!!
+                    +irInt(7777)
+                }
+            }
+            irBuiltins.dataClassArrayMemberToStringSymbol -> {
+                // TODO: Implement
+                return builder.irCall(symbols.anyNtoString).apply {
+                    putValueArgument(0, call.getValueArgument(0))
+                }
+            }
         }
+
+        val nativeInvokeArity = getKotlinFunctionInvokeArity(call)
+        if (nativeInvokeArity != null) {
+            return irCall(call, symbols.functionNInvokeMethods[nativeInvokeArity])
+        }
+
         return call
     }
 
+    private fun getKotlinFunctionInvokeArity(call: IrCall): Int? {
+        val simpleFunction = call.symbol.owner as? IrSimpleFunction ?: return null
+        val receiverType = simpleFunction.dispatchReceiverParameter?.type ?: return null
+        if (simpleFunction.isSuspend) return null
+        if (simpleFunction.name == OperatorNameConventions.INVOKE && receiverType.isFunction()) {
+            return simpleFunction.valueParameters.size
+        }
+        return null
+    }
+
     override fun lower(irFile: IrFile) {
-        irFile.transformChildrenVoid(object : IrElementTransformerVoid() {
+        val builder = context.createIrBuilder(irFile.symbol)
+        irFile.transformChildrenVoid(object : IrElementTransformerVoidWithContext() {
             override fun visitCall(expression: IrCall): IrExpression {
-                val newExpression = transformCall(expression)
+                val newExpression = transformCall(expression, builder)
                 newExpression.transformChildrenVoid(this)
                 return newExpression
             }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/EraseVirtualDispatchReceiverParametersTypes.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/EraseVirtualDispatchReceiverParametersTypes.kt
new file mode 100644
index 00000000000..0d35ca81db3
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/EraseVirtualDispatchReceiverParametersTypes.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.CommonBackendContext
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.ir.copyTo
+import org.jetbrains.kotlin.backend.common.ir.isOverridableOrOverrides
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.builders.irGet
+import org.jetbrains.kotlin.ir.builders.irImplicitCast
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrGetValue
+import org.jetbrains.kotlin.ir.types.isAny
+import org.jetbrains.kotlin.ir.util.isInterface
+import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
+import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+
+/**
+ * This lowering erases dispatch receiver types of virtual functions down to Any.
+ *
+ * WebAssembly function types are contravariant on their parameter types.
+ * But since child classes are not supertypes of parents, in order for virtual method
+ * reference to share the same v-table slot as parent's method, it's dispatch receiver type
+ * has to be erased at least down to type of the parent class.
+ *
+ * Current implementation is rather conservative:
+ *  - Always erases parameter type down to Any
+ *  - Inserts casts back to original type in every usage of dispatch receiver.
+ *
+ * Possible optimisations:
+ *   - Instead of erasing type to Any, erase type down to least concrete supertype containing virtual method
+ *   - Don't erase type at all if bridge will be needed anyway
+ *     Cast receiver in bridge. This would keep precise type for direct calls
+ *   - Cast `this` and assign it to local variable if dispatch receiver is used often
+ *   - Don't cast if usages of `this` don't require precise type
+ *   - Always use bridge + Wasm tail call
+ *
+ *  Related issue: [https://github.com/WebAssembly/gc/issues/29]
+ */
+class EraseVirtualDispatchReceiverParametersTypes(val context: CommonBackendContext) : FileLoweringPass {
+    override fun lower(irFile: IrFile) {
+        irFile.acceptChildrenVoid(object : IrElementVisitorVoid {
+            override fun visitElement(element: IrElement) {
+                element.acceptChildrenVoid(this)
+            }
+
+            override fun visitFunction(declaration: IrFunction) {
+                lower(declaration)
+                super.visitFunction(declaration)
+            }
+        })
+    }
+
+    fun lower(irFunction: IrFunction) {
+        // Lower only functions that override other functions
+        if (irFunction !is IrSimpleFunction) return
+        if (!irFunction.isOverridableOrOverrides) return
+
+        val oldReceiver = irFunction.dispatchReceiverParameter!!
+        val originalReceiverType = oldReceiver.type
+
+        // Interfaces in Wasm are erased to Any, so they already have appropriate type
+        if (originalReceiverType.isInterface() || originalReceiverType.isAny()) return
+
+        val builder = context.createIrBuilder(irFunction.symbol)
+        val newReceiver = oldReceiver.copyTo(irFunction, type = context.irBuiltIns.anyType)
+        irFunction.dispatchReceiverParameter = newReceiver
+
+        // Cast receiver usages back to original type
+        irFunction.transformChildrenVoid(object : IrElementTransformerVoid() {
+            override fun visitGetValue(expression: IrGetValue): IrExpression {
+                if (expression.symbol == oldReceiver.symbol) {
+                    return with(builder) {
+                        irImplicitCast(irGet(newReceiver), originalReceiverType)
+                    }
+                }
+                return expression
+            }
+        })
+    }
+}
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/ExcludeDeclarationsFromCodegen.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/ExcludeDeclarationsFromCodegen.kt
index d61c2dc2ee3..5b3ebff6604 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/ExcludeDeclarationsFromCodegen.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/ExcludeDeclarationsFromCodegen.kt
@@ -8,102 +8,22 @@ package org.jetbrains.kotlin.backend.wasm.lower
 import org.jetbrains.kotlin.backend.common.ir.addChild
 import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
 import org.jetbrains.kotlin.backend.wasm.utils.hasExcludedFromCodegenAnnotation
-import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
-import org.jetbrains.kotlin.name.FqName
-
-private val BODILESS_BUILTIN_CLASSES = listOf(
-    "kotlin.Nothing",
-    "kotlin.Array",
-    "kotlin.Any",
-    "kotlin.ByteArray",
-    "kotlin.CharArray",
-    "kotlin.ShortArray",
-    "kotlin.IntArray",
-    "kotlin.LongArray",
-    "kotlin.FloatArray",
-    "kotlin.DoubleArray",
-    "kotlin.BooleanArray",
-    "kotlin.Boolean",
-    "kotlin.Function",
-    "kotlin.Throwable",
-    "kotlin.Suppress",
-    "kotlin.SinceKotlin",
-    "kotlin.Deprecated",
-    "kotlin.ReplaceWith",
-    "kotlin.DeprecationLevel",
-    "kotlin.UnsafeVariance",
-    "kotlin.reflect.KType",
-    "kotlin.reflect.KTypeProjection",
-    "kotlin.reflect.Companion",
-    "kotlin.reflect.KTypeParameter",
-    "kotlin.reflect.KDeclarationContainer",
-    "kotlin.reflect.KProperty",
-    "kotlin.reflect.KProperty0",
-    "kotlin.reflect.KProperty1",
-    "kotlin.reflect.KProperty2",
-    "kotlin.reflect.KMutableProperty0",
-    "kotlin.reflect.KMutableProperty",
-    "kotlin.reflect.KMutableProperty1",
-    "kotlin.reflect.KMutableProperty2",
-    "kotlin.reflect.Accessor",
-    "kotlin.reflect.Getter",
-    "kotlin.reflect.KFunction",
-    "kotlin.reflect.KVariance",
-    "kotlin.reflect.KVisibility",
-    "kotlin.reflect.KClass",
-    "kotlin.reflect.KCallable",
-    "kotlin.reflect.KClassifier",
-    "kotlin.reflect.KParameter",
-    "kotlin.reflect.Kind",
-    "kotlin.reflect.KAnnotatedElement",
-    "kotlin.annotation.Target",
-    "kotlin.annotation.AnnotationTarget",
-    "kotlin.annotation.Retention",
-    "kotlin.annotation.AnnotationRetention",
-    "kotlin.annotation.MustBeDocumented",
-    "kotlin.Unit",
-    "kotlin.collections.BooleanIterator",
-    "kotlin.collections.CharIterator",
-    "kotlin.collections.ByteIterator",
-    "kotlin.collections.ShortIterator",
-    "kotlin.collections.IntIterator",
-    "kotlin.collections.FloatIterator",
-    "kotlin.collections.LongIterator",
-    "kotlin.collections.DoubleIterator",
-    "kotlin.internal.PlatformDependent",
-    "kotlin.CharSequence",
-    "kotlin.Annotation",
-    "kotlin.Comparable",
-    "kotlin.collections.Collection",
-    "kotlin.collections.Iterable",
-    "kotlin.collections.List",
-    "kotlin.collections.Map",
-    "kotlin.collections.Set",
-    "kotlin.collections.MutableCollection",
-    "kotlin.collections.MutableIterable",
-    "kotlin.collections.MutableSet",
-    "kotlin.collections.MutableList",
-    "kotlin.collections.MutableMap",
-    "kotlin.collections.Entry",
-    "kotlin.collections.MutableEntry",
-    "kotlin.Number",
-    "kotlin.Enum",
-    "kotlin.collections.Iterator",
-    "kotlin.collections.ListIterator",
-    "kotlin.collections.MutableIterator",
-    "kotlin.collections.MutableListIterator"
-).map { FqName(it) }.toSet()
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 
+/**
+ * Move intrinsics marked with @ExcludedFromCodegen to special excluded files.
+ * All references to these declarations must be lowered or treated in a special way in a codegen.
+ */
 fun excludeDeclarationsFromCodegen(context: WasmBackendContext, module: IrModuleFragment) {
-
     fun isExcluded(declaration: IrDeclaration): Boolean {
-        if (declaration is IrDeclarationWithName && declaration.fqNameWhenAvailable in BODILESS_BUILTIN_CLASSES)
-            return true
-
+        // Annotation can be applied to top-level declarations ...
         if (declaration.hasExcludedFromCodegenAnnotation())
             return true
 
+        // ... or files as a whole
         val parentFile = declaration.parent as? IrFile
         if (parentFile?.hasExcludedFromCodegenAnnotation() == true)
             return true
@@ -117,7 +37,8 @@ fun excludeDeclarationsFromCodegen(context: WasmBackendContext, module: IrModule
             val d = it.next() as? IrDeclarationWithName ?: continue
             if (isExcluded(d)) {
                 it.remove()
-                context.excludedDeclarations.addChild(d)
+                // Move to "excluded" package fragment preserving fq-name
+                context.getExcludedPackageFragment(file.fqName).addChild(d)
             }
         }
     }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/FieldInitializersLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/FieldInitializersLowering.kt
new file mode 100644
index 00000000000..0663c143d86
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/FieldInitializersLowering.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.lower.at
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.builders.irSetField
+import org.jetbrains.kotlin.ir.declarations.IrField
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.expressions.IrBlockBody
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
+import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
+
+/**
+ * Move initialization of global fields to start function.
+ *
+ * WebAssembly allows only constant expressions to be used directly in
+ * field initializers.
+ *
+ * TODO: Don't move constant expression initializers
+ * TODO: Make field initialization lazy. Needs design.
+ */
+class FieldInitializersLowering(val context: WasmBackendContext) : FileLoweringPass {
+    override fun lower(irFile: IrFile) {
+        val builder = context.createIrBuilder(context.startFunction.symbol)
+        val startFunctionBody = context.startFunction.body as IrBlockBody
+
+        irFile.acceptChildrenVoid(object : IrElementVisitorVoid {
+            override fun visitElement(element: IrElement) {
+                element.acceptChildrenVoid(this)
+            }
+
+            override fun visitField(declaration: IrField) {
+                super.visitField(declaration)
+                if (!declaration.isStatic) return
+                val initValue: IrExpression = declaration.initializer?.expression ?: return
+
+                startFunctionBody.statements.add(
+                    builder.at(initValue).irSetField(null, declaration, initValue)
+                )
+                // Replace initializer with default one
+                declaration.initializer = null
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/GenericReturnTypeLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/GenericReturnTypeLowering.kt
new file mode 100644
index 00000000000..c266c92ecd5
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/GenericReturnTypeLowering.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.common.lower.irComposite
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.backend.wasm.ir2wasm.erasedUpperBound
+import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
+import org.jetbrains.kotlin.ir.builders.irImplicitCast
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
+import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.symbols.IrSymbol
+import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.util.defaultType
+import org.jetbrains.kotlin.ir.util.irCall
+import org.jetbrains.kotlin.ir.util.isTypeParameter
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+
+/**
+ * This lowering adds implicit casts in places where erased generic function return type
+ * differs from expected type on the call site.
+ */
+class GenericReturnTypeLowering(val context: WasmBackendContext) : FileLoweringPass {
+    override fun lower(irFile: IrFile) {
+        irFile.transformChildrenVoid(object : IrElementTransformerVoidWithContext() {
+            override fun visitCall(expression: IrCall): IrExpression =
+                transformGenericCall(
+                    super.visitCall(expression) as IrCall,
+                    currentScope!!.scope.scopeOwnerSymbol
+                )
+        })
+    }
+
+    private fun IrType.eraseUpperBoundType(): IrType {
+        val type = erasedUpperBound?.defaultType ?: return context.irBuiltIns.anyNType
+        return if (this.isNullable())
+            type.makeNullable()
+        else
+            type
+    }
+
+    private fun transformGenericCall(call: IrCall, scopeOwnerSymbol: IrSymbol): IrExpression {
+        val function: IrSimpleFunction =
+            call.symbol.owner as? IrSimpleFunction ?: return call
+
+        if (!function.realOverrideTarget.returnType.isTypeParameter())
+            return call
+
+        val erasedReturnType: IrType =
+            function.realOverrideTarget.returnType.eraseUpperBoundType()
+
+        val callType = call.type
+
+        if (erasedReturnType != call.type) {
+            if (callType.isNothing()) return call
+            if (erasedReturnType.isSubtypeOf(callType, context.irBuiltIns)) return call
+
+            // Erase type parameter from call return type
+            val newCall = irCall(
+                call,
+                function.symbol,
+                newReturnType = erasedReturnType,
+                newSuperQualifierSymbol = call.superQualifierSymbol
+            )
+
+            context.createIrBuilder(scopeOwnerSymbol).apply {
+                if (call.type.isUnit()) {
+                    return irComposite(call) {
+                        +newCall
+                    }
+                }
+                return irImplicitCast(newCall, call.type)
+            }
+        }
+        return call
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/SimpleStringConcatenationLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/SimpleStringConcatenationLowering.kt
new file mode 100644
index 00000000000..3b32eaeef5c
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/SimpleStringConcatenationLowering.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
+import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
+import org.jetbrains.kotlin.backend.common.lower.at
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.ir.builders.irCall
+import org.jetbrains.kotlin.ir.builders.irString
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrStringConcatenation
+import org.jetbrains.kotlin.ir.types.getClass
+import org.jetbrains.kotlin.ir.types.isNullable
+import org.jetbrains.kotlin.ir.types.isString
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+import org.jetbrains.kotlin.name.Name
+
+/**
+ * Replace string concatenation with a chain of String.plus calls.
+ * TODO: Reuse common StringConcatenationLowering which uses string builder
+ */
+class SimpleStringConcatenationLowering(val context: WasmBackendContext) : FileLoweringPass {
+    override fun lower(irFile: IrFile) {
+        irFile.transformChildrenVoid(StringConcatenationTransformer(this))
+    }
+}
+
+private class StringConcatenationTransformer(val lower: SimpleStringConcatenationLowering) : IrElementTransformerVoidWithContext() {
+    private val context = lower.context
+    private val irBuiltIns = context.irBuiltIns
+    private val stringPlus = irBuiltIns.stringClass.owner.declarations.filterIsInstance<IrSimpleFunction>().find {
+        it.name == Name.identifier("plus")
+    }!!
+
+    private val anyToString = irBuiltIns.anyClass.owner.declarations.filterIsInstance<IrSimpleFunction>().find {
+        it.name == Name.identifier("toString")
+    }!!
+
+    private val anyNToString = context.wasmSymbols.anyNtoString
+
+
+    override fun visitStringConcatenation(expression: IrStringConcatenation): IrExpression {
+        val transformed = super.visitStringConcatenation(expression) as IrStringConcatenation
+        val builder: DeclarationIrBuilder = context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol).at(expression)
+        return transformed.arguments.fold<IrExpression, IrExpression>(
+            builder.irString("")
+        ) { acc, el ->
+            builder.irCall(stringPlus).apply {
+                dispatchReceiver = acc
+                putValueArgument(0, expressionToString(el, builder))
+            }
+        }
+    }
+
+    private fun expressionToString(expression: IrExpression, builder: DeclarationIrBuilder): IrExpression {
+        if (expression.type.isString()) return expression
+        builder.at(expression)
+        val klass = expression.type.getClass()
+
+        if (expression.type.isNullable()) {
+            return builder.irCall(anyNToString).apply {
+                putValueArgument(0, expression)
+            }
+        }
+
+        val toStringMethod: IrSimpleFunction = if (klass != null) {
+            klass.declarations.filterIsInstance<IrSimpleFunction>().find { it.isToStringInheritedFromAny() }!!
+        } else {
+            anyToString
+        }
+
+        return builder.irCall(toStringMethod).apply {
+            dispatchReceiver = expression
+        }
+    }
+}
+
+fun IrFunction.isToStringInheritedFromAny() =
+    name == Name.identifier("toString") &&
+            dispatchReceiverParameter != null &&
+            extensionReceiverParameter == null &&
+            valueParameters.isEmpty()
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/VirtualDispatchReceiverExtraction.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/VirtualDispatchReceiverExtraction.kt
new file mode 100644
index 00000000000..ae6fccaffdd
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/VirtualDispatchReceiverExtraction.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.CommonBackendContext
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.ir.isOverridable
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.common.lower.irBlock
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
+import org.jetbrains.kotlin.ir.builders.createTmpVariable
+import org.jetbrains.kotlin.ir.builders.irGet
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrGetValue
+import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
+import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+
+/**
+ * During Wasm code generation, dispatch receiver can be used multiple times.
+ * Move it to temporary variable if it is complex or can have side effects.
+ */
+class VirtualDispatchReceiverExtraction(val context: CommonBackendContext) : FileLoweringPass {
+    override fun lower(irFile: IrFile) {
+        irFile.acceptChildrenVoid(object : IrElementVisitorVoid {
+            override fun visitElement(element: IrElement) {
+                element.acceptChildrenVoid(this)
+            }
+
+            override fun visitFunction(declaration: IrFunction) {
+                lower(declaration)
+                super.visitFunction(declaration)
+            }
+        })
+    }
+
+    fun lower(irFunction: IrFunction) {
+        irFunction.transformChildrenVoid(object : IrElementTransformerVoid() {
+            override fun visitCall(expression: IrCall): IrExpression {
+                expression.transformChildrenVoid(this)
+                val function = expression.symbol.owner.realOverrideTarget
+                val receiver = expression.dispatchReceiver
+                if (receiver == null || !function.isOverridable)
+                    return expression
+                // TODO: Keep other simple receivers without side effects
+                //       receiver.isPure(true) ?
+                if (receiver is IrGetValue)
+                    return expression
+                return with(context.createIrBuilder(irFunction.symbol)) {
+                    irBlock(expression) {
+                        val tmp = createTmpVariable(receiver)
+                        expression.dispatchReceiver = irGet(tmp)
+                        +expression
+                    }
+                }
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmBridgesConstruction.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmBridgesConstruction.kt
new file mode 100644
index 00000000000..4866ee596d2
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmBridgesConstruction.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.CommonBackendContext
+import org.jetbrains.kotlin.backend.wasm.ir2wasm.erasedUpperBound
+import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
+import org.jetbrains.kotlin.ir.backend.js.lower.BridgesConstruction
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.isNullable
+import org.jetbrains.kotlin.ir.types.makeNullable
+import org.jetbrains.kotlin.ir.util.defaultType
+import org.jetbrains.kotlin.ir.util.render
+import org.jetbrains.kotlin.name.Name
+
+class WasmBridgesConstruction(context: JsCommonBackendContext) : BridgesConstruction(context) {
+    override fun getFunctionSignature(function: IrSimpleFunction): WasmSignature =
+        function.wasmSignature(context.irBuiltIns)
+
+    // Dispatch receiver type must be casted when types are different.
+    override val shouldCastDispatchReceiver: Boolean = true
+}
+
+data class WasmSignature(
+    val name: Name,
+    val extensionReceiverType: IrType?,
+    val valueParametersType: List<IrType>,
+    val returnType: IrType
+) {
+    override fun toString(): String {
+        val er = extensionReceiverType?.let { "(er: ${it.render()}) " } ?: ""
+        val parameters = valueParametersType.joinToString(", ") { it.render() }
+        return "[$er$name($parameters) -> ${returnType.render()}]"
+    }
+}
+
+fun IrSimpleFunction.wasmSignature(irBuiltIns: IrBuiltIns): WasmSignature =
+    WasmSignature(
+        name,
+        extensionReceiverParameter?.type?.eraseGenerics(irBuiltIns),
+        valueParameters.map { it.type.eraseGenerics(irBuiltIns) },
+        returnType.eraseGenerics(irBuiltIns)
+    )
+
+private fun IrType.eraseGenerics(irBuiltIns: IrBuiltIns): IrType {
+    val defaultType = this.erasedUpperBound?.defaultType ?: irBuiltIns.anyType
+    if (!this.isNullable()) return defaultType
+    return defaultType.makeNullable()
+}
+
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmCallableReferenceLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmCallableReferenceLowering.kt
new file mode 100644
index 00000000000..71cd754ec96
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmCallableReferenceLowering.kt
@@ -0,0 +1,314 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
+import org.jetbrains.kotlin.backend.common.ir.copyTo
+import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
+import org.jetbrains.kotlin.backend.common.ir.isSuspend
+import org.jetbrains.kotlin.backend.common.ir.moveBodyTo
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.ir.builders.*
+import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
+import org.jetbrains.kotlin.ir.builders.declarations.addFunction
+import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
+import org.jetbrains.kotlin.ir.builders.declarations.buildClass
+import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.expressions.*
+import org.jetbrains.kotlin.ir.expressions.impl.IrInstanceInitializerCallImpl
+import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.name.SpecialNames
+
+/**
+ * TODO: Temporary lowering stub. Needs to be redone.
+ *       This is a copy of JVM lowering, but parts that don't compile are commented out.
+ *       Turns out this works decently as a stub in most tests.
+ */
+
+val IrStatementOrigin?.isLambda: Boolean
+    get() = this == IrStatementOrigin.LAMBDA || this == IrStatementOrigin.ANONYMOUS_FUNCTION
+
+// Originally copied from K/Native
+internal class WasmCallableReferenceLowering(private val context: WasmBackendContext) : FileLoweringPass, IrElementTransformerVoidWithContext() {
+    // This pass ignores suspend function references and function references used in inline arguments to inline functions.
+    private val ignoredFunctionReferences = mutableSetOf<IrFunctionReference>()
+
+    private val IrFunctionReference.isIgnored: Boolean
+        get() = (!type.isFunctionOrKFunction() || ignoredFunctionReferences.contains(this)) && !isSuspendCallableReference()
+
+    // TODO: Currently, origin of callable references is null. Do we need to create one?
+    private fun IrFunctionReference.isSuspendCallableReference(): Boolean = isSuspend && origin == null
+
+    override fun lower(irFile: IrFile) {
+        // ignoredFunctionReferences.addAll(IrInlineReferenceLocator.scan(context, irFile))
+        irFile.transformChildrenVoid(this)
+    }
+
+    override fun visitBlock(expression: IrBlock): IrExpression {
+        if (!expression.origin.isLambda)
+            return super.visitBlock(expression)
+
+        val reference = expression.statements.last() as IrFunctionReference
+        if (reference.isIgnored)
+            return super.visitBlock(expression)
+
+        expression.statements.dropLast(1).forEach { it.transform(this, null) }
+        reference.transformChildrenVoid(this)
+        return FunctionReferenceBuilder(reference).build()
+    }
+
+    override fun visitFunctionReference(expression: IrFunctionReference): IrExpression {
+        expression.transformChildrenVoid(this)
+        return if (expression.isIgnored) expression else FunctionReferenceBuilder(expression).build()
+    }
+
+    // Handle SAM conversions which wrap a function reference:
+    //     class sam$n(private val receiver: R) : Interface { override fun method(...) = receiver.target(...) }
+    //
+    // This avoids materializing an invokable KFunction representing, thus producing one less class.
+    // This is actually very common, as `Interface { something }` is a local function + a SAM-conversion
+    // of a reference to it into an implementation.
+    override fun visitTypeOperator(expression: IrTypeOperatorCall): IrExpression {
+        if (expression.operator == IrTypeOperator.SAM_CONVERSION) {
+            val invokable = expression.argument
+            val reference = if (invokable is IrFunctionReference) {
+                invokable
+            } else if (invokable is IrBlock && invokable.origin.isLambda && invokable.statements.last() is IrFunctionReference) {
+                invokable.statements.dropLast(1).forEach { it.transform(this, null) }
+                invokable.statements.last() as IrFunctionReference
+            } else {
+                return super.visitTypeOperator(expression)
+            }
+            reference.transformChildrenVoid()
+            return FunctionReferenceBuilder(reference, expression.typeOperand).build()
+        }
+        return super.visitTypeOperator(expression)
+    }
+
+    private inner class FunctionReferenceBuilder(val irFunctionReference: IrFunctionReference, val samSuperType: IrType? = null) {
+        private val isLambda = irFunctionReference.origin.isLambda
+
+        private val callee = irFunctionReference.symbol.owner
+
+        // Only function references can bind a receiver and even then we can only bind either an extension or a dispatch receiver.
+        // However, when we bind a value of an inline class type as a receiver, the receiver will turn into an argument of
+        // the function in question. Yet we still need to record it as the "receiver" in CallableReference in order for reflection
+        // to work correctly.
+        private val boundReceiver: Pair<IrValueParameter, IrExpression>? = irFunctionReference.getArgumentsWithIr().singleOrNull()
+
+        // The type of the reference is KFunction<in A1, ..., in An, out R>
+        private val parameterTypes = (irFunctionReference.type as IrSimpleType).arguments.map { (it as IrTypeProjection).type }
+        private val argumentTypes = parameterTypes.dropLast(1)
+
+        private val typeArgumentsMap = irFunctionReference.typeSubstitutionMap
+
+        private val functionSuperClass =
+            samSuperType?.classOrNull
+                ?: if (irFunctionReference.isSuspend)
+                    context.ir.symbols.suspendFunctionN(argumentTypes.size)
+                else
+                    context.ir.symbols.functionN(argumentTypes.size)
+
+        private val superMethod =
+            functionSuperClass.functions.single { it.owner.modality == Modality.ABSTRACT }
+        // TODO(WASM)
+        // private val superType =
+        //     samSuperType ?: (if (isLambda) context.ir.symbols.lambdaClass else context.ir.symbols.functionReference).defaultType
+
+        private val functionReferenceClass = context.irFactory.buildClass {
+            setSourceRange(irFunctionReference)
+            visibility = DescriptorVisibilities.LOCAL
+            // A callable reference results in a synthetic class, while a lambda is not synthetic.
+            // We don't produce GENERATED_SAM_IMPLEMENTATION, which is always synthetic.
+            // TODO(WASM)
+            // origin = if (isLambda) JvmLoweredDeclarationOrigin.LAMBDA_IMPL else JvmLoweredDeclarationOrigin.FUNCTION_REFERENCE_IMPL
+            name = SpecialNames.NO_NAME_PROVIDED
+        }.apply {
+            parent = currentDeclarationParent!!
+            // TODO(WASM)
+            // superTypes += superType
+            if (samSuperType == null)
+                superTypes += functionSuperClass.typeWith(parameterTypes)
+            // TODO(WASM)
+            // if (irFunctionReference.isSuspend) superTypes += context.ir.symbols.suspendFunctionInterface.defaultType
+            createImplicitParameterDeclarationWithWrappedDescriptor()
+            copyAttributes(irFunctionReference)
+            if (isLambda) {
+                this.metadata = irFunctionReference.symbol.owner.metadata
+            }
+        }
+
+// WASM(TODO)
+//        private val receiverFieldFromSuper = context.ir.symbols.functionReferenceReceiverField.owner
+//
+//        val fakeOverrideReceiverField = functionReferenceClass.addField {
+//            name = receiverFieldFromSuper.name
+//            origin = IrDeclarationOrigin.FAKE_OVERRIDE
+//            type = receiverFieldFromSuper.type
+//            isFinal = receiverFieldFromSuper.isFinal
+//            isStatic = receiverFieldFromSuper.isStatic
+//            visibility = receiverFieldFromSuper.visibility
+//        }
+
+        fun build(): IrExpression = context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol).run {
+            irBlock {
+                val constructor = createConstructor()
+                createInvokeMethod(
+                    if (samSuperType != null && boundReceiver != null) {
+                        irTemporary(boundReceiver.second)
+                    } else null
+                )
+
+// WASM(TODO)
+//                if (!isLambda && samSuperType == null) {
+//                    createGetSignatureMethod(this@run.irSymbols.functionReferenceGetSignature.owner)
+//                    createGetNameMethod(this@run.irSymbols.functionReferenceGetName.owner)
+//                    createGetOwnerMethod(this@run.irSymbols.functionReferenceGetOwner.owner)
+//                }
+
+                +functionReferenceClass
+                +irCall(constructor.symbol).apply {
+                    if (valueArgumentsCount > 0) putValueArgument(0, boundReceiver!!.second)
+                }
+            }
+        }
+
+        private fun createConstructor(): IrConstructor =
+            functionReferenceClass.addConstructor {
+                // origin = JvmLoweredDeclarationOrigin.GENERATED_MEMBER_IN_CALLABLE_REFERENCE
+                returnType = functionReferenceClass.defaultType
+                isPrimary = true
+            }.apply {
+                // Add receiver parameter for bound function references
+                if (samSuperType == null) {
+                    boundReceiver?.first?.let { param ->
+                        valueParameters += param.copyTo(
+                            irFunction = this,
+                            index = 0,
+                            type = param.type.substitute(typeArgumentsMap)
+                        )
+                    }
+                }
+
+                // Super constructor:
+                // - For SAM references, the super class is Any
+                // - For function references with bound receivers, accepts arity and receiver
+                // - For lambdas and function references without bound receivers, accepts arity
+
+// WASM_TODO
+//                val constructor = if (samSuperType != null) {
+//                    context.irBuiltIns.anyClass.owner.constructors.single()
+//                } else {
+//                    superType.getClass()!!.constructors.single {
+//                        it.valueParameters.size == if (boundReceiver != null) 2 else 1
+//                    }
+//                }
+
+                val constructor = context.irBuiltIns.anyClass.owner.constructors.single()
+
+                body = context.createIrBuilder(symbol).irBlockBody(startOffset, endOffset) {
+                    +irDelegatingConstructorCall(constructor).apply {
+//                        WASM_TODO
+//                        if (samSuperType == null) {
+//                            putValueArgument(0, irInt(argumentTypes.size + if (irFunctionReference.isSuspend) 1 else 0))
+//                            if (boundReceiver != null)
+//                                putValueArgument(1, irGet(valueParameters.first()))
+//                        }
+                    }
+                    +IrInstanceInitializerCallImpl(startOffset, endOffset, functionReferenceClass.symbol, context.irBuiltIns.unitType)
+                }
+            }
+
+        private fun createInvokeMethod(receiverVar: IrValueDeclaration?): IrSimpleFunction =
+            functionReferenceClass.addFunction {
+                setSourceRange(if (isLambda) callee else irFunctionReference)
+                name = superMethod.owner.name
+                returnType = callee.returnType
+                isSuspend = callee.isSuspend
+            }.apply {
+                overriddenSymbols += superMethod
+                dispatchReceiverParameter = parentAsClass.thisReceiver!!.copyTo(this)
+                if (isLambda) createLambdaInvokeMethod() else createFunctionReferenceInvokeMethod(receiverVar)
+            }
+
+        // Inline the body of an anonymous function into the generated lambda subclass.
+        private fun IrSimpleFunction.createLambdaInvokeMethod() {
+            annotations += callee.annotations
+            val valueParameterMap = callee.explicitParameters.withIndex().associate { (index, param) ->
+                param to param.copyTo(this, index = index)
+            }
+            valueParameters += valueParameterMap.values
+            body = callee.moveBodyTo(this, valueParameterMap)
+        }
+
+        private fun IrSimpleFunction.createFunctionReferenceInvokeMethod(receiver: IrValueDeclaration?) {
+            for ((index, argumentType) in argumentTypes.withIndex()) {
+                addValueParameter {
+                    name = Name.identifier("p$index")
+                    type = argumentType
+                }
+            }
+
+            body = context.createIrBuilder(symbol).run {
+                var unboundIndex = 0
+                irExprBody(irCall(callee).apply {
+                    for ((typeParameter, typeArgument) in typeArgumentsMap) {
+                        putTypeArgument(typeParameter.owner.index, typeArgument)
+                    }
+
+                    for (parameter in callee.explicitParameters) {
+                        when {
+                            boundReceiver?.first == parameter ->
+                                // Bound receiver parameter. For function references, this is stored in a field of the superclass.
+                                // For sam references, we just capture the value in a local variable and LocalDeclarationsLowering
+                                // will put it into a field.
+//                                if (samSuperType == null)
+//                                    irImplicitCast(
+//                                        irGetField(irGet(dispatchReceiverParameter!!), fakeOverrideReceiverField),
+//                                        boundReceiver.second.type
+//                                    )
+//                                else
+                                    irGet(receiver ?: error("Binding receivers is not supported yet"))
+
+                            // If a vararg parameter corresponds to exactly one KFunction argument, which is an array, that array
+                            // is forwarded as is.
+                            //
+                            //     fun f(x: (Int, Array<String>) -> String) = x(0, arrayOf("OK", "FAIL"))
+                            //     fun h(i: Int, vararg xs: String) = xs[i]
+                            //     f(::h)
+                            //
+                            parameter.isVararg && unboundIndex < argumentTypes.size && parameter.type == valueParameters[unboundIndex].type ->
+                                irGet(valueParameters[unboundIndex++])
+                            // In all other cases, excess arguments are packed into a new array.
+                            //
+                            //     fun g(x: (Int, String, String) -> String) = x(0, "OK", "FAIL")
+                            //     f(::h) == g(::h)
+                            //
+                            parameter.isVararg && (unboundIndex < argumentTypes.size || !parameter.hasDefaultValue()) ->
+                                TODO()
+
+                            unboundIndex >= argumentTypes.size ->
+                                // Default value argument (this pass doesn't handle suspend functions, otherwise
+                                // it could also be the continuation argument)
+                                null
+
+                            else ->
+                                irGet(valueParameters[unboundIndex++])
+                        }?.let { putArgument(callee, parameter, it) }
+                    }
+                })
+            }
+        }
+    }
+}
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmNullCoercionLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmNullCoercionLowering.kt
new file mode 100644
index 00000000000..358f1d1091e
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmNullCoercionLowering.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
+import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
+import org.jetbrains.kotlin.ir.backend.js.lower.AbstractValueUsageLowering
+import org.jetbrains.kotlin.ir.expressions.IrConstKind
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.isNothing
+import org.jetbrains.kotlin.ir.types.isNullable
+import org.jetbrains.kotlin.ir.types.makeNotNull
+
+/**
+ * Replace null constants of type Nothing? with null constants of a concrete class types.
+ *
+ * Wasm GC doesn't have a nullref type anymore.
+ */
+class WasmNullCoercingLowering(context: JsCommonBackendContext) : AbstractValueUsageLowering(context) {
+    override fun IrExpression.useExpressionAsType(actualType: IrType, expectedType: IrType): IrExpression =
+        if (actualType.makeNotNull().isNothing() && actualType.isNullable() && !expectedType.makeNotNull().isNothing())
+            JsIrBuilder.buildComposite(
+                type,
+                listOf(this, IrConstImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, expectedType, IrConstKind.Null, null))
+            )
+        else
+            this
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt
new file mode 100644
index 00000000000..ad7ec9ce650
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.ir.SharedVariablesManager
+import org.jetbrains.kotlin.backend.common.lower.InnerClassesSupport
+import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
+import org.jetbrains.kotlin.ir.backend.js.JsLoweredDeclarationOrigin
+import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
+import org.jetbrains.kotlin.ir.builders.declarations.buildClass
+import org.jetbrains.kotlin.ir.builders.declarations.buildValueParameter
+import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
+import org.jetbrains.kotlin.ir.descriptors.*
+import org.jetbrains.kotlin.ir.expressions.*
+import org.jetbrains.kotlin.ir.expressions.impl.*
+import org.jetbrains.kotlin.ir.symbols.IrVariableSymbol
+import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrConstructorSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrFieldSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrVariableSymbolImpl
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
+import org.jetbrains.kotlin.ir.util.defaultType
+import org.jetbrains.kotlin.name.Name
+
+/**
+ * This is a copy of an old version of JS lowering, because JS did platform-specific optimization incompatible with Wasm.
+ * TODO: Revisit
+ */
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+class WasmSharedVariablesManager(val context: JsCommonBackendContext, val builtIns: IrBuiltIns, val implicitDeclarationsFile: IrPackageFragment) : SharedVariablesManager {
+    override fun declareSharedVariable(originalDeclaration: IrVariable): IrVariable {
+        val initializer = originalDeclaration.initializer ?: IrConstImpl.constNull(
+            originalDeclaration.startOffset,
+            originalDeclaration.endOffset,
+            builtIns.nothingNType
+        )
+
+        val constructorSymbol = closureBoxConstructorDeclaration.symbol
+
+        val irCall =
+            IrConstructorCallImpl.fromSymbolDescriptor(initializer.startOffset, initializer.endOffset, closureBoxType, constructorSymbol)
+                .apply {
+                    putValueArgument(0, initializer)
+                }
+
+        val descriptor = WrappedVariableDescriptor()
+        return IrVariableImpl(
+            originalDeclaration.startOffset,
+            originalDeclaration.endOffset,
+            originalDeclaration.origin,
+            IrVariableSymbolImpl(descriptor),
+            originalDeclaration.name,
+            irCall.type,
+            false,
+            false,
+            false
+        ).also {
+            descriptor.bind(it)
+            it.parent = originalDeclaration.parent
+            it.initializer = irCall
+        }
+    }
+
+    override fun defineSharedValue(originalDeclaration: IrVariable, sharedVariableDeclaration: IrVariable) = sharedVariableDeclaration
+
+    override fun getSharedValue(sharedVariableSymbol: IrVariableSymbol, originalGet: IrGetValue): IrExpression {
+        val getField = IrGetFieldImpl(
+            originalGet.startOffset, originalGet.endOffset,
+            closureBoxFieldDeclaration.symbol,
+            closureBoxFieldDeclaration.type,
+            IrGetValueImpl(
+                originalGet.startOffset,
+                originalGet.endOffset,
+                closureBoxType,
+                sharedVariableSymbol,
+                originalGet.origin
+            ),
+            originalGet.origin
+        )
+
+        return IrTypeOperatorCallImpl(
+            originalGet.startOffset,
+            originalGet.endOffset,
+            originalGet.type,
+            IrTypeOperator.IMPLICIT_CAST,
+            originalGet.type,
+            getField
+        )
+    }
+
+    override fun setSharedValue(sharedVariableSymbol: IrVariableSymbol, originalSet: IrSetValue): IrExpression =
+        IrSetFieldImpl(
+            originalSet.startOffset,
+            originalSet.endOffset,
+            closureBoxFieldDeclaration.symbol,
+            IrGetValueImpl(
+                originalSet.startOffset,
+                originalSet.endOffset,
+                closureBoxType,
+                sharedVariableSymbol,
+                originalSet.origin
+            ),
+            originalSet.value,
+            originalSet.type,
+            originalSet.origin
+        )
+
+    private val boxTypeName = "\$closureBox\$"
+
+    private val closureBoxClassDeclaration by lazy {
+        createClosureBoxClassDeclaration()
+    }
+
+    private val closureBoxConstructorDeclaration by lazy {
+        createClosureBoxConstructorDeclaration()
+    }
+
+    private val closureBoxFieldDeclaration by lazy {
+        closureBoxPropertyDeclaration
+    }
+
+    private val closureBoxPropertyDeclaration by lazy {
+        createClosureBoxPropertyDeclaration()
+    }
+
+    private lateinit var closureBoxType: IrType
+
+    private fun createClosureBoxClassDeclaration(): IrClass {
+        val declaration = context.irFactory.buildClass {
+            origin = JsLoweredDeclarationOrigin.JS_CLOSURE_BOX_CLASS_DECLARATION
+            name = Name.identifier(boxTypeName)
+            visibility = DescriptorVisibilities.PUBLIC
+            modality = Modality.FINAL
+            isCompanion = false
+            isInner = false
+            isData = false
+            isExternal = false
+            isInline = false
+            isExpect = false
+            isFun = false
+        }
+
+        declaration.parent = implicitDeclarationsFile
+        // TODO: substitute
+        closureBoxType = IrSimpleTypeImpl(declaration.symbol, false, emptyList(), emptyList())
+        declaration.thisReceiver = buildValueParameter(declaration) {
+            name = Name.identifier("_this_")
+            index = -1
+            type = closureBoxType
+        }
+        implicitDeclarationsFile.declarations += declaration
+
+        return declaration
+    }
+
+    private fun createClosureBoxPropertyDeclaration(): IrField {
+        val descriptor = WrappedFieldDescriptor()
+        val symbol = IrFieldSymbolImpl(descriptor)
+        val fieldName = Name.identifier("v")
+        return context.irFactory.createField(
+            UNDEFINED_OFFSET,
+            UNDEFINED_OFFSET,
+            InnerClassesSupport.FIELD_FOR_OUTER_THIS,
+            symbol,
+            fieldName,
+            builtIns.anyNType,
+            DescriptorVisibilities.PUBLIC,
+            isFinal = false,
+            isExternal = false,
+            isStatic = false,
+        ).also {
+            descriptor.bind(it)
+            it.parent = closureBoxClassDeclaration
+            closureBoxClassDeclaration.declarations += it
+        }
+    }
+
+    private fun createClosureBoxConstructorDeclaration(): IrConstructor {
+        val descriptor = WrappedClassConstructorDescriptor()
+        val symbol = IrConstructorSymbolImpl(descriptor)
+
+        val declaration = context.irFactory.createConstructor(
+            UNDEFINED_OFFSET, UNDEFINED_OFFSET, JsLoweredDeclarationOrigin.JS_CLOSURE_BOX_CLASS_DECLARATION, symbol,
+            Name.special("<init>"), DescriptorVisibilities.PUBLIC, closureBoxClassDeclaration.defaultType,
+            isInline = false, isExternal = false, isPrimary = true, isExpect = false
+        )
+
+        descriptor.bind(declaration)
+        declaration.parent = closureBoxClassDeclaration
+
+        val parameterDeclaration = createClosureBoxConstructorParameterDeclaration(declaration)
+
+        declaration.valueParameters += parameterDeclaration
+
+        val receiver = JsIrBuilder.buildGetValue(closureBoxClassDeclaration.thisReceiver!!.symbol)
+        val value = JsIrBuilder.buildGetValue(parameterDeclaration.symbol)
+
+        val setField = JsIrBuilder.buildSetField(closureBoxFieldDeclaration.symbol, receiver, value, builtIns.unitType)
+
+        declaration.body = context.irFactory.createBlockBody(UNDEFINED_OFFSET, UNDEFINED_OFFSET, listOf(setField))
+
+        closureBoxClassDeclaration.declarations += declaration
+        return declaration
+    }
+
+    private fun createClosureBoxConstructorParameterDeclaration(irConstructor: IrConstructor): IrValueParameter {
+        return JsIrBuilder.buildValueParameter(irConstructor,"p", 0, closureBoxPropertyDeclaration.type)
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmThrowDebugLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmThrowDebugLowering.kt
new file mode 100644
index 00000000000..45b21868330
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmThrowDebugLowering.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.ir.builders.irCall
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrThrow
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+
+/**
+ * Replace throw expressions with a runtime function call.
+ * TODO: Remove when full-blown exception handling is implemented
+ */
+internal class WasmThrowDebugLowering(
+    private val context: WasmBackendContext
+) : FileLoweringPass, IrElementTransformerVoidWithContext() {
+    override fun lower(irFile: IrFile) {
+        irFile.transformChildrenVoid(this)
+    }
+
+    override fun visitThrow(expression: IrThrow): IrExpression {
+        expression.transformChildrenVoid(this)
+        val builder = context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol)
+
+        return builder.irCall(context.wasmSymbols.wasmThrow).apply {
+            this.putValueArgument(0, expression.value)
+        }
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmTypeOperatorLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmTypeOperatorLowering.kt
new file mode 100644
index 00000000000..d567cbb98ef
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmTypeOperatorLowering.kt
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
+import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
+import org.jetbrains.kotlin.backend.common.lower.at
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.common.lower.irNot
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.backend.wasm.ir2wasm.erasedUpperBound
+import org.jetbrains.kotlin.ir.backend.js.utils.isPure
+import org.jetbrains.kotlin.ir.builders.*
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
+import org.jetbrains.kotlin.ir.expressions.*
+import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+
+
+class WasmTypeOperatorLowering(val context: WasmBackendContext) : FileLoweringPass {
+    override fun lower(irFile: IrFile) {
+        irFile.transformChildrenVoid(WasmBaseTypeOperatorTransformer(context))
+    }
+}
+
+class WasmBaseTypeOperatorTransformer(val context: WasmBackendContext) : IrElementTransformerVoidWithContext() {
+    private val symbols = context.wasmSymbols
+    private val builtIns = context.irBuiltIns
+
+    private lateinit var builder: DeclarationIrBuilder
+
+    override fun visitTypeOperator(expression: IrTypeOperatorCall): IrExpression {
+        super.visitTypeOperator(expression)
+        builder = context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol).at(expression)
+
+        return when (expression.operator) {
+            IrTypeOperator.IMPLICIT_CAST -> lowerImplicitCast(expression)
+            IrTypeOperator.IMPLICIT_DYNAMIC_CAST -> error("Dynamic casts are not supported in Wasm backend")
+            IrTypeOperator.IMPLICIT_COERCION_TO_UNIT -> expression.argument
+            IrTypeOperator.IMPLICIT_INTEGER_COERCION -> lowerIntegerCoercion(expression)
+            IrTypeOperator.IMPLICIT_NOTNULL -> lowerImplicitCast(expression)
+            IrTypeOperator.INSTANCEOF -> lowerInstanceOf(expression, inverted = false)
+            IrTypeOperator.NOT_INSTANCEOF -> lowerInstanceOf(expression, inverted = true)
+            IrTypeOperator.CAST -> lowerCast(expression, isSafe = false)
+            IrTypeOperator.SAFE_CAST -> lowerCast(expression, isSafe = true)
+            IrTypeOperator.SAM_CONVERSION -> TODO("SAM conversion: ${expression.render()}")
+            IrTypeOperator.REINTERPRET_CAST -> expression
+        }
+    }
+
+    private fun lowerInstanceOf(
+        expression: IrTypeOperatorCall,
+        inverted: Boolean
+    ): IrExpression {
+        return builder.irComposite(resultType = builtIns.booleanType) {
+            val argument = cacheValue(expression.argument)
+            val check = generateTypeCheck(argument, expression.typeOperand)
+            if (inverted) {
+                +builder.irNot(check)
+            } else {
+                +check
+            }
+        }
+    }
+
+    private fun IrBlockBuilder.cacheValue(value: IrExpression): () -> IrExpressionWithCopy {
+        if (value.isPure(true) && value is IrExpressionWithCopy) {
+            return { value.deepCopyWithSymbols() }
+        }
+        val tmpVal = createTmpVariable(value)
+        return { builder.irGet(tmpVal) }
+    }
+
+    private fun IrType.isInlined(): Boolean =
+        context.inlineClassesUtils.isTypeInlined(this)
+
+    private val IrType.erasedType: IrType
+        get() = this.erasedUpperBound?.defaultType ?: builtIns.anyType
+
+    private fun generateTypeCheck(
+        valueProvider: () -> IrExpressionWithCopy,
+        toType: IrType
+    ): IrExpression {
+        val toNotNullable = toType.makeNotNull()
+        val valueInstance: IrExpressionWithCopy = valueProvider()
+        val fromType = (valueInstance as IrExpression).type
+
+        // Inlined values have no type information on runtime.
+        // But since they are final we can compute type checks on compile time.
+        if (fromType.isInlined()) {
+            val result = fromType.erasedType.isSubtypeOf(toType.erasedType, builtIns)
+            return builder.irBoolean(result)
+        }
+
+        val instanceCheck = generateTypeCheckNonNull(valueInstance, toNotNullable)
+        val isFromNullable = valueInstance.type.isNullable()
+        val isToNullable = toType.isNullable()
+
+        return when {
+            !isFromNullable -> instanceCheck
+
+            else ->
+                builder.irIfThenElse(
+                    type = builtIns.booleanType,
+                    condition = builder.irEqualsNull(valueProvider() as IrExpression),
+                    thenPart = builder.irBoolean(isToNullable),
+                    elsePart = instanceCheck
+                )
+        }
+    }
+
+    private fun lowerIntegerCoercion(expression: IrTypeOperatorCall): IrExpression =
+        when (expression.typeOperand) {
+            builtIns.byteType,
+            builtIns.shortType ->
+                expression.argument
+
+            builtIns.longType ->
+                builder.irCall(symbols.intToLong).apply {
+                    putValueArgument(0, expression.argument)
+                }
+
+            else -> error("Unreachable execution (coercion to non-Integer type")
+        }
+
+    private fun generateTypeCheckNonNull(argument: IrExpressionWithCopy, toType: IrType): IrExpression {
+        assert(!toType.isMarkedNullable())
+        return when {
+            toType.isNothing() -> builder.irComposite(resultType = builtIns.booleanType) {
+                +(argument as IrExpression)
+                +builder.irFalse()
+            }
+            toType.isTypeParameter() -> generateTypeCheckWithTypeParameter(argument, toType)
+            toType.isInterface() -> generateIsInterface(argument as IrExpression, toType)
+            else -> generateIsSubClass(argument as IrExpression, toType)
+        }
+    }
+
+    private fun narrowType(fromType: IrType, toType: IrType, value: IrExpression): IrExpression {
+        if (fromType == toType) return value
+
+        if (toType == builtIns.nothingNType) {
+            return builder.irComposite(resultType = builtIns.nothingNType) {
+                +value
+                +builder.irNull()
+            }
+        }
+
+        // Handled by autoboxing transformer
+        if (toType.isInlined() && !fromType.isInlined()) {
+            return builder.irCall(
+                symbols.unboxIntrinsic,
+                toType,
+                typeArguments = listOf(fromType, toType)
+            ).also {
+                it.putValueArgument(0, value)
+            }
+        }
+
+        if (!toType.isInlined() && fromType.isInlined()) {
+            return builder.irCall(
+                symbols.boxIntrinsic,
+                toType,
+                typeArguments = listOf(fromType, toType)
+            ).also {
+                it.putValueArgument(0, value)
+            }
+        }
+
+        if (fromType.erasedType.isSubtypeOf(toType.erasedType, context.irBuiltIns)) {
+            return value
+        }
+        if (toType.isNothing()) {
+            return value
+        }
+
+
+        // Ref casts traps on null (https://github.com/WebAssembly/gc/issues/152)
+        // Handling null manually
+        if (toType.isNullable() && fromType.isNullable()) {
+            return builder.irComposite {
+                val cachedValue = cacheValue(value)
+                +builder.irIfNull(
+                    type = toType,
+                    subject = cachedValue() as IrExpression,
+                    thenPart = builder.irNull(toType),
+                    elsePart = builder.irCall(symbols.wasmRefCast, type = toType).apply {
+                        putTypeArgument(0, fromType)
+                        putTypeArgument(1, toType)
+                        putValueArgument(0, cachedValue() as IrExpression)
+                    }
+                )
+            }
+        }
+
+        return builder.irCall(symbols.wasmRefCast, type = toType).apply {
+            putTypeArgument(0, fromType)
+            putTypeArgument(1, toType)
+            putValueArgument(0, value)
+        }
+    }
+
+    private fun lowerCast(
+        expression: IrTypeOperatorCall,
+        isSafe: Boolean
+    ): IrExpression {
+        val toType = expression.typeOperand
+        val fromType = expression.argument.type
+
+        if (fromType.erasedType.isSubtypeOf(expression.type.erasedType, context.irBuiltIns)) {
+            return narrowType(fromType, expression.type, expression.argument)
+        }
+
+        val failResult = if (isSafe) {
+            builder.irNull()
+        } else {
+            builder.irCall(context.ir.symbols.throwTypeCastException)
+        }
+
+        return builder.irComposite(resultType = expression.type) {
+            val argument = cacheValue(expression.argument)
+            val narrowArg = narrowType(fromType, expression.type, argument() as IrExpression)
+            val check = generateTypeCheck(argument, toType)
+            if (check is IrConst<*>) {
+                val value = check.value as Boolean
+                if (value) {
+                    +narrowArg
+                } else {
+                    +failResult
+                }
+            } else {
+                +builder.irIfThenElse(
+                    type = expression.type,
+                    condition = check,
+                    thenPart = narrowArg,
+                    elsePart = failResult
+                )
+            }
+        }
+    }
+
+    private fun lowerImplicitCast(expression: IrTypeOperatorCall): IrExpression =
+        narrowType(
+            fromType = expression.argument.type,
+            toType = expression.typeOperand,
+            value = expression.argument
+        )
+
+    private fun generateTypeCheckWithTypeParameter(argument: IrExpressionWithCopy, toType: IrType): IrExpression {
+        val typeParameter = toType.classifierOrNull?.owner as? IrTypeParameter
+            ?: error("expected type parameter, but got $toType")
+
+        return typeParameter.superTypes.fold(builder.irTrue() as IrExpression) { r, t ->
+            val check = generateTypeCheckNonNull(argument.copy() as IrExpressionWithCopy, t.makeNotNull())
+            builder.irCall(symbols.booleanAnd).apply {
+                putValueArgument(0, r)
+                putValueArgument(1, check)
+            }
+        }
+    }
+
+    private fun generateIsInterface(argument: IrExpression, toType: IrType): IrExpression {
+        val interfaceId = builder.irCall(symbols.wasmInterfaceId).apply {
+            putTypeArgument(0, toType)
+        }
+        return builder.irCall(symbols.isInterface).apply {
+            putValueArgument(0, argument)
+            putValueArgument(1, interfaceId)
+        }
+    }
+
+    private fun generateIsSubClass(argument: IrExpression, toType: IrType): IrExpression {
+        val classId = builder.irCall(symbols.wasmClassId).apply {
+            putTypeArgument(0, toType)
+        }
+        return builder.irCall(symbols.isSubClass).apply {
+            putValueArgument(0, argument)
+            putValueArgument(1, classId)
+        }
+    }
+}
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmVarargExpressionLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmVarargExpressionLowering.kt
new file mode 100644
index 00000000000..f454418a03e
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmVarargExpressionLowering.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.lower
+
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.common.lower.irComposite
+import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.ir.builders.irCall
+import org.jetbrains.kotlin.ir.builders.irGet
+import org.jetbrains.kotlin.ir.builders.irInt
+import org.jetbrains.kotlin.ir.builders.irTemporary
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
+import org.jetbrains.kotlin.ir.expressions.IrVararg
+import org.jetbrains.kotlin.ir.expressions.IrVarargElement
+import org.jetbrains.kotlin.ir.types.classOrNull
+import org.jetbrains.kotlin.ir.util.primaryConstructor
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+import org.jetbrains.kotlin.name.Name
+
+internal class WasmVarargExpressionLowering(
+    private val context: WasmBackendContext
+) : FileLoweringPass, IrElementTransformerVoidWithContext() {
+    val symbols = context.wasmSymbols
+
+    override fun lower(irFile: IrFile) {
+        irFile.transformChildrenVoid(this)
+    }
+
+    override fun visitVararg(expression: IrVararg): IrExpression {
+        val irVararg = super.visitVararg(expression) as IrVararg
+        val builder = context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol)
+        val arrayClass = irVararg.type.classOrNull!!.owner
+        val primaryConstructor = arrayClass.primaryConstructor!!
+        val setMethod = arrayClass.declarations.filterIsInstance<IrSimpleFunction>().find {
+            it.name == Name.identifier("set")
+        }!!
+        return builder.irComposite(irVararg) {
+            val arrayTempVariable = irTemporary(
+                value = irCall(primaryConstructor).apply {
+                    putValueArgument(0, irInt(irVararg.elements.size))
+                    if (primaryConstructor.typeParameters.isNotEmpty()) {
+                        check(primaryConstructor.typeParameters.size == 1)
+                        putTypeArgument(0, irVararg.varargElementType)
+                    }
+                },
+                nameHint = "array_tmp"
+            )
+            for ((index: Int, element: IrVarargElement) in irVararg.elements.withIndex()) {
+                check(element is IrExpression) {
+                    "TODO: Support $element as vararg elements"
+                }
+
+                +irCall(setMethod).apply {
+                    dispatchReceiver = irGet(arrayTempVariable)
+                    putValueArgument(0, irInt(index))
+                    putValueArgument(1, element)
+                }
+            }
+            +irGet(arrayTempVariable)
+        }
+    }
+
+    override fun visitFunctionAccess(expression: IrFunctionAccessExpression) =
+        transformFunctionAccessExpression(expression)
+
+    private fun transformFunctionAccessExpression(expression: IrFunctionAccessExpression): IrExpression {
+        expression.transformChildrenVoid()
+        val builder by lazy { context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol) }
+
+        // Replace empty vararg arguments with empty array construction
+        for (argumentIdx in 0 until expression.valueArgumentsCount) {
+            val argument = expression.getValueArgument(argumentIdx)
+            val parameter = expression.symbol.owner.valueParameters[argumentIdx]
+            val varargElementType = parameter.varargElementType
+            if (argument == null && varargElementType != null) {
+                val arrayClass = parameter.type.classOrNull!!.owner
+                val primaryConstructor = arrayClass.primaryConstructor!!
+                val emptyArrayCall = with(builder) {
+                    irCall(primaryConstructor).apply {
+                        putValueArgument(0, irInt(0))
+                        if (primaryConstructor.typeParameters.isNotEmpty()) {
+                            check(primaryConstructor.typeParameters.size == 1)
+                            putTypeArgument(0, parameter.varargElementType)
+                        }
+                    }
+                }
+                expression.putValueArgument(argumentIdx, emptyArrayCall)
+            }
+        }
+        return expression
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt
index e5765b0bf96..f303b6707cf 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt
@@ -11,19 +11,30 @@ import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.util.getAnnotation
 import org.jetbrains.kotlin.ir.util.hasAnnotation
 import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.wasm.ir.WasmImportPair
 
 fun IrAnnotationContainer.hasExcludedFromCodegenAnnotation(): Boolean =
     hasAnnotation(FqName("kotlin.wasm.internal.ExcludedFromCodegen"))
 
-fun IrAnnotationContainer.getWasmInstructionAnnotation(): String? =
-    getAnnotation(FqName("kotlin.wasm.internal.WasmInstruction"))?.getSingleConstStringArgument()
+fun IrAnnotationContainer.getWasmOpAnnotation(): String? =
+    getAnnotation(FqName("kotlin.wasm.internal.WasmOp"))?.getSingleConstStringArgument()
+
+fun IrAnnotationContainer.hasWasmReinterpretAnnotation(): Boolean =
+    hasAnnotation(FqName("kotlin.wasm.internal.WasmReinterpret"))
+
+fun IrAnnotationContainer.hasWasmForeignAnnotation(): Boolean =
+    hasAnnotation(FqName("kotlin.wasm.internal.WasmForeign"))
+
+fun IrAnnotationContainer.hasWasmPrimitiveAnnotation(): Boolean =
+    hasAnnotation(FqName("kotlin.wasm.internal.WasmPrimitive"))
 
-class WasmImportPair(val module: String, val name: String)
-@Suppress("UNCHECKED_CAST")
 fun IrAnnotationContainer.getWasmImportAnnotation(): WasmImportPair? =
     getAnnotation(FqName("kotlin.wasm.internal.WasmImport"))?.let {
         WasmImportPair(
-            (it.getValueArgument(0) as IrConst<String>).value,
-            (it.getValueArgument(1) as IrConst<String>).value
+            (it.getValueArgument(0) as IrConst<*>).value as String,
+            (it.getValueArgument(1) as IrConst<*>).value as String
         )
     }
+
+fun IrAnnotationContainer.getJsFunAnnotation(): String? =
+    getAnnotation(FqName("kotlin.JsFun"))?.getSingleConstStringArgument()
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/WasmInlineClassesUtils.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/WasmInlineClassesUtils.kt
new file mode 100644
index 00000000000..db1af80c55d
--- /dev/null
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/WasmInlineClassesUtils.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.wasm.utils
+
+import org.jetbrains.kotlin.backend.wasm.WasmSymbols
+import org.jetbrains.kotlin.ir.backend.js.InlineClassesUtils
+import org.jetbrains.kotlin.ir.backend.js.utils.erase
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.types.IrSimpleType
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.isNullable
+
+class WasmInlineClassesUtils(private val wasmSymbols: WasmSymbols) : InlineClassesUtils {
+    override fun isTypeInlined(type: IrType): Boolean {
+        return getInlinedClass(type) != null
+    }
+
+    override fun getInlinedClass(type: IrType): IrClass? {
+        if (type is IrSimpleType) {
+            // TODO: Make inlining less strict
+            if (type.isNullable()) return null
+            val erased = erase(type) ?: return null
+            if (isClassInlineLike(erased)) {
+                return erased
+            }
+        }
+        return null
+    }
+
+    override fun isClassInlineLike(klass: IrClass): Boolean {
+        return klass.isInline || klass.hasWasmPrimitiveAnnotation()
+    }
+
+    override val boxIntrinsic: IrSimpleFunctionSymbol
+        get() = wasmSymbols.boxIntrinsic
+
+    override val unboxIntrinsic: IrSimpleFunctionSymbol
+        get() = wasmSymbols.unboxIntrinsic
+}
\ No newline at end of file
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AnnotationGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AnnotationGenerator.kt
index 0e81af581d1..45103ec9838 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AnnotationGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AnnotationGenerator.kt
@@ -30,12 +30,17 @@ class AnnotationGenerator(context: GeneratorContext) : IrElementVisitorVoid {
     }
 
     private fun generateAnnotationsForDeclaration(declaration: IrDeclaration) {
+        // For interface functions implemented by delegation,
+        // front-end (incorrectly) copies annotations from corresponding interface members.
+        if (declaration is IrProperty && declaration.origin == IrDeclarationOrigin.DELEGATED_MEMBER) return
+
         // Delegate field is mapped to a new property descriptor with annotations of the original property delegate
         // (see IrPropertyDelegateDescriptorImpl), but annotations on backing fields should be processed manually here
         val annotatedDescriptor =
             if (declaration is IrField && declaration.origin != IrDeclarationOrigin.PROPERTY_DELEGATE)
                 declaration.descriptor.backingField
-            else declaration.descriptor
+            else
+                declaration.descriptor
 
         if (annotatedDescriptor != null) {
             declaration.annotations += annotatedDescriptor.annotations.mapNotNull {
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AnonymousInitializerGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AnonymousInitializerGenerator.kt
index 0e9789480cf..6561744afbe 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AnonymousInitializerGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AnonymousInitializerGenerator.kt
@@ -16,8 +16,8 @@
 
 package org.jetbrains.kotlin.psi2ir.generators
 
+import org.jetbrains.kotlin.ir.declarations.IrAnonymousInitializer
 import org.jetbrains.kotlin.ir.declarations.IrClass
-import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.psi.KtAnonymousInitializer
 import org.jetbrains.kotlin.psi.KtBlockExpression
@@ -31,7 +31,7 @@ class AnonymousInitializerGenerator(
     fun generateAnonymousInitializerDeclaration(
         ktAnonymousInitializer: KtAnonymousInitializer,
         irClass: IrClass
-    ): IrDeclaration =
+    ): IrAnonymousInitializer =
         context.symbolTable.declareAnonymousInitializer(
             ktAnonymousInitializer.startOffsetSkippingComments, ktAnonymousInitializer.endOffset,
             IrDeclarationOrigin.DEFINED, irClass.descriptor
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
index e639a49bc03..e5ba8c9f328 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
@@ -75,7 +75,7 @@ class ClassGenerator(
 
         fun <T : DeclarationDescriptor> List<T>.sortedByRenderer(): List<T> {
             val rendered = map(DESCRIPTOR_RENDERER::render)
-            val sortedIndices = (0 until size).sortedWith(Comparator { i, j -> rendered[i].compareTo(rendered[j]) })
+            val sortedIndices = (0 until size).sortedWith { i, j -> rendered[i].compareTo(rendered[j]) }
             return sortedIndices.map { this[it] }
         }
     }
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt
index 8880d75874e..ad7079d37fd 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt
@@ -22,12 +22,10 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.util.DataClassMembersGenerator
-import org.jetbrains.kotlin.ir.util.SYNTHETIC_OFFSET
 import org.jetbrains.kotlin.ir.util.declareSimpleFunctionWithOverrides
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtParameter
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 
 /**
  * A generator that generates synthetic members of data class as well as part of inline class.
@@ -88,9 +86,6 @@ class DataClassMembersGenerator(
         override fun generateComponentFunction(function: FunctionDescriptor, parameter: ValueParameterDescriptor) {
             if (!irClass.isData) return
 
-            val ktParameter = DescriptorToSourceUtils.descriptorToDeclaration(parameter)
-                ?: throw AssertionError("No definition for data class constructor parameter $parameter")
-
             val backingField = irDataClassMembersGenerator.getBackingField(parameter, null) ?: return
             irDataClassMembersGenerator.generateComponentFunction(function, backingField)
         }
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
index 1622ece2f5f..14831554085 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
@@ -16,10 +16,13 @@
 
 package org.jetbrains.kotlin.psi2ir.generators
 
+import org.jetbrains.kotlin.backend.common.BackendException
+import org.jetbrains.kotlin.backend.common.CodegenUtil
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
+import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
@@ -58,13 +61,23 @@ class DeclarationGenerator(override val context: GeneratorContext) : Generator {
                         getOrFail(BindingContext.DECLARATION_TO_DESCRIPTOR, ktDeclaration)
                     )
             }
+        } catch (e: BackendException) {
+            throw e
         } catch (e: Throwable) {
-            if (context.configuration.ignoreErrors) {
-                context.irFactory.createErrorDeclaration(
-                    ktDeclaration.startOffsetSkippingComments, ktDeclaration.endOffset,
-                    getOrFail(BindingContext.DECLARATION_TO_DESCRIPTOR, ktDeclaration)
-                )
-            } else throw e
+            when {
+                context.configuration.ignoreErrors -> {
+                    context.irFactory.createErrorDeclaration(
+                        ktDeclaration.startOffsetSkippingComments, ktDeclaration.endOffset,
+                        getOrFail(BindingContext.DECLARATION_TO_DESCRIPTOR, ktDeclaration)
+                    )
+                }
+                e is ErrorExpressionException ->
+                    CodegenUtil.reportBackendException(e.cause ?: e, "psi2ir", PsiDiagnosticUtils.atLocation(e.ktElement), e.message)
+                else -> {
+                    val psiFile = ktDeclaration.containingKtFile
+                    CodegenUtil.reportBackendException(e, "psi2ir", psiFile.virtualFile?.path ?: psiFile.name)
+                }
+            }
         }
     }
 
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ErrorExpressionGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ErrorExpressionGenerator.kt
index e627764d0b7..7f6ef08a6c8 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ErrorExpressionGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ErrorExpressionGenerator.kt
@@ -27,11 +27,11 @@ import org.jetbrains.kotlin.types.ErrorUtils
 class ErrorExpressionGenerator(statementGenerator: StatementGenerator) : StatementGeneratorExtension(statementGenerator) {
     private val ignoreErrors: Boolean get() = context.configuration.ignoreErrors
 
-    private inline fun generateErrorExpression(ktElement: KtElement, e: Throwable? = null, body: () -> IrExpression) =
+    private inline fun generateErrorExpression(ktElement: KtElement, e: Throwable? = null, body: () -> IrExpression): IrExpression =
         if (ignoreErrors)
             body()
         else
-            throw RuntimeException("${e?.message}: ${ktElement::class.java.simpleName}:\n${ktElement.text}", e)
+            throw ErrorExpressionException(ktElement, e)
 
     fun generateErrorExpression(ktElement: KtElement, e: Throwable): IrExpression =
         generateErrorExpression(ktElement, e) {
@@ -80,4 +80,9 @@ class ErrorExpressionGenerator(statementGenerator: StatementGenerator) : Stateme
         irErrorCall
     }
 
-}
\ No newline at end of file
+}
+
+class ErrorExpressionException(val ktElement: KtElement, cause: Throwable?) : RuntimeException(
+    "${cause?.message}: ${ktElement::class.java.simpleName}:\n${ktElement.text}",
+    cause
+)
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
index 44bb8425c21..e3e02ddee65 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.psi2ir.generators
 
+import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
@@ -19,6 +20,8 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrSetFieldImpl
 import org.jetbrains.kotlin.ir.types.impl.IrUninitializedType
 import org.jetbrains.kotlin.ir.util.declareSimpleFunctionWithOverrides
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.name.Name.isValidIdentifier
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.pureEndOffset
 import org.jetbrains.kotlin.psi.psiUtil.pureStartOffset
@@ -26,6 +29,7 @@ import org.jetbrains.kotlin.psi2ir.isConstructorDelegatingToSuper
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator
 import org.jetbrains.kotlin.resolve.descriptorUtil.isAnnotationConstructor
 import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal
@@ -100,7 +104,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
 
     fun generatePropertyAccessor(
         descriptor: PropertyAccessorDescriptor,
-        ktProperty: KtProperty,
+        ktProperty: KtVariableDeclaration,
         ktAccessor: KtPropertyAccessor?
     ): IrSimpleFunction =
         declareSimpleFunctionInner(
@@ -121,9 +125,9 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
 
     fun generateDefaultAccessorForPrimaryConstructorParameter(
         descriptor: PropertyAccessorDescriptor,
-        ktParameter: KtParameter
+        ktElement: KtElement
     ): IrSimpleFunction =
-        declareSimpleFunctionInner(descriptor, ktParameter, IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR).buildWithScope { irAccessor ->
+        declareSimpleFunctionInner(descriptor, ktElement, IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR).buildWithScope { irAccessor ->
             declarationGenerator.generateScopedTypeParameterDeclarations(irAccessor, descriptor.typeParameters)
             irAccessor.returnType = descriptor.returnType!!.toIrType()
             FunctionGenerator(declarationGenerator).generateSyntheticFunctionParameterDeclarations(irAccessor)
@@ -328,17 +332,50 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
         receiverParameterDescriptor: ReceiverParameterDescriptor,
         ktElement: KtPureElement?,
         irOwnerElement: IrElement
-    ): IrValueParameter =
-        declareParameter(receiverParameterDescriptor, ktElement, irOwnerElement)
+    ): IrValueParameter {
+        if (context.languageVersionSettings.supportsFeature(LanguageFeature.NewCapturedReceiverFieldNamingConvention)) {
+            if (ktElement is KtFunctionLiteral) {
+                val name = getCallLabelForLambdaArgument(ktElement, this.context.bindingContext)?.let {
+                    it.takeIf(Name::isValidIdentifier) ?: "\$receiver"
+                }
+                return declareParameter(receiverParameterDescriptor, ktElement, irOwnerElement, name = Name.identifier("\$this\$$name"))
+            }
+        }
+        return declareParameter(receiverParameterDescriptor, ktElement, irOwnerElement)
+    }
 
-    private fun declareParameter(descriptor: ParameterDescriptor, ktElement: KtPureElement?, irOwnerElement: IrElement) =
+    private fun getCallLabelForLambdaArgument(declaration: KtFunctionLiteral, bindingContext: BindingContext): String? {
+        val lambdaExpression = declaration.parent as? KtLambdaExpression ?: return null
+        val lambdaExpressionParent = lambdaExpression.parent
+
+        if (lambdaExpressionParent is KtLabeledExpression) {
+            lambdaExpressionParent.name?.let { return it }
+        }
+
+        val callExpression = when (val argument = lambdaExpression.parent) {
+            is KtLambdaArgument -> {
+                argument.parent as? KtCallExpression ?: return null
+            }
+            is KtValueArgument -> {
+                val valueArgumentList = argument.parent as? KtValueArgumentList ?: return null
+                valueArgumentList.parent as? KtCallExpression ?: return null
+            }
+            else -> return null
+        }
+
+        val call = callExpression.getResolvedCall(bindingContext) ?: return null
+        return call.resultingDescriptor.name.asString()
+    }
+
+    private fun declareParameter(descriptor: ParameterDescriptor, ktElement: KtPureElement?, irOwnerElement: IrElement, name: Name? = null) =
         context.symbolTable.declareValueParameter(
             ktElement?.pureStartOffset ?: irOwnerElement.startOffset,
             ktElement?.pureEndOffset ?: irOwnerElement.endOffset,
             IrDeclarationOrigin.DEFINED,
             descriptor, descriptor.type.toIrType(),
-            (descriptor as? ValueParameterDescriptor)?.varargElementType?.toIrType()
-        )
+            (descriptor as? ValueParameterDescriptor)?.varargElementType?.toIrType(),
+            name
+            )
 
     private fun generateDefaultAnnotationParameterValue(
         valueExpression: KtExpression,
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt
index 57babedd01b..8a44f3a4b03 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt
@@ -16,9 +16,9 @@
 
 package org.jetbrains.kotlin.psi2ir.generators
 
-import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.annotations.Annotations
+import org.jetbrains.kotlin.descriptors.impl.PropertyGetterDescriptorImpl
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
@@ -41,38 +41,80 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
             generateSimpleProperty(ktProperty, propertyDescriptor)
     }
 
+    fun generateDestructuringDeclarationEntryAsPropertyDeclaration(ktEntry: KtDestructuringDeclarationEntry): IrProperty {
+        val propertyDescriptor = getPropertyDescriptor(ktEntry)
+        return context.symbolTable.declareProperty(
+            ktEntry.startOffsetSkippingComments, ktEntry.endOffset,
+            IrDeclarationOrigin.DEFINED,
+            propertyDescriptor,
+            isDelegated = false
+        ).buildWithScope { irProperty ->
+            irProperty.backingField = generatePropertyBackingField(ktEntry, propertyDescriptor) { null }
+
+            irProperty.getter = generateGetterIfRequired(ktEntry, propertyDescriptor)
+            irProperty.setter = generateSetterIfRequired(ktEntry, propertyDescriptor)
+
+            irProperty.linkCorrespondingPropertySymbol()
+        }
+    }
+
     fun generatePropertyForPrimaryConstructorParameter(ktParameter: KtParameter, irValueParameter: IrValueParameter): IrDeclaration {
         val propertyDescriptor = getOrFail(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, ktParameter)
+        return generateSyntheticProperty(ktParameter, propertyDescriptor, irValueParameter)
+    }
 
+    fun generateSyntheticProperty(
+        ktDeclarationContainer: KtElement, propertyDescriptor: PropertyDescriptor,
+        irValueParameter: IrValueParameter?, generateSyntheticAccessors: Boolean = false
+    ): IrProperty {
         val irPropertyType = propertyDescriptor.type.toIrType()
+        return generateSyntheticPropertyWithInitializer(ktDeclarationContainer, propertyDescriptor, generateSyntheticAccessors) {
+            if (irValueParameter == null) null
+            else {
+                context.irFactory.createExpressionBody(
+                    IrGetValueImpl(
+                        ktDeclarationContainer.startOffsetSkippingComments, ktDeclarationContainer.endOffset,
+                        irPropertyType,
+                        irValueParameter.symbol,
+                        IrStatementOrigin.INITIALIZE_PROPERTY_FROM_PARAMETER
+                    )
+                )
+            }
+        }
+    }
+
+    fun generateSyntheticPropertyWithInitializer(
+        ktDeclarationContainer: KtElement, propertyDescriptor: PropertyDescriptor,
+        generateSyntheticAccessors: Boolean, generateInitializer: (IrField) -> IrExpressionBody?
+    ): IrProperty {
         return context.symbolTable.declareProperty(
-            ktParameter.startOffsetSkippingComments, ktParameter.endOffset,
+            ktDeclarationContainer.startOffsetSkippingComments, ktDeclarationContainer.endOffset,
             IrDeclarationOrigin.DEFINED,
             propertyDescriptor,
             isDelegated = false
         ).also { irProperty ->
-            irProperty.backingField =
-                generatePropertyBackingField(ktParameter, propertyDescriptor) {
-                    context.irFactory.createExpressionBody(
-                        IrGetValueImpl(
-                            ktParameter.startOffsetSkippingComments, ktParameter.endOffset,
-                            irPropertyType,
-                            irValueParameter.symbol,
-                            IrStatementOrigin.INITIALIZE_PROPERTY_FROM_PARAMETER
-                        )
-                    )
-                }
+            irProperty.backingField = generatePropertyBackingField(ktDeclarationContainer, propertyDescriptor, generateInitializer)
 
             val getter = propertyDescriptor.getter
-                ?: throw AssertionError("Property declared in primary constructor has no getter: $propertyDescriptor")
+                ?: if (generateSyntheticAccessors)
+                    // TODO: check if this is the correct way to generate synthetic accessor
+                    PropertyGetterDescriptorImpl(
+                        propertyDescriptor,
+                        Annotations.EMPTY, Modality.FINAL, DescriptorVisibilities.PUBLIC, false, false, false,
+                        CallableMemberDescriptor.Kind.SYNTHESIZED, null, propertyDescriptor.source
+                    ).apply {
+                        initialize(propertyDescriptor.type)
+                    }
+                else throw AssertionError("Property declared in primary constructor has no getter: $propertyDescriptor")
             irProperty.getter =
-                FunctionGenerator(declarationGenerator).generateDefaultAccessorForPrimaryConstructorParameter(getter, ktParameter)
+                FunctionGenerator(declarationGenerator).generateDefaultAccessorForPrimaryConstructorParameter(getter, ktDeclarationContainer)
 
             if (propertyDescriptor.isVar) {
                 val setter = propertyDescriptor.setter
+                    // TODO: implement setter descriptor generation, if needed
                     ?: throw AssertionError("Property declared in primary constructor has no setter: $propertyDescriptor")
                 irProperty.setter =
-                    FunctionGenerator(declarationGenerator).generateDefaultAccessorForPrimaryConstructorParameter(setter, ktParameter)
+                    FunctionGenerator(declarationGenerator).generateDefaultAccessorForPrimaryConstructorParameter(setter, ktDeclarationContainer)
             }
 
             irProperty.linkCorrespondingPropertySymbol()
@@ -105,7 +147,7 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
     private fun PropertyDescriptor.actuallyHasBackingField(bindingContext: BindingContext) =
         hasBackingField(bindingContext) || context.extensions.isPropertyWithPlatformField(this)
 
-    private fun generateSimpleProperty(ktProperty: KtProperty, propertyDescriptor: PropertyDescriptor): IrProperty =
+    private fun generateSimpleProperty(ktProperty: KtVariableDeclaration, propertyDescriptor: PropertyDescriptor): IrProperty =
         context.symbolTable.declareProperty(
             ktProperty.startOffsetSkippingComments, ktProperty.endOffset,
             IrDeclarationOrigin.DEFINED,
@@ -154,18 +196,18 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
         }
     }
 
-    private fun generateGetterIfRequired(ktProperty: KtProperty, property: PropertyDescriptor): IrSimpleFunction? {
+    private fun generateGetterIfRequired(ktProperty: KtVariableDeclaration, property: PropertyDescriptor): IrSimpleFunction? {
         val getter = property.getter ?: return null
-        return FunctionGenerator(declarationGenerator).generatePropertyAccessor(getter, ktProperty, ktProperty.getter)
+        return FunctionGenerator(declarationGenerator).generatePropertyAccessor(getter, ktProperty, (ktProperty as? KtProperty)?.getter)
     }
 
-    private fun generateSetterIfRequired(ktProperty: KtProperty, property: PropertyDescriptor): IrSimpleFunction? {
+    private fun generateSetterIfRequired(ktProperty: KtVariableDeclaration, property: PropertyDescriptor): IrSimpleFunction? {
         if (!property.isVar) return null
         val setter = property.setter ?: return null
-        return FunctionGenerator(declarationGenerator).generatePropertyAccessor(setter, ktProperty, ktProperty.setter)
+        return FunctionGenerator(declarationGenerator).generatePropertyAccessor(setter, ktProperty, (ktProperty as? KtProperty)?.setter)
     }
 
-    private fun getPropertyDescriptor(ktProperty: KtProperty): PropertyDescriptor {
+    private fun getPropertyDescriptor(ktProperty: KtVariableDeclaration): PropertyDescriptor {
         val variableDescriptor = getOrFail(BindingContext.VARIABLE, ktProperty)
         return variableDescriptor as? PropertyDescriptor ?: TODO("not a property: $variableDescriptor")
     }
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt
index cd28b7c9baa..44aa66e2264 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt
@@ -5,14 +5,34 @@
 
 package org.jetbrains.kotlin.psi2ir.generators
 
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.ParameterDescriptor
 import org.jetbrains.kotlin.descriptors.ScriptDescriptor
+import org.jetbrains.kotlin.ir.assertCast
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
+import org.jetbrains.kotlin.ir.declarations.IrValueParameter
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
+import org.jetbrains.kotlin.ir.expressions.impl.IrCompositeImpl
+import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
+import org.jetbrains.kotlin.ir.expressions.impl.IrSetFieldImpl
+import org.jetbrains.kotlin.ir.util.indexOrMinusOne
+import org.jetbrains.kotlin.ir.util.isCrossinline
+import org.jetbrains.kotlin.ir.util.isNoinline
+import org.jetbrains.kotlin.ir.util.varargElementType
+import org.jetbrains.kotlin.psi.KtDestructuringDeclaration
 import org.jetbrains.kotlin.psi.KtScript
 import org.jetbrains.kotlin.psi.KtScriptInitializer
+import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.pureEndOffset
 import org.jetbrains.kotlin.psi.psiUtil.pureStartOffset
+import org.jetbrains.kotlin.psi.psiUtil.startOffsetSkippingComments
+import org.jetbrains.kotlin.psi2ir.deparenthesize
+import org.jetbrains.kotlin.psi2ir.intermediate.createTemporaryVariableInBlock
+import org.jetbrains.kotlin.psi2ir.intermediate.setExplicitReceiverValue
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.calls.util.isSingleUnderscore
 
 class ScriptGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGeneratorExtension(declarationGenerator) {
     fun generateScriptDeclaration(ktScript: KtScript): IrDeclaration? {
@@ -22,27 +42,169 @@ class ScriptGenerator(declarationGenerator: DeclarationGenerator) : DeclarationG
 
         return context.symbolTable.declareScript(descriptor).buildWithScope { irScript ->
 
+            // A workaround for the JS/REPL backend:
+            // JS backend doesn't save previously executed snippets anywhere, they should be taken for now from the context.symbolTable.listExistedScripts()
+            // on the other hand imported scripts are also stored there so to avoid clashes the imported scripts should be filtered out
+            // NOTE: that JVM IR is not properly tested with REPL, so it might have the same problem
+            // TODO: design and implement other schema for handling previous snippets
+            val importedScripts = descriptor.implicitReceivers.filterIsInstanceTo(HashSet<ScriptDescriptor>())
+
             // TODO: since script could reference instances of previous one their receivers have to be enlisted in its scope
             // Remove this code once script is no longer represented by Class
-            existedScripts.forEach { context.symbolTable.introduceValueParameter(it.owner.thisReceiver) }
+            existedScripts.forEach {
+                if (it.owner != irScript && it.descriptor !in importedScripts) {
+                    context.symbolTable.introduceValueParameter(it.owner.thisReceiver)
+                }
+            }
 
             val startOffset = ktScript.pureStartOffset
             val endOffset = ktScript.pureEndOffset
 
-            irScript.thisReceiver = context.symbolTable.declareValueParameter(
-                startOffset, endOffset,
-                IrDeclarationOrigin.INSTANCE_RECEIVER,
-                descriptor.thisAsReceiverParameter,
-                descriptor.thisAsReceiverParameter.type.toIrType()
-            ).also { it.parent = irScript }
+            fun makeParameter(descriptor: ParameterDescriptor, origin: IrDeclarationOrigin, index: Int = -1): IrValueParameter {
+                val type = descriptor.type.toIrType()
+                val varargElementType = descriptor.varargElementType?.toIrType()
+                return context.symbolTable.declareValueParameter(
+                    startOffset, endOffset,
+                    origin,
+                    descriptor,
+                    type
+                ) { symbol ->
+                    context.irFactory.createValueParameter(
+                        startOffset, endOffset,
+                        origin, symbol, context.symbolTable.nameProvider.nameForDeclaration(descriptor),
+                        if (index != -1) index else descriptor.indexOrMinusOne,
+                        type, varargElementType,
+                        descriptor.isCrossinline, descriptor.isNoinline, false
+                    )
+                } .also { it.parent = irScript }
+            }
+
+            irScript.thisReceiver = makeParameter(descriptor.thisAsReceiverParameter, IrDeclarationOrigin.INSTANCE_RECEIVER)
+
+            irScript.baseClass = descriptor.typeConstructor.supertypes.single().toIrType()
+
+            // This is part of a hack for implicit receivers that converted to value parameters below
+            // The proper schema would be to get properly indexed parameters from frontend (descriptor.implicitReceiversParameters),
+            // but it seems would require a proper remapping for the script body
+            // TODO: implement implicit receiver parameters handlin properly
+            var parametersIndex = 0
+
+            irScript.explicitCallParameters = descriptor.explicitConstructorParameters.map { valueParameterDescriptor ->
+                parametersIndex++
+                valueParameterDescriptor.toIrValueParameter(startOffset, endOffset, IrDeclarationOrigin.SCRIPT_CALL_PARAMETER).also { it.parent = irScript }
+            }
+
+            irScript.implicitReceiversParameters = descriptor.implicitReceivers.map {
+                makeParameter(it.thisAsReceiverParameter, IrDeclarationOrigin.SCRIPT_IMPLICIT_RECEIVER, parametersIndex++)
+            }
+
+            irScript.providedProperties = descriptor.scriptProvidedProperties.zip(descriptor.scriptProvidedPropertiesParameters)
+                .map { (providedProperty, parameter) ->
+                    // TODO: initializer
+                    // TODO: do not keep direct links
+                    val type = providedProperty.type.toIrType()
+                    val valueParameter = context.symbolTable.declareValueParameter(
+                        startOffset, endOffset, IrDeclarationOrigin.SCRIPT_PROVIDED_PROPERTY, parameter, type
+                    )
+                    val irProperty =
+                        PropertyGenerator(declarationGenerator).generateSyntheticProperty(ktScript, providedProperty, valueParameter)
+                    irProperty.origin = IrDeclarationOrigin.SCRIPT_PROVIDED_PROPERTY
+                    irScript.statements += irProperty
+                    valueParameter to irProperty.symbol
+                }
+
+            irScript.earlierScripts = existedScripts
 
             for (d in ktScript.declarations) {
-                if (d is KtScriptInitializer) irScript.statements += BodyGenerator(
-                    irScript.symbol,
-                    context
-                ).generateExpressionBody(d.body!!).expression
-                else irScript.declarations += declarationGenerator.generateMemberDeclaration(d)!!
+                when (d) {
+                    is KtScriptInitializer -> {
+                        val irExpressionBody = BodyGenerator(
+                            irScript.symbol,
+                            context
+                        ).generateExpressionBody(d.body!!)
+                        if (d == ktScript.declarations.last() && descriptor.resultValue != null) {
+                            descriptor.resultValue!!.let { resultDescriptor ->
+                                PropertyGenerator(declarationGenerator)
+                                    .generateSyntheticPropertyWithInitializer(ktScript, resultDescriptor, generateSyntheticAccessors = true) {
+                                        // TODO: check if this is a correct place to do it
+                                        it.visibility = DescriptorVisibilities.PUBLIC
+                                        irExpressionBody
+                                    }.also {
+                                        it.origin = IrDeclarationOrigin.SCRIPT_RESULT_PROPERTY
+                                        irScript.statements += it
+                                        irScript.resultProperty = it.symbol
+                                    }
+                            }
+                        } else {
+                            irScript.statements += irExpressionBody.expression
+                        }
+                    }
+                    is KtDestructuringDeclaration -> {
+                        // copied with modifications from StatementGenerator.visitDestructuringDeclaration
+                        // TODO: consider code deduplication
+                        val bodyGenerator = BodyGenerator(irScript.symbol, context)
+                        val statementGenerator = bodyGenerator.createStatementGenerator()
+                        val irBlock = IrCompositeImpl(
+                            d.startOffsetSkippingComments, d.endOffset,
+                            context.irBuiltIns.unitType, IrStatementOrigin.DESTRUCTURING_DECLARATION
+                        )
+                        val ktInitializer = d.initializer!!
+                        val initializerExpr = ktInitializer.deparenthesize().accept(statementGenerator, null).assertCast<IrExpression>()
+                        val containerValue =
+                            statementGenerator.scope.createTemporaryVariableInBlock(context, initializerExpr, irBlock, "container")
+
+                        val callGenerator = CallGenerator(statementGenerator)
+
+                        for ((index, ktEntry) in d.entries.withIndex()) {
+                            val componentResolvedCall = getOrFail(BindingContext.COMPONENT_RESOLVED_CALL, ktEntry)
+
+                            val componentSubstitutedCall = statementGenerator.pregenerateCall(componentResolvedCall)
+                            componentSubstitutedCall.setExplicitReceiverValue(containerValue)
+
+                            val componentVariable = getOrFail(BindingContext.VARIABLE, ktEntry)
+
+                            // componentN for '_' SHOULD NOT be evaluated
+                            if (componentVariable.name.isSpecial || ktEntry.isSingleUnderscore) continue
+
+                            val irComponentCall = callGenerator.generateCall(
+                                ktEntry.startOffsetSkippingComments, ktEntry.endOffset, componentSubstitutedCall,
+                                IrStatementOrigin.COMPONENT_N.withIndex(index + 1)
+                            )
+
+                            val irComponentProperty =
+                                PropertyGenerator(declarationGenerator).generateDestructuringDeclarationEntryAsPropertyDeclaration(
+                                    ktEntry
+                                )
+                            val irComponentBackingField = irComponentProperty.backingField!!
+
+                            irScript.statements += irComponentProperty
+
+                            val irComponentInitializer = IrSetFieldImpl(
+                                ktEntry.startOffsetSkippingComments, ktEntry.endOffset,
+                                irComponentBackingField.symbol,
+                                context.irBuiltIns.unitType,
+                                origin = null, superQualifierSymbol = null
+                            ).apply {
+                                value = irComponentCall
+                                receiver = IrGetValueImpl(
+                                    ktEntry.startOffsetSkippingComments, ktEntry.endOffset, irScript.thisReceiver.symbol
+                                )
+                            }
+                            irBlock.statements.add(irComponentInitializer)
+                        }
+                        irScript.statements += irBlock
+                    }
+                    else -> irScript.statements += declarationGenerator.generateMemberDeclaration(d)!!
+                }
             }
         }
     }
+
+    private fun ParameterDescriptor.toIrValueParameter(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin) =
+        context.symbolTable.declareValueParameter(
+            startOffset, endOffset, origin,
+            this,
+            type.toIrType(),
+            varargElementType?.toIrType()
+        )
 }
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StatementGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StatementGenerator.kt
index c3cf23c3e0f..cd6bfe7c0b5 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StatementGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StatementGenerator.kt
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.psi2ir.generators
 
+import org.jetbrains.kotlin.backend.common.BackendException
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -73,6 +74,10 @@ class StatementGenerator(
     private fun KtElement.genStmt(): IrStatement =
         try {
             deparenthesize().accept(this@StatementGenerator, null)
+        } catch (e: BackendException) {
+            throw e
+        } catch (e: ErrorExpressionException) {
+            throw e
         } catch (e: Throwable) {
             ErrorExpressionGenerator(this@StatementGenerator).generateErrorExpression(this, e)
         }
diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt
index dd648146127..7756426f808 100644
--- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt
+++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.ir.declarations.impl
@@ -49,9 +38,9 @@ class IrLocalDelegatedPropertyImpl(
 
     override lateinit var delegate: IrVariable
 
-    override lateinit var getter: IrFunction
+    override lateinit var getter: IrSimpleFunction
 
-    override var setter: IrFunction? = null
+    override var setter: IrSimpleFunction? = null
 
     override var metadata: MetadataSource? = null
 }
diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrLocalDelegatedProperty.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrLocalDelegatedProperty.kt
index ce438dc803c..39691ae9e8f 100644
--- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrLocalDelegatedProperty.kt
+++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrLocalDelegatedProperty.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.ir.declarations.persistent
@@ -78,9 +67,9 @@ internal class PersistentIrLocalDelegatedProperty(
             }
         }
 
-    override var getterField: IrFunction? = null
+    override var getterField: IrSimpleFunction? = null
 
-    override var getter: IrFunction
+    override var getter: IrSimpleFunction
         get() = getCarrier().getterField!!
         set(v) {
             if (getCarrier().getterField !== v) {
@@ -88,9 +77,9 @@ internal class PersistentIrLocalDelegatedProperty(
             }
         }
 
-    override var setterField: IrFunction? = null
+    override var setterField: IrSimpleFunction? = null
 
-    override var setter: IrFunction?
+    override var setter: IrSimpleFunction?
         get() = getCarrier().setterField
         set(v) {
             if (setter !== v) {
diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/LocalDelegatedPropertyCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/LocalDelegatedPropertyCarrier.kt
index 3b297d33827..12d76ac24e1 100644
--- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/LocalDelegatedPropertyCarrier.kt
+++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/LocalDelegatedPropertyCarrier.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.ir.declarations.persistent.carriers
@@ -12,8 +12,8 @@ import org.jetbrains.kotlin.ir.types.IrType
 internal interface LocalDelegatedPropertyCarrier : DeclarationCarrier {
     var typeField: IrType
     var delegateField: IrVariable?
-    var getterField: IrFunction?
-    var setterField: IrFunction?
+    var getterField: IrSimpleFunction?
+    var setterField: IrSimpleFunction?
     var metadataField: MetadataSource?
 
     override fun clone(): LocalDelegatedPropertyCarrier {
@@ -38,7 +38,7 @@ internal class LocalDelegatedPropertyCarrierImpl(
     override var annotationsField: List<IrConstructorCall>,
     override var typeField: IrType,
     override var delegateField: IrVariable?,
-    override var getterField: IrFunction?,
-    override var setterField: IrFunction?,
+    override var getterField: IrSimpleFunction?,
+    override var setterField: IrSimpleFunction?,
     override var metadataField: MetadataSource?
 ) : LocalDelegatedPropertyCarrier
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt
index 992c0ba4e97..eb52fd4f9da 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt
@@ -38,6 +38,14 @@ interface IrDeclarationOrigin {
 
     object FILE_CLASS : IrDeclarationOriginImpl("FILE_CLASS")
     object SYNTHETIC_FILE_CLASS : IrDeclarationOriginImpl("SYNTHETIC_FILE_CLASS", isSynthetic = true)
+    object JVM_MULTIFILE_CLASS : IrDeclarationOriginImpl("JVM_MULTIFILE_CLASS")
+
+    object SCRIPT_CLASS : IrDeclarationOriginImpl("SCRIPT_CLASS")
+    object SCRIPT_STATEMENT : IrDeclarationOriginImpl("SCRIPT_STATEMENT")
+    object SCRIPT_CALL_PARAMETER : IrDeclarationOriginImpl("SCRIPT_CALL_PARAMETER")
+    object SCRIPT_IMPLICIT_RECEIVER : IrDeclarationOriginImpl("SCRIPT_IMPLICIT_RECEIVER")
+    object SCRIPT_PROVIDED_PROPERTY : IrDeclarationOriginImpl("SCRIPT_PROVIDED_PROPERTY")
+    object SCRIPT_RESULT_PROPERTY : IrDeclarationOriginImpl("SCRIPT_RESULT_PROPERTY")
     object GENERATED_DATA_CLASS_MEMBER : IrDeclarationOriginImpl("GENERATED_DATA_CLASS_MEMBER")
     object GENERATED_INLINE_CLASS_MEMBER : IrDeclarationOriginImpl("GENERATED_INLINE_CLASS_MEMBER")
     object LOCAL_FUNCTION_FOR_LAMBDA : IrDeclarationOriginImpl("LOCAL_FUNCTION_FOR_LAMBDA")
@@ -60,7 +68,8 @@ interface IrDeclarationOrigin {
     object ADAPTER_FOR_SUSPEND_CONVERSION : IrDeclarationOriginImpl("ADAPTER_FOR_SUSPEND_CONVERSION")
     object ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION : IrDeclarationOriginImpl("ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION")
 
-    object GENERATED_SAM_IMPLEMENTATION : IrDeclarationOriginImpl("GENERATED_SAM_IMPLEMENTATION", isSynthetic = true)
+    object GENERATED_SAM_IMPLEMENTATION : IrDeclarationOriginImpl("GENERATED_SAM_IMPLEMENTATION")
+    object SYNTHETIC_GENERATED_SAM_IMPLEMENTATION : IrDeclarationOriginImpl("SYNTHETIC_GENERATED_SAM_IMPLEMENTATION", isSynthetic = true)
 
     val isSynthetic: Boolean get() = false
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrLocalDelegatedProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrLocalDelegatedProperty.kt
index 178e6f39ecc..11944e4b798 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrLocalDelegatedProperty.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrLocalDelegatedProperty.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.ir.declarations
@@ -37,8 +26,8 @@ abstract class IrLocalDelegatedProperty :
     abstract val isVar: Boolean
 
     abstract var delegate: IrVariable
-    abstract var getter: IrFunction
-    abstract var setter: IrFunction?
+    abstract var getter: IrSimpleFunction
+    abstract var setter: IrSimpleFunction?
 
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
         visitor.visitLocalDelegatedProperty(this, data)
@@ -51,7 +40,7 @@ abstract class IrLocalDelegatedProperty :
 
     override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
         delegate = delegate.transform(transformer, data) as IrVariable
-        getter = getter.transform(transformer, data) as IrFunction
-        setter = setter?.transform(transformer, data) as? IrFunction
+        getter = getter.transform(transformer, data) as IrSimpleFunction
+        setter = setter?.transform(transformer, data) as? IrSimpleFunction
     }
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrScript.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrScript.kt
index 7a05b835510..8f242cc2d3b 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrScript.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrScript.kt
@@ -5,15 +5,30 @@
 
 package org.jetbrains.kotlin.ir.declarations
 
-import org.jetbrains.kotlin.ir.IrStatement
+import org.jetbrains.kotlin.ir.expressions.IrStatementContainer
+import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 import org.jetbrains.kotlin.ir.symbols.IrScriptSymbol
+import org.jetbrains.kotlin.ir.types.IrType
 
 //TODO: make IrScript as IrPackageFragment, because script is used as a file, not as a class
 //NOTE: declarations and statements stored separately
 abstract class IrScript :
-    IrDeclarationBase(), IrSymbolDeclaration<IrScriptSymbol>, IrDeclarationContainer, IrDeclarationWithName, IrDeclarationParent {
-    abstract val statements: MutableList<IrStatement>
+    IrDeclarationBase(), IrSymbolDeclaration<IrScriptSymbol>, IrDeclarationWithName,
+    IrDeclarationParent, IrStatementContainer {
 
     // NOTE: is the result of the FE conversion, because there script interpreted as a class and has receiver
+    // TODO: consider removing from here and handle appropriately in the lowering
     abstract var thisReceiver: IrValueParameter
+
+    abstract var baseClass: IrType
+
+    abstract var explicitCallParameters: List<IrValueParameter>
+
+    abstract var implicitReceiversParameters: List<IrValueParameter>
+
+    abstract var providedProperties: List<Pair<IrValueParameter, IrPropertySymbol>>
+
+    abstract var resultProperty: IrPropertySymbol?
+
+    abstract var earlierScripts: List<IrScriptSymbol>?
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/MetadataSource.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/MetadataSource.kt
index f96927c50a6..e3e11a6d565 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/MetadataSource.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/MetadataSource.kt
@@ -14,7 +14,9 @@ interface MetadataSource {
     interface File : MetadataSource
     interface Class : MetadataSource
     interface Function : MetadataSource
-    interface Property : MetadataSource
+    interface Property : MetadataSource {
+        val isConst: Boolean
+    }
 }
 
 sealed class DescriptorMetadataSource : MetadataSource {
@@ -30,8 +32,12 @@ sealed class DescriptorMetadataSource : MetadataSource {
 
     class Function(override val descriptor: FunctionDescriptor) : DescriptorMetadataSource(), MetadataSource.Function
 
-    class Property(override val descriptor: PropertyDescriptor) : DescriptorMetadataSource(), MetadataSource.Property
+    class Property(override val descriptor: PropertyDescriptor) : DescriptorMetadataSource(), MetadataSource.Property {
+        override val isConst: Boolean get() = descriptor.isConst
+    }
 
     class LocalDelegatedProperty(override val descriptor: VariableDescriptorWithAccessors) : DescriptorMetadataSource(),
-        MetadataSource.Property
+        MetadataSource.Property {
+        override val isConst: Boolean get() = descriptor.isConst
+    }
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt
index 50a7d8db8a9..f72b8e59e3b 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt
@@ -11,14 +11,16 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 import org.jetbrains.kotlin.ir.symbols.IrScriptSymbol
+import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.util.transformInPlace
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.utils.SmartList
 
-private val SCRIPT_ORIGIN = object : IrDeclarationOriginImpl("FIELD_FOR_OBJECT_INSTANCE") {}
+private val SCRIPT_ORIGIN = object : IrDeclarationOriginImpl("SCRIPT") {}
 
 class IrScriptImpl(
     override val symbol: IrScriptSymbol,
@@ -38,11 +40,17 @@ class IrScriptImpl(
 
     override var annotations: List<IrConstructorCall> = SmartList()
 
-    override val declarations: MutableList<IrDeclaration> = mutableListOf()
     override val statements: MutableList<IrStatement> = mutableListOf()
 
     override lateinit var thisReceiver: IrValueParameter
 
+    override lateinit var baseClass: IrType
+    override lateinit var explicitCallParameters: List<IrValueParameter>
+    override lateinit var implicitReceiversParameters: List<IrValueParameter>
+    override lateinit var providedProperties: List<Pair<IrValueParameter, IrPropertySymbol>>
+    override var resultProperty: IrPropertySymbol? = null
+    override var earlierScripts: List<IrScriptSymbol>? = null
+
     @ObsoleteDescriptorBasedAPI
     override val descriptor: ScriptDescriptor
         get() = symbol.descriptor
@@ -59,14 +67,18 @@ class IrScriptImpl(
     }
 
     override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {
-        declarations.forEach { it.accept(visitor, data) }
         statements.forEach { it.accept(visitor, data) }
         thisReceiver.accept(visitor, data)
+        explicitCallParameters.forEach { it.accept(visitor, data) }
+        implicitReceiversParameters.forEach { it.accept(visitor, data) }
+        providedProperties.forEach { it.first.accept(visitor, data) }
     }
 
     override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
-        declarations.transformInPlace(transformer, data)
         statements.transformInPlace(transformer, data)
         thisReceiver = thisReceiver.transform(transformer, data)
+        explicitCallParameters = explicitCallParameters.map { it.transform(transformer, data) }
+        implicitReceiversParameters = implicitReceiversParameters.map { it.transform(transformer, data) }
+        providedProperties = providedProperties.map { it.first.transform(transformer, data) to it.second }
     }
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
index f4fd06ee9bf..d2309d11fcf 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
@@ -10,14 +10,15 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor
-import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyFunction
 import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyProperty
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.*
@@ -363,9 +364,9 @@ open class IrBasedVariableDescriptorWithAccessor(owner: IrLocalDelegatedProperty
     override fun isLateInit(): Boolean = false
 
     override val getter: VariableAccessorDescriptor?
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("not implemented")
     override val setter: VariableAccessorDescriptor?
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("not implemented")
     override val isDelegated: Boolean = true
 }
 
@@ -416,11 +417,11 @@ open class IrBasedSimpleFunctionDescriptor(owner: IrSimpleFunction) : SimpleFunc
         else CallableMemberDescriptor.Kind.SYNTHESIZED
 
     override fun copy(
-            newOwner: DeclarationDescriptor?,
-            modality: Modality?,
-            visibility: DescriptorVisibility?,
-            kind: CallableMemberDescriptor.Kind?,
-            copyOverrides: Boolean
+        newOwner: DeclarationDescriptor?,
+        modality: Modality?,
+        visibility: DescriptorVisibility?,
+        kind: CallableMemberDescriptor.Kind?,
+        copyOverrides: Boolean
     ): Nothing {
         TODO("not implemented")
     }
@@ -484,11 +485,11 @@ open class IrBasedClassConstructorDescriptor(owner: IrConstructor) : ClassConstr
     }
 
     override fun copy(
-            newOwner: DeclarationDescriptor,
-            modality: Modality,
-            visibility: DescriptorVisibility,
-            kind: CallableMemberDescriptor.Kind,
-            copyOverrides: Boolean
+        newOwner: DeclarationDescriptor,
+        modality: Modality,
+        visibility: DescriptorVisibility,
+        kind: CallableMemberDescriptor.Kind,
+        copyOverrides: Boolean
     ): ClassConstructorDescriptor {
         throw UnsupportedOperationException()
     }
@@ -556,11 +557,12 @@ open class IrBasedClassConstructorDescriptor(owner: IrConstructor) : ClassConstr
 
 fun IrConstructor.toIrBasedDescriptor() = IrBasedClassConstructorDescriptor(this)
 
-fun IrFunction.toIrBasedDescriptor(): FunctionDescriptor = when(this) {
-    is IrSimpleFunction -> toIrBasedDescriptor()
-    is IrConstructor -> toIrBasedDescriptor()
-    else -> error("Unknown function kind")
-}
+fun IrFunction.toIrBasedDescriptor(): FunctionDescriptor =
+    when (this) {
+        is IrSimpleFunction -> toIrBasedDescriptor()
+        is IrConstructor -> toIrBasedDescriptor()
+        else -> error("Unknown function kind")
+    }
 
 open class IrBasedClassDescriptor(owner: IrClass) : ClassDescriptor, IrBasedDeclarationDescriptor<IrClass>(owner) {
     override fun getName() = owner.name
@@ -590,7 +592,8 @@ open class IrBasedClassDescriptor(owner: IrClass) : ClassDescriptor, IrBasedDecl
 
     override fun getModality() = owner.modality
 
-    override fun getCompanionObjectDescriptor() = owner.declarations.filterIsInstance<IrClass>().firstOrNull { it.isCompanion }?.toIrBasedDescriptor()
+    override fun getCompanionObjectDescriptor() =
+        owner.declarations.filterIsInstance<IrClass>().firstOrNull { it.isCompanion }?.toIrBasedDescriptor()
 
     override fun getVisibility() = owner.visibility
 
@@ -632,13 +635,7 @@ open class IrBasedClassDescriptor(owner: IrClass) : ClassDescriptor, IrBasedDecl
     }
 
     private fun collectTypeParameters(): List<TypeParameterDescriptor> =
-        generateSequence(owner as IrTypeParametersContainer,
-                         { current ->
-                             val parent = current.parent as? IrTypeParametersContainer
-                             if (parent is IrClass && current is IrClass && !current.isInner) null
-                             else parent
-                         })
-            .flatMap { it.typeParameters }
+        owner.typeConstructorParameters
             .map { it.toIrBasedDescriptor() }
             .toList()
 
@@ -778,11 +775,11 @@ open class IrBasedPropertyDescriptor(owner: IrProperty) : PropertyDescriptor, Ir
     override fun getOverriddenDescriptors(): MutableCollection<out PropertyDescriptor> = mutableListOf()
 
     override fun copy(
-            newOwner: DeclarationDescriptor?,
-            modality: Modality?,
-            visibility: DescriptorVisibility?,
-            kind: CallableMemberDescriptor.Kind?,
-            copyOverrides: Boolean
+        newOwner: DeclarationDescriptor?,
+        modality: Modality?,
+        visibility: DescriptorVisibility?,
+        kind: CallableMemberDescriptor.Kind?,
+        copyOverrides: Boolean
     ): CallableMemberDescriptor {
         TODO("not implemented")
     }
@@ -822,13 +819,15 @@ open class IrBasedPropertyDescriptor(owner: IrProperty) : PropertyDescriptor, Ir
 
     override fun isVar() = owner.isVar
 
-    override fun getDispatchReceiverParameter() = owner.getter?.dispatchReceiverParameter?.toIrBasedDescriptor() as? ReceiverParameterDescriptor
+    override fun getDispatchReceiverParameter() =
+        owner.getter?.dispatchReceiverParameter?.toIrBasedDescriptor() as? ReceiverParameterDescriptor
 
     override fun isConst() = owner.isConst
 
     override fun isLateInit() = owner.isLateinit
 
-    override fun getExtensionReceiverParameter() = owner.getter?.extensionReceiverParameter?.toIrBasedDescriptor() as? ReceiverParameterDescriptor
+    override fun getExtensionReceiverParameter() =
+        owner.getter?.extensionReceiverParameter?.toIrBasedDescriptor() as? ReceiverParameterDescriptor
 
     override fun isExternal() = owner.isExternal
 
@@ -973,11 +972,11 @@ open class IrBasedFieldDescriptor(owner: IrField) : PropertyDescriptor, IrBasedD
     override fun getOverriddenDescriptors(): MutableCollection<out PropertyDescriptor> = mutableListOf()
 
     override fun copy(
-            newOwner: DeclarationDescriptor?,
-            modality: Modality?,
-            visibility: DescriptorVisibility?,
-            kind: CallableMemberDescriptor.Kind?,
-            copyOverrides: Boolean
+        newOwner: DeclarationDescriptor?,
+        modality: Modality?,
+        visibility: DescriptorVisibility?,
+        kind: CallableMemberDescriptor.Kind?,
+        copyOverrides: Boolean
     ): CallableMemberDescriptor {
         TODO("not implemented")
     }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt
index 3d5fced9fa4..56c6d5ed28a 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt
@@ -10,12 +10,13 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor
-import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.types.classifierOrFail
 import org.jetbrains.kotlin.ir.types.toKotlinType
+import org.jetbrains.kotlin.ir.types.typeConstructorParameters
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.*
@@ -612,13 +613,7 @@ open class WrappedClassDescriptor : ClassDescriptor, WrappedDeclarationDescripto
     }
 
     private fun collectTypeParameters(): List<TypeParameterDescriptor> =
-        generateSequence(owner as IrTypeParametersContainer,
-                         { current ->
-                             val parent = current.parent as? IrTypeParametersContainer
-                             if (parent is IrClass && current is IrClass && !current.isInner) null
-                             else parent
-                         })
-            .flatMap { it.typeParameters }
+        owner.typeConstructorParameters
             .map { it.descriptor }
             .toList()
 
@@ -644,6 +639,122 @@ open class WrappedClassDescriptor : ClassDescriptor, WrappedDeclarationDescripto
     }
 }
 
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+open class WrappedScriptDescriptor : ScriptDescriptor, WrappedDeclarationDescriptor<IrScript>() {
+    override fun getName() = owner.name
+
+    override fun getMemberScope(typeArguments: MutableList<out TypeProjection>) = MemberScope.Empty
+
+    override fun getMemberScope(typeSubstitution: TypeSubstitution) = MemberScope.Empty
+
+    override fun getUnsubstitutedMemberScope() = MemberScope.Empty
+
+    override fun getUnsubstitutedInnerClassesScope() = MemberScope.Empty
+
+    override fun getStaticScope() = MemberScope.Empty
+
+    override fun getSource(): SourceElement = SourceElement.NO_SOURCE
+
+    override fun getConstructors() =
+        owner.statements.filterIsInstance<IrConstructor>().filter { !it.origin.isSynthetic }.map { it.descriptor }.toList()
+
+    override fun getContainingDeclaration() = (owner.parent as IrSymbolOwner).symbol.descriptor
+
+    private val _defaultType: SimpleType by lazy {
+        TypeUtils.makeUnsubstitutedType(this, unsubstitutedMemberScope, KotlinTypeFactory.EMPTY_REFINED_TYPE_FACTORY)
+    }
+
+    override fun getDefaultType(): SimpleType = _defaultType
+
+    override fun getKind() = TODO()
+
+    override fun getModality() = TODO()
+
+    override fun getCompanionObjectDescriptor() = owner.statements.filterIsInstance<IrClass>().firstOrNull { it.isCompanion }?.descriptor
+
+    override fun getVisibility() = TODO()
+
+    override fun isCompanionObject() = false
+
+    override fun isData() = false
+
+    override fun isInline() = false
+
+    override fun isFun() = false
+
+    override fun getThisAsReceiverParameter() = owner.thisReceiver.descriptor as ReceiverParameterDescriptor
+
+    override fun getUnsubstitutedPrimaryConstructor() = TODO()
+
+    override fun getDeclaredTypeParameters() = TODO()
+
+    override fun getSealedSubclasses(): Collection<ClassDescriptor> {
+        TODO("not implemented")
+    }
+
+    override fun getOriginal() = this
+
+    override fun isExpect() = false
+
+    override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters =
+        throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
+
+    override fun isInner(): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun isActual() = false
+
+    override fun isExternal(): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun getTypeConstructor(): TypeConstructor = TODO()
+
+    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R =
+        visitor!!.visitClassDescriptor(this, data)
+
+    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
+        visitor!!.visitClassDescriptor(this, null)
+    }
+
+    override fun getDefaultFunctionTypeForSamInterface(): SimpleType? {
+        TODO("not yet implemented")
+    }
+
+    override fun isDefinitelyNotSamInterface(): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun getPriority(): Int {
+        TODO("Not yet implemented")
+    }
+
+    override fun getExplicitConstructorParameters(): MutableList<ValueParameterDescriptor> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getImplicitReceiversParameters(): MutableList<ValueParameterDescriptor> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getScriptProvidedPropertiesParameters(): MutableList<ValueParameterDescriptor> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getImplicitReceivers(): MutableList<ClassDescriptor> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getScriptProvidedProperties(): MutableList<PropertyDescriptor> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getResultValue(): PropertyDescriptor? {
+        TODO("Not yet implemented")
+    }
+}
+
 class LazyTypeConstructor(
     val classDescriptor: ClassDescriptor,
     val parametersBuilder: () -> List<TypeParameterDescriptor>,
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFunctionAccessExpression.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFunctionAccessExpression.kt
index 2151d2c0d7a..ac1c7d94245 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFunctionAccessExpression.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFunctionAccessExpression.kt
@@ -21,14 +21,14 @@ abstract class IrFunctionAccessExpression(
 
     override fun getValueArgument(index: Int): IrExpression? {
         if (index >= valueArgumentsCount) {
-            throw AssertionError("$this: No such value argument slot: $index")
+            throwNoSuchArgumentSlotException("value", index, valueArgumentsCount)
         }
         return argumentsByParameterIndex[index]
     }
 
     override fun putValueArgument(index: Int, valueArgument: IrExpression?) {
         if (index >= valueArgumentsCount) {
-            throw AssertionError("$this: No such value argument slot: $index")
+            throwNoSuchArgumentSlotException("value", index, valueArgumentsCount)
         }
         argumentsByParameterIndex[index] = valueArgument
     }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrMemberAccessExpression.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrMemberAccessExpression.kt
index 394038a7609..ce7396bdbc8 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrMemberAccessExpression.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrMemberAccessExpression.kt
@@ -39,14 +39,14 @@ abstract class IrMemberAccessExpression<S : IrSymbol>(typeArgumentsCount: Int) :
 
     fun getTypeArgument(index: Int): IrType? {
         if (index >= typeArgumentsCount) {
-            throw AssertionError("$this: No such type argument slot: $index")
+            throwNoSuchArgumentSlotException("type", index, typeArgumentsCount)
         }
         return typeArgumentsByIndex[index]
     }
 
     fun putTypeArgument(index: Int, type: IrType?) {
         if (index >= typeArgumentsCount) {
-            throw AssertionError("$this: No such type argument slot: $index")
+            throwNoSuchArgumentSlotException("type", index, typeArgumentsCount)
         }
         typeArgumentsByIndex[index] = type
     }
@@ -62,6 +62,13 @@ abstract class IrMemberAccessExpression<S : IrSymbol>(typeArgumentsCount: Int) :
     }
 }
 
+internal fun IrMemberAccessExpression<*>.throwNoSuchArgumentSlotException(kind: String, index: Int, total: Int): Nothing {
+    throw AssertionError(
+        "No such $kind argument slot in ${this::class.java.simpleName}: $index (total=$total)" +
+                (symbol.signature?.let { ".\nSymbol: $it" } ?: "")
+    )
+}
+
 fun IrMemberAccessExpression<*>.getTypeArgument(typeParameterDescriptor: TypeParameterDescriptor): IrType? =
     getTypeArgument(typeParameterDescriptor.index)
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt
index d9cf941740f..d11dfe3230b 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt
@@ -69,7 +69,7 @@ interface IrClassifierSymbol : IrSymbol, TypeConstructorMarker {
 
 interface IrClassSymbol : IrClassifierSymbol, IrBindableSymbol<ClassDescriptor, IrClass>
 
-interface IrScriptSymbol : IrSymbol, IrBindableSymbol<ScriptDescriptor, IrScript>
+interface IrScriptSymbol : IrClassifierSymbol, IrBindableSymbol<ScriptDescriptor, IrScript>
 
 interface IrTypeParameterSymbol : IrClassifierSymbol, IrBindableSymbol<TypeParameterDescriptor, IrTypeParameter>, TypeParameterMarker
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeCheckerContext.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeCheckerContext.kt
index f18f9e93ecf..2fe6f32b8b9 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeCheckerContext.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeCheckerContext.kt
@@ -8,9 +8,7 @@ package org.jetbrains.kotlin.ir.types
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.types.AbstractTypeCheckerContext
-import org.jetbrains.kotlin.types.model.KotlinTypeMarker
-import org.jetbrains.kotlin.types.model.SimpleTypeMarker
-import org.jetbrains.kotlin.types.model.TypeConstructorMarker
+import org.jetbrains.kotlin.types.model.*
 
 open class IrTypeCheckerContext(override val irBuiltIns: IrBuiltIns) : IrTypeSystemContext, AbstractTypeCheckerContext() {
 
@@ -39,7 +37,25 @@ open class IrTypeCheckerContext(override val irBuiltIns: IrBuiltIns) : IrTypeSys
     ): AbstractTypeCheckerContext = IrTypeCheckerContext(irBuiltIns)
 
     override fun KotlinTypeMarker.isUninferredParameter(): Boolean = false
+    override fun KotlinTypeMarker.withNullability(nullable: Boolean): KotlinTypeMarker {
+        if (this.isSimpleType()) {
+            return this.asSimpleType()!!.withNullability(nullable)
+        } else {
+            error("withNullability for non-simple types is not supported in IR")
+        }
+    }
 
     override fun captureFromExpression(type: KotlinTypeMarker): KotlinTypeMarker? =
         error("Captured type is unsupported in IR")
+
+    override fun DefinitelyNotNullTypeMarker.original(): SimpleTypeMarker =
+        error("DefinitelyNotNull type is unsupported in IR")
+
+    override fun KotlinTypeMarker.makeDefinitelyNotNullOrNotNull(): KotlinTypeMarker {
+        error("makeDefinitelyNotNullOrNotNull is not supported in IR")
+    }
+
+    override fun SimpleTypeMarker.makeSimpleTypeDefinitelyNotNullOrNotNull(): SimpleTypeMarker {
+        error("makeSimpleTypeDefinitelyNotNullOrNotNull is not yet supported in IR")
+    }
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt
index 99acfb35440..21d5d108720 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt
@@ -389,7 +389,6 @@ fun extractTypeParameters(klass: IrDeclarationParent): List<IrTypeParameter> {
     val result = mutableListOf<IrTypeParameter>()
     var current: IrDeclarationParent? = klass
     while (current != null) {
-//        result += current.typeParameters
         (current as? IrTypeParametersContainer)?.let { result += it.typeParameters }
         current =
             when (current) {
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypes.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypes.kt
index c9a4c157a3f..f7f14c8288d 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypes.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypes.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
+import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
@@ -50,6 +51,18 @@ fun IrType.addAnnotations(newAnnotations: List<IrConstructorCall>): IrType =
             this
     }
 
+fun IrType.removeAnnotations(predicate: (IrConstructorCall) -> Boolean): IrType =
+    when (this) {
+        is IrSimpleType ->
+            toBuilder().apply {
+                annotations = annotations.filterNot(predicate)
+            }.buildSimpleType()
+        is IrDynamicType ->
+            IrDynamicTypeImpl(null, annotations.filterNot(predicate), Variance.INVARIANT)
+        else ->
+            this
+    }
+
 val IrType.classifierOrFail: IrClassifierSymbol
     get() = cast<IrSimpleType>().classifier
 
@@ -137,10 +150,19 @@ val IrClassSymbol.starProjectedType: IrSimpleType
     get() = IrSimpleTypeImpl(
         this,
         hasQuestionMark = false,
-        arguments = owner.typeParameters.map { IrStarProjectionImpl },
+        arguments = owner.typeConstructorParameters.map { IrStarProjectionImpl }.toList(),
         annotations = emptyList()
     )
 
+val IrClass.typeConstructorParameters: Sequence<IrTypeParameter>
+    get() = generateSequence(this as IrTypeParametersContainer,
+                             { current ->
+                                 val parent = current.parent as? IrTypeParametersContainer
+                                 if (parent is IrClass && current is IrClass && !current.isInner) null
+                                 else parent
+                             })
+        .flatMap { it.typeParameters }
+
 fun IrClassifierSymbol.typeWithParameters(parameters: List<IrTypeParameter>): IrSimpleType =
     typeWith(parameters.map { it.defaultType })
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt
index d7431b7079f..98c65048016 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt
@@ -245,3 +245,7 @@ fun IrClassSymbol.getPropertySetter(name: String): IrSimpleFunctionSymbol? = own
 
 inline fun MemberScope.findFirstFunction(name: String, predicate: (CallableMemberDescriptor) -> Boolean) =
     getContributedFunctions(Name.identifier(name), NoLookupLocation.FROM_BACKEND).first(predicate)
+
+fun filterOutAnnotations(fqName: FqName, annotations: List<IrConstructorCall>): List<IrConstructorCall> {
+    return annotations.filterNot { it.annotationClass.hasEqualFqName(fqName) }
+}
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt
index 2a1bc1313d4..70b5b5214d3 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt
@@ -114,13 +114,14 @@ open class DeepCopyIrTreeWithSymbols(
 
     override fun visitScript(declaration: IrScript): IrStatement {
         return IrScriptImpl(
-            //TODO: something may go wrong, because expected using symbolRemapper
-            IrScriptSymbolImpl(declaration.descriptor as ScriptDescriptor),
+            symbolRemapper.getDeclaredScript(declaration.symbol),
             declaration.name
-        ).also {
-            it.thisReceiver = declaration.thisReceiver.transform()
-            declaration.transformDeclarationsTo(it)
-            it.statements.addAll(declaration.statements.map { it.transform() })
+        ).also { scriptCopy ->
+            scriptCopy.thisReceiver = declaration.thisReceiver.transform()
+            declaration.statements.mapTo(scriptCopy.statements) { it.transform() }
+            scriptCopy.explicitCallParameters = declaration.explicitCallParameters.map { it.transform() }
+            scriptCopy.implicitReceiversParameters = declaration.implicitReceiversParameters.map { it.transform() }
+            scriptCopy.providedProperties = declaration.providedProperties.map { it.first.transform() to it.second }
         }
     }
 
@@ -227,6 +228,7 @@ open class DeepCopyIrTreeWithSymbols(
             containerSource = declaration.containerSource,
         ).apply {
             transformAnnotations(declaration)
+            copyAttributes(declaration)
             this.backingField = declaration.backingField?.transform()?.also {
                 it.correspondingPropertySymbol = symbol
             }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt
index 1684ffb2b49..f37a0ad690a 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt
@@ -33,6 +33,7 @@ open class DeepCopySymbolRemapper(
 ) : IrElementVisitorVoid, SymbolRemapper {
 
     private val classes = hashMapOf<IrClassSymbol, IrClassSymbol>()
+    private val scripts = hashMapOf<IrScriptSymbol, IrScriptSymbol>()
     private val constructors = hashMapOf<IrConstructorSymbol, IrConstructorSymbol>()
     private val enumEntries = hashMapOf<IrEnumEntrySymbol, IrEnumEntrySymbol>()
     private val externalPackageFragments = hashMapOf<IrExternalPackageFragmentSymbol, IrExternalPackageFragmentSymbol>()
@@ -64,6 +65,13 @@ open class DeepCopySymbolRemapper(
         declaration.acceptChildrenVoid(this)
     }
 
+    override fun visitScript(declaration: IrScript) {
+        remapSymbol(scripts, declaration) {
+            IrScriptSymbolImpl(descriptorsRemapper.remapDeclaredScript(it.descriptor))
+        }
+        declaration.acceptChildrenVoid(this)
+    }
+
     override fun visitConstructor(declaration: IrConstructor) {
         remapSymbol(constructors, declaration) {
             IrConstructorSymbolImpl(descriptorsRemapper.remapDeclaredConstructor(it.descriptor))
@@ -166,6 +174,7 @@ open class DeepCopySymbolRemapper(
         getOrElse(symbol) { symbol }
 
     override fun getDeclaredClass(symbol: IrClassSymbol): IrClassSymbol = classes.getDeclared(symbol)
+    override fun getDeclaredScript(symbol: IrScriptSymbol): IrScriptSymbol = scripts.getDeclared(symbol)
     override fun getDeclaredFunction(symbol: IrSimpleFunctionSymbol): IrSimpleFunctionSymbol = functions.getDeclared(symbol)
     override fun getDeclaredProperty(symbol: IrPropertySymbol): IrPropertySymbol = properties.getDeclared(symbol)
     override fun getDeclaredField(symbol: IrFieldSymbol): IrFieldSymbol = fields.getDeclared(symbol)
@@ -184,6 +193,7 @@ open class DeepCopySymbolRemapper(
     override fun getDeclaredTypeAlias(symbol: IrTypeAliasSymbol): IrTypeAliasSymbol = typeAliases.getDeclared(symbol)
 
     override fun getReferencedClass(symbol: IrClassSymbol): IrClassSymbol = classes.getReferenced(symbol)
+    override fun getReferencedScript(symbol: IrScriptSymbol): IrScriptSymbol = scripts.getReferenced(symbol)
     override fun getReferencedClassOrNull(symbol: IrClassSymbol?): IrClassSymbol? = symbol?.let { classes.getReferenced(it) }
     override fun getReferencedEnumEntry(symbol: IrEnumEntrySymbol): IrEnumEntrySymbol = enumEntries.getReferenced(symbol)
     override fun getReferencedVariable(symbol: IrVariableSymbol): IrVariableSymbol = variables.getReferenced(symbol)
@@ -214,6 +224,7 @@ open class DeepCopySymbolRemapper(
     override fun getReferencedClassifier(symbol: IrClassifierSymbol): IrClassifierSymbol =
         when (symbol) {
             is IrClassSymbol -> classes.getReferenced(symbol)
+            is IrScriptSymbol -> scripts.getReferenced(symbol)
             is IrTypeParameterSymbol -> typeParameters.getReferenced(symbol)
             else -> throw IllegalArgumentException("Unexpected symbol $symbol")
         }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsRemapper.kt
index 6be2012e176..68c121e3e86 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsRemapper.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.descriptors.*
 
 interface DescriptorsRemapper {
     fun remapDeclaredClass(descriptor: ClassDescriptor): ClassDescriptor = descriptor
+    fun remapDeclaredScript(descriptor: ScriptDescriptor): ScriptDescriptor = descriptor
     fun remapDeclaredConstructor(descriptor: ClassConstructorDescriptor): ClassConstructorDescriptor = descriptor
     fun remapDeclaredEnumEntry(descriptor: ClassDescriptor): ClassDescriptor = descriptor
     fun remapDeclaredExternalPackageFragment(descriptor: PackageFragmentDescriptor): PackageFragmentDescriptor = descriptor
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/InlineClasses.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/InlineClasses.kt
index 15499835b6d..9452afa3261 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/InlineClasses.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/InlineClasses.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.ir.declarations.IrConstructor
 import org.jetbrains.kotlin.ir.declarations.IrField
 import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.IrScriptSymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.IrType
@@ -51,6 +52,7 @@ private tailrec fun erase(type: IrType): IrClass? {
 
     return when (classifier) {
         is IrClassSymbol -> classifier.owner
+        is IrScriptSymbol -> null // TODO: check if correct
         is IrTypeParameterSymbol -> erase(classifier.owner.superTypes.first())
         else -> error(classifier)
     }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrFakeOverrideUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrFakeOverrideUtils.kt
index 3e91a6faf67..5639181114c 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrFakeOverrideUtils.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrFakeOverrideUtils.kt
@@ -30,20 +30,29 @@ val IrFunction.target: IrFunction get() = when (this) {
     else -> error(this)
 }
 
-fun IrSimpleFunction.collectRealOverrides(toSkip: (IrSimpleFunction) -> Boolean = { false }): Set<IrSimpleFunction> {
+fun IrSimpleFunction.collectRealOverrides(
+    toSkip: (IrSimpleFunction) -> Boolean = { false },
+    filter: (IrOverridableMember) -> Boolean = { false }
+): Set<IrSimpleFunction> {
     if (isReal && !toSkip(this)) return setOf(this)
 
     return this.overriddenSymbols
         .map { it.owner }
-        .collectAndFilterRealOverrides {
-            require(it is IrSimpleFunction) { "Expected IrSimpleFunction: ${it.render()}" }
-            toSkip(it)
-        }
+        .collectAndFilterRealOverrides(
+            {
+                require(it is IrSimpleFunction) { "Expected IrSimpleFunction: ${it.render()}" }
+                toSkip(it)
+            },
+            filter
+        )
         .map { it as IrSimpleFunction }
         .toSet()
 }
 
-fun Collection<IrOverridableMember>.collectAndFilterRealOverrides(toSkip: (IrOverridableMember) -> Boolean = { false }): Set<IrOverridableMember> {
+fun Collection<IrOverridableMember>.collectAndFilterRealOverrides(
+    toSkip: (IrOverridableMember) -> Boolean = { false },
+    filter: (IrOverridableMember) -> Boolean = { false }
+): Set<IrOverridableMember> {
 
     val visited = mutableSetOf<IrOverridableMember>()
     val realOverrides = mutableSetOf<IrOverridableMember>()
@@ -57,7 +66,7 @@ fun Collection<IrOverridableMember>.collectAndFilterRealOverrides(toSkip: (IrOve
     }
 
     fun collectRealOverrides(member: IrOverridableMember) {
-        if (!visited.add(member)) return
+        if (!visited.add(member) || filter(member)) return
 
         if (member.isReal && !toSkip(member)) {
             realOverrides += member
@@ -85,13 +94,12 @@ fun Collection<IrOverridableMember>.collectAndFilterRealOverrides(toSkip: (IrOve
 
 // TODO: use this implementation instead of any other
 fun IrSimpleFunction.resolveFakeOverride(allowAbstract: Boolean = false, toSkip: (IrSimpleFunction) -> Boolean = { false }): IrSimpleFunction? {
-    val reals = collectRealOverrides(toSkip)
     return if (allowAbstract) {
+        val reals = collectRealOverrides(toSkip)
         if (reals.isEmpty()) error("No real overrides for ${this.render()}")
         reals.first()
     } else {
-        reals
-            .filter { it.modality != Modality.ABSTRACT }
+        collectRealOverrides(toSkip, { it.modality == Modality.ABSTRACT })
             .let { realOverrides ->
                 // Kotlin forbids conflicts between overrides, but they may trickle down from Java.
                 realOverrides.singleOrNull { it.parent.safeAs<IrClass>()?.isInterface != true }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
index cb63dd7e753..2529dc3df0e 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
@@ -401,14 +401,16 @@ fun irCall(
     newFunction: IrSimpleFunction,
     receiversAsArguments: Boolean = false,
     argumentsAsReceivers: Boolean = false,
-    newSuperQualifierSymbol: IrClassSymbol? = null
+    newSuperQualifierSymbol: IrClassSymbol? = null,
+    newReturnType: IrType? = null
 ): IrCall =
     irCall(
         call,
         newFunction.symbol,
         receiversAsArguments,
         argumentsAsReceivers,
-        newSuperQualifierSymbol
+        newSuperQualifierSymbol,
+        newReturnType
     )
 
 fun irCall(
@@ -416,13 +418,14 @@ fun irCall(
     newSymbol: IrSimpleFunctionSymbol,
     receiversAsArguments: Boolean = false,
     argumentsAsReceivers: Boolean = false,
-    newSuperQualifierSymbol: IrClassSymbol? = null
+    newSuperQualifierSymbol: IrClassSymbol? = null,
+    newReturnType: IrType? = null
 ): IrCall =
     call.run {
         IrCallImpl(
             startOffset,
             endOffset,
-            type,
+            newReturnType ?: type,
             newSymbol,
             typeArgumentsCount,
             valueArgumentsCount = newSymbol.owner.valueParameters.size,
@@ -512,10 +515,27 @@ val IrFunction.allTypeParameters: List<IrTypeParameter>
     else
         typeParameters
 
-fun IrMemberAccessExpression<*>.getTypeSubstitutionMap(irFunction: IrFunction): Map<IrTypeParameterSymbol, IrType> =
-    irFunction.allTypeParameters.withIndex().associate {
+
+fun IrMemberAccessExpression<*>.getTypeSubstitutionMap(irFunction: IrFunction): Map<IrTypeParameterSymbol, IrType> {
+    val typeParameters = irFunction.allTypeParameters
+    val dispatchReceiverTypeArguments = (dispatchReceiver?.type as? IrSimpleType)?.arguments ?: emptyList()
+    if (typeParameters.isEmpty() && dispatchReceiverTypeArguments.isEmpty()) {
+        return emptyMap()
+    }
+
+    val result = mutableMapOf<IrTypeParameterSymbol, IrType>()
+    if (dispatchReceiverTypeArguments.isNotEmpty()) {
+        val parentTypeParameters = extractTypeParameters(irFunction.parentClassOrNull!!)
+        parentTypeParameters.withIndex().forEach { (index, typeParam) ->
+            dispatchReceiverTypeArguments[index].typeOrNull?.let {
+                result[typeParam.symbol] = it
+            }
+        }
+    }
+    return typeParameters.withIndex().associateTo(result) {
         it.value.symbol to getTypeArgument(it.index)!!
     }
+}
 
 val IrFunctionReference.typeSubstitutionMap: Map<IrTypeParameterSymbol, IrType>
     get() = getTypeSubstitutionMap(symbol.owner)
@@ -524,7 +544,10 @@ val IrFunctionAccessExpression.typeSubstitutionMap: Map<IrTypeParameterSymbol, I
     get() = getTypeSubstitutionMap(symbol.owner)
 
 val IrDeclaration.isFileClass: Boolean
-    get() = origin == IrDeclarationOrigin.FILE_CLASS || origin == IrDeclarationOrigin.SYNTHETIC_FILE_CLASS
+    get() =
+        origin == IrDeclarationOrigin.FILE_CLASS ||
+                origin == IrDeclarationOrigin.SYNTHETIC_FILE_CLASS ||
+                origin == IrDeclarationOrigin.JVM_MULTIFILE_CLASS
 
 val IrValueDeclaration.isImmutable: Boolean
     get() = this is IrValueParameter || this is IrVariable && !isVar
@@ -536,4 +559,4 @@ val IrFunction.originalFunction: IrFunction
     get() = (this as? IrAttributeContainer)?.attributeOwnerId as? IrFunction ?: this
 
 val IrProperty.originalProperty: IrProperty
-    get() = attributeOwnerId as? IrProperty ?: this
\ No newline at end of file
+    get() = attributeOwnerId as? IrProperty ?: this
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
index f8ac4d8ed9a..cc6d908565d 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
@@ -743,6 +743,7 @@ internal fun IrClassifierSymbol.renderClassifierFqn(): String =
     if (isBound)
         when (val owner = owner) {
             is IrClass -> owner.renderClassFqn()
+            is IrScript -> owner.renderScriptFqn()
             is IrTypeParameter -> owner.renderTypeParameterFqn()
             else -> "`unexpected classifier: ${owner.render()}`"
         }
@@ -758,6 +759,9 @@ internal fun IrTypeAliasSymbol.renderTypeAliasFqn(): String =
 internal fun IrClass.renderClassFqn(): String =
     StringBuilder().also { renderDeclarationFqn(it) }.toString()
 
+internal fun IrScript.renderScriptFqn(): String =
+    StringBuilder().also { renderDeclarationFqn(it) }.toString()
+
 internal fun IrTypeParameter.renderTypeParameterFqn(): String =
     StringBuilder().also { sb ->
         sb.append(name.asString())
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SimpleTypeRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SimpleTypeRemapper.kt
new file mode 100644
index 00000000000..cf6ef7b9749
--- /dev/null
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SimpleTypeRemapper.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.ir.util
+
+import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
+import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
+import org.jetbrains.kotlin.ir.types.impl.IrTypeAbbreviationImpl
+import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
+
+class SimpleTypeRemapper(
+    private val symbolRemapper: SymbolRemapper
+) : TypeRemapper {
+
+    override fun enterScope(irTypeParametersContainer: IrTypeParametersContainer) {
+    }
+
+    override fun leaveScope() {
+    }
+
+    override fun remapType(type: IrType): IrType =
+        if (type !is IrSimpleType)
+            type
+        else {
+            val symbol = symbolRemapper.getReferencedClassifier(type.classifier)
+            val arguments = type.arguments.map { remapTypeArgument(it) }
+            if (symbol == type.classifier && arguments == type.arguments)
+                type
+            else {
+                IrSimpleTypeImpl(
+                    null,
+                    symbol,
+                    type.hasQuestionMark,
+                    arguments,
+                    type.annotations,
+                    type.abbreviation?.remapTypeAbbreviation()
+                )
+            }
+        }
+
+    private fun remapTypeArgument(typeArgument: IrTypeArgument): IrTypeArgument =
+        if (typeArgument is IrTypeProjection)
+            makeTypeProjection(this.remapType(typeArgument.type), typeArgument.variance)
+        else
+            typeArgument
+
+    private fun IrTypeAbbreviation.remapTypeAbbreviation() =
+        IrTypeAbbreviationImpl(
+            symbolRemapper.getReferencedTypeAlias(typeAlias),
+            hasQuestionMark,
+            arguments.map { remapTypeArgument(it) },
+            annotations
+        )
+}
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolRemapper.kt
index 2f57081ef81..a2763a0f36f 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolRemapper.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.ir.symbols.*
 
 interface SymbolRemapper {
     fun getDeclaredClass(symbol: IrClassSymbol): IrClassSymbol
+    fun getDeclaredScript(symbol: IrScriptSymbol): IrScriptSymbol
     fun getDeclaredFunction(symbol: IrSimpleFunctionSymbol): IrSimpleFunctionSymbol
     fun getDeclaredProperty(symbol: IrPropertySymbol): IrPropertySymbol
     fun getDeclaredField(symbol: IrFieldSymbol): IrFieldSymbol
@@ -34,6 +35,7 @@ interface SymbolRemapper {
     fun getDeclaredTypeAlias(symbol: IrTypeAliasSymbol): IrTypeAliasSymbol
 
     fun getReferencedClass(symbol: IrClassSymbol): IrClassSymbol
+    fun getReferencedScript(symbol: IrScriptSymbol): IrScriptSymbol
     fun getReferencedClassOrNull(symbol: IrClassSymbol?): IrClassSymbol?
     fun getReferencedEnumEntry(symbol: IrEnumEntrySymbol): IrEnumEntrySymbol
     fun getReferencedVariable(symbol: IrVariableSymbol): IrVariableSymbol
@@ -47,4 +49,65 @@ interface SymbolRemapper {
     fun getReferencedReturnableBlock(symbol: IrReturnableBlockSymbol): IrReturnableBlockSymbol
     fun getReferencedClassifier(symbol: IrClassifierSymbol): IrClassifierSymbol
     fun getReferencedTypeAlias(symbol: IrTypeAliasSymbol): IrTypeAliasSymbol
+
+    open class Empty : SymbolRemapper {
+        override fun getDeclaredClass(symbol: IrClassSymbol): IrClassSymbol = symbol
+
+        override fun getDeclaredScript(symbol: IrScriptSymbol): IrScriptSymbol = symbol
+
+        override fun getDeclaredFunction(symbol: IrSimpleFunctionSymbol): IrSimpleFunctionSymbol = symbol
+
+        override fun getDeclaredProperty(symbol: IrPropertySymbol): IrPropertySymbol = symbol
+
+        override fun getDeclaredField(symbol: IrFieldSymbol): IrFieldSymbol = symbol
+
+        override fun getDeclaredFile(symbol: IrFileSymbol): IrFileSymbol = symbol
+
+        override fun getDeclaredConstructor(symbol: IrConstructorSymbol): IrConstructorSymbol = symbol
+
+        override fun getDeclaredEnumEntry(symbol: IrEnumEntrySymbol): IrEnumEntrySymbol = symbol
+
+        override fun getDeclaredExternalPackageFragment(symbol: IrExternalPackageFragmentSymbol): IrExternalPackageFragmentSymbol = symbol
+
+        override fun getDeclaredVariable(symbol: IrVariableSymbol): IrVariableSymbol = symbol
+
+        override fun getDeclaredLocalDelegatedProperty(symbol: IrLocalDelegatedPropertySymbol): IrLocalDelegatedPropertySymbol = symbol
+
+        override fun getDeclaredTypeParameter(symbol: IrTypeParameterSymbol): IrTypeParameterSymbol = symbol
+
+        override fun getDeclaredValueParameter(symbol: IrValueParameterSymbol): IrValueParameterSymbol = symbol
+
+        override fun getDeclaredTypeAlias(symbol: IrTypeAliasSymbol): IrTypeAliasSymbol = symbol
+
+        override fun getReferencedClass(symbol: IrClassSymbol): IrClassSymbol = symbol
+
+        override fun getReferencedScript(symbol: IrScriptSymbol): IrScriptSymbol = symbol
+
+        override fun getReferencedClassOrNull(symbol: IrClassSymbol?): IrClassSymbol? = symbol
+
+        override fun getReferencedEnumEntry(symbol: IrEnumEntrySymbol): IrEnumEntrySymbol = symbol
+
+        override fun getReferencedVariable(symbol: IrVariableSymbol): IrVariableSymbol = symbol
+
+        override fun getReferencedLocalDelegatedProperty(symbol: IrLocalDelegatedPropertySymbol): IrLocalDelegatedPropertySymbol = symbol
+
+        override fun getReferencedField(symbol: IrFieldSymbol): IrFieldSymbol = symbol
+
+        override fun getReferencedConstructor(symbol: IrConstructorSymbol): IrConstructorSymbol = symbol
+
+        override fun getReferencedValue(symbol: IrValueSymbol): IrValueSymbol = symbol
+
+        override fun getReferencedFunction(symbol: IrFunctionSymbol): IrFunctionSymbol = symbol
+
+        override fun getReferencedProperty(symbol: IrPropertySymbol): IrPropertySymbol = symbol
+
+        override fun getReferencedSimpleFunction(symbol: IrSimpleFunctionSymbol): IrSimpleFunctionSymbol = symbol
+
+        override fun getReferencedReturnableBlock(symbol: IrReturnableBlockSymbol): IrReturnableBlockSymbol = symbol
+
+        override fun getReferencedClassifier(symbol: IrClassifierSymbol): IrClassifierSymbol = symbol
+
+        override fun getReferencedTypeAlias(symbol: IrTypeAliasSymbol): IrTypeAliasSymbol = symbol
+    }
+
 }
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
index 6e90cca0ef1..510a5b7d7bb 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
@@ -31,12 +31,15 @@ import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.symbols.impl.*
 import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DescriptorWithContainerSource
 
 interface ReferenceSymbolTable {
     fun referenceClass(descriptor: ClassDescriptor): IrClassSymbol
 
+    fun referenceScript(descriptor: ScriptDescriptor): IrScriptSymbol
+
     fun referenceConstructor(descriptor: ClassConstructorDescriptor): IrConstructorSymbol
 
     fun referenceEnumEntry(descriptor: ClassDescriptor): IrEnumEntrySymbol
@@ -83,7 +86,7 @@ class SymbolTable(
     @Suppress("LeakingThis")
     val lazyWrapper = IrLazySymbolTable(this)
 
-    private abstract inner class SymbolTableBase<D : DeclarationDescriptor, B : IrSymbolOwner, S : IrBindableSymbol<D, B>> {
+    private abstract class SymbolTableBase<D : DeclarationDescriptor, B : IrSymbolOwner, S : IrBindableSymbol<D, B>> {
         val unboundSymbols = linkedSetOf<S>()
 
         abstract fun get(d: D): S?
@@ -397,7 +400,19 @@ class SymbolTable(
         )
     }
 
-    fun referenceScript(descriptor: ScriptDescriptor): IrScriptSymbol {
+    fun declareScript(
+        sig: IdSignature,
+        symbolFactory: () -> IrScriptSymbol,
+        classFactory: (IrScriptSymbol) -> IrScript
+    ): IrScript {
+        return scriptSymbolTable.declare(
+            sig,
+            symbolFactory,
+            classFactory
+        )
+    }
+
+    override fun referenceScript(descriptor: ScriptDescriptor): IrScriptSymbol {
         return scriptSymbolTable.referenced(descriptor) { IrScriptSymbolImpl(descriptor) }
     }
 
@@ -893,9 +908,10 @@ class SymbolTable(
         descriptor: ParameterDescriptor,
         type: IrType,
         varargElementType: IrType? = null,
+        name: Name? = null,
         valueParameterFactory: (IrValueParameterSymbol) -> IrValueParameter = {
             irFactory.createValueParameter(
-                startOffset, endOffset, origin, it, nameProvider.nameForDeclaration(descriptor),
+                startOffset, endOffset, origin, it, name ?: nameProvider.nameForDeclaration(descriptor),
                 descriptor.indexOrMinusOne, type, varargElementType, descriptor.isCrossinline, descriptor.isNoinline, false
             )
         }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
index c09848f00f5..4a7e673a1fc 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
@@ -8,10 +8,8 @@ package org.jetbrains.kotlin.ir.util
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
-import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
@@ -119,6 +117,9 @@ class TypeTranslator(
                     annotations = translateTypeAnnotations(upperType, approximatedType)
                 }
 
+                is ScriptDescriptor -> {
+                    classifier = symbolTable.referenceScript(upperTypeDescriptor)
+                }
                 is ClassDescriptor -> {
                     // Types such as 'java.util.Collection<? extends CharSequence>' are treated as
                     // '( kotlin.collections.MutableCollection<out kotlin.CharSequence!>
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/transform.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/transform.kt
index 77496f9351e..95601418c3c 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/transform.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/transform.kt
@@ -46,19 +46,42 @@ inline fun <T> MutableList<T>.transformFlat(transformation: (T) -> List<T>?) {
     while (i < size) {
         val item = get(i)
 
-        val transformed = transformation(item)
+        i = replaceInPlace(transformation(item), i)
+    }
+}
 
-        when (transformed?.size) {
-            null -> i++
-            0 -> removeAt(i)
-            1 -> set(i++, transformed.first())
-            else -> {
-                addAll(i, transformed)
-                i += transformed.size
-                removeAt(i)
-            }
+/**
+ * Transforms a subset of a mutable list in place.
+ * Each element `it` that has a type S is replaced with a result of `transformation(it)`,
+ * `null` means "keep existing element" (to avoid creating excessive singleton lists).
+ */
+inline fun <T, reified S : T> MutableList<T>.transformSubsetFlat(transformation: (S) -> List<S>?) {
+    var i = 0
+    while (i < size) {
+        val item = get(i)
+
+        if (item !is S) {
+            i++
+            continue
+        }
+
+        i = replaceInPlace(transformation(item), i)
+    }
+}
+
+@PublishedApi internal fun <T> MutableList<T>.replaceInPlace(transformed: List<T>?, atIndex: Int): Int {
+    var i = atIndex
+    when (transformed?.size) {
+        null -> i++
+        0 -> removeAt(i)
+        1 -> set(i++, transformed.first())
+        else -> {
+            addAll(i, transformed)
+            i += transformed.size
+            removeAt(i)
         }
     }
+    return i
 }
 
 /**
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt
index 4c7f5d02b45..2446e31bb2f 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt
@@ -63,17 +63,6 @@ object DefaultFakeOverrideClassFilter : FakeOverrideClassFilter {
     override fun needToConstructFakeOverrides(clazz: IrClass): Boolean = true
 }
 
-object FakeOverrideControl {
-    // If set to true: all fake overrides go to klib serialized IR.
-    // If set to false: eligible fake overrides are not serialized.
-    val serializeFakeOverrides: Boolean = true
-
-    // If set to true: fake overrides are deserialized from klib serialized IR.
-    // If set to false: eligible fake overrides are constructed within IR linker.
-    // This is the default in the absence of -Xdeserialize-fake-overrides flag.
-    val deserializeFakeOverrides: Boolean = false
-}
-
 class FakeOverrideBuilder(
     val linker: FileLocalAwareLinker,
     val symbolTable: SymbolTable,
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
index ceb119d085a..edd7f0a7b5d 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
@@ -114,7 +114,6 @@ abstract class IrFileDeserializer(
     val builtIns: IrBuiltIns,
     val symbolTable: SymbolTable,
     protected var deserializeBodies: Boolean,
-    private val deserializeFakeOverrides: Boolean,
     private val fakeOverrideBuilder: FakeOverrideBuilder,
     private val allowErrorNodes: Boolean
 ) {
@@ -1170,8 +1169,10 @@ abstract class IrFileDeserializer(
      *
      * For more information see `anonymousClassLeak.kt` test and issue KT-40216
      */
-    private fun IrType.checkObjectLeak(isPrivate: Boolean): Boolean {
-        return isPrivate && this is IrSimpleType && classifier.let { !it.isPublicApi && it !is IrTypeParameterSymbol }
+    private fun IrType.checkObjectLeak(): Boolean {
+        return if (this is IrSimpleType) {
+            classifier.let { !it.isPublicApi && it !is IrTypeParameterSymbol } || arguments.any { it.typeOrNull?.checkObjectLeak() == true }
+        } else false
     }
 
     private fun <T : IrFunction> T.withBodyGuard(block: T.() -> Unit) {
@@ -1180,7 +1181,7 @@ abstract class IrFileDeserializer(
         fun checkInlineBody(): Boolean = deserializeInlineFunctions && this is IrSimpleFunction && isInline
 
         try {
-            deserializeBodies = oldBodiesPolicy || checkInlineBody() || returnType.checkObjectLeak(!symbol.isPublicApi)
+            deserializeBodies = oldBodiesPolicy || checkInlineBody() || returnType.checkObjectLeak()
             block()
         } finally {
             deserializeBodies = oldBodiesPolicy
@@ -1188,11 +1189,11 @@ abstract class IrFileDeserializer(
     }
 
 
-    private fun IrField.withInitializerGuard(isPrivateProperty: Boolean, f: IrField.() -> Unit) {
+    private fun IrField.withInitializerGuard(f: IrField.() -> Unit) {
         val oldBodiesPolicy = deserializeBodies
 
         try {
-            deserializeBodies = oldBodiesPolicy || type.checkObjectLeak(isPrivateProperty)
+            deserializeBodies = oldBodiesPolicy || type.checkObjectLeak()
             f()
         } finally {
             deserializeBodies = oldBodiesPolicy
@@ -1319,7 +1320,7 @@ abstract class IrFileDeserializer(
 
 
 
-    private fun deserializeIrField(proto: ProtoField, isPrivateProperty: Boolean): IrField =
+    private fun deserializeIrField(proto: ProtoField): IrField =
         withDeserializedIrDeclarationBase(proto.base) { symbol, uniqId, startOffset, endOffset, origin, fcode ->
             val nameType = BinaryNameAndType.decode(proto.nameType)
             val type = deserializeIrType(nameType.typeIndex)
@@ -1337,7 +1338,7 @@ abstract class IrFileDeserializer(
                 )
             }.usingParent {
                 if (proto.hasInitializer()) {
-                    withInitializerGuard(isPrivateProperty) {
+                    withInitializerGuard {
                         initializer = irFactory.createExpressionBody(deserializeExpressionBody(proto.initializer))
                     }
                 }
@@ -1396,7 +1397,7 @@ abstract class IrFileDeserializer(
                     }
                 }
                 if (proto.hasBackingField()) {
-                    backingField = deserializeIrField(proto.backingField, !symbol.isPublicApi).also {
+                    backingField = deserializeIrField(proto.backingField).also {
                         // A property symbol and its field symbol share the same descriptor.
                         // Unfortunately symbol deserialization doesn't know anything about that.
                         // So we can end up with two wrapped property descriptors for property and its field.
@@ -1444,7 +1445,7 @@ abstract class IrFileDeserializer(
         val declaration: IrDeclaration = when (proto.declaratorCase!!) {
             IR_ANONYMOUS_INIT -> deserializeIrAnonymousInit(proto.irAnonymousInit)
             IR_CONSTRUCTOR -> deserializeIrConstructor(proto.irConstructor)
-            IR_FIELD -> deserializeIrField(proto.irField, false)
+            IR_FIELD -> deserializeIrField(proto.irField)
             IR_CLASS -> deserializeIrClass(proto.irClass)
             IR_FUNCTION -> deserializeIrFunction(proto.irFunction)
             IR_PROPERTY -> deserializeIrProperty(proto.irProperty)
@@ -1466,7 +1467,6 @@ abstract class IrFileDeserializer(
     // Depending on deserialization strategy we either deserialize public api fake overrides
     // or reconstruct them after IR linker completes.
     private fun isSkippableFakeOverride(proto: ProtoDeclaration, parent: IrClass): Boolean {
-        if (deserializeFakeOverrides) return false
         if (!platformFakeOverrideClassFilter.needToConstructFakeOverrides(parent)) return false
 
         val symbol = when (proto.declaratorCase!!) {
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
index 9d43c48d29f..37177c73c9b 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.backend.common.serialization
 
 import org.jetbrains.kotlin.backend.common.LoggingContext
 import org.jetbrains.kotlin.backend.common.ir.ir2string
-import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideControl
 import org.jetbrains.kotlin.backend.common.serialization.encodings.*
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.IrElement
@@ -25,6 +24,7 @@ import org.jetbrains.kotlin.library.impl.IrMemoryArrayWriter
 import org.jetbrains.kotlin.library.impl.IrMemoryDeclarationWriter
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.Variance
+import org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature as ProtoAccessorIdSignature
 import org.jetbrains.kotlin.backend.common.serialization.proto.Actual as ProtoActual
 import org.jetbrains.kotlin.backend.common.serialization.proto.FieldAccessCommon as ProtoFieldAccessCommon
 import org.jetbrains.kotlin.backend.common.serialization.proto.FileEntry as ProtoFileEntry
@@ -53,9 +53,9 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicOperator
 import org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicType as ProtoDynamicType
 import org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumConstructorCall as ProtoEnumConstructorCall
 import org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumEntry as ProtoEnumEntry
+import org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression as ProtoErrorCallExpression
 import org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorDeclaration as ProtoErrorDeclaration
 import org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorExpression as ProtoErrorExpression
-import org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression as ProtoErrorCallExpression
 import org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorType as ProtoErrorType
 import org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression as ProtoExpression
 import org.jetbrains.kotlin.backend.common.serialization.proto.IrField as ProtoField
@@ -102,7 +102,6 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.Loop as ProtoLoop
 import org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon as ProtoMemberAccessCommon
 import org.jetbrains.kotlin.backend.common.serialization.proto.NullableIrExpression as ProtoNullableIrExpression
 import org.jetbrains.kotlin.backend.common.serialization.proto.PublicIdSignature as ProtoPublicIdSignature
-import org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature as ProtoAccessorIdSignature
 
 open class IrFileSerializer(
     val logger: LoggingContext,
@@ -1092,9 +1091,9 @@ open class IrFileSerializer(
             .setBase(serializeIrDeclarationBase(variable, LocalVariableFlags.encode(variable)))
             .setNameType(serializeNameAndType(variable.name, variable.type))
             .setDelegate(serializeIrVariable(variable.delegate))
-            .setGetter(serializeIrFunction(variable.getter as IrSimpleFunction)) // TODO: can it be non simple?
+            .setGetter(serializeIrFunction(variable.getter))
 
-        variable.setter?.let { proto.setSetter(serializeIrFunction(it as IrSimpleFunction)) } // TODO: ditto.
+        variable.setter?.let { proto.setSetter(serializeIrFunction(it)) }
 
         return proto.build()
     }
@@ -1243,7 +1242,6 @@ open class IrFileSerializer(
 
     fun memberNeedsSerialization(member: IrDeclaration): Boolean {
         assert(member.parent is IrClass)
-        if (FakeOverrideControl.serializeFakeOverrides) return true
         if (backendSpecificSerializeAllMembers(member.parent as IrClass)) return true
 
         return (!member.isFakeOverride)
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
index 69e2ee3ce8e..b717736fe8f 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
@@ -52,8 +52,7 @@ abstract class KotlinIrLinker(
     val logger: LoggingContext,
     val builtIns: IrBuiltIns,
     val symbolTable: SymbolTable,
-    private val exportedDependencies: List<ModuleDescriptor>,
-    private val deserializeFakeOverrides: Boolean
+    private val exportedDependencies: List<ModuleDescriptor>
 ) : IrDeserializer, FileLocalAwareLinker {
 
     // Kotlin-MPP related data. Consider some refactoring
@@ -173,7 +172,6 @@ abstract class KotlinIrLinker(
                     fileIndex,
                     !strategy.needBodies,
                     strategy.inlineBodies,
-                    deserializeFakeOverrides,
                     moduleDeserializer, allowErrorNodes
                 ).apply {
 
@@ -236,7 +234,6 @@ abstract class KotlinIrLinker(
         private val fileIndex: Int,
         onlyHeaders: Boolean,
         inlineBodies: Boolean,
-        deserializeFakeOverrides: Boolean,
         private val moduleDeserializer: IrModuleDeserializer,
         allowErrorNodes: Boolean
     ) :
@@ -245,7 +242,6 @@ abstract class KotlinIrLinker(
             builtIns,
             symbolTable,
             !onlyHeaders,
-            deserializeFakeOverrides,
             fakeOverrideBuilder,
             allowErrorNodes
         )
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/MangleConstant.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/MangleConstant.kt
index 9c5de29d8f1..11b25a989f6 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/MangleConstant.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/MangleConstant.kt
@@ -16,6 +16,7 @@ enum class MangleConstant(val prefix: Char, val separator: Char, val suffix: Cha
         const val VAR_ARG_MARK = "..."
         const val STAR_MARK = '*'
         const val Q_MARK = '?'
+        const val ENHANCED_NULLABILITY_MARK = "{EnhancedNullability}"
         const val EXPECT_MARK = "#expect"
         const val UNKNOWN_MARK = "<unknown>"
         const val DYNAMIC_MARK = "<dynamic>"
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
index 3ebd612d69b..13c61d365dc 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
@@ -10,7 +10,9 @@ import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleConstant
 import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode
 import org.jetbrains.kotlin.backend.common.serialization.mangle.collectForMangler
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.load.java.typeEnhancement.hasEnhancedNullability
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext
 import org.jetbrains.kotlin.types.typeUtil.isUnit
 import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
 
@@ -188,6 +190,11 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
                 }
 
                 if (type.isMarkedNullable) tBuilder.appendSignature(MangleConstant.Q_MARK)
+
+                // Disambiguate between 'double' and '@NotNull java.lang.Double' types in mixed Java/Kotlin class hierarchies
+                if (SimpleClassicTypeSystemContext.hasEnhancedNullability(type)) {
+                    tBuilder.appendSignature(MangleConstant.ENHANCED_NULLABILITY_MARK)
+                }
             }
             is DynamicType -> tBuilder.appendSignature(MangleConstant.DYNAMIC_MARK)
             is FlexibleType -> {
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
index d6f505833c8..e111038fd4f 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
@@ -12,9 +12,11 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.util.hasAnnotation
 import org.jetbrains.kotlin.ir.util.isVararg
 import org.jetbrains.kotlin.ir.util.render
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
 
@@ -178,6 +180,10 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
                 }
 
                 if (type.hasQuestionMark) tBuilder.appendSignature(MangleConstant.Q_MARK)
+
+                if (type.hasAnnotation(JvmAnnotationNames.ENHANCED_NULLABILITY_ANNOTATION)) {
+                    tBuilder.append(MangleConstant.ENHANCED_NULLABILITY_MARK)
+                }
             }
             is IrDynamicType -> tBuilder.appendSignature(MangleConstant.DYNAMIC_MARK)
             is IrErrorType -> tBuilder.appendSignature(MangleConstant.ERROR_MARK)
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt
index 049a4130089..c97fcfef86a 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt
@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.backend.common.serialization.signature
 
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.descriptors.WrappedDeclarationDescriptor
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.IdSignatureComposer
diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/JsLibraryResolver.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/JsLibraryResolver.kt
index 9be976c912e..1368ba7afc5 100644
--- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/JsLibraryResolver.kt
+++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/JsLibraryResolver.kt
@@ -19,8 +19,6 @@ import org.jetbrains.kotlin.util.Logger
 class JsLibraryResolver(
     repositories: List<String>,
     directLibs: List<String>,
-    knownAbiVersions: List<KotlinAbiVersion>?,
-    knownCompilerVersions: List<CompilerVersion>?,
     distributionKlib: String?,
     localKotlinDir: String?,
     skipCurrentDir: Boolean,
@@ -28,8 +26,6 @@ class JsLibraryResolver(
 ) : KotlinLibraryProperResolverWithAttributes<KotlinLibrary>(
     repositories,
     directLibs,
-    knownAbiVersions,
-    knownCompilerVersions,
     distributionKlib,
     localKotlinDir,
     skipCurrentDir,
@@ -48,8 +44,6 @@ fun jsResolveLibraries(libraries: List<String>, logger: Logger): KotlinLibraryRe
     val libraryResolver = JsLibraryResolver(
         repositories = emptyList(),
         directLibs = libraryAbsolutePaths,
-        knownAbiVersions = listOf(KotlinAbiVersion.CURRENT),
-        knownCompilerVersions = emptyList<CompilerVersion>(),
         distributionKlib = null,
         localKotlinDir = null,
         skipCurrentDir = false,
diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
index 966fce3cbad..b71ee31d59c 100644
--- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
+++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
@@ -150,7 +150,6 @@ fun generateKLib(
     irBuiltIns.functionFactory = functionFactory
 
     val expectDescriptorToSymbol = mutableMapOf<DeclarationDescriptor, IrSymbol>()
-    val deserializeFakeOverrides = configuration.getBoolean(CommonConfigurationKeys.DESERIALIZE_FAKE_OVERRIDES)
     val feContext = psi2IrContext.run {
         JsIrLinker.JsFePluginContext(moduleDescriptor, bindingContext, symbolTable, typeTranslator, irBuiltIns)
     }
@@ -161,8 +160,7 @@ fun generateKLib(
         psi2IrContext.symbolTable,
         functionFactory,
         feContext,
-        serializedIrFiles?.let { ICData(it, errorPolicy.allowErrors) },
-        deserializeFakeOverrides
+        serializedIrFiles?.let { ICData(it, errorPolicy.allowErrors) }
     )
 
     sortDependencies(allDependencies.getFullList(), depsDescriptors.descriptors).map {
@@ -172,7 +170,7 @@ fun generateKLib(
     val moduleFragment = psi2IrContext.generateModuleFragmentWithPlugins(project, files, irLinker, expectDescriptorToSymbol)
 
     moduleFragment.acceptVoid(ManglerChecker(JsManglerIr, Ir2DescriptorManglerAdapter(JsManglerDesc)))
-    if (!configuration.getBoolean(JSConfigurationKeys.DISABLE_FAKE_OVERRIDE_VALIDATOR)) {
+    if (configuration.getBoolean(JSConfigurationKeys.FAKE_OVERRIDE_VALIDATOR)) {
         val fakeOverrideChecker = FakeOverrideChecker(JsManglerIr, JsManglerDesc)
         irLinker.modules.forEach { fakeOverrideChecker.check(it) }
     }
@@ -227,7 +225,6 @@ fun loadIr(
     irFactory: IrFactory,
 ): IrModuleInfo {
     val depsDescriptors = ModulesStructure(project, mainModule, analyzer, configuration, allDependencies, friendDependencies)
-    val deserializeFakeOverrides = configuration.getBoolean(CommonConfigurationKeys.DESERIALIZE_FAKE_OVERRIDES)
     val errorPolicy = configuration.get(JSConfigurationKeys.ERROR_TOLERANCE_POLICY) ?: ErrorTolerancePolicy.DEFAULT
 
     when (mainModule) {
@@ -240,7 +237,7 @@ fun loadIr(
             val feContext = psi2IrContext.run {
                 JsIrLinker.JsFePluginContext(moduleDescriptor, bindingContext, symbolTable, typeTranslator, irBuiltIns)
             }
-            val irLinker = JsIrLinker(psi2IrContext.moduleDescriptor, emptyLoggingContext, irBuiltIns, symbolTable, functionFactory, feContext, null, deserializeFakeOverrides)
+            val irLinker = JsIrLinker(psi2IrContext.moduleDescriptor, emptyLoggingContext, irBuiltIns, symbolTable, functionFactory, feContext, null)
             val deserializedModuleFragments = sortDependencies(allDependencies.getFullList(), depsDescriptors.descriptors).map {
                 irLinker.deserializeIrModuleHeader(depsDescriptors.getModuleDescriptor(it), it)
             }
@@ -252,7 +249,7 @@ fun loadIr(
             val mangleChecker = ManglerChecker(JsManglerIr, Ir2DescriptorManglerAdapter(JsManglerDesc))
             moduleFragment.acceptVoid(mangleChecker)
 
-            if (!configuration.getBoolean(JSConfigurationKeys.DISABLE_FAKE_OVERRIDE_VALIDATOR)) {
+            if (configuration.getBoolean(JSConfigurationKeys.FAKE_OVERRIDE_VALIDATOR)) {
                 val fakeOverrideChecker = FakeOverrideChecker(JsManglerIr, JsManglerDesc)
                 irLinker.modules.forEach { fakeOverrideChecker.check(it) }
             }
@@ -277,7 +274,7 @@ fun loadIr(
             val irBuiltIns = IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, symbolTable)
             val functionFactory = IrFunctionFactory(irBuiltIns, symbolTable)
             val irLinker =
-                JsIrLinker(null, emptyLoggingContext, irBuiltIns, symbolTable, functionFactory, null, null, deserializeFakeOverrides)
+                JsIrLinker(null, emptyLoggingContext, irBuiltIns, symbolTable, functionFactory, null, null)
 
             val deserializedModuleFragments = sortDependencies(allDependencies.getFullList(), depsDescriptors.descriptors).map {
                 val strategy =
diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
index 916668a80c4..de2b78291f3 100644
--- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
+++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir
 
 import org.jetbrains.kotlin.backend.common.LoggingContext
 import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilder
-import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideControl
 import org.jetbrains.kotlin.backend.common.serialization.*
 import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -27,9 +26,8 @@ class JsIrLinker(
     private val currentModule: ModuleDescriptor?, logger: LoggingContext, builtIns: IrBuiltIns, symbolTable: SymbolTable,
     override val functionalInterfaceFactory: IrAbstractFunctionFactory,
     override val translationPluginContext: TranslationPluginContext?,
-    private val icData: ICData? = null,
-    deserializeFakeOverrides: Boolean = FakeOverrideControl.deserializeFakeOverrides
-) : KotlinIrLinker(currentModule, logger, builtIns, symbolTable, emptyList(), deserializeFakeOverrides) {
+    private val icData: ICData? = null
+) : KotlinIrLinker(currentModule, logger, builtIns, symbolTable, emptyList()) {
 
     override val fakeOverrideBuilder = FakeOverrideBuilder(this, symbolTable, IdSignatureSerializer(JsManglerIr), builtIns)
 
diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/JvmLibraryResolver.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/JvmLibraryResolver.kt
index a147887502d..fbe4f79c8cc 100644
--- a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/JvmLibraryResolver.kt
+++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/JvmLibraryResolver.kt
@@ -21,8 +21,6 @@ val jvmLibrariesProvidedByDefault = setOf("stdlib", "kotlin")
 class JvmLibraryResolver(
     repositories: List<String>,
     directLibs: List<String>,
-    knownAbiVersions: List<KotlinAbiVersion>?,
-    knownCompilerVersions: List<CompilerVersion>?,
     distributionKlib: String?,
     localKotlinDir: String?,
     skipCurrentDir: Boolean,
@@ -30,8 +28,6 @@ class JvmLibraryResolver(
 ) : KotlinLibraryProperResolverWithAttributes<KotlinLibrary>(
     repositories,
     directLibs,
-    knownAbiVersions,
-    knownCompilerVersions,
     distributionKlib,
     localKotlinDir,
     skipCurrentDir,
@@ -54,8 +50,6 @@ fun jvmResolveLibraries(libraries: List<String>, logger: Logger): KotlinLibraryR
     val libraryResolver = JvmLibraryResolver(
         repositories = emptyList(),
         directLibs = libraryAbsolutePaths,
-        knownAbiVersions = listOf(KotlinAbiVersion.CURRENT),
-        knownCompilerVersions = emptyList<CompilerVersion>(),
         distributionKlib = null,
         localKotlinDir = null,
         skipCurrentDir = false,
diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt
index df6fcdc22e6..cb81822cb83 100644
--- a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt
+++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.ir.backend.jvm.serialization
 
 import org.jetbrains.kotlin.backend.common.LoggingContext
 import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilder
-import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideControl
 import org.jetbrains.kotlin.backend.common.serialization.*
 import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolData
 import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer
@@ -41,9 +40,8 @@ class JvmIrLinker(
     override val functionalInterfaceFactory: IrAbstractFunctionFactory,
     override val translationPluginContext: TranslationPluginContext?,
     private val stubGenerator: DeclarationStubGenerator,
-    private val manglerDesc: JvmManglerDesc,
-    deserializeFakeOverrides: Boolean = FakeOverrideControl.deserializeFakeOverrides
-) : KotlinIrLinker(currentModule, logger, builtIns, symbolTable, emptyList(), deserializeFakeOverrides) {
+    private val manglerDesc: JvmManglerDesc
+) : KotlinIrLinker(currentModule, logger, builtIns, symbolTable, emptyList()) {
 
     override val fakeOverrideBuilder = FakeOverrideBuilder(this, symbolTable, IdSignatureSerializer(JvmManglerIr), builtIns)
 
diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts
index 5485cf50c08..29a726a1ceb 100644
--- a/compiler/light-classes/build.gradle.kts
+++ b/compiler/light-classes/build.gradle.kts
@@ -11,10 +11,8 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
-    Platform[192].orHigher {
-        compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") }
-    }
-    
+    compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") }
+
     compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
 }
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
index 9e616eb4490..97b528802dc 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
@@ -550,11 +550,17 @@ fun KtClassOrObject.defaultJavaAncestorQualifiedName(): String? {
 }
 
 fun KtClassOrObject.shouldNotBeVisibleAsLightClass(): Boolean {
+
+    if (containingFile is KtCodeFragment) {
+        // Avoid building light classes for code fragments
+        return true
+    }
+
     if (parentsWithSelf.filterIsInstance<KtClassOrObject>().any { it.hasExpectModifier() }) {
         return true
     }
 
-    if (safeIsLocal()) {
+    if (isLocal) {
         if (containingFile.virtualFile == null) return true
         if (hasParseErrorsAround(this) || PsiUtilCore.hasErrorElementChild(this)) return true
     }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt
index 69905ce29e4..5660c7e6be0 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt
@@ -50,9 +50,9 @@ fun PsiReferenceList.addSuperTypeEntry(
     }
 }
 
-internal fun KtClassOrObject.getExternalDependencies(): List<ModificationTracker> {
+fun KtClassOrObject.getExternalDependencies(): List<ModificationTracker> {
     return with(KotlinModificationTrackerService.getInstance(project)) {
-        if (!safeIsLocal()) return listOf(outOfBlockModificationTracker)
+        if (!this@getExternalDependencies.isLocal) return listOf(outOfBlockModificationTracker)
         else when (val file = containingFile) {
             is KtFile -> listOf(outOfBlockModificationTracker, fileModificationTracker(file))
             else -> listOf(outOfBlockModificationTracker)
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt
index 30f4e3b54d4..92f0d4ceb05 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethods.kt
@@ -32,13 +32,13 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
 import org.jetbrains.kotlin.types.RawType
 
-internal const val METHOD_INDEX_FOR_GETTER = 1
-internal const val METHOD_INDEX_FOR_SETTER = 2
-internal const val METHOD_INDEX_FOR_DEFAULT_CTOR = 3
-internal const val METHOD_INDEX_FOR_NO_ARG_OVERLOAD_CTOR = 4
-internal const val METHOD_INDEX_FOR_NON_ORIGIN_METHOD = 5
-internal const val METHOD_INDEX_FOR_SCRIPT_MAIN = 6
-internal const val METHOD_INDEX_BASE = 7
+const val METHOD_INDEX_FOR_GETTER = 1
+const val METHOD_INDEX_FOR_SETTER = 2
+const val METHOD_INDEX_FOR_DEFAULT_CTOR = 3
+const val METHOD_INDEX_FOR_NO_ARG_OVERLOAD_CTOR = 4
+const val METHOD_INDEX_FOR_NON_ORIGIN_METHOD = 5
+const val METHOD_INDEX_FOR_SCRIPT_MAIN = 6
+const val METHOD_INDEX_BASE = 7
 
 internal abstract class KtUltraLightMethod(
     internal val delegate: PsiMethod,
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt
index 8d54ba5b08b..89bebc5a10e 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt
@@ -26,7 +26,6 @@ import com.intellij.psi.util.PsiUtilCore
 import com.intellij.util.SmartList
 import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
-import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.isValidJavaFqName
@@ -73,7 +72,7 @@ class JavaElementFinder(
 
         for (declaration in classOrObjectDeclarations) {
             if (declaration !is KtEnumEntry) {
-                val lightClass = declaration.toLightClass()
+                val lightClass = kotlinAsJavaSupport.getLightClass(declaration)
                 if (lightClass != null) {
                     answer.add(lightClass)
                 }
@@ -90,7 +89,7 @@ class JavaElementFinder(
             ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
             //NOTE: can't filter out more interfaces right away because decompiled declarations do not have member bodies
             if (classOrObject is KtClass && classOrObject.isInterface()) {
-                val interfaceClass = classOrObject.toLightClass() ?: continue
+                val interfaceClass = kotlinAsJavaSupport.getLightClass(classOrObject) ?: continue
                 val implsClass = interfaceClass.findInnerClassByName(JvmAbi.DEFAULT_IMPLS_CLASS_NAME, false) ?: continue
                 answer.add(implsClass)
             }
@@ -141,7 +140,7 @@ class JavaElementFinder(
 
         val declarations = kotlinAsJavaSupport.findClassOrObjectDeclarationsInPackage(packageFQN, scope)
         for (declaration in declarations) {
-            val aClass = declaration.toLightClass() ?: continue
+            val aClass = kotlinAsJavaSupport.getLightClass(declaration) ?: continue
             answer.add(aClass)
         }
 
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt
index 76c605c3f31..2bf4819091f 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt
@@ -23,13 +23,12 @@ object KotlinStubVersions {
     // Though only kotlin declarations (no code in the bodies) are stubbed, please do increase this version
     //      if you are not 100% sure it can be avoided.
     // Increasing this version will lead to reindexing of all kotlin source files on the first IDE startup with the new version.
-    const val SOURCE_STUB_VERSION = 137
+    const val SOURCE_STUB_VERSION = 138
 
     // Binary stub version should be increased if stub format (org.jetbrains.kotlin.psi.stubs.impl) is changed
     //      or changes are made to the core stub building code (org.jetbrains.kotlin.idea.decompiler.stubBuilder).
     // Increasing this version will lead to reindexing of all binary files that are potentially kotlin binaries (including all class files).
-    // TODO: Before updating this, please see the kdoc at DeserializedMemberScope.computeDescriptors and KT-41859
-    private const val BINARY_STUB_VERSION = 72
+    private const val BINARY_STUB_VERSION = 73
 
     // Classfile stub version should be increased if changes are made to classfile stub building subsystem (org.jetbrains.kotlin.idea.decompiler.classFile)
     // Increasing this version will lead to reindexing of all classfiles.
diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt
index ef8c250af0d..2ce05be83a5 100644
--- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt
+++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.resolve.calls.inference.components
 
-
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemOperation
@@ -196,8 +195,8 @@ class ConstraintInjector(
             return baseContext.substitutionSupertypePolicy(type)
         }
 
-        override fun areEqualTypeConstructors(a: TypeConstructorMarker, b: TypeConstructorMarker): Boolean {
-            return baseContext.areEqualTypeConstructors(a, b)
+        override fun areEqualTypeConstructors(c1: TypeConstructorMarker, c2: TypeConstructorMarker): Boolean {
+            return baseContext.areEqualTypeConstructors(c1, c2)
         }
 
         override fun prepareType(type: KotlinTypeMarker): KotlinTypeMarker {
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt
index 164e7984ae8..b118347753f 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt
@@ -6,16 +6,17 @@
 package org.jetbrains.kotlin.resolve.calls
 
 import org.jetbrains.kotlin.config.LanguageFeature
-import org.jetbrains.kotlin.descriptors.CallableDescriptor
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus
-import org.jetbrains.kotlin.resolve.calls.components.*
+import org.jetbrains.kotlin.resolve.calls.components.CallableReferenceResolver
+import org.jetbrains.kotlin.resolve.calls.components.KotlinCallCompleter
+import org.jetbrains.kotlin.resolve.calls.components.KotlinResolutionCallbacks
+import org.jetbrains.kotlin.resolve.calls.components.NewOverloadingConflictResolver
 import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode
 import org.jetbrains.kotlin.resolve.calls.model.*
 import org.jetbrains.kotlin.resolve.calls.tower.*
+import org.jetbrains.kotlin.resolve.descriptorUtil.OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValueWithSmartCastInfo
 import org.jetbrains.kotlin.types.UnwrappedType
-import java.lang.UnsupportedOperationException
 
 
 class KotlinCallResolver(
@@ -25,10 +26,6 @@ class KotlinCallResolver(
     private val callableReferenceResolver: CallableReferenceResolver,
     private val callComponents: KotlinCallComponents
 ) {
-    companion object {
-        val OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION = FqName.fromSegments(listOf("kotlin", "OverloadResolutionByLambdaReturnType"))
-    }
-
     fun resolveCall(
         scopeTower: ImplicitScopeTower,
         resolutionCallbacks: KotlinResolutionCallbacks,
@@ -145,7 +142,7 @@ class KotlinCallResolver(
             candidates.all { resolutionCallbacks.inferenceSession.shouldRunCompletion(it) }
         ) {
             val candidatesWithAnnotation =
-                candidates.filter { it.resolvedCall.candidateDescriptor.annotations.hasAnnotation(OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION) }
+                candidates.filter { it.resolvedCall.candidateDescriptor.annotations.hasAnnotation(OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION_FQ_NAME) }
             val candidatesWithoutAnnotation = candidates - candidatesWithAnnotation
             if (candidatesWithAnnotation.isNotEmpty()) {
                 val newCandidates = kotlinCallCompleter.chooseCandidateRegardingOverloadResolutionByLambdaReturnType(maximallySpecificCandidates, resolutionCallbacks)
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
index b228360c995..e9bb36cf332 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.resolve.constants.EnumValue
 import org.jetbrains.kotlin.resolve.constants.IntValue
 import org.jetbrains.kotlin.resolve.constants.NullValue
 import org.jetbrains.kotlin.resolve.constants.StringValue
+import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.descriptorUtil.nonSourceAnnotations
 import org.jetbrains.kotlin.resolve.isInlineClassType
 import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags
diff --git a/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt b/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt
index 20a5bef4f91..d92ef8984d8 100644
--- a/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt
+++ b/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt
@@ -6,4 +6,6 @@ class A {
     fun f() {
 
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/DollarsInName.kt b/compiler/testData/asJava/lightClasses/DollarsInName.kt
index 7ccba55715d..59db1a02a79 100644
--- a/compiler/testData/asJava/lightClasses/DollarsInName.kt
+++ b/compiler/testData/asJava/lightClasses/DollarsInName.kt
@@ -8,3 +8,5 @@ class `A$B` {
         inner class `G$G$`
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt b/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt
index de23a745648..45cfb5c798c 100644
--- a/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt
+++ b/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt
@@ -6,3 +6,5 @@ class `A$B` {
         inner class `G$G$`
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/HiddenDeprecated.kt b/compiler/testData/asJava/lightClasses/HiddenDeprecated.kt
index a4578555b95..7931a1853ce 100644
--- a/compiler/testData/asJava/lightClasses/HiddenDeprecated.kt
+++ b/compiler/testData/asJava/lightClasses/HiddenDeprecated.kt
@@ -5,4 +5,5 @@ package a
 fun f() {
 
 }
-// LAZINESS:NoLaziness
\ No newline at end of file
+// LAZINESS:NoLaziness
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt b/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt
index 21cb4e1d4de..aefba25e839 100644
--- a/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt
+++ b/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt
@@ -8,4 +8,5 @@ class A {
     }
 }
 
-// LAZINESS:NoLaziness
\ No newline at end of file
+// LAZINESS:NoLaziness
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt b/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt
index 24d059976f7..4a18369a8c2 100644
--- a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt
+++ b/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt
@@ -21,4 +21,6 @@ interface I1 {
 
 interface I2 {
     fun bar() = "bar"
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/InlineReified.kt b/compiler/testData/asJava/lightClasses/InlineReified.kt
index 5a4dcba1474..7a1c67a3d31 100644
--- a/compiler/testData/asJava/lightClasses/InlineReified.kt
+++ b/compiler/testData/asJava/lightClasses/InlineReified.kt
@@ -11,3 +11,5 @@ class InlineReified {
         inline get() = toString()
         inline set(value) {}
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/JvmNameOnMember.kt b/compiler/testData/asJava/lightClasses/JvmNameOnMember.kt
index 192de550c82..a030481ceae 100644
--- a/compiler/testData/asJava/lightClasses/JvmNameOnMember.kt
+++ b/compiler/testData/asJava/lightClasses/JvmNameOnMember.kt
@@ -10,4 +10,6 @@ class C {
     fun z(c: C, c2: C) {
 
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/NestedObjects.kt b/compiler/testData/asJava/lightClasses/NestedObjects.kt
index 59c3bbaa366..e5186b9a079 100644
--- a/compiler/testData/asJava/lightClasses/NestedObjects.kt
+++ b/compiler/testData/asJava/lightClasses/NestedObjects.kt
@@ -12,4 +12,6 @@ class A {
             object G
         }
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt b/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt
index b7118c477f0..48085b8b837 100644
--- a/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt
+++ b/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt
@@ -15,4 +15,6 @@ class A(val y: Int) {
     }
 
     fun component1() = y
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt b/compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt
index 8b830b32651..7f27b923b31 100644
--- a/compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt
+++ b/compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt
@@ -5,4 +5,6 @@ class A {
 }
 
 interface P
-interface RS
\ No newline at end of file
+interface RS
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/VarArgs.kt b/compiler/testData/asJava/lightClasses/VarArgs.kt
index 1169c96b4e0..eb43d5ca27d 100644
--- a/compiler/testData/asJava/lightClasses/VarArgs.kt
+++ b/compiler/testData/asJava/lightClasses/VarArgs.kt
@@ -10,3 +10,5 @@ class C {
 
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt
index 9062c54364c..cd03ecfa32a 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt
@@ -1,4 +1,6 @@
 // p.B
 package p
 
-actual class B
\ No newline at end of file
+actual class B
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt
index 8f71bd33b22..121e3596dc6 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt
@@ -1,4 +1,5 @@
 // p.ActualTypeAliasKt
+// FIR_COMPARISON
 package p
 
 actual typealias B = List<Int>
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt b/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt
index ac48268dda4..1af1854d386 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt
@@ -10,3 +10,5 @@ public inline fun f(): Int = 3
 
 @kotlin.internal.InlineOnly
 public inline fun g(p: String): String = "p"
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt
index eb57fed743c..87f6d7c332c 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt
@@ -1,4 +1,6 @@
 // p.B
+// FIR_COMPARISON
+
 package p
 
 expect class B
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt
index c55b87e1708..43a210aee5c 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt
@@ -1,4 +1,6 @@
 // p.B
+// FIR_COMPARISON
+
 package p
 
 expect object B
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt
index 80349a316ce..0a8d8d064a6 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt
@@ -1,4 +1,6 @@
 // p.B.Nested
+// FIR_COMPARISON
+
 package p
 
 expect class B {
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt
index 384e25d66c4..f1081cb72be 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt
@@ -1,4 +1,6 @@
 // p.B.Nested
+// FIR_COMPARISON
+
 package p
 
 expect object B {
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt b/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
index 8f941b76dd6..df3c1c1a2d3 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
@@ -1,6 +1,7 @@
 // Validation
 // ALLOW_FRONTEND_EXCEPTION
 // See KT-24323
+// FIR_COMPARISON
 
 @Retention(AnnotationRetention.RUNTIME /* ) was removed */
                    annotation class Validation()
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt b/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt
index 6dc2b547b9f..849842fc8f0 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt
@@ -27,4 +27,6 @@ annotation class S(val g: String)
 
 @Repeatable
 @Retention(AnnotationRetention.SOURCE)
-annotation class R(val s: String)
\ No newline at end of file
+annotation class R(val s: String)
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/facades/SingleFile.kt b/compiler/testData/asJava/lightClasses/facades/SingleFile.kt
index 894f4f770a8..5e84aea566d 100644
--- a/compiler/testData/asJava/lightClasses/facades/SingleFile.kt
+++ b/compiler/testData/asJava/lightClasses/facades/SingleFile.kt
@@ -1,3 +1,5 @@
 // SingleFileKt
 
-public fun foo() {}
\ No newline at end of file
+public fun foo() {}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt b/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt
index 84502416452..f39dca97d6e 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt
+++ b/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt
@@ -27,4 +27,6 @@ interface I1 {
 interface I2 {
     @Anno("S")
     fun bar() = "bar"
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt
index 4b9b7cc1c59..7712f8c1367 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt
@@ -3,4 +3,6 @@
 class ClassWithConstructor(
         nullable: String?,
         notNull: String
-)
\ No newline at end of file
+)
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt
index 472220f5b30..fe453e1c023 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt
@@ -8,4 +8,5 @@ class C : Base {
     override fun foo(): Unit {}
 }
 
-// LAZINESS:NoLaziness
\ No newline at end of file
+// LAZINESS:NoLaziness
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt
index b70a2a636ca..abb40e47290 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt
@@ -8,4 +8,6 @@ class Synthetic {
     }
 
     private fun foo() {}
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt
index dd6503163c3..83f28b40f03 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt
@@ -7,4 +7,5 @@ interface Base<T> {
 class C : Base<Unit> {
     override fun foo(t: Unit) {}
 }
-// LAZINESS:NoLaziness
\ No newline at end of file
+// LAZINESS:NoLaziness
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt
index 9b2009edf2b..74ffdf39942 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt
@@ -1,3 +1,5 @@
 // UnitParameterKt
 
-fun foo(s: Unit) {}
\ No newline at end of file
+fun foo(s: Unit) {}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt
index a5dabdd9acb..08434fa5c24 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt
@@ -1,3 +1,5 @@
 // VoidReturnKt
 
-fun foo(g: String) {}
\ No newline at end of file
+fun foo(g: String) {}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/publicField/Simple.kt b/compiler/testData/asJava/lightClasses/publicField/Simple.kt
index 14c9539f1ae..5708dc842c7 100644
--- a/compiler/testData/asJava/lightClasses/publicField/Simple.kt
+++ b/compiler/testData/asJava/lightClasses/publicField/Simple.kt
@@ -4,3 +4,5 @@
 class C {
     @[kotlin.jvm.JvmField] public val foo: String = { "A" }()
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt b/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt
index a25e58554ad..76a9a6333c4 100644
--- a/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt
+++ b/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt
@@ -1,3 +1,4 @@
+// CHECK_BY_JAVA_FILE
 annotation class Anno
 
 class TestClass(@setparam:Anno var hello: Int)
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/annotations.java b/compiler/testData/asJava/ultraLightClasses/annotations.java
new file mode 100644
index 00000000000..b0f6722ec29
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/annotations.java
@@ -0,0 +1,162 @@
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
+public abstract @interface Anno2 /* Anno2*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
+public abstract @interface Anno3 /* Anno3*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
+public abstract @interface Anno4 /* Anno4*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
+public abstract @interface Anno5 /* Anno5*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
+public abstract @interface Anno6 /* Anno6*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ {
+  @kotlin.jvm.JvmField()
+  public static final int x;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final AnnoWithCompanion.Companion Companion;
+
+
+  class Companion ...
+  
+  }
+
+public static final class Companion /* AnnoWithCompanion.Companion*/ {
+  private  Companion();//  .ctor()
+
+  public final void foo();//  foo()
+
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno /* Anno*/ {
+  public abstract Anno[] x() default {@Anno(p = "a"), @Anno(p = "b")};//  x()
+
+  public abstract java.lang.String p() default "";//  p()
+
+}
+
+@Deprecated(message = "This anno is deprecated, use === instead", replaceWith = @ReplaceWith(expression = "this === other"))
+@java.lang.annotation.Documented()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
+@kotlin.annotation.MustBeDocumented()
+@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
+public abstract @interface Fancy /* Fancy*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface ReplaceWith /* ReplaceWith*/ {
+  public abstract java.lang.String expression();//  expression()
+
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ {
+  @Anno()
+  public abstract java.lang.String x();//  x()
+
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Deprecated /* Deprecated*/ {
+  public abstract ReplaceWith replaceWith() default @ReplaceWith(expression = "");//  replaceWith()
+
+  public abstract java.lang.String message();//  message()
+
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Ann /* Ann*/ {
+  public abstract java.lang.Class<? extends java.lang.Object> arg2();//  arg2()
+
+  public abstract java.lang.Class<?> arg1();//  arg1()
+
+}
+
+@Anno()
+public final class F /* F*/ implements java.lang.Runnable {
+  @org.jetbrains.annotations.NotNull()
+  private java.lang.String prop;
+
+  @Anno(p = "f")
+  public final void f(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String);//  f(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getProp();//  getProp()
+
+  public  F();//  .ctor()
+
+  public final void setProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp(java.lang.String)
+
+}
+
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.String x;
+
+  @Anno()
+  public  Foo(error.NonExistentClass);//  .ctor(error.NonExistentClass)
+
+  @Anno()
+  public final void f4(@org.jetbrains.annotations.NotNull() java.lang.String);//  f4(java.lang.String)
+
+  @Anno()
+  public final void setX(@org.jetbrains.annotations.Nullable() java.lang.String);//  setX(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getX();//  getX()
+
+}
+
+@Ann(arg1 = String::class, arg2 = Int::class)
+public final class MyClass /* MyClass*/ {
+  public  MyClass();//  .ctor()
+
+}
+
+public final class Example /* Example*/ {
+  @Ann()
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String foo;
+
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String bar;
+
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String quux;
+
+  @Ann()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getBar();//  getBar()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getFoo();//  getFoo()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getQuux();//  getQuux()
+
+  public  Example(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @Ann() @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String, java.lang.String)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/classModifiers.java b/compiler/testData/asJava/ultraLightClasses/classModifiers.java
new file mode 100644
index 00000000000..4773eae1465
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/classModifiers.java
@@ -0,0 +1,60 @@
+public class Open /* pkg.Open*/ {
+  public  Open();//  .ctor()
+
+
+
+
+  class Private ...
+  
+    class Private2 ...
+  
+    class StaticInternal ...
+  
+  }
+
+private static final class Private /* pkg.Open.Private*/ extends pkg.Open {
+  public  Private();//  .ctor()
+
+}
+
+protected final class Private2 /* pkg.Open.Private2*/ {
+  public  Private2();//  .ctor()
+
+}
+
+public static final class StaticInternal /* pkg.Open.StaticInternal*/ {
+  public  StaticInternal();//  .ctor()
+
+}
+
+public final class OuterInternal /* pkg.OuterInternal*/ {
+  public  OuterInternal();//  .ctor()
+
+}
+
+final class TopLevelPrivate /* pkg.TopLevelPrivate*/ {
+  public  TopLevelPrivate();//  .ctor()
+
+}
+
+public abstract class Season /* pkg.Season*/ {
+  private  Season();//  .ctor()
+
+
+  class Nested ...
+  
+  }
+
+public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season {
+  public  Nested();//  .ctor()
+
+}
+
+public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ {
+  private final int a;
+
+  private  SealedWithArgs(int);//  .ctor(int)
+
+  public final int getA();//  getA()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/classModifiers.kt b/compiler/testData/asJava/ultraLightClasses/classModifiers.kt
index df2452132f1..c8fddda2654 100644
--- a/compiler/testData/asJava/ultraLightClasses/classModifiers.kt
+++ b/compiler/testData/asJava/ultraLightClasses/classModifiers.kt
@@ -13,4 +13,6 @@ sealed class Season {
     class Nested: Season()
 }
 
-sealed class SealedWithArgs(val a: Int)
\ No newline at end of file
+sealed class SealedWithArgs(val a: Int)
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/constructors.java b/compiler/testData/asJava/ultraLightClasses/constructors.java
new file mode 100644
index 00000000000..7bbedfb4424
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/constructors.java
@@ -0,0 +1,54 @@
+public final class TestConstructor /* TestConstructor*/ {
+  private  TestConstructor(int);//  .ctor(int)
+
+}
+
+public final class A /* A*/ {
+  public  A(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0<kotlin.Unit>);//  .ctor(int[], kotlin.jvm.functions.Function0<kotlin.Unit>)
+
+}
+
+public final class B /* B*/ {
+}
+
+public final class Outer /* Outer*/ {
+  public  Outer();//  .ctor()
+
+
+
+  class Inner ...
+  
+    class Nested ...
+  
+  }
+
+public final class Inner /* Outer.Inner*/ {
+  public  Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
+
+}
+
+public static final class Nested /* Outer.Nested*/ {
+  public  Nested();//  .ctor()
+
+  public  Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
+
+}
+
+public abstract class A /* A*/ {
+  @org.jetbrains.annotations.Nullable()
+  private final java.lang.String x;
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getX();//  getX()
+
+  private  A(@org.jetbrains.annotations.Nullable() java.lang.String);//  .ctor(java.lang.String)
+
+
+  class C ...
+  
+  }
+
+public static final class C /* A.C*/ extends A {
+  public  C();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/coroutines.java b/compiler/testData/asJava/ultraLightClasses/coroutines.java
new file mode 100644
index 00000000000..d45451433ac
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/coroutines.java
@@ -0,0 +1,33 @@
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
+
+  public  Foo();//  .ctor()
+
+}
+
+public final class Boo /* Boo*/ {
+  public  Boo();//  .ctor()
+
+}
+
+public final class Bar /* Bar*/ {
+  public  Bar();//  .ctor()
+
+  public final <T> void async(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>, ? extends java.lang.Object>);// <T>  async(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>, ? extends java.lang.Object>)
+
+}
+
+public abstract interface Base /* Base*/ {
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);//  foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
+
+}
+
+public final class Derived /* Derived*/ implements Base {
+  @org.jetbrains.annotations.Nullable()
+  public java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);//  foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
+
+  public  Derived();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/dataClasses.java b/compiler/testData/asJava/ultraLightClasses/dataClasses.java
new file mode 100644
index 00000000000..bd9b3b2bf2b
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/dataClasses.java
@@ -0,0 +1,61 @@
+public final class User /* User*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String name;
+
+  private final int age;
+
+  @org.jetbrains.annotations.NotNull()
+  public final User copy(@org.jetbrains.annotations.NotNull() java.lang.String, int);//  copy(java.lang.String, int)
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String component1();//  component1()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getName();//  getName()
+
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
+
+  public  User();//  .ctor()
+
+  public  User(@org.jetbrains.annotations.NotNull() java.lang.String, int);//  .ctor(java.lang.String, int)
+
+  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
+
+  public final int component2();//  component2()
+
+  public final int getAge();//  getAge()
+
+  public int hashCode();//  hashCode()
+
+}
+
+public final class Person /* Person*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String name;
+
+  private int age;
+
+  @org.jetbrains.annotations.NotNull()
+  public final Person copy(@org.jetbrains.annotations.NotNull() java.lang.String);//  copy(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String component1();//  component1()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getName();//  getName()
+
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
+
+  public  Person(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
+
+  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
+
+  public final int getAge();//  getAge()
+
+  public final void setAge(int);//  setAge(int)
+
+  public int hashCode();//  hashCode()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt b/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt
index de4234f85b6..314ab9afa00 100644
--- a/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt
+++ b/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt
@@ -1,3 +1,4 @@
+// CHECK_BY_JAVA_FILE
 import kotlin.reflect.KClass
 
 annotation class SimpleAnn(val value: String)
diff --git a/compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.java b/compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.java
new file mode 100644
index 00000000000..4d04235309b
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.java
@@ -0,0 +1,44 @@
+public abstract interface Base /* Base*/ {
+  public abstract int foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.Object);//  foo(java.lang.String, java.lang.Object)
+
+  public abstract int getX();//  getX()
+
+  public abstract int getY();//  getY()
+
+  public abstract void printMessage();//  printMessage()
+
+  public abstract void printMessageLine();//  printMessageLine()
+
+  public abstract void setY(int);//  setY(int)
+
+}
+
+public final class BaseImpl /* BaseImpl*/ implements Base {
+  private final int x;
+
+  public  BaseImpl(int);//  .ctor(int)
+
+  public final int getX();//  getX()
+
+  public void printMessage();//  printMessage()
+
+  public void printMessageLine();//  printMessageLine()
+
+}
+
+public final class Derived /* Derived*/ implements Base {
+  public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
+
+  public int foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.Object);//  foo(java.lang.String, java.lang.Object)
+
+  public int getX();//  getX()
+
+  public int getY();//  getY()
+
+  public void printMessage();//  printMessage()
+
+  public void printMessageLine();//  printMessageLine()
+
+  public void setY(int);//  setY(int)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt b/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt
index bfeded47066..4422978ca20 100644
--- a/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt
+++ b/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt
@@ -1,4 +1,5 @@
 // c.b.a.Foo$bar$A$B
+// CHECK_BY_JAVA_FILE
 package c.b.a
 
 class Foo {
diff --git a/compiler/testData/asJava/ultraLightClasses/enums.java b/compiler/testData/asJava/ultraLightClasses/enums.java
new file mode 100644
index 00000000000..bfd24153096
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/enums.java
@@ -0,0 +1,121 @@
+public enum Direction /* Direction*/ {
+  NORTH,
+  SOUTH,
+  WEST,
+  EAST;
+
+  private  Direction();//  .ctor()
+
+}
+
+public enum Color /* Color*/ {
+  RED,
+  GREEN,
+  BLUE;
+
+  private final int rgb;
+
+  private  Color(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
+
+  private  Color(int);//  .ctor(int)
+
+  public final int getRgb();//  getRgb()
+
+}
+
+public enum ProtocolState /* ProtocolState*/ {
+  WAITING {
+     WAITING();//  .ctor()
+  
+    @org.jetbrains.annotations.NotNull()
+    public ProtocolState signal();//  signal()
+  
+  },
+  TALKING {
+     TALKING();//  .ctor()
+  
+    @org.jetbrains.annotations.NotNull()
+    public ProtocolState signal();//  signal()
+  
+  };
+
+  @org.jetbrains.annotations.NotNull()
+  public abstract ProtocolState signal();//  signal()
+
+  private  ProtocolState();//  .ctor()
+
+
+
+  class TALKING ...
+  
+    class WAITING ...
+  
+  }
+
+public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState {
+   WAITING();//  .ctor()
+
+  @org.jetbrains.annotations.NotNull()
+  public ProtocolState signal();//  signal()
+
+}
+
+public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState {
+   TALKING();//  .ctor()
+
+  @org.jetbrains.annotations.NotNull()
+  public ProtocolState signal();//  signal()
+
+}
+
+public enum IntArithmetics /* IntArithmetics*/ {
+  PLUS {
+     PLUS();//  .ctor()
+  
+    public int apply(int, int);//  apply(int, int)
+  
+  },
+  TIMES {
+     TIMES();//  .ctor()
+  
+    public int apply(int, int);//  apply(int, int)
+  
+  };
+
+  @org.jetbrains.annotations.NotNull()
+  public IntArithmetics applyAsInt(int, int);//  applyAsInt(int, int)
+
+  private  IntArithmetics();//  .ctor()
+
+
+
+  class PLUS ...
+  
+    class TIMES ...
+  
+  }
+
+public static final class PLUS /* IntArithmetics.PLUS*/ extends IntArithmetics {
+   PLUS();//  .ctor()
+
+  public int apply(int, int);//  apply(int, int)
+
+}
+
+public static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics {
+   TIMES();//  .ctor()
+
+  public int apply(int, int);//  apply(int, int)
+
+}
+
+public final class C /* C*/ {
+  @org.jetbrains.annotations.Nullable()
+  private final Direction enumConst;
+
+  @org.jetbrains.annotations.Nullable()
+  public final Direction getEnumConst();//  getEnumConst()
+
+  public  C();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/generics.java b/compiler/testData/asJava/ultraLightClasses/generics.java
new file mode 100644
index 00000000000..6cef4df46d5
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/generics.java
@@ -0,0 +1,81 @@
+public abstract class C /* C*/<T>  {
+  @org.jetbrains.annotations.NotNull()
+  private java.util.List<? extends java.lang.CharSequence> constructorParam;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.util.HashSet<java.lang.String> sHashSetProp;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.util.List<? extends java.lang.CharSequence> csListProp;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.util.List<java.lang.String> sListProp;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.util.Set<java.lang.String> sMutableSetProp;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.util.Set<java.lang.String> sSetProp;
+
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.util.Collection<java.util.Collection<java.lang.CharSequence>> nested(@org.jetbrains.annotations.NotNull() java.util.List<? extends java.util.List<? extends java.lang.CharSequence>>);//  nested(java.util.List<? extends java.util.List<? extends java.lang.CharSequence>>)
+
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.util.List<java.lang.CharSequence> listCS(@org.jetbrains.annotations.NotNull() java.util.List<? extends java.lang.CharSequence>);//  listCS(java.util.List<? extends java.lang.CharSequence>)
+
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.util.List<java.lang.String> listS(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.String>);//  listS(java.util.List<java.lang.String>)
+
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.util.Set<java.lang.CharSequence> mutables(@org.jetbrains.annotations.NotNull() java.util.Collection<? super java.lang.Number>, @org.jetbrains.annotations.NotNull() java.util.List<? extends C<?>>);//  mutables(java.util.Collection<? super java.lang.Number>, java.util.List<? extends C<?>>)
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.List<java.lang.CharSequence> getConstructorParam();//  getConstructorParam()
+
+  @org.jetbrains.annotations.Nullable()
+  public final <T extends java.lang.Object & java.lang.Comparable<? super T>> T max(@org.jetbrains.annotations.Nullable() java.util.Collection<? extends T>);// <T extends java.lang.Object & java.lang.Comparable<? super T>>  max(java.util.Collection<? extends T>)
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.util.HashSet<java.lang.String> getSHashSetProp();//  getSHashSetProp()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.util.List<java.lang.CharSequence> getCsListProp();//  getCsListProp()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.util.List<java.lang.String> getSListProp();//  getSListProp()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.util.Set<java.lang.String> getSMutableSetProp();//  getSMutableSetProp()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.util.Set<java.lang.String> getSSetProp();//  getSSetProp()
+
+  public  C(@org.jetbrains.annotations.NotNull() java.util.List<? extends java.lang.CharSequence>);//  .ctor(java.util.List<? extends java.lang.CharSequence>)
+
+  public final <Q extends T> Q getW(Q);// <Q extends T>  getW(Q)
+
+  public final <V, U extends V> T foo(V, @org.jetbrains.annotations.NotNull() C<V>, @org.jetbrains.annotations.NotNull() kotlin.sequences.Sequence<? extends V>);// <V, U extends V>  foo(V, C<V>, kotlin.sequences.Sequence<? extends V>)
+
+  public final void setConstructorParam(@org.jetbrains.annotations.NotNull() java.util.List<? extends java.lang.CharSequence>);//  setConstructorParam(java.util.List<? extends java.lang.CharSequence>)
+
+  public final void setCsListProp(@org.jetbrains.annotations.Nullable() java.util.List<? extends java.lang.CharSequence>);//  setCsListProp(java.util.List<? extends java.lang.CharSequence>)
+
+  public final void setSHashSetProp(@org.jetbrains.annotations.Nullable() java.util.HashSet<java.lang.String>);//  setSHashSetProp(java.util.HashSet<java.lang.String>)
+
+  public final void setSListProp(@org.jetbrains.annotations.Nullable() java.util.List<java.lang.String>);//  setSListProp(java.util.List<java.lang.String>)
+
+  public final void setSMutableSetProp(@org.jetbrains.annotations.Nullable() java.util.Set<java.lang.String>);//  setSMutableSetProp(java.util.Set<java.lang.String>)
+
+  public final void setSSetProp(@org.jetbrains.annotations.Nullable() java.util.Set<java.lang.String>);//  setSSetProp(java.util.Set<java.lang.String>)
+
+}
+
+public class K /* K*/<T extends K<? extends T>>  {
+  public  K();//  .ctor()
+
+}
+
+public final class Sub /* Sub*/ extends K<K<?>> {
+  public  Sub();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.java b/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.java
new file mode 100644
index 00000000000..2e7d216db9f
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.java
@@ -0,0 +1,27 @@
+public final class MyList /* MyList*/ implements java.util.List<java.lang.String>, kotlin.collections.List<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String get(int);//  get(int)
+
+  public  MyList();//  .ctor()
+
+}
+
+public abstract interface ASet /* ASet*/<T>  extends java.util.Collection<T>, kotlin.collections.MutableCollection<T>, kotlin.jvm.internal.markers.KMutableCollection {
+}
+
+public abstract class MySet /* MySet*/<T>  implements ASet<T> {
+  public  MySet();//  .ctor()
+
+  public boolean remove(@org.jetbrains.annotations.NotNull() java.lang.String);//  remove(java.lang.String)
+
+}
+
+public abstract class SmartSet /* SmartSet*/<T>  extends kotlin.collections.AbstractMutableSet<T> {
+  @org.jetbrains.annotations.NotNull()
+  public java.util.Iterator<T> iterator();//  iterator()
+
+  private  SmartSet();//  .ctor()
+
+  public boolean add(T);//  add(T)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/importAliases.java b/compiler/testData/asJava/ultraLightClasses/importAliases.java
new file mode 100644
index 00000000000..26fb3b8200b
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/importAliases.java
@@ -0,0 +1,10 @@
+public final class O /* O*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final O INSTANCE;
+
+  @kotlin.jvm.JvmStatic()
+  public static final void foo();//  foo()
+
+  private  O();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/importAliases.kt b/compiler/testData/asJava/ultraLightClasses/importAliases.kt
index d57a56dfc49..70b08005dff 100644
--- a/compiler/testData/asJava/ultraLightClasses/importAliases.kt
+++ b/compiler/testData/asJava/ultraLightClasses/importAliases.kt
@@ -3,3 +3,5 @@ import kotlin.jvm.JvmStatic as JS
 object O {
   @JS fun foo() {}
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt b/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt
index 5f295e20c9f..a7a84bcd45a 100644
--- a/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt
+++ b/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt
@@ -1,3 +1,4 @@
+// CHECK_BY_JAVA_FILE
 class Prop {
     private val someProp = object { }
 }
diff --git a/compiler/testData/asJava/ultraLightClasses/inheritance.java b/compiler/testData/asJava/ultraLightClasses/inheritance.java
new file mode 100644
index 00000000000..ce488c04a12
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/inheritance.java
@@ -0,0 +1,78 @@
+public abstract interface Intf /* Intf*/ {
+  public abstract int v();//  v()
+
+}
+
+public abstract interface IntfWithProp /* IntfWithProp*/ extends Intf {
+  public abstract int getX();//  getX()
+
+}
+
+public abstract class Base /* Base*/ {
+  private int y;
+
+  private int z;
+
+  @org.jetbrains.annotations.Nullable()
+  protected java.lang.Integer v();//  v()
+
+  protected int getZ();//  getZ()
+
+  protected void setZ(int);//  setZ(int)
+
+  public  Base(int);//  .ctor(int)
+
+  public abstract int abs();//  abs()
+
+  public final void nv();//  nv()
+
+  public int getX$light_idea_test_case();//  getX$light_idea_test_case()
+
+  public int getY();//  getY()
+
+  public void setY(int);//  setY(int)
+
+}
+
+public final class Derived /* Derived*/ extends Base implements IntfWithProp {
+  private final int x;
+
+  public  Derived(int);//  .ctor(int)
+
+  public error.NonExistentClass v();//  v()
+
+  public int abs();//  abs()
+
+  public int getX();//  getX()
+
+}
+
+public abstract class AnotherDerived /* AnotherDerived*/ extends Base {
+  private final int x;
+
+  private final int y;
+
+  private final int z;
+
+  protected final void v();//  v()
+
+  protected int getZ();//  getZ()
+
+  public  AnotherDerived(int, int, int);//  .ctor(int, int, int)
+
+  public abstract int getAbstractProp();//  getAbstractProp()
+
+  public abstract void noReturn(@org.jetbrains.annotations.NotNull() java.lang.String);//  noReturn(java.lang.String)
+
+  public int getX$light_idea_test_case();//  getX$light_idea_test_case()
+
+  public int getY();//  getY()
+
+}
+
+final class Private /* Private*/ {
+  public  Private();//  .ctor()
+
+  public boolean getOverridesNothing();//  getOverridesNothing()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt b/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt
index da3c30eb734..ab77e06dd28 100644
--- a/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt
+++ b/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt
@@ -1,3 +1,4 @@
+// CHECK_BY_JAVA_FILE
 inline class UInt(private val value: Int) { }
 
 inline enum class Foo(val x: Int) {
diff --git a/compiler/testData/asJava/ultraLightClasses/inlineOnly.java b/compiler/testData/asJava/ultraLightClasses/inlineOnly.java
new file mode 100644
index 00000000000..0d728d6323b
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/inlineOnly.java
@@ -0,0 +1,7 @@
+public final class A /* A*/ {
+  @kotlin.internal.InlineOnly()
+  private final void foo();//  foo()
+
+  public  A();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/inlineReified.java b/compiler/testData/asJava/ultraLightClasses/inlineReified.java
new file mode 100644
index 00000000000..fe24292674f
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/inlineReified.java
@@ -0,0 +1,4 @@
+public final class C /* C*/ {
+  public  C();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/inlineReified.kt b/compiler/testData/asJava/ultraLightClasses/inlineReified.kt
index 06b275b8232..664b14b5ae0 100644
--- a/compiler/testData/asJava/ultraLightClasses/inlineReified.kt
+++ b/compiler/testData/asJava/ultraLightClasses/inlineReified.kt
@@ -9,3 +9,5 @@ class C {
         inline get() = toString()
         inline set(value) {}
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmField.java b/compiler/testData/asJava/ultraLightClasses/jvmField.java
new file mode 100644
index 00000000000..15a1f83b1a0
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/jvmField.java
@@ -0,0 +1,61 @@
+public final class A /* A*/ {
+  @kotlin.jvm.JvmField()
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.Collection<?> a;
+
+  @kotlin.jvm.JvmField()
+  @org.jetbrains.annotations.NotNull()
+  public static final java.util.Collection<?> c;
+
+  @kotlin.jvm.JvmField()
+  public int b;
+
+  @kotlin.jvm.JvmField()
+  public static int d;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final A.Companion Companion;
+
+  public  A();//  .ctor()
+
+
+  class Companion ...
+  
+  }
+
+public static final class Companion /* A.Companion*/ {
+  private  Companion();//  .ctor()
+
+}
+
+public abstract interface B /* B*/ {
+  @kotlin.jvm.JvmField()
+  @org.jetbrains.annotations.NotNull()
+  public static final java.util.Collection<?> a;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final B.Companion Companion;
+
+
+  class Companion ...
+  
+  }
+
+public static final class Companion /* B.Companion*/ {
+  private  Companion();//  .ctor()
+
+}
+
+public final class C /* C*/ {
+  @kotlin.jvm.JvmField()
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.Collection<?> a;
+
+  @kotlin.jvm.JvmField()
+  public int b;
+
+  public  C();//  .ctor()
+
+  public  C(@org.jetbrains.annotations.NotNull() java.util.Collection<?>, int);//  .ctor(java.util.Collection<?>, int)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmName.java b/compiler/testData/asJava/ultraLightClasses/jvmName.java
new file mode 100644
index 00000000000..15240bb5c0f
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/jvmName.java
@@ -0,0 +1,29 @@
+public final class C /* C*/ {
+  @kotlin.jvm.JvmName(name = "fooInt")
+  public final void fooInt(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.Integer>);//  fooInt(java.util.List<java.lang.Integer>)
+
+  @kotlin.jvm.JvmName(name = "get_rwProp")
+  public final int get_rwProp();//  get_rwProp()
+
+  @kotlin.jvm.JvmName(name = "hasBigArity")
+  public final boolean hasBigArity();//  hasBigArity()
+
+  @kotlin.jvm.JvmName(name = "set_rwProp")
+  public final void set_rwProp(int);//  set_rwProp(int)
+
+  @kotlin.jvm.JvmName(name = "xyz1")
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String xyz1();//  xyz1()
+
+  @kotlin.jvm.JvmName(name = "xyz2")
+  public final void xyz2(@org.jetbrains.annotations.NotNull() java.lang.String);//  xyz2(java.lang.String)
+
+  public  C();//  .ctor()
+
+  public final int getRwProp();//  getRwProp()
+
+  public final void foo(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.String>);//  foo(java.util.List<java.lang.String>)
+
+  public final void setRwProp(int);//  setRwProp(int)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmOverloads.java b/compiler/testData/asJava/ultraLightClasses/jvmOverloads.java
new file mode 100644
index 00000000000..980fa44aa4a
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/jvmOverloads.java
@@ -0,0 +1,116 @@
+public final class C /* C*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String p2;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final C.Companion Companion;
+
+  @org.jetbrains.annotations.Nullable()
+  private final java.lang.String type;
+
+  private final boolean p1;
+
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public static final void fooStatic(double);//  fooStatic(double)
+
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public static final void fooStatic(int, double);//  fooStatic(int, double)
+
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public static final void fooStatic(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  fooStatic(int, double, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public  C(@org.jetbrains.annotations.Nullable() java.lang.String);//  .ctor(java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public  C(@org.jetbrains.annotations.Nullable() java.lang.String, boolean);//  .ctor(java.lang.String, boolean)
+
+  @kotlin.jvm.JvmOverloads()
+  public  C(@org.jetbrains.annotations.Nullable() java.lang.String, boolean, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, boolean, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void bar();//  bar()
+
+  @kotlin.jvm.JvmOverloads()
+  public final void bar(int);//  bar(int)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void bar(int, double);//  bar(int, double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void bar(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  bar(int, double, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void baz(@org.jetbrains.annotations.NotNull() java.lang.String);//  baz(java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void baz(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  baz(int, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void baz(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  baz(int, double, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo(double);//  foo(double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo(int, double);//  foo(int, double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  foo(int, double, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foobar(int);//  foobar(int)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foobar(int, double);//  foobar(int, double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foobar(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  foobar(int, double, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foobarbaz(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  foobarbaz(int, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foobarbaz(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  foobarbaz(int, double, java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getP2();//  getP2()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getType();//  getType()
+
+  public final boolean getP1();//  getP1()
+
+
+  class Companion ...
+  
+  }
+
+public static final class Companion /* C.Companion*/ {
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public final void fooStatic(double);//  fooStatic(double)
+
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public final void fooStatic(int, double);//  fooStatic(int, double)
+
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public final void fooStatic(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  fooStatic(int, double, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo123(double);//  foo123(double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo123(int, double);//  foo123(int, double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo123(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  foo123(int, double, java.lang.String)
+
+  private  Companion();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.java b/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.java
new file mode 100644
index 00000000000..b6fd3cf6f80
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.java
@@ -0,0 +1,10 @@
+public final class A /* A*/ {
+  private int z;
+
+  public  A();//  .ctor()
+
+  public final int getX();//  getX()
+
+  public final void setX(int);//  setX(int)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt b/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt
index f122ffdbf0e..d4a3aabec65 100644
--- a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt
+++ b/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt
@@ -1,4 +1,4 @@
-
+// CHECK_BY_JAVA_FILE
 
 class X {
     @get:JvmSynthetic
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.java b/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.java
new file mode 100644
index 00000000000..f9150fe7baf
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.java
@@ -0,0 +1,71 @@
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+
+}
+
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+
+}
+
+public final class Container /* Container*/ {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  @org.jetbrains.annotations.NotNull()
+  public final Out<? extends Open> bar();//  bar()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  foo(boolean, Out<? extends java.lang.Integer>)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);//  bar(boolean, In<java.lang.Long>, long)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  deepOpen(Out<Out<Out<Open>>>)
+
+  @org.jetbrains.annotations.NotNull()
+  public final OutPair<? extends Final, OutPair<Out<Final>, Out<? extends Final>>> falseTrueFalse();//  falseTrueFalse()
+
+  @org.jetbrains.annotations.NotNull()
+  public final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();//  combination()
+
+  public  Container();//  .ctor()
+
+  public final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);//  simpleIn(In<? super java.lang.Object>)
+
+  public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
+
+}
+
+public abstract interface A /* A*/<T>  {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public abstract Out<T> foo();//  foo()
+
+}
+
+public abstract interface B /* B*/ {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public abstract In<Open> foo();//  foo()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/lateinitProperty.java b/compiler/testData/asJava/ultraLightClasses/lateinitProperty.java
new file mode 100644
index 00000000000..efe5b40c591
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/lateinitProperty.java
@@ -0,0 +1,94 @@
+public class A /* A*/ {
+  private java.lang.String b;
+
+  protected java.lang.String c;
+
+  public java.lang.String a;
+
+  public java.lang.String d;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getA();//  getA()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getB();//  getB()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getC();//  getC()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getD();//  getD()
+
+  protected final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC(java.lang.String)
+
+  public  A();//  .ctor()
+
+  public final void setA(@org.jetbrains.annotations.NotNull() java.lang.String);//  setA(java.lang.String)
+
+  public final void setD$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);//  setD$light_idea_test_case(java.lang.String)
+
+}
+
+public class B /* B*/ {
+  private java.lang.String b;
+
+  protected java.lang.String c;
+
+  public java.lang.String a;
+
+  public java.lang.String d;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getA$light_idea_test_case();//  getA$light_idea_test_case()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getB$light_idea_test_case();//  getB$light_idea_test_case()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getC$light_idea_test_case();//  getC$light_idea_test_case()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getD$light_idea_test_case();//  getD$light_idea_test_case()
+
+  protected final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC(java.lang.String)
+
+  public  B();//  .ctor()
+
+  public final void setA$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);//  setA$light_idea_test_case(java.lang.String)
+
+  public final void setD$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);//  setD$light_idea_test_case(java.lang.String)
+
+}
+
+public class C /* C*/ {
+  private java.lang.String b;
+
+  protected java.lang.String a;
+
+  protected java.lang.String c;
+
+  @org.jetbrains.annotations.NotNull()
+  protected final java.lang.String getA();//  getA()
+
+  @org.jetbrains.annotations.NotNull()
+  protected final java.lang.String getB();//  getB()
+
+  @org.jetbrains.annotations.NotNull()
+  protected final java.lang.String getC();//  getC()
+
+  protected final void setA(@org.jetbrains.annotations.NotNull() java.lang.String);//  setA(java.lang.String)
+
+  protected final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC(java.lang.String)
+
+  public  C();//  .ctor()
+
+}
+
+public class D /* D*/ {
+  private java.lang.String a;
+
+  private java.lang.String b;
+
+  public  D();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/localClassDerived.kt b/compiler/testData/asJava/ultraLightClasses/localClassDerived.kt
index ff57137e3bf..708b0ca037d 100644
--- a/compiler/testData/asJava/ultraLightClasses/localClassDerived.kt
+++ b/compiler/testData/asJava/ultraLightClasses/localClassDerived.kt
@@ -1,3 +1,4 @@
+// CHECK_BY_JAVA_FILE
 class Boo {
     fun fooBar() {
         class LocalClassBase
diff --git a/compiler/testData/asJava/ultraLightClasses/objects.java b/compiler/testData/asJava/ultraLightClasses/objects.java
new file mode 100644
index 00000000000..5e377974013
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/objects.java
@@ -0,0 +1,171 @@
+public final class C /* C*/ {
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String x;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final C.Companion Companion;
+
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getC(@org.jetbrains.annotations.NotNull() I);//  getC(I)
+
+  @kotlin.jvm.JvmStatic()
+  public static final void foo();//  foo()
+
+  @kotlin.jvm.JvmStatic()
+  public static final void setC(@org.jetbrains.annotations.NotNull() I, @org.jetbrains.annotations.NotNull() java.lang.String);//  setC(I, java.lang.String)
+
+  @kotlin.jvm.JvmStatic()
+  public static final void setC1(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC1(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getX();//  getX()
+
+  public  C();//  .ctor()
+
+  public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
+
+
+
+  class Companion ...
+  
+    class Factory ...
+  
+  }
+
+public static final class Companion /* C.Companion*/ {
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getC(@org.jetbrains.annotations.NotNull() I);//  getC(I)
+
+  @kotlin.jvm.JvmStatic()
+  public final void foo();//  foo()
+
+  @kotlin.jvm.JvmStatic()
+  public final void setC(@org.jetbrains.annotations.NotNull() I, @org.jetbrains.annotations.NotNull() java.lang.String);//  setC(I, java.lang.String)
+
+  @kotlin.jvm.JvmStatic()
+  public final void setC1(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC1(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getC1();//  getC1()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getX();//  getX()
+
+  private  Companion();//  .ctor()
+
+  public final void bar();//  bar()
+
+  public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
+
+}
+
+public static final class Factory /* C.Factory*/ {
+  private  Factory();//  .ctor()
+
+}
+
+public final class C1 /* C1*/ {
+  private static final C1.Companion Companion;
+
+  public  C1();//  .ctor()
+
+
+  class Companion ...
+  
+  }
+
+private static final class Companion /* C1.Companion*/ {
+  private  Companion();//  .ctor()
+
+}
+
+public abstract interface I /* I*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final I.Companion Companion;
+
+
+  class Companion ...
+  
+  }
+
+public static final class Companion /* I.Companion*/ {
+  private  Companion();//  .ctor()
+
+}
+
+public final class Obj /* Obj*/ implements java.lang.Runnable {
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String x;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Obj INSTANCE;
+
+  @kotlin.jvm.JvmStatic()
+  public static final int zoo();//  zoo()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getX();//  getX()
+
+  private  Obj();//  .ctor()
+
+  public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
+
+  public void run();//  run()
+
+}
+
+public final class ConstContainer /* ConstContainer*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final ConstContainer INSTANCE;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */;
+
+  public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */;
+
+  public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */;
+
+  public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */;
+
+  public static final int one = 1 /* initializer type: int */ /* constant value 1 */;
+
+  public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */;
+
+  public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */;
+
+  private  ConstContainer();//  .ctor()
+
+}
+
+public final class ClassWithConstContainer /* ClassWithConstContainer*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final ClassWithConstContainer.Companion Companion;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */;
+
+  public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */;
+
+  public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */;
+
+  public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */;
+
+  public static final int one = 1 /* initializer type: int */ /* constant value 1 */;
+
+  public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */;
+
+  public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */;
+
+  public  ClassWithConstContainer();//  .ctor()
+
+
+  class Companion ...
+  
+  }
+
+public static final class Companion /* ClassWithConstContainer.Companion*/ {
+  private  Companion();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/properties.java b/compiler/testData/asJava/ultraLightClasses/properties.java
new file mode 100644
index 00000000000..d2a5afba7ca
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/properties.java
@@ -0,0 +1,230 @@
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final Foo b;
+
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.Object arrayConst;
+
+  @org.jetbrains.annotations.NotNull()
+  private final kotlin.jvm.functions.Function1<java.lang.Integer, java.lang.Integer> sum;
+
+  @org.jetbrains.annotations.NotNull()
+  private java.lang.String name;
+
+  @org.jetbrains.annotations.NotNull()
+  private java.lang.String protectedWithPrivateSet;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String CONSTANT_WITH_ESCAPES = "A\tB\nC\rD'E\"F\\G$H" /* initializer type: java.lang.String */ /* constant value A	B
+  C
+  D'E"F\G$H */;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String SUBSYSTEM_DEPRECATED = "This subsystem is deprecated" /* initializer type: java.lang.String */ /* constant value This subsystem is deprecated */;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Foo.Companion Companion;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.Boolean isEmptyMutable;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.Boolean islowercase;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.Integer getInt;
+
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.Integer isEmptyInt;
+
+  private boolean c;
+
+  private final error.NonExistentClass d;
+
+  private final error.NonExistentClass delegatedProp$delegate;
+
+  private final error.NonExistentClass delegatedProp2$delegate;
+
+  private final error.NonExistentClass lazyProp$delegate;
+
+  private final error.NonExistentClass privateDelegated$delegate;
+
+  private final int f1$1;
+
+  private final java.lang.Void intConst;
+
+  private final long e;
+
+  private int counter;
+
+  private int f2;
+
+  private int internalWithPrivateSet;
+
+  private int privateVarWithPrivateSet;
+
+  private java.lang.Object privateVarWithGet;
+
+  private java.lang.String internalVarPrivateSet;
+
+  private java.lang.String noAccessors;
+
+  private static final error.NonExistentClass contextBean;
+
+  private static final int f1;
+
+  private static int prop7;
+
+  protected java.lang.String protectedLateinitVar;
+
+  public error.NonExistentClass subject;
+
+  @org.jetbrains.annotations.NotNull()
+  protected final java.lang.String getProtectedLateinitVar();//  getProtectedLateinitVar()
+
+  @org.jetbrains.annotations.NotNull()
+  protected final java.lang.String getProtectedWithPrivateSet();//  getProtectedWithPrivateSet()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Foo getB();//  getB()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.Object getArrayConst();//  getArrayConst()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getDelegatedProp();//  getDelegatedProp()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getInternalVarPrivateSet$light_idea_test_case();//  getInternalVarPrivateSet$light_idea_test_case()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getLazyProp();//  getLazyProp()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getName();//  getName()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getStringRepresentation$light_idea_test_case();//  getStringRepresentation$light_idea_test_case()
+
+  @org.jetbrains.annotations.NotNull()
+  public final kotlin.jvm.functions.Function1<java.lang.Integer, java.lang.Integer> getSum();//  getSum()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.Boolean getIslowercase();//  getIslowercase()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.Boolean isEmptyMutable();//  isEmptyMutable()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.Integer getCounter2();//  getCounter2()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.Integer getGetInt();//  getGetInt()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.Integer isEmptyInt();//  isEmptyInt()
+
+  private final int getPrivateDelegated();//  getPrivateDelegated()
+
+  private final java.lang.String getPrivateValWithGet();//  getPrivateValWithGet()
+
+  private final void setPrivateDelegated(int);//  setPrivateDelegated(int)
+
+  protected final int getF2();//  getF2()
+
+  protected final long getE();//  getE()
+
+  protected final void setF2(int);//  setF2(int)
+
+  protected final void setProtectedLateinitVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProtectedLateinitVar(java.lang.String)
+
+  public  Foo(int, @org.jetbrains.annotations.NotNull() Foo, boolean, error.NonExistentClass, long);//  .ctor(int, Foo, boolean, error.NonExistentClass, long)
+
+  public final boolean getC();//  getC()
+
+  public final boolean isEmpty();//  isEmpty()
+
+  public final error.NonExistentClass getSubject();//  getSubject()
+
+  public final int getCounter();//  getCounter()
+
+  public final int getDelegatedProp2();//  getDelegatedProp2()
+
+  public final int getF1();//  getF1()
+
+  public final int getIntProp(int);//  getIntProp(int)
+
+  public final int getInternalWithPrivateSet$light_idea_test_case();//  getInternalWithPrivateSet$light_idea_test_case()
+
+  public final java.lang.Void getIntConst();//  getIntConst()
+
+  public final void setC(boolean);//  setC(boolean)
+
+  public final void setCounter(int);//  setCounter(int)
+
+  public final void setCounter2(@org.jetbrains.annotations.Nullable() java.lang.Integer);//  setCounter2(java.lang.Integer)
+
+  public final void setDelegatedProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setDelegatedProp(java.lang.String)
+
+  public final void setDelegatedProp2(int);//  setDelegatedProp2(int)
+
+  public final void setEmptyInt(@org.jetbrains.annotations.Nullable() java.lang.Integer);//  setEmptyInt(java.lang.Integer)
+
+  public final void setEmptyMutable(@org.jetbrains.annotations.Nullable() java.lang.Boolean);//  setEmptyMutable(java.lang.Boolean)
+
+  public final void setGetInt(@org.jetbrains.annotations.Nullable() java.lang.Integer);//  setGetInt(java.lang.Integer)
+
+  public final void setIslowercase(@org.jetbrains.annotations.Nullable() java.lang.Boolean);//  setIslowercase(java.lang.Boolean)
+
+  public final void setLazyProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setLazyProp(java.lang.String)
+
+  public final void setName(@org.jetbrains.annotations.NotNull() java.lang.String);//  setName(java.lang.String)
+
+  public final void setStringRepresentation$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);//  setStringRepresentation$light_idea_test_case(java.lang.String)
+
+  public final void setSubject(error.NonExistentClass);//  setSubject(error.NonExistentClass)
+
+
+  class Companion ...
+  
+  }
+
+public static final class Companion /* Foo.Companion*/ {
+  private  Companion();//  .ctor()
+
+  public final int getF1();//  getF1()
+
+  public final int getProp3();//  getProp3()
+
+  public final int getProp7();//  getProp7()
+
+  public final void setProp7(int);//  setProp7(int)
+
+}
+
+public final class MyProperty /* MyProperty*/<T>  {
+  public  MyProperty();//  .ctor()
+
+  public final int getValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty<?>);//  getValue(T, kotlin.reflect.KProperty<?>)
+
+  public final void setValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty<?>, int);//  setValue(T, kotlin.reflect.KProperty<?>, int)
+
+}
+
+public final class Modifiers /* Modifiers*/ {
+  private final int plainField;
+
+  public  Modifiers();//  .ctor()
+
+  public final int getPlainField();//  getPlainField()
+
+}
+
+public abstract interface A /* A*/ {
+  protected abstract int getInt1();//  getInt1()
+
+  public abstract int getInt2();//  getInt2()
+
+  public abstract void setInt2$light_idea_test_case(int);//  setInt2$light_idea_test_case(int)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/simpleFunctions.java b/compiler/testData/asJava/ultraLightClasses/simpleFunctions.java
new file mode 100644
index 00000000000..beea600e819
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/simpleFunctions.java
@@ -0,0 +1,31 @@
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.NotNull()
+  public final Foo onString(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1<? super java.lang.Integer, ? extends java.lang.Object>);//  onString(java.lang.String, kotlin.jvm.functions.Function1<? super java.lang.Integer, ? extends java.lang.Object>)
+
+  @org.jetbrains.annotations.NotNull()
+  public final Foo plus(int);//  plus(int)
+
+  @org.jetbrains.annotations.NotNull()
+  public final native java.lang.String externalFun(int);//  externalFun(int)
+
+  private final /* vararg */ java.lang.String bar3(Foo.Inner, Foo.Inner...);//  bar3(Foo.Inner, Foo.Inner[])
+
+  public  Foo();//  .ctor()
+
+  public final /* vararg */ void nullableVararg(@org.jetbrains.annotations.Nullable() java.lang.Object...);//  nullableVararg(java.lang.Object[])
+
+  public final int bar4();//  bar4()
+
+  public final void bar2$light_idea_test_case(error.NonExistentClass, error.NonExistentClass);//  bar2$light_idea_test_case(error.NonExistentClass, error.NonExistentClass)
+
+  public void bar(int, @org.jetbrains.annotations.NotNull() java.lang.Object, @org.jetbrains.annotations.NotNull() Foo);//  bar(int, java.lang.Object, Foo)
+
+
+  class Inner ...
+  
+  }
+
+public static final class Inner /* Foo.Inner*/ {
+  public  Inner();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.java b/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.java
new file mode 100644
index 00000000000..7038f73c29a
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.java
@@ -0,0 +1,20 @@
+public final class MyException /* MyException*/ extends java.lang.Exception {
+  public  MyException();//  .ctor()
+
+}
+
+public final class C /* C*/ {
+  @kotlin.jvm.Throws(exceptionClasses = {Exception::class})
+  public  C() throws java.lang.Exception;//  .ctor()
+
+  @kotlin.jvm.Throws(exceptionClasses = {Exception::class})
+  public  C(int) throws java.lang.Exception;//  .ctor(int)
+
+  @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException::class, MyException::class})
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;//  readFile(java.lang.String)
+
+  @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable::class})
+  public final void baz() throws java.lang.Throwable;//  baz()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/typeAliases.java b/compiler/testData/asJava/ultraLightClasses/typeAliases.java
new file mode 100644
index 00000000000..29c78dc652f
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/typeAliases.java
@@ -0,0 +1,16 @@
+public final class O /* O*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final O INSTANCE;
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo();//  foo()
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo(int);//  foo(int)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  foo(int, java.lang.String)
+
+  private  O();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt b/compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt
index 412b1832292..110b5ea7144 100644
--- a/compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt
+++ b/compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt
@@ -1,3 +1,4 @@
+// CHECK_BY_JAVA_FILE
 @Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE)
 annotation class A0
 @Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE)
diff --git a/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.java b/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.java
new file mode 100644
index 00000000000..856fb9975b2
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.java
@@ -0,0 +1,109 @@
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+
+}
+
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+
+}
+
+public final class Container /* Container*/ {
+  @org.jetbrains.annotations.NotNull()
+  public final In<Final> notDeepIn();//  notDeepIn()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Inv<? super Out<? extends Open>> skipWildcardsUntilInProjection();//  skipWildcardsUntilInProjection()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Inv<In<Out<? extends Open>>> skipAllInvWildcards();//  skipAllInvWildcards()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Inv<OutPair<Open, Out<Out<Open>>>> skipAllOutInvWildcards();//  skipAllOutInvWildcards()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Out<In<Out<? extends Open>>> skipWildcardsUntilIn0();//  skipWildcardsUntilIn0()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Out<In<Out<Final>>> skipWildcardsUntilIn1();//  skipWildcardsUntilIn1()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Out<In<OutPair<Final, ? extends Out<? extends Open>>>> skipWildcardsUntilIn2();//  skipWildcardsUntilIn2()
+
+  public  Container();//  .ctor()
+
+  public final <Q extends Final> void typeParameter(@org.jetbrains.annotations.NotNull() Out<? extends Q>, @org.jetbrains.annotations.NotNull() In<? super Q>);// <Q extends Final>  typeParameter(Out<? extends Q>, In<? super Q>)
+
+  public final void arrayOfOutFinal(@org.jetbrains.annotations.NotNull() Out<Final>[]);//  arrayOfOutFinal(Out<Final>[])
+
+  public final void arrayOfOutOpen(@org.jetbrains.annotations.NotNull() Out<Open>[]);//  arrayOfOutOpen(Out<Open>[])
+
+  public final void deepFinal(@org.jetbrains.annotations.NotNull() Out<Out<Out<Final>>>);//  deepFinal(Out<Out<Out<Final>>>)
+
+  public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);//  deepOpen(Out<? extends Out<? extends Out<? extends Open>>>)
+
+  public final void finalClassArgument(@org.jetbrains.annotations.NotNull() Out<Final>, @org.jetbrains.annotations.NotNull() In<? super Final>);//  finalClassArgument(Out<Final>, In<? super Final>)
+
+  public final void inAny(@org.jetbrains.annotations.NotNull() In<java.lang.Object>);//  inAny(In<java.lang.Object>)
+
+  public final void inFinal(@org.jetbrains.annotations.NotNull() In<? super Final>);//  inFinal(In<? super Final>)
+
+  public final void inOutFinal(@org.jetbrains.annotations.NotNull() In<? super Out<Final>>);//  inOutFinal(In<? super Out<Final>>)
+
+  public final void invFinal(@org.jetbrains.annotations.NotNull() Inv<Final>);//  invFinal(Inv<Final>)
+
+  public final void invIn(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? super Final>>);//  invIn(Out<? extends Inv<? super Final>>)
+
+  public final void invInAny(@org.jetbrains.annotations.NotNull() Out<Inv<? super java.lang.Object>>);//  invInAny(Out<Inv<? super java.lang.Object>>)
+
+  public final void invInOutFinal(@org.jetbrains.annotations.NotNull() Inv<In<Out<Final>>>);//  invInOutFinal(Inv<In<Out<Final>>>)
+
+  public final void invInOutOpen(@org.jetbrains.annotations.NotNull() Inv<In<Out<? extends Open>>>);//  invInOutOpen(Inv<In<Out<? extends Open>>>)
+
+  public final void invInv(@org.jetbrains.annotations.NotNull() Out<Inv<Open>>);//  invInv(Out<Inv<Open>>)
+
+  public final void invOpen(@org.jetbrains.annotations.NotNull() Inv<Open>);//  invOpen(Inv<Open>)
+
+  public final void invOut(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? extends Open>>);//  invOut(Out<? extends Inv<? extends Open>>)
+
+  public final void invOutFinal(@org.jetbrains.annotations.NotNull() Inv<Out<Final>>);//  invOutFinal(Inv<Out<Final>>)
+
+  public final void invOutFinal(@org.jetbrains.annotations.NotNull() Out<Inv<? extends Final>>);//  invOutFinal(Out<Inv<? extends Final>>)
+
+  public final void invOutOpen(@org.jetbrains.annotations.NotNull() Inv<Out<Open>>);//  invOutOpen(Inv<Out<Open>>)
+
+  public final void invOutProjectedOutFinal(@org.jetbrains.annotations.NotNull() Inv<? extends Out<Final>>);//  invOutProjectedOutFinal(Inv<? extends Out<Final>>)
+
+  public final void oneArgumentFinal(@org.jetbrains.annotations.NotNull() OutPair<Final, ? extends Open>);//  oneArgumentFinal(OutPair<Final, ? extends Open>)
+
+  public final void openClassArgument(@org.jetbrains.annotations.NotNull() Out<? extends Open>, @org.jetbrains.annotations.NotNull() In<? super Open>);//  openClassArgument(Out<? extends Open>, In<? super Open>)
+
+  public final void outIn(@org.jetbrains.annotations.NotNull() Out<? extends In<? super Final>>);//  outIn(Out<? extends In<? super Final>>)
+
+  public final void outInAny(@org.jetbrains.annotations.NotNull() Out<In<java.lang.Object>>);//  outInAny(Out<In<java.lang.Object>>)
+
+  public final void outOfArrayOpen(@org.jetbrains.annotations.NotNull() Out<Open[]>);//  outOfArrayOpen(Out<Open[]>)
+
+  public final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out<? extends Open[]>);//  outOfArrayOutOpen(Out<? extends Open[]>)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/coroutines.java b/compiler/testData/asJava/ultraLightFacades/coroutines.java
new file mode 100644
index 00000000000..612af128285
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/coroutines.java
@@ -0,0 +1,7 @@
+public final class CoroutinesKt /* CoroutinesKt*/ {
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super java.lang.Integer>);//  doSomething(java.lang.String, kotlin.coroutines.Continuation<? super java.lang.Integer>)
+
+  public static final <T> void async(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>, ? extends java.lang.Object>);// <T>  async(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>, ? extends java.lang.Object>)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/importAliases.java b/compiler/testData/asJava/ultraLightFacades/importAliases.java
new file mode 100644
index 00000000000..84691634696
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/importAliases.java
@@ -0,0 +1,4 @@
+public final class ImportAliasesKt /* ImportAliasesKt*/ {
+  public static final void foo();//  foo()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/inlineOnly.java b/compiler/testData/asJava/ultraLightFacades/inlineOnly.java
new file mode 100644
index 00000000000..f669caab980
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/inlineOnly.java
@@ -0,0 +1,5 @@
+public final class InlineOnlyKt /* InlineOnlyKt*/ {
+  @kotlin.internal.InlineOnly()
+  private static final void foo();//  foo()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/jvmField.java b/compiler/testData/asJava/ultraLightFacades/jvmField.java
new file mode 100644
index 00000000000..bbe623141be
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/jvmField.java
@@ -0,0 +1,9 @@
+public final class JvmFieldKt /* JvmFieldKt*/ {
+  @kotlin.jvm.JvmField()
+  @org.jetbrains.annotations.NotNull()
+  public static final java.util.Collection<?> a;
+
+  @kotlin.jvm.JvmField()
+  public static int b;
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/jvmName.java b/compiler/testData/asJava/ultraLightFacades/jvmName.java
new file mode 100644
index 00000000000..5a1225e3b85
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/jvmName.java
@@ -0,0 +1,27 @@
+public final class JvmNameKt /* JvmNameKt*/ {
+  @kotlin.jvm.JvmName(name = "fooInt")
+  public static final void fooInt(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.Integer>);//  fooInt(java.util.List<java.lang.Integer>)
+
+  @kotlin.jvm.JvmName(name = "get_rwProp")
+  public static final int get_rwProp();//  get_rwProp()
+
+  @kotlin.jvm.JvmName(name = "hasBigArity")
+  public static final boolean hasBigArity();//  hasBigArity()
+
+  @kotlin.jvm.JvmName(name = "set_rwProp")
+  public static final void set_rwProp(int);//  set_rwProp(int)
+
+  @kotlin.jvm.JvmName(name = "xyz1")
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String xyz1();//  xyz1()
+
+  @kotlin.jvm.JvmName(name = "xyz2")
+  public static final void xyz2(@org.jetbrains.annotations.NotNull() java.lang.String);//  xyz2(java.lang.String)
+
+  public static final int getRwProp();//  getRwProp()
+
+  public static final void foo(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.String>);//  foo(java.util.List<java.lang.String>)
+
+  public static final void setRwProp(int);//  setRwProp(int)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.java b/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.java
new file mode 100644
index 00000000000..0eb595209f7
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.java
@@ -0,0 +1,33 @@
+public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<? extends Open> bar();//  bar()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  public static final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  foo(boolean, Out<? extends java.lang.Integer>)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public static final In<Open> foo3();//  foo3()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<error.NonExistentClass> foo2();//  foo2()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);//  bar(boolean, In<java.lang.Long>, long)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  deepOpen(Out<Out<Out<Open>>>)
+
+  @org.jetbrains.annotations.NotNull()
+  public static final OutPair<? extends Final, OutPair<Out<Final>, Out<? extends Final>>> falseTrueFalse();//  falseTrueFalse()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();//  combination()
+
+  public static final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);//  simpleIn(In<? super java.lang.Object>)
+
+  public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/lateinitProperty.java b/compiler/testData/asJava/ultraLightFacades/lateinitProperty.java
new file mode 100644
index 00000000000..772ab9613c8
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/lateinitProperty.java
@@ -0,0 +1,28 @@
+public final class LateinitPropertyKt /* LateinitPropertyKt*/ {
+  private static java.lang.String b;
+
+  protected static java.lang.String c;
+
+  public static java.lang.String a;
+
+  public static java.lang.String d;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getA();//  getA()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getB();//  getB()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getC();//  getC()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getD();//  getD()
+
+  protected static final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC(java.lang.String)
+
+  public static final void setA(@org.jetbrains.annotations.NotNull() java.lang.String);//  setA(java.lang.String)
+
+  public static final void setD(@org.jetbrains.annotations.NotNull() java.lang.String);//  setD(java.lang.String)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacade.java b/compiler/testData/asJava/ultraLightFacades/multifileFacade.java
new file mode 100644
index 00000000000..db61ca28918
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/multifileFacade.java
@@ -0,0 +1,14 @@
+public final class multifileFacade /* multifileFacade*/ {
+  public static final int x1 = 42 /* initializer type: int */ /* constant value 42 */;
+
+  public static final int y1 = 42 /* initializer type: int */ /* constant value 42 */;
+
+  public static final int bar();//  bar()
+
+  public static final int foo();//  foo()
+
+  public static final int getX();//  getX()
+
+  public static final int getY();//  getY()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.java b/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.java
new file mode 100644
index 00000000000..17d78c68854
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.java
@@ -0,0 +1,9 @@
+public final class multifileFacade /* multifileFacade*/ {
+  public static final int foo();//  foo()
+
+}
+
+public final class otherMultifileFacade /* otherMultifileFacade*/ {
+  public static final int bar();//  bar()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt b/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt
index 80ac73702af..b013669ce71 100644
--- a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt
+++ b/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt
@@ -1,4 +1,6 @@
 @file:JvmMultifileClass
 @file:JvmName("multifileFacade")
 
-fun foo() = 42
\ No newline at end of file
+fun foo() = 42
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/properties.java b/compiler/testData/asJava/ultraLightFacades/properties.java
new file mode 100644
index 00000000000..8a0493c05e9
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/properties.java
@@ -0,0 +1,175 @@
+public final class PropertiesKt /* PropertiesKt*/ {
+  @org.jetbrains.annotations.NotNull()
+  private static final java.lang.Object arrayConst;
+
+  @org.jetbrains.annotations.NotNull()
+  private static final java.lang.String x;
+
+  @org.jetbrains.annotations.NotNull()
+  private static final kotlin.jvm.functions.Function1<java.lang.Integer, java.lang.Integer> sum;
+
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String name;
+
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String protectedWithPrivateSet;
+
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String x$1;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String SUBSYSTEM_DEPRECATED = "This subsystem is deprecated" /* initializer type: java.lang.String */ /* constant value This subsystem is deprecated */;
+
+  @org.jetbrains.annotations.Nullable()
+  private static java.lang.Boolean isEmptyMutable;
+
+  @org.jetbrains.annotations.Nullable()
+  private static java.lang.Boolean islowercase;
+
+  @org.jetbrains.annotations.Nullable()
+  private static java.lang.Integer getInt;
+
+  @org.jetbrains.annotations.Nullable()
+  private static java.lang.Integer isEmptyInt;
+
+  private static final error.NonExistentClass delegatedProp$delegate;
+
+  private static final error.NonExistentClass delegatedProp2$delegate;
+
+  private static final error.NonExistentClass lazyProp$delegate;
+
+  private static final int f1;
+
+  private static final int plainField;
+
+  private static final int privateVal;
+
+  private static final int privateVar;
+
+  private static final java.lang.Void intConst;
+
+  private static int counter;
+
+  private static int f2;
+
+  private static int int1;
+
+  private static int int2;
+
+  private static int internalWithPrivateSet;
+
+  private static java.lang.String internalVarPrivateSet;
+
+  protected static java.lang.String protectedLateinitVar;
+
+  public static error.NonExistentClass subject;
+
+  @org.jetbrains.annotations.NotNull()
+  protected static final java.lang.String getProtectedLateinitVar();//  getProtectedLateinitVar()
+
+  @org.jetbrains.annotations.NotNull()
+  protected static final java.lang.String getProtectedWithPrivateSet();//  getProtectedWithPrivateSet()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.Object getArrayConst();//  getArrayConst()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getDelegatedProp();//  getDelegatedProp()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getInternalVarPrivateSet();//  getInternalVarPrivateSet()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getLazyProp();//  getLazyProp()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getName();//  getName()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getStringRepresentation();//  getStringRepresentation()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getX();//  getX()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getX();//  getX()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final kotlin.jvm.functions.Function1<java.lang.Integer, java.lang.Integer> getSum();//  getSum()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.Boolean getIslowercase();//  getIslowercase()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.Boolean isEmptyMutable();//  isEmptyMutable()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.Integer getCounter2();//  getCounter2()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.Integer getGetInt();//  getGetInt()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.Integer isEmptyInt();//  isEmptyInt()
+
+  private static final int privateFun();//  privateFun()
+
+  protected static final int getF2();//  getF2()
+
+  protected static final int getInt1();//  getInt1()
+
+  protected static final void setF2(int);//  setF2(int)
+
+  protected static final void setProtectedLateinitVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProtectedLateinitVar(java.lang.String)
+
+  public static final boolean isEmpty();//  isEmpty()
+
+  public static final error.NonExistentClass getDelegatedProp2();//  getDelegatedProp2()
+
+  public static final error.NonExistentClass getSubject();//  getSubject()
+
+  public static final int getCounter();//  getCounter()
+
+  public static final int getF1();//  getF1()
+
+  public static final int getInt2();//  getInt2()
+
+  public static final int getIntProp(int);//  getIntProp(int)
+
+  public static final int getInternalWithPrivateSet();//  getInternalWithPrivateSet()
+
+  public static final int getPlainField();//  getPlainField()
+
+  public static final int getValue(error.NonExistentClass, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty<?>);//  getValue(error.NonExistentClass, kotlin.reflect.KProperty<?>)
+
+  public static final java.lang.Void getIntConst();//  getIntConst()
+
+  public static final void setCounter(int);//  setCounter(int)
+
+  public static final void setCounter2(@org.jetbrains.annotations.Nullable() java.lang.Integer);//  setCounter2(java.lang.Integer)
+
+  public static final void setDelegatedProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setDelegatedProp(java.lang.String)
+
+  public static final void setDelegatedProp2(error.NonExistentClass);//  setDelegatedProp2(error.NonExistentClass)
+
+  public static final void setEmptyInt(@org.jetbrains.annotations.Nullable() java.lang.Integer);//  setEmptyInt(java.lang.Integer)
+
+  public static final void setEmptyMutable(@org.jetbrains.annotations.Nullable() java.lang.Boolean);//  setEmptyMutable(java.lang.Boolean)
+
+  public static final void setGetInt(@org.jetbrains.annotations.Nullable() java.lang.Integer);//  setGetInt(java.lang.Integer)
+
+  public static final void setInt2(int);//  setInt2(int)
+
+  public static final void setIslowercase(@org.jetbrains.annotations.Nullable() java.lang.Boolean);//  setIslowercase(java.lang.Boolean)
+
+  public static final void setLazyProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setLazyProp(java.lang.String)
+
+  public static final void setName(@org.jetbrains.annotations.NotNull() java.lang.String);//  setName(java.lang.String)
+
+  public static final void setStringRepresentation(@org.jetbrains.annotations.NotNull() java.lang.String);//  setStringRepresentation(java.lang.String)
+
+  public static final void setSubject(error.NonExistentClass);//  setSubject(error.NonExistentClass)
+
+  public static final void setValue(error.NonExistentClass, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty<?>, int);//  setValue(error.NonExistentClass, kotlin.reflect.KProperty<?>, int)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/simpleFunctions.java b/compiler/testData/asJava/ultraLightFacades/simpleFunctions.java
new file mode 100644
index 00000000000..7c785f9434c
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/simpleFunctions.java
@@ -0,0 +1,19 @@
+public final class SimpleFunctionsKt /* SimpleFunctionsKt*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final native java.lang.String externalFun(int);//  externalFun(int)
+
+  private static final /* vararg */ java.lang.String bar3(error.NonExistentClass, error.NonExistentClass...);//  bar3(error.NonExistentClass, error.NonExistentClass[])
+
+  public static final /* vararg */ void nullableVararg(@org.jetbrains.annotations.Nullable() java.lang.Object...);//  nullableVararg(java.lang.Object[])
+
+  public static final error.NonExistentClass onString(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1<? super java.lang.Integer, ? extends java.lang.Object>);//  onString(java.lang.String, kotlin.jvm.functions.Function1<? super java.lang.Integer, ? extends java.lang.Object>)
+
+  public static final error.NonExistentClass plus(int);//  plus(int)
+
+  public static final int bar4();//  bar4()
+
+  public static final void bar2(error.NonExistentClass, error.NonExistentClass);//  bar2(error.NonExistentClass, error.NonExistentClass)
+
+  public static void bar(int, @org.jetbrains.annotations.NotNull() java.lang.Object, error.NonExistentClass);//  bar(int, java.lang.Object, error.NonExistentClass)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.java b/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.java
new file mode 100644
index 00000000000..f91a4210efa
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.java
@@ -0,0 +1,9 @@
+public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ {
+  @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException::class, MyException::class})
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;//  readFile(java.lang.String)
+
+  @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable::class})
+  public static final void baz() throws java.lang.Throwable;//  baz()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/wildcardOptimization.java b/compiler/testData/asJava/ultraLightFacades/wildcardOptimization.java
new file mode 100644
index 00000000000..cb47ab4a35a
--- /dev/null
+++ b/compiler/testData/asJava/ultraLightFacades/wildcardOptimization.java
@@ -0,0 +1,77 @@
+public final class WildcardOptimizationKt /* WildcardOptimizationKt*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final In<Final> notDeepIn();//  notDeepIn()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Inv<? super Out<? extends Open>> skipWildcardsUntilInProjection();//  skipWildcardsUntilInProjection()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Inv<In<Out<? extends Open>>> skipAllInvWildcards();//  skipAllInvWildcards()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Inv<OutPair<Open, Out<Out<Open>>>> skipAllOutInvWildcards();//  skipAllOutInvWildcards()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<In<Out<? extends Open>>> skipWildcardsUntilIn0();//  skipWildcardsUntilIn0()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<In<Out<Final>>> skipWildcardsUntilIn1();//  skipWildcardsUntilIn1()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<In<OutPair<Final, ? extends Out<? extends Open>>>> skipWildcardsUntilIn2();//  skipWildcardsUntilIn2()
+
+  public static final <Q extends Final> void typeParameter(@org.jetbrains.annotations.NotNull() Out<? extends Q>, @org.jetbrains.annotations.NotNull() In<? super Q>);// <Q extends Final>  typeParameter(Out<? extends Q>, In<? super Q>)
+
+  public static final void arrayOfOutFinal(@org.jetbrains.annotations.NotNull() Out<Final>[]);//  arrayOfOutFinal(Out<Final>[])
+
+  public static final void arrayOfOutOpen(@org.jetbrains.annotations.NotNull() Out<Open>[]);//  arrayOfOutOpen(Out<Open>[])
+
+  public static final void deepFinal(@org.jetbrains.annotations.NotNull() Out<Out<Out<Final>>>);//  deepFinal(Out<Out<Out<Final>>>)
+
+  public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);//  deepOpen(Out<? extends Out<? extends Out<? extends Open>>>)
+
+  public static final void finalClassArgument(@org.jetbrains.annotations.NotNull() Out<Final>, @org.jetbrains.annotations.NotNull() In<? super Final>);//  finalClassArgument(Out<Final>, In<? super Final>)
+
+  public static final void inAny(@org.jetbrains.annotations.NotNull() In<java.lang.Object>);//  inAny(In<java.lang.Object>)
+
+  public static final void inFinal(@org.jetbrains.annotations.NotNull() In<? super Final>);//  inFinal(In<? super Final>)
+
+  public static final void inOutFinal(@org.jetbrains.annotations.NotNull() In<? super Out<Final>>);//  inOutFinal(In<? super Out<Final>>)
+
+  public static final void invFinal(@org.jetbrains.annotations.NotNull() Inv<Final>);//  invFinal(Inv<Final>)
+
+  public static final void invIn(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? super Final>>);//  invIn(Out<? extends Inv<? super Final>>)
+
+  public static final void invInAny(@org.jetbrains.annotations.NotNull() Out<Inv<? super java.lang.Object>>);//  invInAny(Out<Inv<? super java.lang.Object>>)
+
+  public static final void invInOutFinal(@org.jetbrains.annotations.NotNull() Inv<In<Out<Final>>>);//  invInOutFinal(Inv<In<Out<Final>>>)
+
+  public static final void invInOutOpen(@org.jetbrains.annotations.NotNull() Inv<In<Out<? extends Open>>>);//  invInOutOpen(Inv<In<Out<? extends Open>>>)
+
+  public static final void invInv(@org.jetbrains.annotations.NotNull() Out<Inv<Open>>);//  invInv(Out<Inv<Open>>)
+
+  public static final void invOpen(@org.jetbrains.annotations.NotNull() Inv<Open>);//  invOpen(Inv<Open>)
+
+  public static final void invOut(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? extends Open>>);//  invOut(Out<? extends Inv<? extends Open>>)
+
+  public static final void invOutFinal(@org.jetbrains.annotations.NotNull() Inv<Out<Final>>);//  invOutFinal(Inv<Out<Final>>)
+
+  public static final void invOutFinal(@org.jetbrains.annotations.NotNull() Out<Inv<? extends Final>>);//  invOutFinal(Out<Inv<? extends Final>>)
+
+  public static final void invOutOpen(@org.jetbrains.annotations.NotNull() Inv<Out<Open>>);//  invOutOpen(Inv<Out<Open>>)
+
+  public static final void invOutProjectedOutFinal(@org.jetbrains.annotations.NotNull() Inv<? extends Out<Final>>);//  invOutProjectedOutFinal(Inv<? extends Out<Final>>)
+
+  public static final void oneArgumentFinal(@org.jetbrains.annotations.NotNull() OutPair<Final, ? extends Open>);//  oneArgumentFinal(OutPair<Final, ? extends Open>)
+
+  public static final void openClassArgument(@org.jetbrains.annotations.NotNull() Out<? extends Open>, @org.jetbrains.annotations.NotNull() In<? super Open>);//  openClassArgument(Out<? extends Open>, In<? super Open>)
+
+  public static final void outIn(@org.jetbrains.annotations.NotNull() Out<? extends In<? super Final>>);//  outIn(Out<? extends In<? super Final>>)
+
+  public static final void outInAny(@org.jetbrains.annotations.NotNull() Out<In<java.lang.Object>>);//  outInAny(Out<In<java.lang.Object>>)
+
+  public static final void outOfArrayOpen(@org.jetbrains.annotations.NotNull() Out<Open[]>);//  outOfArrayOpen(Out<Open[]>)
+
+  public static final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out<? extends Open[]>);//  outOfArrayOutOpen(Out<? extends Open[]>)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/cli/js/jsExtraHelp.out b/compiler/testData/cli/js/jsExtraHelp.out
index 5dba5d832be..03bc63d0b88 100644
--- a/compiler/testData/cli/js/jsExtraHelp.out
+++ b/compiler/testData/cli/js/jsExtraHelp.out
@@ -1,9 +1,8 @@
 Usage: kotlinc-js <options> <source files>
 where advanced options include:
-  -Xdisable-fake-override-validator
-                             Disable IR fake override validator
   -Xenable-js-scripting      Enable experimental support of .kts files using K/JS (with -Xir only)
   -Xerror-tolerance-policy   Set up error tolerance policy (NONE, SEMANTIC, SYNTAX, ALL)
+  -Xfake-override-validator  Enable IR fake override validator
   -Xfriend-modules=<path>    Paths to friend modules
   -Xfriend-modules-disabled  Disable internal declaration export
   -Xgenerate-dts             Generate TypeScript declarations .d.ts file alongside JS file. Available in IR backend only.
@@ -21,6 +20,7 @@ where advanced options include:
   -Xir-produce-klib-file     Generate packed klib into file specified by -output. Disables pre-IR backend
   -Xmetadata-only            Generate *.meta.js and *.kjsm files only
   -Xtyped-arrays             Translate primitive arrays to JS typed arrays
+  -Xwasm                     Use experimental WebAssembly compiler backend
   -Xallow-kotlin-package     Allow compiling code in package 'kotlin' and allow not requiring kotlin.stdlib in module-info
   -Xallow-result-return-type Allow compiling code when `kotlin.Result` is used as a return type
   -Xcheck-phase-conditions   Check pre- and postconditions on phases
@@ -30,7 +30,6 @@ where advanced options include:
                              Should be a subset of sources passed as free arguments
   -Xcoroutines={enable|warn|error}
                              Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier
-  -Xdeserialize-fake-overrides Fallback to deserializing fake overrides
   -Xdisable-default-scripting-plugin
                              Do not enable scripting plugin by default
   -Xdisable-phases           Disable backend phases
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index ab4de7d4146..d4a0c34af7c 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -78,6 +78,7 @@ where advanced options include:
                              Do not use optimized callable reference superclasses available from 1.4
   -Xno-param-assertions      Don't generate not-null assertions on parameters of methods accessible from Java
   -Xno-receiver-assertions   Don't generate not-null assertion for extension receiver arguments of platform types
+  -Xno-reset-jar-timestamps  Do not reset jar entry timestamps to a fixed date
   -Xno-unified-null-checks   Use pre-1.4 exception types in null checks instead of java.lang.NPE. See KT-22275 for more details
   -Xno-use-ir                Do not use the IR backend. Useful for a custom-built compiler where IR backend is enabled by default
   -Xprofile=<profilerPath:command:outputDir>
@@ -111,6 +112,8 @@ where advanced options include:
   -Xuse-javac                Use javac for Java source and class files analysis
   -Xuse-old-class-files-reading Use old class files reading implementation. This may slow down the build and cause problems with Groovy interop.
                              Should be used in case of problems with the new implementation
+  -Xuse-14-inline-classes-mangling-scheme
+                             Use 1.4 inline classes mangling scheme instead of 1.4.30 one
   -Xuse-old-spilled-var-type-analysis
                              Use old, SourceInterpreter-based analysis for fields, used for spilled variables in coroutines
   -Xuse-type-table           Use type table in metadata serialization
@@ -123,7 +126,6 @@ where advanced options include:
                              Should be a subset of sources passed as free arguments
   -Xcoroutines={enable|warn|error}
                              Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier
-  -Xdeserialize-fake-overrides Fallback to deserializing fake overrides
   -Xdisable-default-scripting-plugin
                              Do not enable scripting plugin by default
   -Xdisable-phases           Disable backend phases
diff --git a/compiler/testData/codegen/asmLike/receiverMangling/innerClass.kt b/compiler/testData/codegen/asmLike/receiverMangling/innerClass.kt
deleted file mode 100644
index 690ce27852a..00000000000
--- a/compiler/testData/codegen/asmLike/receiverMangling/innerClass.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class Foo {
-    inner class Bar
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/asmLike/receiverMangling/innerClass.txt b/compiler/testData/codegen/asmLike/receiverMangling/innerClass.txt
deleted file mode 100644
index 9d1a34b62b5..00000000000
--- a/compiler/testData/codegen/asmLike/receiverMangling/innerClass.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-public final class Foo$Bar : java/lang/Object {
-    final Foo this$0
-
-    public void <init>(Foo this$0)
-}
-
-public final class Foo : java/lang/Object {
-    public void <init>()
-}
diff --git a/compiler/testData/codegen/asmLike/receiverMangling/simple.kt b/compiler/testData/codegen/asmLike/receiverMangling/simple.kt
deleted file mode 100644
index 02956a31e98..00000000000
--- a/compiler/testData/codegen/asmLike/receiverMangling/simple.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun String.foo(a: Int) {}
\ No newline at end of file
diff --git a/compiler/testData/codegen/asmLike/receiverMangling/simple.txt b/compiler/testData/codegen/asmLike/receiverMangling/simple.txt
deleted file mode 100644
index d528fedc150..00000000000
--- a/compiler/testData/codegen/asmLike/receiverMangling/simple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-public final class SimpleKt : java/lang/Object {
-    public final static void foo(java.lang.String $this$foo, int a)
-}
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/complex.kt b/compiler/testData/codegen/asmLike/typeAnnotations/complex.kt
index 185ca53c651..f04b736344c 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/complex.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/complex.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/constructor.kt b/compiler/testData/codegen/asmLike/typeAnnotations/constructor.kt
index 399ba8a0bd3..0f2051eefed 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/constructor.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/constructor.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/defaultArgs.kt b/compiler/testData/codegen/asmLike/typeAnnotations/defaultArgs.kt
index 7aa9f258129..8a18676e952 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/defaultArgs.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/defaultArgs.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.kt b/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.kt
index ead5c6f97ed..c034c7a3f2c 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.kt
@@ -1,7 +1,6 @@
 // IGNORE_BACKEND: JVM_IR
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/extension.kt b/compiler/testData/codegen/asmLike/typeAnnotations/extension.kt
index 398f6e8bd1f..f099638af77 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/extension.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/extension.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/implicit.kt b/compiler/testData/codegen/asmLike/typeAnnotations/implicit.kt
index 148e0eaa958..e9674ff4efa 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/implicit.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/implicit.kt
@@ -1,7 +1,6 @@
 // IGNORE_BACKEND: JVM_IR
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/innerClassConstructor.kt b/compiler/testData/codegen/asmLike/typeAnnotations/innerClassConstructor.kt
index b73432d5186..00ec835fde8 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/innerClassConstructor.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/innerClassConstructor.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/jvmOverload.kt b/compiler/testData/codegen/asmLike/typeAnnotations/jvmOverload.kt
index 91dd5d47c69..d81ba3c0c1c 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/jvmOverload.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/jvmOverload.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/jvmStatic.kt b/compiler/testData/codegen/asmLike/typeAnnotations/jvmStatic.kt
index 808d6f2d00b..35a887941af 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/jvmStatic.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/jvmStatic.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/notYetSupported.kt b/compiler/testData/codegen/asmLike/typeAnnotations/notYetSupported.kt
index b5e4224014c..f9aeb71790b 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/notYetSupported.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/notYetSupported.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/property.kt b/compiler/testData/codegen/asmLike/typeAnnotations/property.kt
index d13f62aca03..2ff5bce5b19 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/property.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/property.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/simple.kt b/compiler/testData/codegen/asmLike/typeAnnotations/simple.kt
index a0a27a07ca6..c794a40c42e 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/simple.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/simple.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/simple2Params.kt b/compiler/testData/codegen/asmLike/typeAnnotations/simple2Params.kt
index 659e82d9a85..d4927e3e9cd 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/simple2Params.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/simple2Params.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/staticNested.kt b/compiler/testData/codegen/asmLike/typeAnnotations/staticNested.kt
index 37d79655766..1082cdfd8fe 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/staticNested.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/staticNested.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/syntheticAccessors.kt b/compiler/testData/codegen/asmLike/typeAnnotations/syntheticAccessors.kt
index fbc25f158e7..53ec4dc4924 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/syntheticAccessors.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/syntheticAccessors.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TYPE_ANNOTATIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 package foo
diff --git a/compiler/testData/codegen/box/annotations/parameters.kt b/compiler/testData/codegen/box/annotations/parameters.kt
index f58826c7fab..f43a23c041d 100644
--- a/compiler/testData/codegen/box/annotations/parameters.kt
+++ b/compiler/testData/codegen/box/annotations/parameters.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/annotations/typeAnnotations/kt41484.kt b/compiler/testData/codegen/box/annotations/typeAnnotations/kt41484.kt
index c21ac1949ec..73e2000475f 100644
--- a/compiler/testData/codegen/box/annotations/typeAnnotations/kt41484.kt
+++ b/compiler/testData/codegen/box/annotations/typeAnnotations/kt41484.kt
@@ -1,6 +1,5 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // JVM_TARGET: 1.8
 // FULL_JDK
 
diff --git a/compiler/testData/codegen/box/argumentOrder/kt17691WithEnabledFeature.kt b/compiler/testData/codegen/box/argumentOrder/kt17691WithEnabledFeature.kt
index 48c994256fa..0384d9b8e6e 100644
--- a/compiler/testData/codegen/box/argumentOrder/kt17691WithEnabledFeature.kt
+++ b/compiler/testData/codegen/box/argumentOrder/kt17691WithEnabledFeature.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // !LANGUAGE: +UseCorrectExecutionOrderForVarargArguments
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/arrays/arraysAreCloneable.kt b/compiler/testData/codegen/box/arrays/arraysAreCloneable.kt
index ffb5b27e083..d95544e84b3 100644
--- a/compiler/testData/codegen/box/arrays/arraysAreCloneable.kt
+++ b/compiler/testData/codegen/box/arrays/arraysAreCloneable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/arrays/cloneArray.kt b/compiler/testData/codegen/box/arrays/cloneArray.kt
index f4f2dd09bcc..df2d2d20895 100644
--- a/compiler/testData/codegen/box/arrays/cloneArray.kt
+++ b/compiler/testData/codegen/box/arrays/cloneArray.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/arrays/clonePrimitiveArrays.kt b/compiler/testData/codegen/box/arrays/clonePrimitiveArrays.kt
index 0ea3f9f6f4f..0efa454f1ed 100644
--- a/compiler/testData/codegen/box/arrays/clonePrimitiveArrays.kt
+++ b/compiler/testData/codegen/box/arrays/clonePrimitiveArrays.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt b/compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt
index 4a7d83c589e..cee2efdf235 100644
--- a/compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt
+++ b/compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 operator fun ArrayList<String>.get(index1: Int, index2: Int) = this[index1 + index2]
 operator fun ArrayList<String>.set(index1: Int, index2: Int, elem: String) {
diff --git a/compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt b/compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt
index 4cc8a004134..eebe23c527b 100644
--- a/compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt
+++ b/compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 operator fun ArrayList<String>.get(index1: Int, index2: Int) = this[index1 + index2]
 operator fun ArrayList<String>.set(index1: Int, index2: Int, elem: String) {
diff --git a/compiler/testData/codegen/box/arrays/forInReversed/reversedOriginalUpdatedInLoopBody.kt b/compiler/testData/codegen/box/arrays/forInReversed/reversedOriginalUpdatedInLoopBody.kt
index e51e49904fc..1f05e3ab4ea 100644
--- a/compiler/testData/codegen/box/arrays/forInReversed/reversedOriginalUpdatedInLoopBody.kt
+++ b/compiler/testData/codegen/box/arrays/forInReversed/reversedOriginalUpdatedInLoopBody.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/arrays/forInReversed/reversedReversedOriginalUpdatedInLoopBody.kt b/compiler/testData/codegen/box/arrays/forInReversed/reversedReversedOriginalUpdatedInLoopBody.kt
index 44a2264c2f1..902716d3587 100644
--- a/compiler/testData/codegen/box/arrays/forInReversed/reversedReversedOriginalUpdatedInLoopBody.kt
+++ b/compiler/testData/codegen/box/arrays/forInReversed/reversedReversedOriginalUpdatedInLoopBody.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/arrays/hashMap.kt b/compiler/testData/codegen/box/arrays/hashMap.kt
index 38316baee5e..5a92b3da0dc 100644
--- a/compiler/testData/codegen/box/arrays/hashMap.kt
+++ b/compiler/testData/codegen/box/arrays/hashMap.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 operator fun HashMap<String, Int?>.set(index: String, elem: Int?) {
     this.put(index, elem)
diff --git a/compiler/testData/codegen/box/arrays/kt2997.kt b/compiler/testData/codegen/box/arrays/kt2997.kt
index ac70c009a2d..dea97c8b0c1 100644
--- a/compiler/testData/codegen/box/arrays/kt2997.kt
+++ b/compiler/testData/codegen/box/arrays/kt2997.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: WASM_NULL_CAST
 //KT-2997 Automatically cast error (Array)
 
 fun foo(a: Any): Int {
diff --git a/compiler/testData/codegen/box/arrays/kt33.kt b/compiler/testData/codegen/box/arrays/kt33.kt
index f705364a5a2..11253c2739e 100644
--- a/compiler/testData/codegen/box/arrays/kt33.kt
+++ b/compiler/testData/codegen/box/arrays/kt33.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 
 // KJS_WITH_FULL_RUNTIME
 fun box () : String {
diff --git a/compiler/testData/codegen/box/arrays/kt503.kt b/compiler/testData/codegen/box/arrays/kt503.kt
index ef98fb73ec8..2d9c71a9f86 100644
--- a/compiler/testData/codegen/box/arrays/kt503.kt
+++ b/compiler/testData/codegen/box/arrays/kt503.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/arrays/kt594.kt b/compiler/testData/codegen/box/arrays/kt594.kt
index c67bd1b66e7..c12fd898ddb 100644
--- a/compiler/testData/codegen/box/arrays/kt594.kt
+++ b/compiler/testData/codegen/box/arrays/kt594.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 package array_test
 
 fun box() : String {
diff --git a/compiler/testData/codegen/box/arrays/kt7338.kt b/compiler/testData/codegen/box/arrays/kt7338.kt
index 545dd48ded2..a5a695615c3 100644
--- a/compiler/testData/codegen/box/arrays/kt7338.kt
+++ b/compiler/testData/codegen/box/arrays/kt7338.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: NATIVE
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/arrays/kt950.kt b/compiler/testData/codegen/box/arrays/kt950.kt
index ca832fd2ad9..a37f06f0794 100644
--- a/compiler/testData/codegen/box/arrays/kt950.kt
+++ b/compiler/testData/codegen/box/arrays/kt950.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 operator fun <K, V> MutableMap<K, V>.set(k : K, v : V) = put(k, v)
 
diff --git a/compiler/testData/codegen/box/arrays/multiArrayConstructors.kt b/compiler/testData/codegen/box/arrays/multiArrayConstructors.kt
index 77663265456..0262d1168e5 100644
--- a/compiler/testData/codegen/box/arrays/multiArrayConstructors.kt
+++ b/compiler/testData/codegen/box/arrays/multiArrayConstructors.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: WASM_NULL_CAST
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals
diff --git a/compiler/testData/codegen/box/arrays/nonLocalReturnArrayConstructor.kt b/compiler/testData/codegen/box/arrays/nonLocalReturnArrayConstructor.kt
index dded8539cda..d981f577025 100644
--- a/compiler/testData/codegen/box/arrays/nonLocalReturnArrayConstructor.kt
+++ b/compiler/testData/codegen/box/arrays/nonLocalReturnArrayConstructor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 typealias ArrayS = Array<String>
 
 fun testArray() {
diff --git a/compiler/testData/codegen/box/arrays/primitiveArrays.kt b/compiler/testData/codegen/box/arrays/primitiveArrays.kt
index cd2a5f23cf9..aa102fc6874 100644
--- a/compiler/testData/codegen/box/arrays/primitiveArrays.kt
+++ b/compiler/testData/codegen/box/arrays/primitiveArrays.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/assert/alwaysDisable.kt b/compiler/testData/codegen/box/assert/alwaysDisable.kt
index 7537141d308..7979acc6e65 100644
--- a/compiler/testData/codegen/box/assert/alwaysDisable.kt
+++ b/compiler/testData/codegen/box/assert/alwaysDisable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_ASSERT
 // IGNORE_BACKEND: NATIVE
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/assert/alwaysEnable.kt b/compiler/testData/codegen/box/assert/alwaysEnable.kt
index 35c6cb217a5..33d66d70a1f 100644
--- a/compiler/testData/codegen/box/assert/alwaysEnable.kt
+++ b/compiler/testData/codegen/box/assert/alwaysEnable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_ASSERT
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/box/binaryOp/compareWithBoxedNotNullDouble.kt b/compiler/testData/codegen/box/binaryOp/compareWithBoxedNotNullDouble.kt
index da09a2090c3..1b54a33dad5 100644
--- a/compiler/testData/codegen/box/binaryOp/compareWithBoxedNotNullDouble.kt
+++ b/compiler/testData/codegen/box/binaryOp/compareWithBoxedNotNullDouble.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 //FILE: Holder.java
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/codegen/box/binaryOp/compareWithBoxedNotNullLong.kt b/compiler/testData/codegen/box/binaryOp/compareWithBoxedNotNullLong.kt
index 089d65bcb67..17627b3cbee 100644
--- a/compiler/testData/codegen/box/binaryOp/compareWithBoxedNotNullLong.kt
+++ b/compiler/testData/codegen/box/binaryOp/compareWithBoxedNotNullLong.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 //FILE: JavaClass.java
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/codegen/box/binaryOp/divisionByZero.kt b/compiler/testData/codegen/box/binaryOp/divisionByZero.kt
index cf55c24d273..1e57e36bb7b 100644
--- a/compiler/testData/codegen/box/binaryOp/divisionByZero.kt
+++ b/compiler/testData/codegen/box/binaryOp/divisionByZero.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/box/boxingOptimization/checkcastAndInstanceOf.kt b/compiler/testData/codegen/box/boxingOptimization/checkcastAndInstanceOf.kt
index 9306a1e2caf..23f49942c65 100644
--- a/compiler/testData/codegen/box/boxingOptimization/checkcastAndInstanceOf.kt
+++ b/compiler/testData/codegen/box/boxingOptimization/checkcastAndInstanceOf.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/boxingOptimization/kt5493.kt b/compiler/testData/codegen/box/boxingOptimization/kt5493.kt
index efd7e94a5f7..c0942550ef8 100644
--- a/compiler/testData/codegen/box/boxingOptimization/kt5493.kt
+++ b/compiler/testData/codegen/box/boxingOptimization/kt5493.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box() : String {
     try {
         return "OK"
diff --git a/compiler/testData/codegen/box/boxingOptimization/kt6842.kt b/compiler/testData/codegen/box/boxingOptimization/kt6842.kt
index 9f52810a009..13daa41befb 100644
--- a/compiler/testData/codegen/box/boxingOptimization/kt6842.kt
+++ b/compiler/testData/codegen/box/boxingOptimization/kt6842.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/boxingOptimization/progressions.kt b/compiler/testData/codegen/box/boxingOptimization/progressions.kt
index 5ea2b777575..92181f07fa7 100644
--- a/compiler/testData/codegen/box/boxingOptimization/progressions.kt
+++ b/compiler/testData/codegen/box/boxingOptimization/progressions.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/bridges/complexTraitImpl.kt b/compiler/testData/codegen/box/bridges/complexTraitImpl.kt
index b17347ff040..fcfb9d705fb 100644
--- a/compiler/testData/codegen/box/bridges/complexTraitImpl.kt
+++ b/compiler/testData/codegen/box/bridges/complexTraitImpl.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt b/compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt
index ffff9f297e4..a6c4b35a400 100644
--- a/compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt
+++ b/compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // KT-3985
 
 interface Trait<T> {
diff --git a/compiler/testData/codegen/box/bridges/fakeOverrideThroughGenericSuperclass.kt b/compiler/testData/codegen/box/bridges/fakeOverrideThroughGenericSuperclass.kt
index 6691f9c14a5..87f977bb103 100644
--- a/compiler/testData/codegen/box/bridges/fakeOverrideThroughGenericSuperclass.kt
+++ b/compiler/testData/codegen/box/bridges/fakeOverrideThroughGenericSuperclass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
diff --git a/compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt b/compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt
new file mode 100644
index 00000000000..b304450a2a3
--- /dev/null
+++ b/compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt
@@ -0,0 +1,14 @@
+
+class Outer<OP> {
+    inner class Inner<IP>
+
+    fun <T> withInner(block: Inner<T>.() -> String) = Inner<T>().block()
+}
+
+fun <TT> withOuter(block: Outer<TT>.() -> String) = Outer<TT>().block()
+
+fun box() = withOuter<Int> {
+    withInner<Boolean> {
+        "OK"
+    }
+}
diff --git a/compiler/testData/codegen/box/bridges/kt2498.kt b/compiler/testData/codegen/box/bridges/kt2498.kt
index 6b504f4167e..56b2501dd6a 100644
--- a/compiler/testData/codegen/box/bridges/kt2498.kt
+++ b/compiler/testData/codegen/box/bridges/kt2498.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/bridges/kt42137.kt b/compiler/testData/codegen/box/bridges/kt42137.kt
new file mode 100644
index 00000000000..5c806317dcd
--- /dev/null
+++ b/compiler/testData/codegen/box/bridges/kt42137.kt
@@ -0,0 +1,16 @@
+interface A<out T> {
+    val value: T
+}
+
+interface B<out T : CharSequence> : A<T>
+
+open class C(override val value: String) : B<CharSequence>
+
+interface X {
+    val value: CharSequence
+}
+
+class Y(value: String) : C(value), X
+
+fun box(): String =
+    (Y("OK") as X).value.toString()
diff --git a/compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt b/compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt
index daa5cd81b4c..e9623089858 100644
--- a/compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt
+++ b/compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/bridges/objectClone.kt b/compiler/testData/codegen/box/bridges/objectClone.kt
index e768b6a7f3e..773f66e04c4 100644
--- a/compiler/testData/codegen/box/bridges/objectClone.kt
+++ b/compiler/testData/codegen/box/bridges/objectClone.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 import java.util.HashSet
 
diff --git a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.kt
index 473cee266e1..fa3658cc6b6 100644
--- a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.kt
+++ b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BRIDGE_ISSUES
 public open class A<T> {
     fun foo(x: T) = "O"
     fun foo(x: A<T>) = "K"
diff --git a/compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt b/compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt
index 029e3e01522..563458e1afe 100644
--- a/compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt
+++ b/compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND: JS_IR
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
diff --git a/compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt b/compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt
index b2c27e27ff2..e719bf80692 100644
--- a/compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt
+++ b/compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt
index ba7fdde2891..412f82c0753 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // TARGET_BACKEND: JVM
 
 import java.util.AbstractList
diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt
index 78722b53f8d..18bb26f2000 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt
index 544accc28f1..74898483503 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt
index 102071c4266..d28b819ef07 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // KT-6042 java.lang.UnsupportedOperationException with ArrayList
diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt
index ec655001017..24eabb0410c 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt
index 544accc28f1..74898483503 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/noTypeSafeBridge.kt b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/noTypeSafeBridge.kt
index a2b8144fb70..76b1dbadea6 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/noTypeSafeBridge.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/noTypeSafeBridge.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridge.kt b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridge.kt
index e065073b68a..30b5d8246d1 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridge.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridge.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridgeNotNullAny.kt b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridgeNotNullAny.kt
index a1ba239ddd3..af94cf5946c 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridgeNotNullAny.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault/typeSafeBridgeNotNullAny.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt
index e5055ef0295..a11d6ea1285 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 
 fun foo(s: String = "kotlin", vararg t: String): Boolean {
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt
index 38689d0fb0e..1789ca1b654 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt
index 22ef6bfe71f..9c38e878442 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 
 fun foo(vararg a: String, result: String = "OK"): String =
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt
index ef0e4d91f74..234d87d33e9 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 
 fun foo(x: String = "O", vararg y: String): String =
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineBound.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineBound.kt
index 2a2db3f9ea0..37ea82ef9d5 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineBound.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineBound.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 
 inline fun foo(x: () -> Unit): String {
     x()
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt
index c9c2d198a1a..e613d7366e4 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt
index d45b3b05d79..4f9bf64c01e 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt
index d30f9487ba1..3b81bddcfd8 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 
 class Outer(val o: String) {
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt
index ca32a3a831b..14b949f4a4f 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BIG_ARITY
 // !LANGUAGE: +NewInference
 
 fun foo(
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/noNameClashForReferencesToSameFunction.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/noNameClashForReferencesToSameFunction.kt
index 130632b5260..00bdd943452 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/noNameClashForReferencesToSameFunction.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/noNameClashForReferencesToSameFunction.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 var result = ""
 
 class C(val token: String) {
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/referenceToVarargWithDefaults.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/referenceToVarargWithDefaults.kt
index 1197e758f35..fc21c0424f6 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/referenceToVarargWithDefaults.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/referenceToVarargWithDefaults.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 var result = "fail"
 
 fun foo(vararg xs: Int, s1: String = "", s2: String = "OK") {
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithCoercionToUnit.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithCoercionToUnit.kt
index e63135228f9..20f58afdd9b 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithCoercionToUnit.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithCoercionToUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithDefaultArguments.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithDefaultArguments.kt
index 5941bff2a27..6fe7b1848f7 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithDefaultArguments.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithDefaultArguments.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithVarargs.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithVarargs.kt
index 77ed5a7ce9b..1a053ca9632 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithVarargs.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/adaptedWithVarargs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/bound.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/bound.kt
index ec496236572..6d56431ae6b 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/bound.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/bound.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/boundExtension.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/boundExtension.kt
index 9274074db21..05d170dbaef 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/boundExtension.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/boundExtension.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/crossInline.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/crossInline.kt
index c904caebf91..0eb0be068bb 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/crossInline.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/crossInline.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithCoercionToUnit.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithCoercionToUnit.kt
index f1f9ce38064..8ddbeaf6770 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithCoercionToUnit.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithCoercionToUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithDefaultArguments.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithDefaultArguments.kt
index 24717ab4a8e..21fc23d257e 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithDefaultArguments.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithDefaultArguments.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithVarargs.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithVarargs.kt
index 8444182b076..b598c00d53b 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithVarargs.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineAdaptedWithVarargs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineBound.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineBound.kt
index a45b389582c..eb658801ab7 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineBound.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineBound.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineSimple.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineSimple.kt
index 292c2aa541a..54f772944b7 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineSimple.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineSimple.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineWithParameters.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineWithParameters.kt
index 208458733f2..454067b8737 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineWithParameters.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/inlineWithParameters.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/isAs.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/isAs.kt
index df9f1d7a009..879cc43fda3 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/isAs.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/isAs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/simple.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/simple.kt
index ce54c5b3f73..e669e307b25 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/simple.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/simple.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/withParameters.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/withParameters.kt
index 602fd94c29f..3866c2f37f4 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/withParameters.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion/withParameters.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt
index 35dd9d53e3f..a9bf2ae57d2 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt
index d811287c073..d008145045f 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // !LANGUAGE: +NewInference
 
 fun sum(vararg args: Int): Int {
diff --git a/compiler/testData/codegen/box/callableReference/bound/adapted.kt b/compiler/testData/codegen/box/callableReference/bound/adapted.kt
index 926c7f7d79a..51836aecdd1 100644
--- a/compiler/testData/codegen/box/callableReference/bound/adapted.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/adapted.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 class C {
     fun ffff(i: Int, s: String = "OK") = s
 }
diff --git a/compiler/testData/codegen/box/callableReference/bound/array.kt b/compiler/testData/codegen/box/callableReference/bound/array.kt
index 2a78bb9cc88..58ff770f459 100644
--- a/compiler/testData/codegen/box/callableReference/bound/array.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/array.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 open class A {
     var f: String = "OK"
 }
diff --git a/compiler/testData/codegen/box/callableReference/bound/arrayGetIntrinsic.kt b/compiler/testData/codegen/box/callableReference/bound/arrayGetIntrinsic.kt
index d81fb9087aa..d2b65908df7 100644
--- a/compiler/testData/codegen/box/callableReference/bound/arrayGetIntrinsic.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/arrayGetIntrinsic.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 fun box(): String {
     return if ((arrayOf(1, 2, 3)::get)(1) == 2) "OK" else "Fail"
 }
diff --git a/compiler/testData/codegen/box/callableReference/bound/boundReferenceToOverloadedFunction.kt b/compiler/testData/codegen/box/callableReference/bound/boundReferenceToOverloadedFunction.kt
index 68131027466..cfa74463e72 100644
--- a/compiler/testData/codegen/box/callableReference/bound/boundReferenceToOverloadedFunction.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/boundReferenceToOverloadedFunction.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // !LANGUAGE: +NewInference
 
 interface JsonParser
diff --git a/compiler/testData/codegen/box/callableReference/bound/coercionToUnit.kt b/compiler/testData/codegen/box/callableReference/bound/coercionToUnit.kt
index d05bbce7f2a..0a65921290b 100644
--- a/compiler/testData/codegen/box/callableReference/bound/coercionToUnit.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/coercionToUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +NewInference
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/callableReference/bound/companionObjectReceiver.kt b/compiler/testData/codegen/box/callableReference/bound/companionObjectReceiver.kt
index ddf856c54da..0881f432f0a 100644
--- a/compiler/testData/codegen/box/callableReference/bound/companionObjectReceiver.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/companionObjectReceiver.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 class A {
     companion object {
         fun ok() = "OK"
diff --git a/compiler/testData/codegen/box/callableReference/bound/dontShareReceiver.kt b/compiler/testData/codegen/box/callableReference/bound/dontShareReceiver.kt
index d5d36ca681d..894e9b1d080 100644
--- a/compiler/testData/codegen/box/callableReference/bound/dontShareReceiver.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/dontShareReceiver.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 
 fun box(): String {
     var state = 0
diff --git a/compiler/testData/codegen/box/callableReference/bound/emptyLHS.kt b/compiler/testData/codegen/box/callableReference/bound/emptyLHS.kt
index e83e406c73b..5ce879ab6de 100644
--- a/compiler/testData/codegen/box/callableReference/bound/emptyLHS.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/emptyLHS.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 var result = ""
 
 class A {
diff --git a/compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt b/compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt
index 94b54d0e920..adb11ae577c 100644
--- a/compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 enum class E {
diff --git a/compiler/testData/codegen/box/callableReference/bound/equals/nullableReceiverInEquals.kt b/compiler/testData/codegen/box/callableReference/bound/equals/nullableReceiverInEquals.kt
index ac9762778df..660a7feb821 100644
--- a/compiler/testData/codegen/box/callableReference/bound/equals/nullableReceiverInEquals.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/equals/nullableReceiverInEquals.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/callableReference/bound/equals/propertyAccessors.kt b/compiler/testData/codegen/box/callableReference/bound/equals/propertyAccessors.kt
index 577b638cf4a..6a1ff39ab3b 100644
--- a/compiler/testData/codegen/box/callableReference/bound/equals/propertyAccessors.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/equals/propertyAccessors.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/callableReference/bound/equals/receiverInEquals.kt b/compiler/testData/codegen/box/callableReference/bound/equals/receiverInEquals.kt
index b1fffa5d7b8..717e5c0822e 100644
--- a/compiler/testData/codegen/box/callableReference/bound/equals/receiverInEquals.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/equals/receiverInEquals.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: investigate should it be ran for JS or not
@@ -26,4 +28,4 @@ fun box(): String =
             aFoo == A_foo -> "Bound ref SHOULD NOT be equal to free ref"
 
             else -> "OK"
-        }
\ No newline at end of file
+        }
diff --git a/compiler/testData/codegen/box/callableReference/bound/equals/reflectionReference.kt b/compiler/testData/codegen/box/callableReference/bound/equals/reflectionReference.kt
index 5a09de2f199..00bf4df95e7 100644
--- a/compiler/testData/codegen/box/callableReference/bound/equals/reflectionReference.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/equals/reflectionReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/callableReference/bound/genericValOnLHS.kt b/compiler/testData/codegen/box/callableReference/bound/genericValOnLHS.kt
index 8911473c689..50d169f3c97 100644
--- a/compiler/testData/codegen/box/callableReference/bound/genericValOnLHS.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/genericValOnLHS.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 class Generic<P : Any>(val p: P)
 
 class Host {
diff --git a/compiler/testData/codegen/box/callableReference/bound/kCallableNameIntrinsic.kt b/compiler/testData/codegen/box/callableReference/bound/kCallableNameIntrinsic.kt
index 557e76d4377..99a03fc6984 100644
--- a/compiler/testData/codegen/box/callableReference/bound/kCallableNameIntrinsic.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/kCallableNameIntrinsic.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // SKIP_SOURCEMAP_REMAPPING
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/bound/kt12738.kt b/compiler/testData/codegen/box/callableReference/bound/kt12738.kt
index abd0b58b533..4a489ea9a34 100644
--- a/compiler/testData/codegen/box/callableReference/bound/kt12738.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/kt12738.kt
@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 fun <T> get(t: T): () -> String {
     return t::toString
 }
diff --git a/compiler/testData/codegen/box/callableReference/bound/kt15446.kt b/compiler/testData/codegen/box/callableReference/bound/kt15446.kt
index 2630e17739a..eb21954874e 100644
--- a/compiler/testData/codegen/box/callableReference/bound/kt15446.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/kt15446.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // KJS_WITH_FULL_RUNTIME
 //WITH_RUNTIME
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/bound/multiCase.kt b/compiler/testData/codegen/box/callableReference/bound/multiCase.kt
index 08af3dd78ca..dabb7b760c1 100644
--- a/compiler/testData/codegen/box/callableReference/bound/multiCase.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/multiCase.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // IGNORE_BACKEND: NATIVE
 class A(var v: Int) {
     fun f(x: Int) = x * v
diff --git a/compiler/testData/codegen/box/callableReference/bound/nullReceiver.kt b/compiler/testData/codegen/box/callableReference/bound/nullReceiver.kt
index 0111a54d58b..d3b540c5cae 100644
--- a/compiler/testData/codegen/box/callableReference/bound/nullReceiver.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/nullReceiver.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 val String?.ok: String
     get() = "OK"
 
diff --git a/compiler/testData/codegen/box/callableReference/bound/objectReceiver.kt b/compiler/testData/codegen/box/callableReference/bound/objectReceiver.kt
index a03203792d5..3e2ff238c41 100644
--- a/compiler/testData/codegen/box/callableReference/bound/objectReceiver.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/objectReceiver.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 object Singleton {
     fun ok() = "OK"
 }
diff --git a/compiler/testData/codegen/box/callableReference/bound/primitiveReceiver.kt b/compiler/testData/codegen/box/callableReference/bound/primitiveReceiver.kt
index 2773e0cdcd1..6b4db84d300 100644
--- a/compiler/testData/codegen/box/callableReference/bound/primitiveReceiver.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/primitiveReceiver.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 fun Boolean.foo() = 1
 fun Byte.foo() = 2
 fun Short.foo() = 3
diff --git a/compiler/testData/codegen/box/callableReference/bound/receiverEvaluatedOnce.kt b/compiler/testData/codegen/box/callableReference/bound/receiverEvaluatedOnce.kt
index fcc6d27ed51..ac1a19eda60 100644
--- a/compiler/testData/codegen/box/callableReference/bound/receiverEvaluatedOnce.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/receiverEvaluatedOnce.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 var x = 0
 
 class A {
diff --git a/compiler/testData/codegen/box/callableReference/bound/simpleFunction.kt b/compiler/testData/codegen/box/callableReference/bound/simpleFunction.kt
index 15fae151f5f..418549b9ec8 100644
--- a/compiler/testData/codegen/box/callableReference/bound/simpleFunction.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/simpleFunction.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 fun box(): String {
     val f = "KOTLIN"::get
     return "${f(1)}${f(0)}"
diff --git a/compiler/testData/codegen/box/callableReference/bound/simpleProperty.kt b/compiler/testData/codegen/box/callableReference/bound/simpleProperty.kt
index c271b1c6418..d17561afaf4 100644
--- a/compiler/testData/codegen/box/callableReference/bound/simpleProperty.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/simpleProperty.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 fun box(): String {
     val f = "kotlin"::length
     val result = f.get()
diff --git a/compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt b/compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt
index e77d8a9c3da..02d4baecc2f 100644
--- a/compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // FILE: test.kt
diff --git a/compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt b/compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt
index a4ef7be5798..fa0296d7d36 100644
--- a/compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // FILE: test.kt
diff --git a/compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt b/compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt
index 380b4775542..0cd0731d067 100644
--- a/compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // FILE: test.kt
diff --git a/compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt b/compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt
index e77c2f0d3af..6ca06c22fc6 100644
--- a/compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // FILE: test.kt
diff --git a/compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt b/compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt
index fc6bcd8321c..a9f35b5e620 100644
--- a/compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // FILE: test.kt
diff --git a/compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt b/compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt
index 2c97d31838f..a0978ab9dec 100644
--- a/compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // FILE: test.kt
diff --git a/compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt b/compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt
index 651d7839719..30ec5d1010e 100644
--- a/compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // FILE: test.kt
diff --git a/compiler/testData/codegen/box/callableReference/equality/suspendConversion.kt b/compiler/testData/codegen/box/callableReference/equality/suspendConversion.kt
index 0c521662b72..450769ff0b4 100644
--- a/compiler/testData/codegen/box/callableReference/equality/suspendConversion.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/suspendConversion.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +SuspendConversion
 // FILE: suspendCovnersion.kt
 
diff --git a/compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt b/compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt
index f371dd3af54..090b86e21b1 100644
--- a/compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt
+++ b/compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // FILE: test.kt
diff --git a/compiler/testData/codegen/box/callableReference/function/argumentTypes.kt b/compiler/testData/codegen/box/callableReference/function/argumentTypes.kt
index 6046e7f015a..da45ae5b723 100644
--- a/compiler/testData/codegen/box/callableReference/function/argumentTypes.kt
+++ b/compiler/testData/codegen/box/callableReference/function/argumentTypes.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CALLABLE_REFERENCES_FAIL
 inline fun <TT> id(x: TT): TT = x
 inline fun <TT> String.extId(x: TT): String = this
 
diff --git a/compiler/testData/codegen/box/callableReference/function/classMemberFromCompanionObject.kt b/compiler/testData/codegen/box/callableReference/function/classMemberFromCompanionObject.kt
index c7be9b7a68f..87b5846d460 100644
--- a/compiler/testData/codegen/box/callableReference/function/classMemberFromCompanionObject.kt
+++ b/compiler/testData/codegen/box/callableReference/function/classMemberFromCompanionObject.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 class C {
     fun OK() {}
 
diff --git a/compiler/testData/codegen/box/callableReference/function/genericCallableReferenceArguments.kt b/compiler/testData/codegen/box/callableReference/function/genericCallableReferenceArguments.kt
index 15d54d48337..d8480bfb0b7 100644
--- a/compiler/testData/codegen/box/callableReference/function/genericCallableReferenceArguments.kt
+++ b/compiler/testData/codegen/box/callableReference/function/genericCallableReferenceArguments.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JS, NATIVE
diff --git a/compiler/testData/codegen/box/callableReference/function/genericCallableReferencesWithNullableTypes.kt b/compiler/testData/codegen/box/callableReference/function/genericCallableReferencesWithNullableTypes.kt
index 59896ac53f8..39f85994f71 100644
--- a/compiler/testData/codegen/box/callableReference/function/genericCallableReferencesWithNullableTypes.kt
+++ b/compiler/testData/codegen/box/callableReference/function/genericCallableReferencesWithNullableTypes.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 // WITH_RUNTIME
 // WITH_REFLECT
 
diff --git a/compiler/testData/codegen/box/callableReference/function/genericCallableReferencesWithOverload.kt b/compiler/testData/codegen/box/callableReference/function/genericCallableReferencesWithOverload.kt
index 874f41cac3c..bbb37f5218b 100644
--- a/compiler/testData/codegen/box/callableReference/function/genericCallableReferencesWithOverload.kt
+++ b/compiler/testData/codegen/box/callableReference/function/genericCallableReferencesWithOverload.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 // WITH_RUNTIME
 // WITH_REFLECT
 
diff --git a/compiler/testData/codegen/box/callableReference/function/genericWithDependentType.kt b/compiler/testData/codegen/box/callableReference/function/genericWithDependentType.kt
index 50ce78afc24..1302dd5e72f 100644
--- a/compiler/testData/codegen/box/callableReference/function/genericWithDependentType.kt
+++ b/compiler/testData/codegen/box/callableReference/function/genericWithDependentType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/callableReference/function/getArityViaFunctionImpl.kt b/compiler/testData/codegen/box/callableReference/function/getArityViaFunctionImpl.kt
index b6af1ac7c75..29fdec2405d 100644
--- a/compiler/testData/codegen/box/callableReference/function/getArityViaFunctionImpl.kt
+++ b/compiler/testData/codegen/box/callableReference/function/getArityViaFunctionImpl.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/callableReference/function/innerClassConstructorWithTwoReceivers.kt b/compiler/testData/codegen/box/callableReference/function/innerClassConstructorWithTwoReceivers.kt
index 35fa6ffc598..1726532fc58 100644
--- a/compiler/testData/codegen/box/callableReference/function/innerClassConstructorWithTwoReceivers.kt
+++ b/compiler/testData/codegen/box/callableReference/function/innerClassConstructorWithTwoReceivers.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 abstract class A {
     inner class InnerInA {
         fun returnOk() = "OK"
diff --git a/compiler/testData/codegen/box/callableReference/function/kt21787.kt b/compiler/testData/codegen/box/callableReference/function/kt21787.kt
index 5f8e82ca648..5fbd1988e8c 100644
--- a/compiler/testData/codegen/box/callableReference/function/kt21787.kt
+++ b/compiler/testData/codegen/box/callableReference/function/kt21787.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 class Container {
diff --git a/compiler/testData/codegen/box/callableReference/function/local/equalsHashCode.kt b/compiler/testData/codegen/box/callableReference/function/local/equalsHashCode.kt
index 2265a7637ca..ae10e2e0c0e 100644
--- a/compiler/testData/codegen/box/callableReference/function/local/equalsHashCode.kt
+++ b/compiler/testData/codegen/box/callableReference/function/local/equalsHashCode.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
diff --git a/compiler/testData/codegen/box/callableReference/function/local/localFunctionName.kt b/compiler/testData/codegen/box/callableReference/function/local/localFunctionName.kt
index 361ba4c3ce3..eed6c774d65 100644
--- a/compiler/testData/codegen/box/callableReference/function/local/localFunctionName.kt
+++ b/compiler/testData/codegen/box/callableReference/function/local/localFunctionName.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 fun box(): String {
     fun OK() {}
 
diff --git a/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt b/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt
index 760f13cd4ab..7c9dbdc6e7c 100644
--- a/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt
+++ b/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/callableReference/function/referenceToCompanionMember.kt b/compiler/testData/codegen/box/callableReference/function/referenceToCompanionMember.kt
index 1dc47d1a240..3be2c51a9dd 100644
--- a/compiler/testData/codegen/box/callableReference/function/referenceToCompanionMember.kt
+++ b/compiler/testData/codegen/box/callableReference/function/referenceToCompanionMember.kt
@@ -1,5 +1,6 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS
 
 class A {
diff --git a/compiler/testData/codegen/box/callableReference/function/sortListOfStrings.kt b/compiler/testData/codegen/box/callableReference/function/sortListOfStrings.kt
index b26a4e942d1..59c30191889 100644
--- a/compiler/testData/codegen/box/callableReference/function/sortListOfStrings.kt
+++ b/compiler/testData/codegen/box/callableReference/function/sortListOfStrings.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 // SKIP_DCE_DRIVEN
diff --git a/compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitManyArgs.kt b/compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitManyArgs.kt
index a154316a52b..d9ed15320e6 100644
--- a/compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitManyArgs.kt
+++ b/compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitManyArgs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BIG_ARITY
 // IGNORE_BACKEND: NATIVE
 var result = "Fail"
 
diff --git a/compiler/testData/codegen/box/callableReference/genericConstructorReference.kt b/compiler/testData/codegen/box/callableReference/genericConstructorReference.kt
index 4fec1e7cd07..982b28b4c68 100644
--- a/compiler/testData/codegen/box/callableReference/genericConstructorReference.kt
+++ b/compiler/testData/codegen/box/callableReference/genericConstructorReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND_FIR: JVM_IR
diff --git a/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt b/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt
index eb2a0728db2..0e36ed8a8d9 100644
--- a/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt
+++ b/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 abstract class Base {
     val result = "OK"
 }
diff --git a/compiler/testData/codegen/box/callableReference/property/delegated.kt b/compiler/testData/codegen/box/callableReference/property/delegated.kt
index 00b880be84e..3eca56876f6 100644
--- a/compiler/testData/codegen/box/callableReference/property/delegated.kt
+++ b/compiler/testData/codegen/box/callableReference/property/delegated.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty
 
 val four: Int by NumberDecrypter
diff --git a/compiler/testData/codegen/box/callableReference/property/delegatedMutable.kt b/compiler/testData/codegen/box/callableReference/property/delegatedMutable.kt
index 3bc30b3c17d..07c0e5902be 100644
--- a/compiler/testData/codegen/box/callableReference/property/delegatedMutable.kt
+++ b/compiler/testData/codegen/box/callableReference/property/delegatedMutable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty
 
 var result: String by Delegate
diff --git a/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt b/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt
index 10ccfbdee1e..19e9b4d607e 100644
--- a/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt
+++ b/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 enum class E {
     I
 }
diff --git a/compiler/testData/codegen/box/callableReference/property/extensionToArray.kt b/compiler/testData/codegen/box/callableReference/property/extensionToArray.kt
index 455b69ae0cf..457cc7de547 100644
--- a/compiler/testData/codegen/box/callableReference/property/extensionToArray.kt
+++ b/compiler/testData/codegen/box/callableReference/property/extensionToArray.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 val Array<String>.firstElement: String get() = get(0)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/property/genericProperty.kt b/compiler/testData/codegen/box/callableReference/property/genericProperty.kt
index 63de5fccffe..b0d76b7c397 100644
--- a/compiler/testData/codegen/box/callableReference/property/genericProperty.kt
+++ b/compiler/testData/codegen/box/callableReference/property/genericProperty.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // IGNORE_BACKEND: NATIVE
 //For KT-6020
 import kotlin.reflect.KProperty1
diff --git a/compiler/testData/codegen/box/callableReference/property/inEnum.kt b/compiler/testData/codegen/box/callableReference/property/inEnum.kt
index 6e1a4f95efa..f6c4a9e0b88 100644
--- a/compiler/testData/codegen/box/callableReference/property/inEnum.kt
+++ b/compiler/testData/codegen/box/callableReference/property/inEnum.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 
 import kotlin.reflect.KProperty1
 
diff --git a/compiler/testData/codegen/box/callableReference/property/inReceiverOfAnother.kt b/compiler/testData/codegen/box/callableReference/property/inReceiverOfAnother.kt
index da300db3a28..28c8514afb1 100644
--- a/compiler/testData/codegen/box/callableReference/property/inReceiverOfAnother.kt
+++ b/compiler/testData/codegen/box/callableReference/property/inReceiverOfAnother.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 var x = "OK"
 
 class C(init: () -> String) {
diff --git a/compiler/testData/codegen/box/callableReference/property/invokePropertyReference.kt b/compiler/testData/codegen/box/callableReference/property/invokePropertyReference.kt
index 617732ae7f0..9d2aa3a56a9 100644
--- a/compiler/testData/codegen/box/callableReference/property/invokePropertyReference.kt
+++ b/compiler/testData/codegen/box/callableReference/property/invokePropertyReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 var state = ""
 
 var topLevel: Int
diff --git a/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt b/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt
index 0030d8026c3..38bd1e3be89 100644
--- a/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt
+++ b/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // Name of the getter should be 'getaBcde' according to JavaBean conventions
 var aBcde: Int = 239
 
diff --git a/compiler/testData/codegen/box/callableReference/property/kClassInstanceIsInitializedFirst.kt b/compiler/testData/codegen/box/callableReference/property/kClassInstanceIsInitializedFirst.kt
index 5ce636926d5..c1111cc124f 100644
--- a/compiler/testData/codegen/box/callableReference/property/kClassInstanceIsInitializedFirst.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kClassInstanceIsInitializedFirst.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty1
 
 class A {
diff --git a/compiler/testData/codegen/box/callableReference/property/kt12044.kt b/compiler/testData/codegen/box/callableReference/property/kt12044.kt
index ea43b14b545..52b0746aba6 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt12044.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt12044.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // KT-12044 Assertion "Rewrite at slice LEXICAL_SCOPE" for 'if' with property references
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/property/kt12982_protectedPropertyReference.kt b/compiler/testData/codegen/box/callableReference/property/kt12982_protectedPropertyReference.kt
index 7cabd9c6d65..fe528d1d04a 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt12982_protectedPropertyReference.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt12982_protectedPropertyReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 class Foo {
     protected var x = 0
 
diff --git a/compiler/testData/codegen/box/callableReference/property/kt14330.kt b/compiler/testData/codegen/box/callableReference/property/kt14330.kt
index 43969a5fd1a..0b620b02ae9 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt14330.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt14330.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 data class Foo(var bar: Int?)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/property/kt14330_2.kt b/compiler/testData/codegen/box/callableReference/property/kt14330_2.kt
index d0acfccb0bd..9d363274aa6 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt14330_2.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt14330_2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 var recivier : Any? = "fail"
 var value2 : Any? = "fail2"
 
diff --git a/compiler/testData/codegen/box/callableReference/property/kt15447.kt b/compiler/testData/codegen/box/callableReference/property/kt15447.kt
index d1d9a817df9..2185c258155 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt15447.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt15447.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 //WITH_RUNTIME
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/property/kt6870_privatePropertyReference.kt b/compiler/testData/codegen/box/callableReference/property/kt6870_privatePropertyReference.kt
index 50d2a1d8413..1e140b8e929 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt6870_privatePropertyReference.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt6870_privatePropertyReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/callableReference/property/listOfStringsMapLength.kt b/compiler/testData/codegen/box/callableReference/property/listOfStringsMapLength.kt
index a3e3522f66d..d520921eb76 100644
--- a/compiler/testData/codegen/box/callableReference/property/listOfStringsMapLength.kt
+++ b/compiler/testData/codegen/box/callableReference/property/listOfStringsMapLength.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/callableReference/property/localClassVar.kt b/compiler/testData/codegen/box/callableReference/property/localClassVar.kt
index fd45085df67..e7c0cf06ccc 100644
--- a/compiler/testData/codegen/box/callableReference/property/localClassVar.kt
+++ b/compiler/testData/codegen/box/callableReference/property/localClassVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 fun box(): String {
     class Local {
         var result = "Fail"
diff --git a/compiler/testData/codegen/box/callableReference/property/overriddenInSubclass.kt b/compiler/testData/codegen/box/callableReference/property/overriddenInSubclass.kt
index d892efcba29..fc636768a96 100644
--- a/compiler/testData/codegen/box/callableReference/property/overriddenInSubclass.kt
+++ b/compiler/testData/codegen/box/callableReference/property/overriddenInSubclass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 open class Base {
     open val foo = "Base"
 }
diff --git a/compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt b/compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt
index 632b3d49dc5..e43704b4c4d 100644
--- a/compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt
+++ b/compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 class A {
     var value: String = "fail1"
         private set
diff --git a/compiler/testData/codegen/box/callableReference/property/privateSetterInsideClass.kt b/compiler/testData/codegen/box/callableReference/property/privateSetterInsideClass.kt
index 8674d12a3a8..ac74136d45d 100644
--- a/compiler/testData/codegen/box/callableReference/property/privateSetterInsideClass.kt
+++ b/compiler/testData/codegen/box/callableReference/property/privateSetterInsideClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KMutableProperty
 
 class Bar(name: String) {
diff --git a/compiler/testData/codegen/box/callableReference/property/privateSetterOutsideClass.kt b/compiler/testData/codegen/box/callableReference/property/privateSetterOutsideClass.kt
index b4318589531..dc5f6e97bb3 100644
--- a/compiler/testData/codegen/box/callableReference/property/privateSetterOutsideClass.kt
+++ b/compiler/testData/codegen/box/callableReference/property/privateSetterOutsideClass.kt
@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // See KT-12337 Reference to property with invisible setter should not be a KMutableProperty
 
 import kotlin.reflect.KProperty1
diff --git a/compiler/testData/codegen/box/callableReference/property/receiverEvaluatedOnce.kt b/compiler/testData/codegen/box/callableReference/property/receiverEvaluatedOnce.kt
index 3b58ed7b9a5..16a7fb64ad1 100644
--- a/compiler/testData/codegen/box/callableReference/property/receiverEvaluatedOnce.kt
+++ b/compiler/testData/codegen/box/callableReference/property/receiverEvaluatedOnce.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // WITH_REFLECT
 import kotlin.reflect.KProperty0
 
diff --git a/compiler/testData/codegen/box/callableReference/property/simpleExtension.kt b/compiler/testData/codegen/box/callableReference/property/simpleExtension.kt
index 28d7199fe8d..090f3f65234 100644
--- a/compiler/testData/codegen/box/callableReference/property/simpleExtension.kt
+++ b/compiler/testData/codegen/box/callableReference/property/simpleExtension.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 val String.id: String
     get() = this
 
diff --git a/compiler/testData/codegen/box/callableReference/property/simpleMember.kt b/compiler/testData/codegen/box/callableReference/property/simpleMember.kt
index 39bf36a0707..4daa2966d63 100644
--- a/compiler/testData/codegen/box/callableReference/property/simpleMember.kt
+++ b/compiler/testData/codegen/box/callableReference/property/simpleMember.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 class A(val x: Int)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/property/simpleMutableExtension.kt b/compiler/testData/codegen/box/callableReference/property/simpleMutableExtension.kt
index e69cbbe72fc..d6ef602311e 100644
--- a/compiler/testData/codegen/box/callableReference/property/simpleMutableExtension.kt
+++ b/compiler/testData/codegen/box/callableReference/property/simpleMutableExtension.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 var storage = 0
 
 var Int.foo: Int
diff --git a/compiler/testData/codegen/box/callableReference/property/simpleMutableMember.kt b/compiler/testData/codegen/box/callableReference/property/simpleMutableMember.kt
index f7d815af3fc..56c397515f9 100644
--- a/compiler/testData/codegen/box/callableReference/property/simpleMutableMember.kt
+++ b/compiler/testData/codegen/box/callableReference/property/simpleMutableMember.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 data class Box(var value: String)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/property/simpleMutableTopLevel.kt b/compiler/testData/codegen/box/callableReference/property/simpleMutableTopLevel.kt
index 46abcebe5f9..cf0738b84e6 100644
--- a/compiler/testData/codegen/box/callableReference/property/simpleMutableTopLevel.kt
+++ b/compiler/testData/codegen/box/callableReference/property/simpleMutableTopLevel.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 data class Box(val value: String)
 
 var pr = Box("first")
diff --git a/compiler/testData/codegen/box/callableReference/property/simpleTopLevel.kt b/compiler/testData/codegen/box/callableReference/property/simpleTopLevel.kt
index 818327da26f..05f9b3dfe56 100644
--- a/compiler/testData/codegen/box/callableReference/property/simpleTopLevel.kt
+++ b/compiler/testData/codegen/box/callableReference/property/simpleTopLevel.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 data class Box(val value: String)
 
 val foo = Box("lol")
diff --git a/compiler/testData/codegen/box/casts/as.kt b/compiler/testData/codegen/box/casts/as.kt
index 19fa4490ef8..023a4591720 100644
--- a/compiler/testData/codegen/box/casts/as.kt
+++ b/compiler/testData/codegen/box/casts/as.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/asForConstants.kt b/compiler/testData/codegen/box/casts/asForConstants.kt
index d0b6d7ed513..cfc14ff8967 100644
--- a/compiler/testData/codegen/box/casts/asForConstants.kt
+++ b/compiler/testData/codegen/box/casts/asForConstants.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/asSafe.kt b/compiler/testData/codegen/box/casts/asSafe.kt
index 347508a6413..5bd206ffb73 100644
--- a/compiler/testData/codegen/box/casts/asSafe.kt
+++ b/compiler/testData/codegen/box/casts/asSafe.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/asWithGeneric.kt b/compiler/testData/codegen/box/casts/asWithGeneric.kt
index 70c08016e79..9c190dde419 100644
--- a/compiler/testData/codegen/box/casts/asWithGeneric.kt
+++ b/compiler/testData/codegen/box/casts/asWithGeneric.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/castGenericNull.kt b/compiler/testData/codegen/box/casts/castGenericNull.kt
index 42628250375..5a4c902f50e 100644
--- a/compiler/testData/codegen/box/casts/castGenericNull.kt
+++ b/compiler/testData/codegen/box/casts/castGenericNull.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun <T> castToString(t: T) {
     t as String
 }
diff --git a/compiler/testData/codegen/box/casts/dontCreateInconsistentTypeDuringStarProjectionSubstitution.kt b/compiler/testData/codegen/box/casts/dontCreateInconsistentTypeDuringStarProjectionSubstitution.kt
index 09a5934ae03..ea126baa467 100644
--- a/compiler/testData/codegen/box/casts/dontCreateInconsistentTypeDuringStarProjectionSubstitution.kt
+++ b/compiler/testData/codegen/box/casts/dontCreateInconsistentTypeDuringStarProjectionSubstitution.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 interface I
 
 interface Foo<in L : I, in M>
diff --git a/compiler/testData/codegen/box/casts/functions/asFunKBig.kt b/compiler/testData/codegen/box/casts/functions/asFunKBig.kt
index 0c170a05a5d..c50687dcc41 100644
--- a/compiler/testData/codegen/box/casts/functions/asFunKBig.kt
+++ b/compiler/testData/codegen/box/casts/functions/asFunKBig.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt
index e486a8ae99d..86d295d53ab 100644
--- a/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt
+++ b/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/isFunKBig.kt b/compiler/testData/codegen/box/casts/functions/isFunKBig.kt
index 821e78fb38c..846b72e8662 100644
--- a/compiler/testData/codegen/box/casts/functions/isFunKBig.kt
+++ b/compiler/testData/codegen/box/casts/functions/isFunKBig.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/isFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/isFunKSmall.kt
index f98f1fafe96..fc84d3032f0 100644
--- a/compiler/testData/codegen/box/casts/functions/isFunKSmall.kt
+++ b/compiler/testData/codegen/box/casts/functions/isFunKSmall.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/reifiedAsFunKBig.kt b/compiler/testData/codegen/box/casts/functions/reifiedAsFunKBig.kt
index d780181d747..e50cef777f5 100644
--- a/compiler/testData/codegen/box/casts/functions/reifiedAsFunKBig.kt
+++ b/compiler/testData/codegen/box/casts/functions/reifiedAsFunKBig.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt
index 89dc5f7c0ed..ab7e6b240ad 100644
--- a/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt
+++ b/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/reifiedIsFunKBig.kt b/compiler/testData/codegen/box/casts/functions/reifiedIsFunKBig.kt
index f91b9746982..5fc842a73cb 100644
--- a/compiler/testData/codegen/box/casts/functions/reifiedIsFunKBig.kt
+++ b/compiler/testData/codegen/box/casts/functions/reifiedIsFunKBig.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/reifiedIsFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/reifiedIsFunKSmall.kt
index 9225f9021c2..b1674ce5b31 100644
--- a/compiler/testData/codegen/box/casts/functions/reifiedIsFunKSmall.kt
+++ b/compiler/testData/codegen/box/casts/functions/reifiedIsFunKSmall.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKBig.kt b/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKBig.kt
index 1482af6ee7b..0c1ad9e402f 100644
--- a/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKBig.kt
+++ b/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKBig.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKSmall.kt
index b0874e965ae..9fe23b7927f 100644
--- a/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKSmall.kt
+++ b/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKSmall.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/safeAsFunKBig.kt b/compiler/testData/codegen/box/casts/functions/safeAsFunKBig.kt
index cefdb4f447c..5bbdb40574c 100644
--- a/compiler/testData/codegen/box/casts/functions/safeAsFunKBig.kt
+++ b/compiler/testData/codegen/box/casts/functions/safeAsFunKBig.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/functions/safeAsFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/safeAsFunKSmall.kt
index 930d9af33bc..310a4eb79eb 100644
--- a/compiler/testData/codegen/box/casts/functions/safeAsFunKSmall.kt
+++ b/compiler/testData/codegen/box/casts/functions/safeAsFunKSmall.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/is.kt b/compiler/testData/codegen/box/casts/is.kt
index bd2adca9192..1efbb4bbe49 100644
--- a/compiler/testData/codegen/box/casts/is.kt
+++ b/compiler/testData/codegen/box/casts/is.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/javaInterop/nullCheckOnMapGetOrDefault.kt b/compiler/testData/codegen/box/casts/javaInterop/nullCheckOnMapGetOrDefault.kt
index 544a5e8212c..97c450bcb5f 100644
--- a/compiler/testData/codegen/box/casts/javaInterop/nullCheckOnMapGetOrDefault.kt
+++ b/compiler/testData/codegen/box/casts/javaInterop/nullCheckOnMapGetOrDefault.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/casts/javaInterop/nullCheckOnMapRemove2.kt b/compiler/testData/codegen/box/casts/javaInterop/nullCheckOnMapRemove2.kt
index e23d2ed3aec..5458fc23ea0 100644
--- a/compiler/testData/codegen/box/casts/javaInterop/nullCheckOnMapRemove2.kt
+++ b/compiler/testData/codegen/box/casts/javaInterop/nullCheckOnMapRemove2.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt
index ba84efefebb..ce8633c0da6 100644
--- a/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt
+++ b/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt
index f3f382bde0c..b2ffe6cbfcc 100644
--- a/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt
+++ b/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.kt
index 44ec882a87b..c62cfa89120 100644
--- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.kt
+++ b/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.kt
index 812b77298a0..ff3224b7b73 100644
--- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.kt
+++ b/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt
index 25120f2f2a7..c1351775085 100644
--- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt
+++ b/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt
index 327fa12b5b7..9b8170dcdc2 100644
--- a/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt
+++ b/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt b/compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt
index 4957754b1c8..15d8efe623e 100644
--- a/compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt
+++ b/compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/notIs.kt b/compiler/testData/codegen/box/casts/notIs.kt
index 4bb0b2c25f3..2cf76b135f3 100644
--- a/compiler/testData/codegen/box/casts/notIs.kt
+++ b/compiler/testData/codegen/box/casts/notIs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/casts/nullableSafeCastToTypeParameterWithInterfaceUpperBound.kt b/compiler/testData/codegen/box/casts/nullableSafeCastToTypeParameterWithInterfaceUpperBound.kt
index 0b0c484db3a..d9a884d2ef5 100644
--- a/compiler/testData/codegen/box/casts/nullableSafeCastToTypeParameterWithInterfaceUpperBound.kt
+++ b/compiler/testData/codegen/box/casts/nullableSafeCastToTypeParameterWithInterfaceUpperBound.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: NULLABLE_BOX_FUNCTION
 interface I
 
 fun <E: I> foo(a: Any?): E? = a as? E
diff --git a/compiler/testData/codegen/box/casts/unitAsAny.kt b/compiler/testData/codegen/box/casts/unitAsAny.kt
index 74326356cba..7f378b05701 100644
--- a/compiler/testData/codegen/box/casts/unitAsAny.kt
+++ b/compiler/testData/codegen/box/casts/unitAsAny.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun println(s: String) {
 }
 
diff --git a/compiler/testData/codegen/box/casts/unitAsSafeAny.kt b/compiler/testData/codegen/box/casts/unitAsSafeAny.kt
index 81d5a495425..c79dc43079e 100644
--- a/compiler/testData/codegen/box/casts/unitAsSafeAny.kt
+++ b/compiler/testData/codegen/box/casts/unitAsSafeAny.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun println(s: String) {
 }
 
diff --git a/compiler/testData/codegen/box/casts/unitNullableCast.kt b/compiler/testData/codegen/box/casts/unitNullableCast.kt
index c0f644e88a5..6e8f51599d5 100644
--- a/compiler/testData/codegen/box/casts/unitNullableCast.kt
+++ b/compiler/testData/codegen/box/casts/unitNullableCast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun foo() {}
 
 fun bar(): Int? = foo() as? Int
diff --git a/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt b/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt
index 33350be544d..54f0e60653a 100644
--- a/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt
+++ b/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt
@@ -1,22 +1,30 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: NATIVE
-// IGNORE_BACKEND: JS_IR
-// IGNORE_BACKEND: JS_IR_ES6
-var global = 0;
+var global = "A"
 
 class C {
+  init {
+      global += "D"
+  }
+
   companion object {
       init {
-        global = 1;
+        global += "B"
+      }
+
+      init {
+          global += "C"
       }
   }
 }
 
 fun box(): String {
-  if (global != 0) {
+  if (global != "A") {
     return "fail1: global = $global"
   }
 
   val c = C()
-  if (global == 1) return "OK" else return "fail2: global = $global"
+  if (global == "ABCD") return "OK" else return "fail2: global = $global"
 }
 
diff --git a/compiler/testData/codegen/box/classes/comanionObjectFieldVsClassField.kt b/compiler/testData/codegen/box/classes/comanionObjectFieldVsClassField.kt
index b5249099f80..19b57d05af4 100644
--- a/compiler/testData/codegen/box/classes/comanionObjectFieldVsClassField.kt
+++ b/compiler/testData/codegen/box/classes/comanionObjectFieldVsClassField.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/classes/delegationJava.kt b/compiler/testData/codegen/box/classes/delegationJava.kt
index d845d9a3c09..dcd079649b1 100644
--- a/compiler/testData/codegen/box/classes/delegationJava.kt
+++ b/compiler/testData/codegen/box/classes/delegationJava.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // Enable for JS when it supports Java class library.
diff --git a/compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt b/compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt
index 885e93727d6..d9aef2015c8 100644
--- a/compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt
+++ b/compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt
@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
 
diff --git a/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt b/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt
index 60f1d9f24c1..c88fb09fd15 100644
--- a/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt
+++ b/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 class World() {
diff --git a/compiler/testData/codegen/box/classes/innerClass.kt b/compiler/testData/codegen/box/classes/innerClass.kt
index ef36d624b1c..ba19311d923 100644
--- a/compiler/testData/codegen/box/classes/innerClass.kt
+++ b/compiler/testData/codegen/box/classes/innerClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 class Outer(val foo: StringBuilder) {
   inner class Inner() {
diff --git a/compiler/testData/codegen/box/classes/kt1120.kt b/compiler/testData/codegen/box/classes/kt1120.kt
index ed26a55ef84..0e92015a158 100644
--- a/compiler/testData/codegen/box/classes/kt1120.kt
+++ b/compiler/testData/codegen/box/classes/kt1120.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // Won't ever work with JS backend.
diff --git a/compiler/testData/codegen/box/classes/kt1535.kt b/compiler/testData/codegen/box/classes/kt1535.kt
index de7816b4482..99ed03d710a 100644
--- a/compiler/testData/codegen/box/classes/kt1535.kt
+++ b/compiler/testData/codegen/box/classes/kt1535.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IMPLEMENTING_FUNCTION_INTERFACE
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: Enable when JS backend supports Java class library, since FunctionX are required for interoperation
diff --git a/compiler/testData/codegen/box/classes/kt1918.kt b/compiler/testData/codegen/box/classes/kt1918.kt
index 1da1471e2d3..7cb847544c6 100644
--- a/compiler/testData/codegen/box/classes/kt1918.kt
+++ b/compiler/testData/codegen/box/classes/kt1918.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 class Bar {
 }
 
diff --git a/compiler/testData/codegen/box/classes/kt1980.kt b/compiler/testData/codegen/box/classes/kt1980.kt
index e237e4c8b9b..11a6a417507 100644
--- a/compiler/testData/codegen/box/classes/kt1980.kt
+++ b/compiler/testData/codegen/box/classes/kt1980.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 public inline fun Int.times(body : () -> Unit) {
     var count = this;
diff --git a/compiler/testData/codegen/box/classes/kt2391.kt b/compiler/testData/codegen/box/classes/kt2391.kt
index f3826f81a2f..ae1f70bd643 100644
--- a/compiler/testData/codegen/box/classes/kt2391.kt
+++ b/compiler/testData/codegen/box/classes/kt2391.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 public interface LoggerAware {
     public val logger: StringBuilder
diff --git a/compiler/testData/codegen/box/classes/kt2417.kt b/compiler/testData/codegen/box/classes/kt2417.kt
index c72d216109e..d820f8e9e22 100644
--- a/compiler/testData/codegen/box/classes/kt2417.kt
+++ b/compiler/testData/codegen/box/classes/kt2417.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 fun box() : String{
     val set = HashSet<String>()
diff --git a/compiler/testData/codegen/box/classes/kt343.kt b/compiler/testData/codegen/box/classes/kt343.kt
index 9bf3a3f0957..ff7e6d329c0 100644
--- a/compiler/testData/codegen/box/classes/kt343.kt
+++ b/compiler/testData/codegen/box/classes/kt343.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 fun launch(f : () -> Unit) {
     f()
diff --git a/compiler/testData/codegen/box/classes/kt496.kt b/compiler/testData/codegen/box/classes/kt496.kt
index e4c31c86a27..5f84aa5d027 100644
--- a/compiler/testData/codegen/box/classes/kt496.kt
+++ b/compiler/testData/codegen/box/classes/kt496.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun test1() : Boolean {
     try {
         return true
diff --git a/compiler/testData/codegen/box/classes/kt500.kt b/compiler/testData/codegen/box/classes/kt500.kt
index b9c66165f9e..da877cec2ef 100644
--- a/compiler/testData/codegen/box/classes/kt500.kt
+++ b/compiler/testData/codegen/box/classes/kt500.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 var GUEST_USER_ID = 3
 val USER_ID =
     try {
diff --git a/compiler/testData/codegen/box/classes/kt501.kt b/compiler/testData/codegen/box/classes/kt501.kt
index 6705704587e..59a9cec5094 100644
--- a/compiler/testData/codegen/box/classes/kt501.kt
+++ b/compiler/testData/codegen/box/classes/kt501.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class Reluctant() {
      init {
         throw Exception("I'm not coming out")
diff --git a/compiler/testData/codegen/box/classes/kt508.kt b/compiler/testData/codegen/box/classes/kt508.kt
index 2f985304586..80fe2e32cfd 100644
--- a/compiler/testData/codegen/box/classes/kt508.kt
+++ b/compiler/testData/codegen/box/classes/kt508.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 
 operator fun <K, V> MutableMap<K, V>.set(key : K, value : V) = put(key, value)
diff --git a/compiler/testData/codegen/box/classes/kt707.kt b/compiler/testData/codegen/box/classes/kt707.kt
index 1fece6f1b82..e4c7b98c8ae 100644
--- a/compiler/testData/codegen/box/classes/kt707.kt
+++ b/compiler/testData/codegen/box/classes/kt707.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: Enable for JS when it supports Java class library.
diff --git a/compiler/testData/codegen/box/classes/kt8011.kt b/compiler/testData/codegen/box/classes/kt8011.kt
index d9fa7470852..cd301d550f2 100644
--- a/compiler/testData/codegen/box/classes/kt8011.kt
+++ b/compiler/testData/codegen/box/classes/kt8011.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/classes/overloadBinaryOperator.kt b/compiler/testData/codegen/box/classes/overloadBinaryOperator.kt
index 91ec4e1c307..756c19fa3e0 100644
--- a/compiler/testData/codegen/box/classes/overloadBinaryOperator.kt
+++ b/compiler/testData/codegen/box/classes/overloadBinaryOperator.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/compiler/testData/codegen/box/classes/overloadPlusAssign.kt b/compiler/testData/codegen/box/classes/overloadPlusAssign.kt
index 7ed86497c80..22b433345cf 100644
--- a/compiler/testData/codegen/box/classes/overloadPlusAssign.kt
+++ b/compiler/testData/codegen/box/classes/overloadPlusAssign.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt b/compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt
index 6d0747891b8..c63c226cfe3 100644
--- a/compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt
+++ b/compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt b/compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt
index 6d0747891b8..c63c226cfe3 100644
--- a/compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt
+++ b/compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/compiler/testData/codegen/box/classes/overloadUnaryOperator.kt b/compiler/testData/codegen/box/classes/overloadUnaryOperator.kt
index f1751827e0c..235ab4d83cd 100644
--- a/compiler/testData/codegen/box/classes/overloadUnaryOperator.kt
+++ b/compiler/testData/codegen/box/classes/overloadUnaryOperator.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 class ArrayWrapper<T>() {
diff --git a/compiler/testData/codegen/box/classes/quotedClassName.kt b/compiler/testData/codegen/box/classes/quotedClassName.kt
index c2b5ba5bdbe..ca81c973a2e 100644
--- a/compiler/testData/codegen/box/classes/quotedClassName.kt
+++ b/compiler/testData/codegen/box/classes/quotedClassName.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedAsImplicitThisInBoundReference.kt b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedAsImplicitThisInBoundReference.kt
index cf797c460ad..b6ad12e5cc9 100644
--- a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedAsImplicitThisInBoundReference.kt
+++ b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedAsImplicitThisInBoundReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 abstract class Base(val fn: () -> String)
 
 class Outer {
diff --git a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInPrimaryConstructorDefaultParameter.kt b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInPrimaryConstructorDefaultParameter.kt
index ceae8c6a0cb..d54f3e7c825 100644
--- a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInPrimaryConstructorDefaultParameter.kt
+++ b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInPrimaryConstructorDefaultParameter.kt
@@ -1,4 +1,5 @@
-// IGNORE_BACKEND: JS_IR
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
 class Outer(val x: Any) {
diff --git a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInSecondaryConstructorDefaultParameter.kt b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInSecondaryConstructorDefaultParameter.kt
index 4baec6284e1..f4d8058cf22 100644
--- a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInSecondaryConstructorDefaultParameter.kt
+++ b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInSecondaryConstructorDefaultParameter.kt
@@ -1,4 +1,5 @@
-// IGNORE_BACKEND: JS_IR
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
 class Outer(val x: Any) {
diff --git a/compiler/testData/codegen/box/closures/capturedVarsOptimization/kt17588.kt b/compiler/testData/codegen/box/closures/capturedVarsOptimization/kt17588.kt
index d0c14281668..855183ba152 100644
--- a/compiler/testData/codegen/box/closures/capturedVarsOptimization/kt17588.kt
+++ b/compiler/testData/codegen/box/closures/capturedVarsOptimization/kt17588.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 //WITH_RUNTIME
 class Test {
 
diff --git a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt
index b7057738b5c..4a6150b2030 100644
--- a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt
+++ b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt
index 6d672ff1edc..c64f4d1f374 100644
--- a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt
+++ b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST
diff --git a/compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt b/compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt
index 9287967d5ea..ed99663c597 100644
--- a/compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt
+++ b/compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 package d
 
diff --git a/compiler/testData/codegen/box/closures/closureOnTopLevel1.kt b/compiler/testData/codegen/box/closures/closureOnTopLevel1.kt
index 3e33c801342..7c4d0ec14c6 100644
--- a/compiler/testData/codegen/box/closures/closureOnTopLevel1.kt
+++ b/compiler/testData/codegen/box/closures/closureOnTopLevel1.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IMPLEMENTING_FUNCTION_INTERFACE
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/closures/closureOnTopLevel2.kt b/compiler/testData/codegen/box/closures/closureOnTopLevel2.kt
index 391a3ff2b58..9d7209bce04 100644
--- a/compiler/testData/codegen/box/closures/closureOnTopLevel2.kt
+++ b/compiler/testData/codegen/box/closures/closureOnTopLevel2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IMPLEMENTING_FUNCTION_INTERFACE
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/collections/implementCollectionThroughKotlin.kt b/compiler/testData/codegen/box/collections/implementCollectionThroughKotlin.kt
index 036eb71f713..7ae5dc78ad3 100644
--- a/compiler/testData/codegen/box/collections/implementCollectionThroughKotlin.kt
+++ b/compiler/testData/codegen/box/collections/implementCollectionThroughKotlin.kt
@@ -1,4 +1,5 @@
 // TARGET_BACKEND: JVM
+// IGNORE_BACKEND_FIR: JVM_IR
 
 // FILE: J.java
 
diff --git a/compiler/testData/codegen/box/collections/inSetWithSmartCast.kt b/compiler/testData/codegen/box/collections/inSetWithSmartCast.kt
index e5a490931a5..054207b10bb 100644
--- a/compiler/testData/codegen/box/collections/inSetWithSmartCast.kt
+++ b/compiler/testData/codegen/box/collections/inSetWithSmartCast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/collections/javaCollectionWithRemovePrimitiveInt.kt b/compiler/testData/codegen/box/collections/javaCollectionWithRemovePrimitiveInt.kt
index 7768bd068eb..15c4643bd45 100644
--- a/compiler/testData/codegen/box/collections/javaCollectionWithRemovePrimitiveInt.kt
+++ b/compiler/testData/codegen/box/collections/javaCollectionWithRemovePrimitiveInt.kt
@@ -1,4 +1,5 @@
 // TARGET_BACKEND: JVM
+// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // FILE: javaCollectionWithRemovePrimitiveInt.kt
 
diff --git a/compiler/testData/codegen/box/collections/kt41123.kt b/compiler/testData/codegen/box/collections/kt41123.kt
index e09d4b71100..c4e0a6921c1 100644
--- a/compiler/testData/codegen/box/collections/kt41123.kt
+++ b/compiler/testData/codegen/box/collections/kt41123.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND_FIR: JVM_IR
diff --git a/compiler/testData/codegen/box/constants/comparisonTrue.kt b/compiler/testData/codegen/box/constants/comparisonTrue.kt
index eb1d02c5c20..98c6ce4ba27 100644
--- a/compiler/testData/codegen/box/constants/comparisonTrue.kt
+++ b/compiler/testData/codegen/box/constants/comparisonTrue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 fun foo(): Array<Boolean> {
diff --git a/compiler/testData/codegen/box/constants/divisionByZero.kt b/compiler/testData/codegen/box/constants/divisionByZero.kt
index 661141bfffd..49d733d2758 100644
--- a/compiler/testData/codegen/box/constants/divisionByZero.kt
+++ b/compiler/testData/codegen/box/constants/divisionByZero.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/box/constants/float.kt b/compiler/testData/codegen/box/constants/float.kt
index 8084120c4ce..3a32563f3e3 100644
--- a/compiler/testData/codegen/box/constants/float.kt
+++ b/compiler/testData/codegen/box/constants/float.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_MATH
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/constants/kt9532.kt b/compiler/testData/codegen/box/constants/kt9532.kt
index 92ea89584ab..bf4eabfed44 100644
--- a/compiler/testData/codegen/box/constants/kt9532.kt
+++ b/compiler/testData/codegen/box/constants/kt9532.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: MINOR: CONST_EQUIVALENCE
 // !LANGUAGE: -NoConstantValueAttributeForNonConstVals
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/constants/kt9532_lv10.kt b/compiler/testData/codegen/box/constants/kt9532_lv10.kt
index 3f6b9867702..f8dc433ca64 100644
--- a/compiler/testData/codegen/box/constants/kt9532_lv10.kt
+++ b/compiler/testData/codegen/box/constants/kt9532_lv10.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -InlineConstVals
 // IGNORE_BACKEND: JS_IR, NATIVE
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/constants/numberLiteralCoercionToInferredType.kt b/compiler/testData/codegen/box/constants/numberLiteralCoercionToInferredType.kt
index e2567c9b26f..441f1c908e5 100644
--- a/compiler/testData/codegen/box/constants/numberLiteralCoercionToInferredType.kt
+++ b/compiler/testData/codegen/box/constants/numberLiteralCoercionToInferredType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR, NATIVE
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND_FIR: JVM_IR
diff --git a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakFromOuter.kt b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakFromOuter.kt
index 7566e7c14a9..e609ee7c318 100644
--- a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakFromOuter.kt
+++ b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakFromOuter.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String {
     OUTER@while (true) {
         var x = ""
diff --git a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/popSizes.kt b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/popSizes.kt
index 8c736e5952b..f12aa92b421 100644
--- a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/popSizes.kt
+++ b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/popSizes.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun foo(x: Long, y: Int, z: Double, s: String) {}
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally1.kt b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally1.kt
index b918861535a..0de59561701 100644
--- a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally1.kt
+++ b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally1.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String {
     var x = "OK"
     while (true) {
diff --git a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally2.kt b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally2.kt
index 147362a181c..ad57f658fc3 100644
--- a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally2.kt
+++ b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String {
     var r = ""
     for (i in 1..1)  {
diff --git a/compiler/testData/codegen/box/controlStructures/breakInFinally.kt b/compiler/testData/codegen/box/controlStructures/breakInFinally.kt
index d761ee60360..14422270688 100644
--- a/compiler/testData/codegen/box/controlStructures/breakInFinally.kt
+++ b/compiler/testData/codegen/box/controlStructures/breakInFinally.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String {
     while (true) {
         try {
diff --git a/compiler/testData/codegen/box/controlStructures/continueInExpr.kt b/compiler/testData/codegen/box/controlStructures/continueInExpr.kt
index 58fa98c913d..059691e02de 100644
--- a/compiler/testData/codegen/box/controlStructures/continueInExpr.kt
+++ b/compiler/testData/codegen/box/controlStructures/continueInExpr.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: WASM_NULL_CAST
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/continueInFor.kt b/compiler/testData/codegen/box/controlStructures/continueInFor.kt
index 7ca3279026b..e886cd79ea2 100644
--- a/compiler/testData/codegen/box/controlStructures/continueInFor.kt
+++ b/compiler/testData/codegen/box/controlStructures/continueInFor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 fun for_int_range(): Int {
     var c = 0
diff --git a/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt b/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt
index 0942c5725e0..e9cc56aaf13 100644
--- a/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt
+++ b/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 fun for_int_range(): Int {
     var c = 0
diff --git a/compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt b/compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt
index db1262a9d7a..e17e68c432b 100644
--- a/compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt
+++ b/compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 var result = "Fail"
 
 fun foo() {
diff --git a/compiler/testData/codegen/box/controlStructures/forArrayList.kt b/compiler/testData/codegen/box/controlStructures/forArrayList.kt
index 7986a79f79e..2cdd964d72c 100644
--- a/compiler/testData/codegen/box/controlStructures/forArrayList.kt
+++ b/compiler/testData/codegen/box/controlStructures/forArrayList.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 val alist = arrayListOf(1, 2, 3) // : j.u.ArrayList<k.Int>
diff --git a/compiler/testData/codegen/box/controlStructures/forArrayListMultiDecl.kt b/compiler/testData/codegen/box/controlStructures/forArrayListMultiDecl.kt
index 350b71d9a59..6aed25ada8e 100644
--- a/compiler/testData/codegen/box/controlStructures/forArrayListMultiDecl.kt
+++ b/compiler/testData/codegen/box/controlStructures/forArrayListMultiDecl.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/forInArray/forInDelegatedPropertyUpdatedInLoopBody.kt b/compiler/testData/codegen/box/controlStructures/forInArray/forInDelegatedPropertyUpdatedInLoopBody.kt
index 4807578c574..223826692e2 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArray/forInDelegatedPropertyUpdatedInLoopBody.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArray/forInDelegatedPropertyUpdatedInLoopBody.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 class Del<T>(var x: T) {
     operator fun getValue(thisRef: Any?, kProp: Any) = x
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArray/forInInlineClassArrayWithUpcast.kt b/compiler/testData/codegen/box/controlStructures/forInArray/forInInlineClassArrayWithUpcast.kt
index 0bafd81fccb..cdd89d67c33 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArray/forInInlineClassArrayWithUpcast.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArray/forInInlineClassArrayWithUpcast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNSIGNED_ARRAYS
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfObjectArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfObjectArrayWithIndex.kt
index 201c8693017..b895e3a1a43 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfObjectArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfObjectArrayWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfPrimArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfPrimArrayWithIndex.kt
index c47698a44c5..b6aabf32568 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfPrimArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfPrimArrayWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexBreakAndContinue.kt
index 1eadf7ee1c2..c22ee205791 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexBreakAndContinue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexContinuesAsUnmodified.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexContinuesAsUnmodified.kt
index fba4bb5c509..5ee7e1a345d 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexContinuesAsUnmodified.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexContinuesAsUnmodified.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // KJS_WITH_FULL_RUNTIME
 // See https://youtrack.jetbrains.com/issue/KT-22424
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoElementVar.kt
index 27ebd2d5101..03c6d926822 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoElementVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexOrElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexOrElementVar.kt
index 3b4321724de..ca7fb53b3f3 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexOrElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexOrElementVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexVar.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexVar.kt
index 004a37109c3..a6bf664852a 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNotDestructured.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNotDestructured.kt
index f319dae335a..5fa7d93ab51 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNotDestructured.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNotDestructured.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexWithExplicitlyTypedIndexVariable.kt
index 7335bf456e0..5694a9fb16b 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexWithExplicitlyTypedIndexVariable.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexWithExplicitlyTypedIndexVariable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndex.kt
index 87d6b9dcb76..daf87d95cd8 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndexWithSmartCast.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndexWithSmartCast.kt
index 9bd16e039fa..06f0acb89d2 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndexWithSmartCast.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndexWithSmartCast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInEmptyArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInEmptyArrayWithIndex.kt
index 61e44061ca8..e26668b047b 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInEmptyArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInEmptyArrayWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndex.kt
index a4d8e55b3bd..5c6286b5eef 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndexWithSmartCast.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndexWithSmartCast.kt
index 5ed671d0e57..e6bb67b0e8c 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndexWithSmartCast.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndexWithSmartCast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayWithIndex.kt
index ffaf44d3ab2..d8294b3d486 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndex.kt
index cf0effa84ee..553af33ee5e 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndexWithSmartCast.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndexWithSmartCast.kt
index aebc5a2a99c..fd9c3851d04 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndexWithSmartCast.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndexWithSmartCast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInObjectArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInObjectArrayWithIndex.kt
index e72e16840a3..b6483b4ec72 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInObjectArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInObjectArrayWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndex.kt
index 19995aa89cf..05732881e0b 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndexWithSmartCast.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndexWithSmartCast.kt
index 8e10ffcd0b6..687955e1b96 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndexWithSmartCast.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndexWithSmartCast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequence.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequence.kt
index b812e816bd5..b9b43faae5a 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequence.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequence.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSeqWithIndexStops.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSeqWithIndexStops.kt
index e03ae88cff5..99d9f215305 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSeqWithIndexStops.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSeqWithIndexStops.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceTypeParameterWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceTypeParameterWithIndex.kt
index bdd9bd933ae..6ab738aaf0f 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceTypeParameterWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceTypeParameterWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt
index bd00dc12b86..17a000db604 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexBreakAndContinue.kt
index d47402ffc6d..0ad50f31fd7 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexBreakAndContinue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexCheckSideEffects.kt
index b708614dbb8..bd8ace2f2f4 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoElementVarCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoElementVarCheckSideEffects.kt
index f345d5d2511..dabfeaf9238 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoElementVarCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoElementVarCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoIndexVarCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoIndexVarCheckSideEffects.kt
index d0f9c59103a..b146139d95b 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoIndexVarCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoIndexVarCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndex.kt
index 833686f56b9..4ddbcf33a3b 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt
index bba925f536a..bbf491b7fbb 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexOrElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexOrElementVar.kt
index ce450aaeaf5..64638c97403 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexOrElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexOrElementVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt
index 2eaeb1faf32..ace944d988f 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNotDestructured.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNotDestructured.kt
index 0d9bd7e3a61..1d35dbe112c 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNotDestructured.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNotDestructured.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt
index f2111a4e9b1..32e0d895bcf 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInEmptyListWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInEmptyListWithIndex.kt
index 326076d5975..77a7b38f14f 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInEmptyListWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInEmptyListWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableTypeParameterWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableTypeParameterWithIndex.kt
index 31d12160d4e..881be2d0775 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableTypeParameterWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableTypeParameterWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexCheckSideEffects.kt
index 69d1de655a9..018dab97a42 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexNoElementVarCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexNoElementVarCheckSideEffects.kt
index 6ac0a7198a7..04561fd8662 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexNoElementVarCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexNoElementVarCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexNoIndexVarCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexNoIndexVarCheckSideEffects.kt
index cd53b7681d9..8bd0c3dbc4b 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexNoIndexVarCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInIterableWithIndexNoIndexVarCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndex.kt
index d5be1ee42fe..48ccfae3560 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexBreakAndContinue.kt
index 45ee9e7320c..2c7d59a3c0e 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexBreakAndContinue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoElementVar.kt
index 3f54e053b7a..b5acef6f942 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoElementVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt
index 915e255554f..f4439df9fd5 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt
index b3b7218f584..f30f42f34ef 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInEmptySequenceWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInEmptySequenceWithIndex.kt
index 16647498f74..78f119e0595 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInEmptySequenceWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInEmptySequenceWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceTypeParameterWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceTypeParameterWithIndex.kt
index c91171b9d5e..807fc6cd939 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceTypeParameterWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceTypeParameterWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndex.kt
index 9931d613cf7..8f19c3c33ce 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexBreakAndContinue.kt
index f988e99d085..cfb2eeb58f9 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexBreakAndContinue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexCheckSideEffects.kt
index 86414b0c9e1..04f88861cdb 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt
index 6d1885e2e62..9b5bbdbbf84 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVarCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVarCheckSideEffects.kt
index efc54ca97f8..1924824cf04 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVarCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVarCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt
index b1a9925be6e..32cce8218ac 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVarCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVarCheckSideEffects.kt
index fa421a95a44..459023054b8 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVarCheckSideEffects.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVarCheckSideEffects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt
index af41524043c..81218b8a7ff 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt b/compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt
index 2d1381c6c1e..d5e24713868 100644
--- a/compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt
+++ b/compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/controlStructures/forUserType.kt b/compiler/testData/codegen/box/controlStructures/forUserType.kt
index 66fa1536564..af462e7d040 100644
--- a/compiler/testData/codegen/box/controlStructures/forUserType.kt
+++ b/compiler/testData/codegen/box/controlStructures/forUserType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/controlStructures/kt14839.kt b/compiler/testData/codegen/box/controlStructures/kt14839.kt
index c76925da31f..13aeb9ed9a0 100644
--- a/compiler/testData/codegen/box/controlStructures/kt14839.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt14839.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String {
     try {
     } catch (e: Exception) {
diff --git a/compiler/testData/codegen/box/controlStructures/kt15726.kt b/compiler/testData/codegen/box/controlStructures/kt15726.kt
index eb4e336f3e9..5dfe00d418e 100644
--- a/compiler/testData/codegen/box/controlStructures/kt15726.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt15726.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 
 fun nyCompiler() {
     try {
diff --git a/compiler/testData/codegen/box/controlStructures/kt1688.kt b/compiler/testData/codegen/box/controlStructures/kt1688.kt
index 0bbc232c5f1..e7a29fe9d9e 100644
--- a/compiler/testData/codegen/box/controlStructures/kt1688.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt1688.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String {
     var s = ""
     try {
diff --git a/compiler/testData/codegen/box/controlStructures/kt2259.kt b/compiler/testData/codegen/box/controlStructures/kt2259.kt
index f0d79145682..3db1e40f341 100644
--- a/compiler/testData/codegen/box/controlStructures/kt2259.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt2259.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun foo(args: Array<String>) {
     try {
     } finally {
diff --git a/compiler/testData/codegen/box/controlStructures/kt237.kt b/compiler/testData/codegen/box/controlStructures/kt237.kt
index e780ebbef83..24c56cb49b9 100644
--- a/compiler/testData/codegen/box/controlStructures/kt237.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt237.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/controlStructures/kt2577.kt b/compiler/testData/codegen/box/controlStructures/kt2577.kt
index c11ba235411..1ad1d07c1a2 100644
--- a/compiler/testData/codegen/box/controlStructures/kt2577.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt2577.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun foo(): Int {
     try {
     } finally {
diff --git a/compiler/testData/codegen/box/controlStructures/kt2597.kt b/compiler/testData/codegen/box/controlStructures/kt2597.kt
index af5af144a86..94da5db09b4 100644
--- a/compiler/testData/codegen/box/controlStructures/kt2597.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt2597.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun box(): String {
     var i = 0
     {
diff --git a/compiler/testData/codegen/box/controlStructures/kt513.kt b/compiler/testData/codegen/box/controlStructures/kt513.kt
index 249fddb7741..862941b5bb7 100644
--- a/compiler/testData/codegen/box/controlStructures/kt513.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt513.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/kt628.kt b/compiler/testData/codegen/box/controlStructures/kt628.kt
index 234e336e5a7..f266b8780dc 100644
--- a/compiler/testData/codegen/box/controlStructures/kt628.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt628.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class A() {
   fun action() = "OK"
 
diff --git a/compiler/testData/codegen/box/controlStructures/kt769.kt b/compiler/testData/codegen/box/controlStructures/kt769.kt
index 7aff4972de7..7998bb49956 100644
--- a/compiler/testData/codegen/box/controlStructures/kt769.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt769.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/controlStructures/kt8148.kt b/compiler/testData/codegen/box/controlStructures/kt8148.kt
index e644af5aeb6..b01ba7c21a1 100644
--- a/compiler/testData/codegen/box/controlStructures/kt8148.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt8148.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class A(var value: String)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/controlStructures/kt8148_break.kt b/compiler/testData/codegen/box/controlStructures/kt8148_break.kt
index 348c38a7fde..2bb42f5c4d8 100644
--- a/compiler/testData/codegen/box/controlStructures/kt8148_break.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt8148_break.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class A(var value: String)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/controlStructures/kt8148_continue.kt b/compiler/testData/codegen/box/controlStructures/kt8148_continue.kt
index dab64b8462b..340200e580a 100644
--- a/compiler/testData/codegen/box/controlStructures/kt8148_continue.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt8148_continue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class A(var value: String)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/controlStructures/kt910.kt b/compiler/testData/codegen/box/controlStructures/kt910.kt
index ae207a80129..a7ac3b9c74d 100644
--- a/compiler/testData/codegen/box/controlStructures/kt910.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt910.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // KJS_WITH_FULL_RUNTIME
 fun foo() : Int =
     try {
diff --git a/compiler/testData/codegen/box/controlStructures/returnsNothing/inlineMethod.kt b/compiler/testData/codegen/box/controlStructures/returnsNothing/inlineMethod.kt
index 5ec5f8feff2..285109df88d 100644
--- a/compiler/testData/codegen/box/controlStructures/returnsNothing/inlineMethod.kt
+++ b/compiler/testData/codegen/box/controlStructures/returnsNothing/inlineMethod.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline fun exit(): Nothing = null!!
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/controlStructures/returnsNothing/tryCatch.kt b/compiler/testData/codegen/box/controlStructures/returnsNothing/tryCatch.kt
index bc23f5cb748..d682fc17bcd 100644
--- a/compiler/testData/codegen/box/controlStructures/returnsNothing/tryCatch.kt
+++ b/compiler/testData/codegen/box/controlStructures/returnsNothing/tryCatch.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun exit(): Nothing = null!!
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt b/compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt
index b0ee1f314dc..f74f2b51303 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box() : String {
     try {
     } finally {
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/catch.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/catch.kt
index cb00faf1fe3..24846c6cc2a 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/catch.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/catch.kt
@@ -1,2 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String =
         "O" + try { throw Exception("oops!") } catch (e: Exception) { "K" }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/complexChain.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/complexChain.kt
index 36f2e84f29f..766a0473926 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/complexChain.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/complexChain.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun cleanup() {}
 
 inline fun concat(x: String, y: String): String = x + y
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/deadTryCatch.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/deadTryCatch.kt
index 41a91a17e08..f5978182d1f 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/deadTryCatch.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/deadTryCatch.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline fun catchAll(x: String, block: () -> Unit): String {
     try {
         block()
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/differentTypes.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/differentTypes.kt
index c845569a6ca..144549076b3 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/differentTypes.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/differentTypes.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/expectException.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/expectException.kt
index 63bd4900c12..e3ffb8f1c91 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/expectException.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/expectException.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 public inline fun fails(block: () -> Unit): Throwable? {
     var thrown: Throwable? = null
     try {
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryCatch.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryCatch.kt
index dd3a181348a..965dbc172a8 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryCatch.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryCatch.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline fun <T> tryOrElse(f1: () -> T, f2: () -> T): T {
     try {
         return f1()
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryExpr.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryExpr.kt
index 8205200452a..d1f5b4bace8 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryExpr.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryExpr.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline fun <T> tryOrElse(f1: () -> T, f2: () -> T): T =
         try { f1() } catch (e: Exception) { f2() }
 
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryFinally.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryFinally.kt
index eb488beb689..f23f45b3608 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryFinally.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryFinally.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline fun <T> tryAndThen(f1: () -> Unit, f2: () -> Unit, f3: () -> T): T {
     try {
         f1()
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572.kt
index 368df7ae6f9..4e22044c94e 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun zap(s: String) = s
 
 inline fun tryZap(string: String, fn: (String) -> String) =
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_2.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_2.kt
index ed417d9b8bc..d7da090cc7e 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_2.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun zap(s: String) = s
 
 inline fun tryZap(s1: String, s2: String, fn: (String, String) -> String) =
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_2_ext.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_2_ext.kt
index 6f5cb1df234..d77b99719c6 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_2_ext.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_2_ext.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun zap(s: String) = s
 
 inline fun tryZap(s1: String, s2: String, fn: String.(String) -> String) =
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_ext.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_ext.kt
index 8e9066f7cc7..356e6ffccb6 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_ext.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_ext.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun zap(s: String) = s
 
 inline fun tryZap(string: String, fn: String.() -> String) =
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_nested.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_nested.kt
index 7d7467b0694..4393fdcb34a 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_nested.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17572_nested.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun zap(s: String) = s
 
 inline fun tryZap(string: String, fn: (String) -> String) =
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17573_nested.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17573_nested.kt
index e241aec5239..05e722de2db 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17573_nested.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt17573_nested.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun zap(s: String) = s
 
 inline fun tryZap1(string: String, fn: (String) -> String) =
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt9644try.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt9644try.kt
index 63921992a06..b0d8a66022d 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt9644try.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt9644try.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline fun doCall(f: () -> Any) = f()
 
 fun test1() {
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/multipleCatchBlocks.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/multipleCatchBlocks.kt
index 4d1bf16a733..c871e77a1d9 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/multipleCatchBlocks.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/multipleCatchBlocks.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class Exception1(msg: String): Exception(msg)
 class Exception2(msg: String): Exception(msg)
 class Exception3(msg: String): Exception(msg)
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt
index c60bde586a1..d8fd2b99ee5 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline fun test(s: () -> Int): Int =
         try {
             val i = s()
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/try.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/try.kt
index 695e324988e..9a4ddea1cbc 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/try.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/try.kt
@@ -1,2 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String =
         "O" + try { "K" } catch (e: Exception) { "oops!" }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAfterTry.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAfterTry.kt
index 7d6dcc3d2a3..d968a945399 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAfterTry.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAfterTry.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String =
         "" +
         try { "O" } catch (e: Exception) { "1" } +
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndBreak.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndBreak.kt
index a1f867b1c3d..24985ca938c 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndBreak.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndBreak.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun idiv(a: Int, b: Int): Int =
         if (b == 0) throw Exception("Division by zero") else a / b
 
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndContinue.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndContinue.kt
index 120d463b00c..960dc8f5879 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndContinue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun idiv(a: Int, b: Int): Int =
         if (b == 0) throw Exception("Division by zero") else a / b
 
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideCatch.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideCatch.kt
index 09f9857b57c..658fbaf3207 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideCatch.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideCatch.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String =
         "O" +
         try {
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideTry.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideTry.kt
index 3d1ccd9e7ae..026e4475760 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideTry.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideTry.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class MyException(message: String): Exception(message)
 
 fun box(): String =
diff --git a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/unmatchedInlineMarkers.kt b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/unmatchedInlineMarkers.kt
index 015b4137f65..4d102c1b537 100644
--- a/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/unmatchedInlineMarkers.kt
+++ b/compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/unmatchedInlineMarkers.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline fun catchAll(x: String, block: () -> Unit): String {
     try {
         block()
diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt
index 597beb0ed1e..227e622dfa9 100644
--- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt
@@ -9,7 +9,8 @@ final class LambdaWithLongReceiverKt$box$1$1 {
     inner (anonymous) class LambdaWithLongReceiverKt$box$1$1
     method <init>(p0: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(p0: long, @org.jetbrains.annotations.Nullable p1: kotlin.coroutines.Continuation): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
@@ -25,7 +26,8 @@ final class LambdaWithLongReceiverKt$box$1 {
     inner (anonymous) class LambdaWithLongReceiverKt$box$1$1
     method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_ir.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_ir.txt
index bbadae4c427..f76c0eba8a5 100644
--- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_ir.txt
@@ -13,7 +13,8 @@ final class LambdaWithMultipleParametersKt$box$1$1 {
     inner (anonymous) class LambdaWithMultipleParametersKt$box$1
     inner (anonymous) class LambdaWithMultipleParametersKt$box$1$1
     method <init>(p0: kotlin.coroutines.Continuation): void
-    public final method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object, p5: java.lang.Object, p6: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: long, p2: long, p3: long, p4: long, p5: long, @org.jetbrains.annotations.Nullable p6: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object, p5: java.lang.Object, p6: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
@@ -29,7 +30,8 @@ final class LambdaWithMultipleParametersKt$box$1 {
     inner (anonymous) class LambdaWithMultipleParametersKt$box$1$1
     method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt
index a401c993376..15ad71b4e49 100644
--- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt
@@ -60,6 +60,18 @@ class Test3 {
     suspend fun test() = bar().s
 }
 
+class Test4 {
+    suspend fun <T> foo(value: T): T = value
+
+    suspend fun bar(): IC? {
+        run {
+            return foo(IC("OK"))
+        }
+    }
+
+    suspend fun test() = bar()!!.s
+}
+
 fun box(): String {
 
     var result = "FAIL"
@@ -83,5 +95,13 @@ fun box(): String {
         result = Test3().test()
     }
 
+    if (result != "OK") return "FAIL 3 $result"
+
+    result = "FAIL 4"
+
+    builder {
+        result = Test4().test()
+    }
+
     return result
 }
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt
index c823ff852d4..b3d8f3bfc83 100644
--- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt
@@ -67,6 +67,18 @@ class Test3 {
     suspend fun test() = bar().s
 }
 
+class Test4 {
+    suspend fun <T> foo(value: T): T = value
+
+    suspend fun bar(): IC? {
+        run {
+            return foo(suspendMe())
+        }
+    }
+
+    suspend fun test() = bar()!!.s
+}
+
 fun box(): String {
 
     var result = "FAIL"
@@ -93,5 +105,14 @@ fun box(): String {
     }
     c?.resume(IC("OK"))
 
+    if (result != "OK") return "FAIL 3 $result"
+
+    result = "FAIL 4"
+
+    builder {
+        result = Test4().test()
+    }
+    c?.resume(IC("OK"))
+
     return result
 }
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt
index a3bd651fb30..c199f7be7ba 100644
--- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt
@@ -71,6 +71,18 @@ class Test3 {
     suspend fun test() = bar().s
 }
 
+class Test4 {
+    suspend fun <T> foo(value: T): T = value
+
+    suspend fun bar(): IC? {
+        run {
+            return foo(suspendMe())
+        }
+    }
+
+    suspend fun test() = bar()!!.s
+}
+
 fun box(): String {
     builder {
         Test1().test()
@@ -95,5 +107,12 @@ fun box(): String {
     }
     c?.resumeWithException(IllegalStateException("OK"))
 
+    if (result != "OK") return "FAIL 3 $result"
+
+    builder {
+        Test4().test()
+    }
+    c?.resumeWithException(IllegalStateException("OK"))
+
     return result
 }
diff --git a/compiler/testData/codegen/box/coroutines/nonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/nonLocalReturn.kt
new file mode 100644
index 00000000000..703da057b33
--- /dev/null
+++ b/compiler/testData/codegen/box/coroutines/nonLocalReturn.kt
@@ -0,0 +1,29 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.coroutines.*
+
+suspend fun coroutineScope(c: suspend () -> Unit) {
+    c()
+}
+
+var counter = 0
+
+suspend fun whatever() = coroutineScope {
+    repeat(10) { // repeat hides a loop, that plays a part in the compiler crash
+        run {
+            counter++
+            return@repeat // required to reproduce the crash
+        }
+    }
+}
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(Continuation(EmptyCoroutineContext) {})
+}
+
+fun box(): String {
+    builder {
+        whatever()
+    }
+    return if (counter != 10) "FAIL $counter" else "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/coroutines/suspendConversion/onInlineArgument_ir.txt b/compiler/testData/codegen/box/coroutines/suspendConversion/onInlineArgument_ir.txt
index 985e2334948..6c9913ff606 100644
--- a/compiler/testData/codegen/box/coroutines/suspendConversion/onInlineArgument_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/suspendConversion/onInlineArgument_ir.txt
@@ -9,7 +9,8 @@ final class OnInlineArgumentKt$box$1 {
     inner (anonymous) class OnInlineArgumentKt$box$1
     method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.jvm.functions.Function1, p2: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt
index f6d71856190..fb8d68b8411 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt
@@ -29,7 +29,7 @@ public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$2$1 {
 public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$2 {
     // source: 'crossinline.kt'
     enclosing method CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1.consume(LSink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    synthetic final field $this_anonymous$inlined: Sink
+    synthetic final field $this_source$inlined: Sink
     inner (anonymous) class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$2
     inner (anonymous) class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$2$1
     public method <init>(p0: Sink): void
@@ -71,7 +71,8 @@ final class CrossinlineKt$box$1 {
     inner (anonymous) class CrossinlineKt$box$1
     method <init>(p0: kotlin.jvm.internal.Ref$IntRef, p1: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
@@ -146,7 +147,7 @@ public final class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1 {
     // source: 'crossinline.kt'
     enclosing method CrossinlineKt.filter(LSourceCrossinline;Lkotlin/jvm/functions/Function1;)LSourceCrossinline;
     synthetic final field $predicate$inlined: kotlin.jvm.functions.Function1
-    synthetic final field $this_anonymous$inlined: Sink
+    synthetic final field $this_source$inlined: Sink
     inner (anonymous) class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1
     inner (anonymous) class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1$1
     public method <init>(p0: kotlin.jvm.functions.Function1, p1: Sink): void
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine_ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine_ir.txt
index b74d8ceca12..2f4fc2f0893 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine_ir.txt
@@ -10,7 +10,8 @@ final class InlineWithoutStateMachineKt$box$1 {
     inner (anonymous) class InlineWithoutStateMachineKt$box$1
     method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation_ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation_ir.txt
index 9174c1a691c..ace972e809d 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation_ir.txt
@@ -19,7 +19,8 @@ final class flow/InnerObjectRetransformationKt$box$1 {
     inner (anonymous) class flow/InnerObjectRetransformationKt$box$1
     method <init>(p0: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5_ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5_ir.txt
index 900858cde0a..7e09a577788 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5_ir.txt
@@ -23,7 +23,8 @@ final class Override5Kt$box$1 {
     inner (anonymous) class Override5Kt$box$1
     method <init>(p0: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/box/dataClasses/doubleParam.kt b/compiler/testData/codegen/box/dataClasses/doubleParam.kt
index 77af1de2c5e..012b60ac256 100644
--- a/compiler/testData/codegen/box/dataClasses/doubleParam.kt
+++ b/compiler/testData/codegen/box/dataClasses/doubleParam.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/dataClasses/floatParam.kt b/compiler/testData/codegen/box/dataClasses/floatParam.kt
index 56dacc27817..a0de5fb5980 100644
--- a/compiler/testData/codegen/box/dataClasses/floatParam.kt
+++ b/compiler/testData/codegen/box/dataClasses/floatParam.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/dataClasses/toString/arrayParams.kt b/compiler/testData/codegen/box/dataClasses/toString/arrayParams.kt
index 7fb1889d5f5..e81b812e428 100644
--- a/compiler/testData/codegen/box/dataClasses/toString/arrayParams.kt
+++ b/compiler/testData/codegen/box/dataClasses/toString/arrayParams.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/dataClasses/toString/unitComponent.kt b/compiler/testData/codegen/box/dataClasses/toString/unitComponent.kt
index 72e5965b320..b3a699a9cba 100644
--- a/compiler/testData/codegen/box/dataClasses/toString/unitComponent.kt
+++ b/compiler/testData/codegen/box/dataClasses/toString/unitComponent.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 data class A(val x: Unit)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/dataClasses/unitComponent.kt b/compiler/testData/codegen/box/dataClasses/unitComponent.kt
index b70b461ab91..ad6967dcc9b 100644
--- a/compiler/testData/codegen/box/dataClasses/unitComponent.kt
+++ b/compiler/testData/codegen/box/dataClasses/unitComponent.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 data class A(val x: Unit)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/defaultArguments/function/funInTraitChain.kt b/compiler/testData/codegen/box/defaultArguments/function/funInTraitChain.kt
index 8933d6ec88d..2045c09a189 100644
--- a/compiler/testData/codegen/box/defaultArguments/function/funInTraitChain.kt
+++ b/compiler/testData/codegen/box/defaultArguments/function/funInTraitChain.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BRIDGE_ISSUES
 interface Foo {
     fun foo(a: Double = 1.0): Double
 }
diff --git a/compiler/testData/codegen/box/defaultArguments/recursiveDefaultArguments.kt b/compiler/testData/codegen/box/defaultArguments/recursiveDefaultArguments.kt
index cc58156bece..57f402d892e 100644
--- a/compiler/testData/codegen/box/defaultArguments/recursiveDefaultArguments.kt
+++ b/compiler/testData/codegen/box/defaultArguments/recursiveDefaultArguments.kt
@@ -1,4 +1,6 @@
-// IGNORE_BACKEND: JS, JS_IR
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
+// IGNORE_BACKEND: JS
 @Suppress("RECURSION_IN_INLINE")
 inline fun test(p: String = test("OK")): String {
     return p
diff --git a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt
index 5fc3e11515b..dcf5548b4bf 100644
--- a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt
+++ b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS, JS_IR, NATIVE
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt b/compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt
new file mode 100644
index 00000000000..0a15e4ab21e
--- /dev/null
+++ b/compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt
@@ -0,0 +1,28 @@
+// KT-40412
+
+// WITH_RUNTIME
+
+// MODULE: lib
+// FILE: lib.kt
+
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+var result = "FAIL"
+
+class CaptureContext<A>(val capture: (A) -> Unit) : ReadOnlyProperty<A, () -> Unit> {
+    override fun getValue(thisRef: A, property: KProperty<*>) = { -> capture(thisRef) }
+}
+operator fun <A> ((A) -> Unit).provideDelegate(thisRef: A, property: KProperty<*>) = CaptureContext(this)
+
+fun right(arg: Right) { result = "OK" }
+class Right { val prop: () -> Unit by ::right }
+
+// MODULE: main(lib)
+// FILE: main.kt
+
+fun box(): String {
+    val r = Right()
+    r.prop()
+    return result
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/delegation/byMiddleInterface.kt b/compiler/testData/codegen/box/delegation/byMiddleInterface.kt
index 5f6256df741..f4e61e75afa 100644
--- a/compiler/testData/codegen/box/delegation/byMiddleInterface.kt
+++ b/compiler/testData/codegen/box/delegation/byMiddleInterface.kt
@@ -1,6 +1,4 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
-
 // FILE: Base.java
 
 public interface Base {
@@ -12,6 +10,7 @@ public interface Base {
 }
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
 
 public interface BaseKotlin : Base {
 }
diff --git a/compiler/testData/codegen/box/delegation/defaultOverride.kt b/compiler/testData/codegen/box/delegation/defaultOverride.kt
index c2a66177a7a..25bdbf7a7f2 100644
--- a/compiler/testData/codegen/box/delegation/defaultOverride.kt
+++ b/compiler/testData/codegen/box/delegation/defaultOverride.kt
@@ -1,6 +1,4 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
-
 // FILE: Base.java
 
 public interface Base {
@@ -12,6 +10,7 @@ public interface Base {
 }
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
 
 public interface BaseKotlin : Base {
     override fun getValue() = "OK"
diff --git a/compiler/testData/codegen/box/delegation/diamond.kt b/compiler/testData/codegen/box/delegation/diamond.kt
index 8a60bda7ef8..7a539ee55bf 100644
--- a/compiler/testData/codegen/box/delegation/diamond.kt
+++ b/compiler/testData/codegen/box/delegation/diamond.kt
@@ -1,4 +1,3 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: Base.java
 
@@ -18,8 +17,8 @@ public interface Base2 extends Base {
     }
 }
 
-
 // FILE: main.kt
+// JVM_TARGET: 1.8
 
 interface KBase : Base
 
diff --git a/compiler/testData/codegen/box/delegation/diamond2.kt b/compiler/testData/codegen/box/delegation/diamond2.kt
index daf19245ade..251670895cc 100644
--- a/compiler/testData/codegen/box/delegation/diamond2.kt
+++ b/compiler/testData/codegen/box/delegation/diamond2.kt
@@ -1,4 +1,3 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: Base.java
 
@@ -18,6 +17,7 @@ public interface Base2 extends Base {
 
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
 
 interface KBase : Base {
     override fun test() = "O" + getValue()
diff --git a/compiler/testData/codegen/box/delegation/inClassDeclaration.kt b/compiler/testData/codegen/box/delegation/inClassDeclaration.kt
index 57d180b8c38..e29eea6a650 100644
--- a/compiler/testData/codegen/box/delegation/inClassDeclaration.kt
+++ b/compiler/testData/codegen/box/delegation/inClassDeclaration.kt
@@ -1,4 +1,3 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: Base.java
 
@@ -11,6 +10,8 @@ public interface Base {
 }
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
+
 class Fail : Base {
     override fun getValue() = "Fail"
 }
diff --git a/compiler/testData/codegen/box/delegation/mixed.kt b/compiler/testData/codegen/box/delegation/mixed.kt
index c8ef7c370a8..091fdbfd6e3 100644
--- a/compiler/testData/codegen/box/delegation/mixed.kt
+++ b/compiler/testData/codegen/box/delegation/mixed.kt
@@ -1,4 +1,3 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: Base.java
 
@@ -11,6 +10,8 @@ public interface Base extends KBase {
 }
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
+
 interface KBase {
     fun getValue(): String
 
diff --git a/compiler/testData/codegen/box/delegation/simple.kt b/compiler/testData/codegen/box/delegation/simple.kt
index 418cea053e1..2f176b6a473 100644
--- a/compiler/testData/codegen/box/delegation/simple.kt
+++ b/compiler/testData/codegen/box/delegation/simple.kt
@@ -1,4 +1,3 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: Base.java
 
@@ -11,6 +10,8 @@ public interface Base {
 }
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
+
 class Fail : Base {
     override fun getValue() = "Fail"
 }
diff --git a/compiler/testData/codegen/box/delegation/simple1.0.kt b/compiler/testData/codegen/box/delegation/simple1.0.kt
index 7395fca1c61..7d22a09f9ed 100644
--- a/compiler/testData/codegen/box/delegation/simple1.0.kt
+++ b/compiler/testData/codegen/box/delegation/simple1.0.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: -NoDelegationToJavaDefaultInterfaceMembers
 // IGNORE_BACKEND_FIR: JVM_IR
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: Base.java
 
@@ -13,6 +12,8 @@ public interface Base {
 }
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
+
 class OK : Base {
     override fun getValue() = "OK"
 }
diff --git a/compiler/testData/codegen/box/destructuringDeclInLambdaParam/stdlibUsages.kt b/compiler/testData/codegen/box/destructuringDeclInLambdaParam/stdlibUsages.kt
index 9d6367910f3..e9bf83b229a 100644
--- a/compiler/testData/codegen/box/destructuringDeclInLambdaParam/stdlibUsages.kt
+++ b/compiler/testData/codegen/box/destructuringDeclInLambdaParam/stdlibUsages.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/destructuringDeclInLambdaParam/withIndexed.kt b/compiler/testData/codegen/box/destructuringDeclInLambdaParam/withIndexed.kt
index 364debd2004..8e1c092ae24 100644
--- a/compiler/testData/codegen/box/destructuringDeclInLambdaParam/withIndexed.kt
+++ b/compiler/testData/codegen/box/destructuringDeclInLambdaParam/withIndexed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 data class Station(
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt
index 52bb89171ed..d12ee214bbb 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt
index 4764c912924..d644b7946bd 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt
index 5877c4bc4f5..bbd9599efa5 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt
index 73ab3a7c9b1..a8edb975f2a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt
index 3fc39c28be0..aa473b7a699 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt
index 7968057d649..d20eb13a565 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt
index 7defc35c901..98bc94c7b8c 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt
index 958549b3308..1227319496f 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // DONT_RUN_GENERATED_CODE: JS
 
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt
index 9b58c22110c..582cae0626a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // DONT_RUN_GENERATED_CODE: JS
 
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt
index 8d6d3585449..5c34734c3ea 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt
index 7a5bd6fe5b0..a8abe36f076 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt
index 21b9836eab7..fe722d7c762 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt
index f915fe058c4..d44861938a7 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt
index 475ff719519..21b8b3ee44b 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt
index 0cafe2465d8..b12ca20bb7a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt
index 7174475aa89..4f47b07aaac 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt
index f50bb9b7218..05c45c2fd8d 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt
index fd920ee31a7..f4c53d720d0 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt
index 1656cf0b7a6..d2b1a61a49e 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt
index 4655ecc7a61..93044f70066 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun foo(x: Int) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt
index 1d9debbc1d5..47399a43b4b 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt
index 327098b345c..aec5d02a1d0 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt
index 038d08fb3d5..51761d0a37a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt
index 9a833aa5f45..2d6806830fd 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt
index 4c1a96c80dd..7a158ade975 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt
index 8d6ee4689e7..10546d7038f 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt b/compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt
index 60521fe8bbf..e7815660613 100644
--- a/compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt
+++ b/compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/elvis/genericElvisWithNullLHS.kt b/compiler/testData/codegen/box/elvis/genericElvisWithNullLHS.kt
index 17981e5031e..2dfe2804f39 100644
--- a/compiler/testData/codegen/box/elvis/genericElvisWithNullLHS.kt
+++ b/compiler/testData/codegen/box/elvis/genericElvisWithNullLHS.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt b/compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt
index 6cad0c98a04..b30305d3e52 100644
--- a/compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt
+++ b/compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 enum class Empty
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/enum/enumCompanionInit.kt b/compiler/testData/codegen/box/enum/enumCompanionInit.kt
index 0f7a1078844..02ca4ad6315 100644
--- a/compiler/testData/codegen/box/enum/enumCompanionInit.kt
+++ b/compiler/testData/codegen/box/enum/enumCompanionInit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/enum/kt7257_boundReference1.kt b/compiler/testData/codegen/box/enum/kt7257_boundReference1.kt
index 02297ec3f33..27df4dc34ee 100644
--- a/compiler/testData/codegen/box/enum/kt7257_boundReference1.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_boundReference1.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BINDING_RECEIVERS
 enum class X {
     B {
         val k = "K"
diff --git a/compiler/testData/codegen/box/enum/kt7257_boundReference2.kt b/compiler/testData/codegen/box/enum/kt7257_boundReference2.kt
index e34bc6403ba..0da0ab1c720 100644
--- a/compiler/testData/codegen/box/enum/kt7257_boundReference2.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_boundReference2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 enum class X {
     B {
 
diff --git a/compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt b/compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt
index 50948f805ff..bc65a5fa1d3 100644
--- a/compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 enum class X {
     B {
         override val value = "OK"
diff --git a/compiler/testData/codegen/box/enum/objectInEnum.kt b/compiler/testData/codegen/box/enum/objectInEnum.kt
index 6b22f24cdce..a177645e9a0 100644
--- a/compiler/testData/codegen/box/enum/objectInEnum.kt
+++ b/compiler/testData/codegen/box/enum/objectInEnum.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -NestedClassesInEnumEntryShouldBeInner
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: NATIVE
 
 enum class E {
diff --git a/compiler/testData/codegen/box/enum/sortEnumEntries.kt b/compiler/testData/codegen/box/enum/sortEnumEntries.kt
index e50f3b52f89..9ad0c0dc229 100644
--- a/compiler/testData/codegen/box/enum/sortEnumEntries.kt
+++ b/compiler/testData/codegen/box/enum/sortEnumEntries.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/enum/valueof.kt b/compiler/testData/codegen/box/enum/valueof.kt
index 89aeaa9cce6..2cfc7bd1639 100644
--- a/compiler/testData/codegen/box/enum/valueof.kt
+++ b/compiler/testData/codegen/box/enum/valueof.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 enum class Color {
   RED,
   BLUE
diff --git a/compiler/testData/codegen/box/exclExcl/genericNull.kt b/compiler/testData/codegen/box/exclExcl/genericNull.kt
index 0d4f831dfb7..15282c401a1 100644
--- a/compiler/testData/codegen/box/exclExcl/genericNull.kt
+++ b/compiler/testData/codegen/box/exclExcl/genericNull.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun <T> foo(t: T) {
     t!!
 }
diff --git a/compiler/testData/codegen/box/extensionFunctions/kt1953.kt b/compiler/testData/codegen/box/extensionFunctions/kt1953.kt
index 4db9260f942..413ddfc7f8d 100644
--- a/compiler/testData/codegen/box/extensionFunctions/kt1953.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/kt1953.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 fun box(): String {
     val sb = StringBuilder()
diff --git a/compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt b/compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt
index 7d394cff6da..573e03b1c9e 100644
--- a/compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 class A {
     private val sb: StringBuilder = StringBuilder()
diff --git a/compiler/testData/codegen/box/extensionFunctions/kt475.kt b/compiler/testData/codegen/box/extensionFunctions/kt475.kt
index abb3684d429..9a1e05b3091 100644
--- a/compiler/testData/codegen/box/extensionFunctions/kt475.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/kt475.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 
 fun box() : String {
diff --git a/compiler/testData/codegen/box/extensionFunctions/kt606.kt b/compiler/testData/codegen/box/extensionFunctions/kt606.kt
index 51449d88e1f..866f1f6cc4d 100644
--- a/compiler/testData/codegen/box/extensionFunctions/kt606.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/kt606.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/extensionFunctions/kt865.kt b/compiler/testData/codegen/box/extensionFunctions/kt865.kt
index dd741dcef83..41cb75f4180 100644
--- a/compiler/testData/codegen/box/extensionFunctions/kt865.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/kt865.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class Template() {
     val collected = ArrayList<String>()
diff --git a/compiler/testData/codegen/box/extensionFunctions/simple.kt b/compiler/testData/codegen/box/extensionFunctions/simple.kt
index b8274e66693..4ae79cd5630 100644
--- a/compiler/testData/codegen/box/extensionFunctions/simple.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/simple.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 fun StringBuilder.first() = this.get(0)
 
diff --git a/compiler/testData/codegen/box/extensionFunctions/whenFail.kt b/compiler/testData/codegen/box/extensionFunctions/whenFail.kt
index 59b92ef2b6a..ce763e026be 100644
--- a/compiler/testData/codegen/box/extensionFunctions/whenFail.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/whenFail.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/fieldRename/delegates.kt b/compiler/testData/codegen/box/fieldRename/delegates.kt
index 0a29a513400..66078db13d3 100644
--- a/compiler/testData/codegen/box/fieldRename/delegates.kt
+++ b/compiler/testData/codegen/box/fieldRename/delegates.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty
 
 public open class TestDelegate<T: Any>(private val initializer: () -> T) {
diff --git a/compiler/testData/codegen/box/fullJdk/charBuffer.kt b/compiler/testData/codegen/box/fullJdk/charBuffer.kt
index 7d7f2702e91..36aead1ab9f 100644
--- a/compiler/testData/codegen/box/fullJdk/charBuffer.kt
+++ b/compiler/testData/codegen/box/fullJdk/charBuffer.kt
@@ -1,4 +1,5 @@
 // TARGET_BACKEND: JVM
+// IGNORE_BACKEND_FIR: JVM_IR
 
 // FULL_JDK
 
diff --git a/compiler/testData/codegen/box/fullJdk/platformTypeAssertionStackTrace.kt b/compiler/testData/codegen/box/fullJdk/platformTypeAssertionStackTrace.kt
index 3c51754ba66..b5ba5b94fac 100644
--- a/compiler/testData/codegen/box/fullJdk/platformTypeAssertionStackTrace.kt
+++ b/compiler/testData/codegen/box/fullJdk/platformTypeAssertionStackTrace.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/funInterface/basicFunInterfaceConversionClash.kt b/compiler/testData/codegen/box/funInterface/basicFunInterfaceConversionClash.kt
index ea1368517af..f2560070c3c 100644
--- a/compiler/testData/codegen/box/funInterface/basicFunInterfaceConversionClash.kt
+++ b/compiler/testData/codegen/box/funInterface/basicFunInterfaceConversionClash.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 
 // FILE: lib.kt
diff --git a/compiler/testData/codegen/box/funInterface/castFromAny.kt b/compiler/testData/codegen/box/funInterface/castFromAny.kt
index 51db56520e0..6f81cc1d07f 100644
--- a/compiler/testData/codegen/box/funInterface/castFromAny.kt
+++ b/compiler/testData/codegen/box/funInterface/castFromAny.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 
 
diff --git a/compiler/testData/codegen/box/funInterface/equality/functionReferencesBound.kt b/compiler/testData/codegen/box/funInterface/equality/functionReferencesBound.kt
index 22ef4dfe0f8..8dc0feafdbf 100644
--- a/compiler/testData/codegen/box/funInterface/equality/functionReferencesBound.kt
+++ b/compiler/testData/codegen/box/funInterface/equality/functionReferencesBound.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6
 // FILE: test.kt
 
diff --git a/compiler/testData/codegen/box/funInterface/equality/functionReferencesUnbound.kt b/compiler/testData/codegen/box/funInterface/equality/functionReferencesUnbound.kt
index 336ba4b1a06..8fd3357e0fc 100644
--- a/compiler/testData/codegen/box/funInterface/equality/functionReferencesUnbound.kt
+++ b/compiler/testData/codegen/box/funInterface/equality/functionReferencesUnbound.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6
 // FILE: test.kt
 
diff --git a/compiler/testData/codegen/box/funInterface/equality/lambdaRuntimeConversion.kt b/compiler/testData/codegen/box/funInterface/equality/lambdaRuntimeConversion.kt
index 0ccea8ebb58..c845c82c602 100644
--- a/compiler/testData/codegen/box/funInterface/equality/lambdaRuntimeConversion.kt
+++ b/compiler/testData/codegen/box/funInterface/equality/lambdaRuntimeConversion.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6
 // FILE: test.kt
 
diff --git a/compiler/testData/codegen/box/funInterface/equality/localFunctionReferences.kt b/compiler/testData/codegen/box/funInterface/equality/localFunctionReferences.kt
index 4d2b534f43b..8feefe3287a 100644
--- a/compiler/testData/codegen/box/funInterface/equality/localFunctionReferences.kt
+++ b/compiler/testData/codegen/box/funInterface/equality/localFunctionReferences.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6
 
 fun checkEqual(x: Any, y: Any) {
diff --git a/compiler/testData/codegen/box/funInterface/funInterfaceInheritance.kt b/compiler/testData/codegen/box/funInterface/funInterfaceInheritance.kt
index 81a3e135b25..c297337727d 100644
--- a/compiler/testData/codegen/box/funInterface/funInterfaceInheritance.kt
+++ b/compiler/testData/codegen/box/funInterface/funInterfaceInheritance.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 
 fun interface Base {
diff --git a/compiler/testData/codegen/box/funInterface/funInterfaceWithReceiver.kt b/compiler/testData/codegen/box/funInterface/funInterfaceWithReceiver.kt
index 6b628186bef..80d36d9821f 100644
--- a/compiler/testData/codegen/box/funInterface/funInterfaceWithReceiver.kt
+++ b/compiler/testData/codegen/box/funInterface/funInterfaceWithReceiver.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
diff --git a/compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt b/compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt
index 30e520ea6dc..16e5ef7fdf5 100644
--- a/compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt
+++ b/compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt b/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt
index 4910fe6e4f7..4d517beeff1 100644
--- a/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt
+++ b/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/funInterface/irrelevantPrivateDeclarations.kt b/compiler/testData/codegen/box/funInterface/irrelevantPrivateDeclarations.kt
index 6aba80b51f6..d012bd5a267 100644
--- a/compiler/testData/codegen/box/funInterface/irrelevantPrivateDeclarations.kt
+++ b/compiler/testData/codegen/box/funInterface/irrelevantPrivateDeclarations.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 fun interface A {
     fun invoke(s: String)
 
diff --git a/compiler/testData/codegen/box/funInterface/multimodule.kt b/compiler/testData/codegen/box/funInterface/multimodule.kt
index 764eb3d1e68..51f97113f33 100644
--- a/compiler/testData/codegen/box/funInterface/multimodule.kt
+++ b/compiler/testData/codegen/box/funInterface/multimodule.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 
 // MODULE: m1
diff --git a/compiler/testData/codegen/box/funInterface/nonAbstractMethod.kt b/compiler/testData/codegen/box/funInterface/nonAbstractMethod.kt
index e190edbd2dc..770c5457689 100644
--- a/compiler/testData/codegen/box/funInterface/nonAbstractMethod.kt
+++ b/compiler/testData/codegen/box/funInterface/nonAbstractMethod.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 
 interface I {
     fun inherited(s: String): String = privateInherited(s)
diff --git a/compiler/testData/codegen/box/funInterface/nullableSam.kt b/compiler/testData/codegen/box/funInterface/nullableSam.kt
index ce5456238ab..649f77ed49b 100644
--- a/compiler/testData/codegen/box/funInterface/nullableSam.kt
+++ b/compiler/testData/codegen/box/funInterface/nullableSam.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/funInterface/subtypeOfFunctionalTypeToFunInterfaceConversion.kt b/compiler/testData/codegen/box/funInterface/subtypeOfFunctionalTypeToFunInterfaceConversion.kt
index 7c216af34e5..ab655dd96a2 100644
--- a/compiler/testData/codegen/box/funInterface/subtypeOfFunctionalTypeToFunInterfaceConversion.kt
+++ b/compiler/testData/codegen/box/funInterface/subtypeOfFunctionalTypeToFunInterfaceConversion.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SAM_CONVERSIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt b/compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt
index 1d57b759264..85d5d6fe6b0 100644
--- a/compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt
+++ b/compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // WITH_COROUTINES
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/functions/bigArity/function255.kt b/compiler/testData/codegen/box/functions/bigArity/function255.kt
index 16fdf6c2c9e..f8cef8a27ae 100644
--- a/compiler/testData/codegen/box/functions/bigArity/function255.kt
+++ b/compiler/testData/codegen/box/functions/bigArity/function255.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BIG_ARITY
 // !LANGUAGE: +FunctionTypesWithBigArity
 
 class A(val value: Int) {
diff --git a/compiler/testData/codegen/box/functions/bigArity/instanceOfCallableReference.kt b/compiler/testData/codegen/box/functions/bigArity/instanceOfCallableReference.kt
index a1525050d14..52cf804258c 100644
--- a/compiler/testData/codegen/box/functions/bigArity/instanceOfCallableReference.kt
+++ b/compiler/testData/codegen/box/functions/bigArity/instanceOfCallableReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BIG_ARITY
 // !LANGUAGE: +FunctionTypesWithBigArity
 // IGNORE_BACKEND: JS_IR, JS
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/functions/bigArity/invokeCallableReference.kt b/compiler/testData/codegen/box/functions/bigArity/invokeCallableReference.kt
index c9509a07ba5..4ea1b0aa81f 100644
--- a/compiler/testData/codegen/box/functions/bigArity/invokeCallableReference.kt
+++ b/compiler/testData/codegen/box/functions/bigArity/invokeCallableReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BIG_ARITY
 // !LANGUAGE: +FunctionTypesWithBigArity
 
 class A
diff --git a/compiler/testData/codegen/box/functions/bigArity/invokeLambda.kt b/compiler/testData/codegen/box/functions/bigArity/invokeLambda.kt
index afb24c958db..07e9d8c8083 100644
--- a/compiler/testData/codegen/box/functions/bigArity/invokeLambda.kt
+++ b/compiler/testData/codegen/box/functions/bigArity/invokeLambda.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BIG_ARITY
 // !LANGUAGE: +FunctionTypesWithBigArity
 
 class A(val value: Int)
diff --git a/compiler/testData/codegen/box/functions/bigArity/invokeMemberCallableReference.kt b/compiler/testData/codegen/box/functions/bigArity/invokeMemberCallableReference.kt
index 743865b5b4d..9ff84d17f0d 100644
--- a/compiler/testData/codegen/box/functions/bigArity/invokeMemberCallableReference.kt
+++ b/compiler/testData/codegen/box/functions/bigArity/invokeMemberCallableReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BIG_ARITY
 // !LANGUAGE: +FunctionTypesWithBigArity
 
 class A {
diff --git a/compiler/testData/codegen/box/functions/bigArity/subclass.kt b/compiler/testData/codegen/box/functions/bigArity/subclass.kt
index 98af6b62ecd..87ef207809c 100644
--- a/compiler/testData/codegen/box/functions/bigArity/subclass.kt
+++ b/compiler/testData/codegen/box/functions/bigArity/subclass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: +FunctionTypesWithBigArity
 
 // Implementing function interface is prohibited in JavaScript
diff --git a/compiler/testData/codegen/box/functions/coerceVoidToArray.kt b/compiler/testData/codegen/box/functions/coerceVoidToArray.kt
index 695a3a50187..bde97423b6a 100644
--- a/compiler/testData/codegen/box/functions/coerceVoidToArray.kt
+++ b/compiler/testData/codegen/box/functions/coerceVoidToArray.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun a(): IntArray? = null
 
 fun b(): Nothing = throw Exception()
diff --git a/compiler/testData/codegen/box/functions/coerceVoidToObject.kt b/compiler/testData/codegen/box/functions/coerceVoidToObject.kt
index 660ea0d44ec..17452d90e0c 100644
--- a/compiler/testData/codegen/box/functions/coerceVoidToObject.kt
+++ b/compiler/testData/codegen/box/functions/coerceVoidToObject.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun a(): String? = null
 
 fun b(): Nothing = throw Exception()
diff --git a/compiler/testData/codegen/box/functions/functionNtoString.kt b/compiler/testData/codegen/box/functions/functionNtoString.kt
index 677fd322378..c14eedbf767 100644
--- a/compiler/testData/codegen/box/functions/functionNtoString.kt
+++ b/compiler/testData/codegen/box/functions/functionNtoString.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt b/compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt
index 7e9313d7852..2111c4e3f80 100644
--- a/compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt
+++ b/compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt b/compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt
index 5f9ed6419ab..12afc85d43e 100644
--- a/compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt
+++ b/compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/functions/invoke/kt3190.kt b/compiler/testData/codegen/box/functions/invoke/kt3190.kt
index 47860503093..fcf74a128d4 100644
--- a/compiler/testData/codegen/box/functions/invoke/kt3190.kt
+++ b/compiler/testData/codegen/box/functions/invoke/kt3190.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 //KT-3190 Compiler crash if function called 'invoke' calls a closure
diff --git a/compiler/testData/codegen/box/functions/invoke/kt3297.kt b/compiler/testData/codegen/box/functions/invoke/kt3297.kt
index 026ac7a3b37..470d628d0c1 100644
--- a/compiler/testData/codegen/box/functions/invoke/kt3297.kt
+++ b/compiler/testData/codegen/box/functions/invoke/kt3297.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 //KT-3297 Calling the wrong function inside an extension method to the Function0 class
 
 infix fun <R> Function0<R>.or(alt: () -> R): R {
diff --git a/compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt b/compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt
index 5279ca2ce28..ea0f55a588d 100644
--- a/compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt
+++ b/compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IMPLEMENTING_FUNCTION_INTERFACE
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 //KT-3822 Compiler crashes when use invoke convention with `this` in class which extends Function0<T>
diff --git a/compiler/testData/codegen/box/functions/kt1649_2.kt b/compiler/testData/codegen/box/functions/kt1649_2.kt
index 33f420dc3f9..5b975d07037 100644
--- a/compiler/testData/codegen/box/functions/kt1649_2.kt
+++ b/compiler/testData/codegen/box/functions/kt1649_2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 interface A {
     val method : () -> Unit?
 }
diff --git a/compiler/testData/codegen/box/functions/kt1739.kt b/compiler/testData/codegen/box/functions/kt1739.kt
index e06a1635766..b7622c572c3 100644
--- a/compiler/testData/codegen/box/functions/kt1739.kt
+++ b/compiler/testData/codegen/box/functions/kt1739.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/functions/kt3214.kt b/compiler/testData/codegen/box/functions/kt3214.kt
index 8ff33fcad23..4b97a069420 100644
--- a/compiler/testData/codegen/box/functions/kt3214.kt
+++ b/compiler/testData/codegen/box/functions/kt3214.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 class A {
     fun get(vararg x: Int) = x.size
 }
diff --git a/compiler/testData/codegen/box/functions/localFunctions/kt4777.kt b/compiler/testData/codegen/box/functions/localFunctions/kt4777.kt
index 4301f0dbe62..bd59d40320f 100644
--- a/compiler/testData/codegen/box/functions/localFunctions/kt4777.kt
+++ b/compiler/testData/codegen/box/functions/localFunctions/kt4777.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt b/compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt
index 709b1c9ac1e..4ce1d05f3ad 100644
--- a/compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt
+++ b/compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 open class T(var value: Int) {}
 
 fun localExtensionOnNullableParameter(): T {
diff --git a/compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt b/compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt
new file mode 100644
index 00000000000..80624661016
--- /dev/null
+++ b/compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt
@@ -0,0 +1,9 @@
+
+class C(val x: String)
+
+fun <T1 : C, T2 : T1> foo(x: T2): String =
+    x.x
+
+fun box(): String {
+    return foo(C("OK"))
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/ieee754/equalsDouble.kt b/compiler/testData/codegen/box/ieee754/equalsDouble.kt
index 2aa48e68651..f2b1fe4b0d4 100644
--- a/compiler/testData/codegen/box/ieee754/equalsDouble.kt
+++ b/compiler/testData/codegen/box/ieee754/equalsDouble.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/equalsFloat.kt b/compiler/testData/codegen/box/ieee754/equalsFloat.kt
index 51de8cf7a74..db1fe11840b 100644
--- a/compiler/testData/codegen/box/ieee754/equalsFloat.kt
+++ b/compiler/testData/codegen/box/ieee754/equalsFloat.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/equalsNaN.kt b/compiler/testData/codegen/box/ieee754/equalsNaN.kt
index f38243aa3eb..c50948bac1c 100644
--- a/compiler/testData/codegen/box/ieee754/equalsNaN.kt
+++ b/compiler/testData/codegen/box/ieee754/equalsNaN.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/equalsNaN_properIeeeComparisons.kt b/compiler/testData/codegen/box/ieee754/equalsNaN_properIeeeComparisons.kt
index 5a7499cebcb..e5b33da6319 100644
--- a/compiler/testData/codegen/box/ieee754/equalsNaN_properIeeeComparisons.kt
+++ b/compiler/testData/codegen/box/ieee754/equalsNaN_properIeeeComparisons.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // !LANGUAGE: +ProperIeee754Comparisons
 // IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ieee754/equalsNullableDouble.kt b/compiler/testData/codegen/box/ieee754/equalsNullableDouble.kt
index 4110e9b972e..3a708e12a63 100644
--- a/compiler/testData/codegen/box/ieee754/equalsNullableDouble.kt
+++ b/compiler/testData/codegen/box/ieee754/equalsNullableDouble.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/equalsNullableFloat.kt b/compiler/testData/codegen/box/ieee754/equalsNullableFloat.kt
index 260cd633d44..26f79779e8d 100644
--- a/compiler/testData/codegen/box/ieee754/equalsNullableFloat.kt
+++ b/compiler/testData/codegen/box/ieee754/equalsNullableFloat.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/greaterDouble.kt b/compiler/testData/codegen/box/ieee754/greaterDouble.kt
index 453cf64beab..fd5ec339738 100644
--- a/compiler/testData/codegen/box/ieee754/greaterDouble.kt
+++ b/compiler/testData/codegen/box/ieee754/greaterDouble.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/greaterFloat.kt b/compiler/testData/codegen/box/ieee754/greaterFloat.kt
index 4434d1ff130..6d8a519db25 100644
--- a/compiler/testData/codegen/box/ieee754/greaterFloat.kt
+++ b/compiler/testData/codegen/box/ieee754/greaterFloat.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/lessDouble.kt b/compiler/testData/codegen/box/ieee754/lessDouble.kt
index 13ab4c05f1a..351482370a4 100644
--- a/compiler/testData/codegen/box/ieee754/lessDouble.kt
+++ b/compiler/testData/codegen/box/ieee754/lessDouble.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/lessFloat.kt b/compiler/testData/codegen/box/ieee754/lessFloat.kt
index e842cddda33..1a3ac80c13e 100644
--- a/compiler/testData/codegen/box/ieee754/lessFloat.kt
+++ b/compiler/testData/codegen/box/ieee754/lessFloat.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/smartCastToDifferentTypes.kt b/compiler/testData/codegen/box/ieee754/smartCastToDifferentTypes.kt
index e2069cf944c..5016c0d8306 100644
--- a/compiler/testData/codegen/box/ieee754/smartCastToDifferentTypes.kt
+++ b/compiler/testData/codegen/box/ieee754/smartCastToDifferentTypes.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // IGNORE_BACKEND: NATIVE
 // DONT_TARGET_EXACT_BACKEND: JS_IR
diff --git a/compiler/testData/codegen/box/ieee754/smartCastToDifferentTypesWithNumericPromotion.kt b/compiler/testData/codegen/box/ieee754/smartCastToDifferentTypesWithNumericPromotion.kt
index cc9dbc5f430..234dd2e4159 100644
--- a/compiler/testData/codegen/box/ieee754/smartCastToDifferentTypesWithNumericPromotion.kt
+++ b/compiler/testData/codegen/box/ieee754/smartCastToDifferentTypesWithNumericPromotion.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // IGNORE_BACKEND: NATIVE
 // DONT_TARGET_EXACT_BACKEND: JS_IR
diff --git a/compiler/testData/codegen/box/ieee754/when.kt b/compiler/testData/codegen/box/ieee754/when.kt
index 4b8d5979276..f67b23bb6c2 100644
--- a/compiler/testData/codegen/box/ieee754/when.kt
+++ b/compiler/testData/codegen/box/ieee754/when.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ieee754/whenNoSubject.kt b/compiler/testData/codegen/box/ieee754/whenNoSubject.kt
index 9a76c4eebea..1bf15fc77c0 100644
--- a/compiler/testData/codegen/box/ieee754/whenNoSubject.kt
+++ b/compiler/testData/codegen/box/ieee754/whenNoSubject.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -ProperIeee754Comparisons
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/increment/mutableListElement.kt b/compiler/testData/codegen/box/increment/mutableListElement.kt
index 4a719eaaef5..6e5cc5dc2c7 100644
--- a/compiler/testData/codegen/box/increment/mutableListElement.kt
+++ b/compiler/testData/codegen/box/increment/mutableListElement.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt b/compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt
index 2acf018d39c..2a2b717f157 100644
--- a/compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt
+++ b/compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // Issues: KT-33542, KT-33544
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/inference/coercionToUnitWithLastLambdaExpression.kt b/compiler/testData/codegen/box/inference/coercionToUnitWithLastLambdaExpression.kt
index 11590ac5d57..aeda825f1d7 100644
--- a/compiler/testData/codegen/box/inference/coercionToUnitWithLastLambdaExpression.kt
+++ b/compiler/testData/codegen/box/inference/coercionToUnitWithLastLambdaExpression.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 
 fun <T> myRun(action: () -> T): T = action()
 fun foo(): String = "foo"
diff --git a/compiler/testData/codegen/box/inference/coerctionToUnitForLastExpressionWithStarProjection.kt b/compiler/testData/codegen/box/inference/coerctionToUnitForLastExpressionWithStarProjection.kt
index 89f75bbd616..c22d0edddae 100644
--- a/compiler/testData/codegen/box/inference/coerctionToUnitForLastExpressionWithStarProjection.kt
+++ b/compiler/testData/codegen/box/inference/coerctionToUnitForLastExpressionWithStarProjection.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNKNOWN
 class Inv<T>
 
 fun Inv<*>.invToInv(): Inv<*>? = null
diff --git a/compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt b/compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt
index 3f635747c4d..66a296c397a 100644
--- a/compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt
+++ b/compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // !LANGUAGE: +NewInference
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/inference/kt35684.kt b/compiler/testData/codegen/box/inference/kt35684.kt
index e5e1ef92214..5da4d907ab9 100644
--- a/compiler/testData/codegen/box/inference/kt35684.kt
+++ b/compiler/testData/codegen/box/inference/kt35684.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +NewInference
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/inference/kt36446.kt b/compiler/testData/codegen/box/inference/kt36446.kt
index 06fbf4bb317..58f2a11b34a 100644
--- a/compiler/testData/codegen/box/inference/kt36446.kt
+++ b/compiler/testData/codegen/box/inference/kt36446.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/inference/kt39824.kt b/compiler/testData/codegen/box/inference/kt39824.kt
index 04f88e04615..bc520620caf 100644
--- a/compiler/testData/codegen/box/inference/kt39824.kt
+++ b/compiler/testData/codegen/box/inference/kt39824.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // WITH_RUNTIME
 
 fun <C : Any> diContext(context: C): DIContext<C> = DIContext(TypeToken(), context)
diff --git a/compiler/testData/codegen/box/inference/noCoercionToUnitWithEqualityConstraintForNullableReturnType.kt b/compiler/testData/codegen/box/inference/noCoercionToUnitWithEqualityConstraintForNullableReturnType.kt
index 1c5250a327e..a0d2e6e1bae 100644
--- a/compiler/testData/codegen/box/inference/noCoercionToUnitWithEqualityConstraintForNullableReturnType.kt
+++ b/compiler/testData/codegen/box/inference/noCoercionToUnitWithEqualityConstraintForNullableReturnType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // IGNORE_BACKEND_FIR: JVM_IR
 
 class Inv<T>(val x: T?)
diff --git a/compiler/testData/codegen/box/inference/plusAssignInsideLambda.kt b/compiler/testData/codegen/box/inference/plusAssignInsideLambda.kt
index b6d4ea8c3ec..771ef24b8a5 100644
--- a/compiler/testData/codegen/box/inference/plusAssignInsideLambda.kt
+++ b/compiler/testData/codegen/box/inference/plusAssignInsideLambda.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // WITH_RUNTIME
 
 import kotlin.experimental.ExperimentalTypeInference
diff --git a/compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt b/compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt
index 88c088c7f6b..64b6279d9f3 100644
--- a/compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt
+++ b/compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun test(): () -> Throwable {
     return try {
         TODO()
diff --git a/compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt b/compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt
index 968ac997ae3..44086d82274 100644
--- a/compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt
+++ b/compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // TARGET_BACKEND: JVM
 
 // FILE: Bar.java
diff --git a/compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt b/compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt
index a5aba2bc44a..532f2e11fcf 100644
--- a/compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt
+++ b/compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +NewInference
diff --git a/compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt b/compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt
index b3e9d72ba18..c95097d8d68 100644
--- a/compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt
+++ b/compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNSIGNED_ARRAYS
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +InlineClasses
 
diff --git a/compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt b/compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt
new file mode 100644
index 00000000000..c1d311545bf
--- /dev/null
+++ b/compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+// KJS_WITH_FULL_RUNTIME
+
+fun testUIntSafeAsInt(x: UInt) = x as? Int
+
+fun box(): String = if (testUIntSafeAsInt(1U) != null) "fail" else "OK"
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt b/compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt
new file mode 100644
index 00000000000..2889cdc5a44
--- /dev/null
+++ b/compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt
@@ -0,0 +1,24 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
+// IGNORE_BACKEND: JS_IR
+
+inline class IC(val i: Int) {
+    init {
+        counter += i
+    }
+}
+
+var counter = 0
+
+fun <T> id(t: T) = t
+
+fun box(): String {
+    val ic = IC(42)
+    if (counter != 42) return "FAIL 1: $counter"
+    counter = 0
+
+    id(ic)
+    if (counter != 0) return "FAIL 2: $counter"
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/kt27586_1.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/kt27586_1.kt
index 0f9cdf6c279..dd3a6df5e2c 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/kt27586_1.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/kt27586_1.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 fun f1(): () -> Result<String> {
     return {
diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/kt27586_2.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/kt27586_2.kt
index c9d3fcb85fc..6f0254f1319 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/kt27586_2.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/kt27586_2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 fun f1() = lazy {
     runCatching {
diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt
index ec59395686a..dbd53ee296b 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt
index 25692ded1b3..db1859c62f2 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234.kt
index 6fc7678f016..b09f06d05e5 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt
index 8c0279ca65c..23512f3cc10 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt
new file mode 100644
index 00000000000..cd364e0730f
--- /dev/null
+++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt
@@ -0,0 +1,20 @@
+inline class Marker(val i: Int)
+
+interface I<T> {
+    fun foo(i: Marker) : T
+}
+
+inline class IC(val a: Any)
+
+class C : I<IC> {
+    override fun foo(i: Marker): IC = IC("OK")
+}
+
+fun box(): String {
+    val i: I<IC> = C()
+    val foo: IC = i.foo(Marker(0))
+    if (foo.a != "OK") return "FAIL 1"
+    val foo1: IC = C().foo(Marker(0))
+    if (foo1.a != "OK") return "FAIL 2"
+    return "OK"
+}
diff --git a/compiler/testData/codegen/box/inlineClasses/boxUnboxInlineClassesWithOperatorsGetSet.kt b/compiler/testData/codegen/box/inlineClasses/boxUnboxInlineClassesWithOperatorsGetSet.kt
index b5d071cbb02..a2eefd932db 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxUnboxInlineClassesWithOperatorsGetSet.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxUnboxInlineClassesWithOperatorsGetSet.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNSIGNED_ARRAYS
 // !LANGUAGE: +InlineClasses
 
 inline class UInt(private val value: Int) {
diff --git a/compiler/testData/codegen/box/inlineClasses/boxUnboxOfInlineClassForCapturedVars.kt b/compiler/testData/codegen/box/inlineClasses/boxUnboxOfInlineClassForCapturedVars.kt
index df21fa88cf8..1cd35abfbd7 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxUnboxOfInlineClassForCapturedVars.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxUnboxOfInlineClassForCapturedVars.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // !LANGUAGE: +InlineClasses
 
 inline class UInt(private val value: Int) {
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassExtensionFun.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassExtensionFun.kt
index ec97a9b91a8..b45e9bb200d 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassExtensionFun.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassExtensionFun.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BOUND_RECEIVER
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassExtensionVal.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassExtensionVal.kt
index f2c4757e960..7a9d36d6988 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassExtensionVal.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassExtensionVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassMemberFun.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassMemberFun.kt
index 465845d7c71..4bcd0668be1 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassMemberFun.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassMemberFun.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BOUND_RECEIVER
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassMemberVal.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassMemberVal.kt
index 29a89e3ede5..79bbdb1c176 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassMemberVal.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassMemberVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassPrimaryVal.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassPrimaryVal.kt
index 1c1dd71e21e..b8f36f83e6c 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassPrimaryVal.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/boundInlineClassPrimaryVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToString.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToString.kt
index c52e805f0b2..58439f93198 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToString.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToString.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6, NATIVE
 // WITH_REFLECT
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassExtensionVal.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassExtensionVal.kt
index 7db8b64f40a..8510a2e312b 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassExtensionVal.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassExtensionVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassInternalPrimaryVal.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassInternalPrimaryVal.kt
index c7477995ee7..733d8657a7b 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassInternalPrimaryVal.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassInternalPrimaryVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 import kotlin.test.assertEquals
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassMemberVal.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassMemberVal.kt
index 3382c4148f3..f35603ea2a0 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassMemberVal.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassMemberVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrimaryVal.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrimaryVal.kt
index e585afa7e4e..ffdd779d0d8 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrimaryVal.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrimaryVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrivatePrimaryVal.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrivatePrimaryVal.kt
index 142b2b798eb..6e95b380884 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrivatePrimaryVal.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrivatePrimaryVal.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 import kotlin.test.assertEquals
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeBoundMemberVar.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeBoundMemberVar.kt
index a515a3da6c2..2281e95f11b 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeBoundMemberVar.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeBoundMemberVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 inline class Z(val x: Int)
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeMemberVar.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeMemberVar.kt
index 17764bb1826..1381c3cc35d 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeMemberVar.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeMemberVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 inline class Z(val x: Int)
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeTopLevelVar.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeTopLevelVar.kt
index e7942b503ce..0f8ffea3ee2 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeTopLevelVar.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassTypeTopLevelVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 inline class Z(val x: Int)
diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferencesWithInlineClasses.kt b/compiler/testData/codegen/box/inlineClasses/callableReferencesWithInlineClasses.kt
index e3e9744f98a..e63c64bd7bf 100644
--- a/compiler/testData/codegen/box/inlineClasses/callableReferencesWithInlineClasses.kt
+++ b/compiler/testData/codegen/box/inlineClasses/callableReferencesWithInlineClasses.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BOUND_RECEIVER
 // !LANGUAGE: +InlineClasses
 // WITH_REFLECT
 
diff --git a/compiler/testData/codegen/box/inlineClasses/checkBoxingForComplexClassHierarchy.kt b/compiler/testData/codegen/box/inlineClasses/checkBoxingForComplexClassHierarchy.kt
index 74b0830be73..4de968ddc10 100644
--- a/compiler/testData/codegen/box/inlineClasses/checkBoxingForComplexClassHierarchy.kt
+++ b/compiler/testData/codegen/box/inlineClasses/checkBoxingForComplexClassHierarchy.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BRIDGE_ISSUES
 // !LANGUAGE: +InlineClasses
 
 inline class IC(val x: Int)
diff --git a/compiler/testData/codegen/box/inlineClasses/constructorImplVisibility.kt b/compiler/testData/codegen/box/inlineClasses/constructorImplVisibility.kt
new file mode 100644
index 00000000000..e7efccb4a1a
--- /dev/null
+++ b/compiler/testData/codegen/box/inlineClasses/constructorImplVisibility.kt
@@ -0,0 +1,18 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+// FULL_JDK
+
+import java.lang.reflect.Modifier
+
+inline class IC1 public constructor(val i: Int)
+inline class IC11 internal constructor(val i: Int)
+inline class IC2 private constructor(val i: Int)
+inline class IC4 protected constructor(val i: Int)
+
+fun box(): String {
+    if (!Modifier.isPublic(IC1::class.java.declaredMethods.single { it.name == "constructor-impl" }.modifiers)) return "FAIL 1"
+    if (!Modifier.isPublic(IC11::class.java.declaredMethods.single { it.name == "constructor-impl" }.modifiers)) return "FAIL 1"
+    if (!Modifier.isPrivate(IC2::class.java.declaredMethods.single { it.name == "constructor-impl" }.modifiers)) return "FAIL 2"
+    if (!Modifier.isProtected(IC4::class.java.declaredMethods.single { it.name == "constructor-impl" }.modifiers)) return "FAIL 4"
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/kt27513.kt b/compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/kt27513.kt
index 5de31ce12ff..63b09a8c226 100644
--- a/compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/kt27513.kt
+++ b/compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/kt27513.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt
new file mode 100644
index 00000000000..cffe5152cc2
--- /dev/null
+++ b/compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt
@@ -0,0 +1,13 @@
+interface IFoo<T> {
+    fun foo(x: T): String = "O"
+    fun T.bar(): String = "K"
+}
+
+inline class L(val x: Long) : IFoo<L>
+
+fun box(): String {
+    val z = L(0L)
+    return with(z) {
+        foo(z) + z.bar()
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/kt26554.kt b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/kt26554.kt
index 2d34e5668a6..88475e1fa97 100644
--- a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/kt26554.kt
+++ b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/kt26554.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // !LANGUAGE: +InlineClasses
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/inlineClasses/equalityForBoxesOfNullableValuesOfInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/equalityForBoxesOfNullableValuesOfInlineClass.kt
index 8ac937a7398..91db1539dce 100644
--- a/compiler/testData/codegen/box/inlineClasses/equalityForBoxesOfNullableValuesOfInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/equalityForBoxesOfNullableValuesOfInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: WASM_NULL_CAST
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderInlineClass.kt
index 7fc6d414460..d849654ec85 100644
--- a/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // !LANGUAGE: +InlineClasses
 
 inline class Inner(val x: Int)
diff --git a/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderNonNull.kt b/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderNonNull.kt
index 1f7ff01c87c..9568e8d8718 100644
--- a/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderNonNull.kt
+++ b/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderNonNull.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // !LANGUAGE: +InlineClasses
 
 inline class A(val x: String = "")
diff --git a/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderNullable.kt b/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderNullable.kt
index 60f0ea4e27b..eeca82846f1 100644
--- a/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderNullable.kt
+++ b/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderNullable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // !LANGUAGE: +InlineClasses
 
 inline class A(val x: Any? = null)
diff --git a/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderPrimitive.kt b/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderPrimitive.kt
index 745e3497825..531243a51b7 100644
--- a/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderPrimitive.kt
+++ b/compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderPrimitive.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // !LANGUAGE: +InlineClasses
 
 inline class A(val x: Int = 0)
diff --git a/compiler/testData/codegen/box/inlineClasses/functionNameMangling/mangledFunctionsPresentInStackTrace.kt b/compiler/testData/codegen/box/inlineClasses/functionNameMangling/mangledFunctionsPresentInStackTrace.kt
index 9b7347d891c..8ed45919378 100644
--- a/compiler/testData/codegen/box/inlineClasses/functionNameMangling/mangledFunctionsPresentInStackTrace.kt
+++ b/compiler/testData/codegen/box/inlineClasses/functionNameMangling/mangledFunctionsPresentInStackTrace.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // !LANGUAGE: +InlineClasses
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForFunctionWithMangledName.kt b/compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForFunctionWithMangledName.kt
index 20cb9d58063..7328632658c 100644
--- a/compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForFunctionWithMangledName.kt
+++ b/compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForFunctionWithMangledName.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BRIDGE_ISSUES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForPropertyOfInlineClassType.kt b/compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForPropertyOfInlineClassType.kt
index 2a43d97f524..30f53c6ceb1 100644
--- a/compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForPropertyOfInlineClassType.kt
+++ b/compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForPropertyOfInlineClassType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt b/compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt
index 7394adb23b6..c13a997a252 100644
--- a/compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt
+++ b/compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-41771
diff --git a/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt b/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt
index 8594c3aec14..e4a455fc25f 100644
--- a/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt
+++ b/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt
@@ -1,6 +1,9 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNSIGNED_ARRAYS
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 class C<T>(val x: T, vararg ys: UInt) {
     val y0 = ys[0]
diff --git a/compiler/testData/codegen/box/inlineClasses/initBlock.kt b/compiler/testData/codegen/box/inlineClasses/initBlock.kt
new file mode 100644
index 00000000000..cda7406d835
--- /dev/null
+++ b/compiler/testData/codegen/box/inlineClasses/initBlock.kt
@@ -0,0 +1,172 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
+// IGNORE_BACKEND: JS_IR
+
+inline class SingleInitBlock(val s: String) {
+    init {
+        res = s
+    }
+}
+
+inline class MultipleInitBlocks(val a: Any?) {
+    init {
+        res = "O"
+    }
+    init {
+        res += "K"
+    }
+}
+
+inline class Lambda(val s: String) {
+    init {
+        val lambda = { res = s }
+        lambda()
+    }
+}
+
+inline class FunLiteral(val s: String) {
+    init {
+        val funLiteral = fun() {
+            res = s
+        }
+        funLiteral()
+    }
+}
+
+inline class ObjectLiteral(val s: String) {
+    init {
+        val objectLiteral = object {
+            fun run() {
+                res = s
+            }
+        }
+        objectLiteral.run()
+    }
+}
+
+inline class LocalFunction(val s: String) {
+    init {
+        fun local() {
+            res = s
+        }
+        local()
+    }
+}
+
+inline class LocalClass(val s: String) {
+    init {
+        class Local {
+            fun run() {
+                res = s
+            }
+        }
+        Local().run()
+    }
+}
+
+inline class Getter(val s: String) {
+    init {
+        res = ok
+    }
+
+    val ok: String
+        get() = s
+}
+
+inline class GetterThis(val s: String) {
+    init {
+        res = this.ok
+    }
+
+    val ok: String
+        get() = s
+}
+
+inline class Method(val s: String) {
+    init {
+        res = ok(this)
+    }
+
+    fun ok(m: Method): String = m.s
+}
+
+inline class MethodThis(val s: String) {
+    init {
+        res = this.ok(this)
+    }
+
+    fun ok(m: MethodThis): String = m.s
+}
+
+inline class InlineFun(val s: String) {
+    init {
+        res = ok()
+    }
+
+    inline fun ok(): String = s
+}
+
+inline class InlineFunThis(val s: String) {
+    init {
+        res = this.ok()
+    }
+
+    inline fun ok(): String = s
+}
+
+var res: String = "FAIL"
+
+fun box(): String {
+    SingleInitBlock("OK")
+    if (res != "OK") return "FAIL 1: $res"
+
+    res = "FAIL 2"
+    MultipleInitBlocks(null)
+    if (res != "OK") return "FAIL 21: $res"
+
+    res = "FAIL 3"
+    Lambda("OK")
+    if (res != "OK") return "FAIL 31: $res"
+
+    res = "FAIL 4"
+    FunLiteral("OK")
+    if (res != "OK") return "FAIL 41: $res"
+
+    res = "FAIL 5"
+    ObjectLiteral("OK")
+    if (res != "OK") return "FAIL 51: $res"
+
+    res = "FAIL 6"
+    LocalFunction("OK")
+    if (res != "OK") return "FAIL 61: $res"
+
+    res = "FAIL 7"
+    LocalClass("OK")
+    if (res != "OK") return "FAIL 71: $res"
+
+    res = "FAIL 8"
+    Getter("OK")
+    if (res != "OK") return "FAIL 81: $res"
+
+    res = "FAIL 9"
+    GetterThis("OK")
+    if (res != "OK") return "FAIL 91: $res"
+
+    res = "FAIL 10"
+    Method("OK")
+    if (res != "OK") return "FAIL 101: $res"
+
+    res = "FAIL 11"
+    MethodThis("OK")
+    if (res != "OK") return "FAIL 111: $res"
+
+    res = "FAIL 12"
+    InlineFun("OK")
+    if (res != "OK") return "FAIL 121: $res"
+
+    res = "FAIL 13"
+    InlineFunThis("OK")
+    if (res != "OK") return "FAIL 131: $res"
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassPropertyReferenceGetAndSet.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassPropertyReferenceGetAndSet.kt
index e75ce35c2bc..197f7a6ed56 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineClassPropertyReferenceGetAndSet.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineClassPropertyReferenceGetAndSet.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.kt b/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.kt
index 4ef76daf60f..d0fa36de698 100644
--- a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.kt
+++ b/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/kt25750.kt b/compiler/testData/codegen/box/inlineClasses/kt25750.kt
index bdb0cd98ffe..aa6c36b049f 100644
--- a/compiler/testData/codegen/box/inlineClasses/kt25750.kt
+++ b/compiler/testData/codegen/box/inlineClasses/kt25750.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/kt25771.kt b/compiler/testData/codegen/box/inlineClasses/kt25771.kt
index d0704e2478a..69f84752912 100644
--- a/compiler/testData/codegen/box/inlineClasses/kt25771.kt
+++ b/compiler/testData/codegen/box/inlineClasses/kt25771.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // !LANGUAGE: +InlineClasses
 
 inline class Result<out T>(val value: Any?) {
diff --git a/compiler/testData/codegen/box/inlineClasses/kt27113.kt b/compiler/testData/codegen/box/inlineClasses/kt27113.kt
index b7d0368111e..6a56d969688 100644
--- a/compiler/testData/codegen/box/inlineClasses/kt27113.kt
+++ b/compiler/testData/codegen/box/inlineClasses/kt27113.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: +InlineClasses
 // IGNORE_BACKEND: JS, JS_IR, NATIVE
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/inlineClasses/kt28405.kt b/compiler/testData/codegen/box/inlineClasses/kt28405.kt
index 448ed6fea8f..8f603774a31 100644
--- a/compiler/testData/codegen/box/inlineClasses/kt28405.kt
+++ b/compiler/testData/codegen/box/inlineClasses/kt28405.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/inlineClasses/kt28585.kt b/compiler/testData/codegen/box/inlineClasses/kt28585.kt
index feaab23ffa2..2a5795b0e4e 100644
--- a/compiler/testData/codegen/box/inlineClasses/kt28585.kt
+++ b/compiler/testData/codegen/box/inlineClasses/kt28585.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/inlineClasses/passInlineClassWithSpreadOperatorToVarargs.kt b/compiler/testData/codegen/box/inlineClasses/passInlineClassWithSpreadOperatorToVarargs.kt
index 24bfd7dbd67..6ac51c23dde 100644
--- a/compiler/testData/codegen/box/inlineClasses/passInlineClassWithSpreadOperatorToVarargs.kt
+++ b/compiler/testData/codegen/box/inlineClasses/passInlineClassWithSpreadOperatorToVarargs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // !LANGUAGE: +InlineClasses
 
 inline class UInt(val value: Int)
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/captureLocalVarDelegatedToInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/captureLocalVarDelegatedToInlineClass.kt
index b677ce3ab9b..dfc34dc40d8 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/captureLocalVarDelegatedToInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/captureLocalVarDelegatedToInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 
 var setterInvoked = 0
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateClassVarToInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateClassVarToInlineClass.kt
index 8cfad98309d..19773e2d633 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateClassVarToInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateClassVarToInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 
 class Foo {
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateClassVarToInlineClassWithProvideDelegate.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateClassVarToInlineClassWithProvideDelegate.kt
index 31533f625a6..986d7bfeef5 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateClassVarToInlineClassWithProvideDelegate.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateClassVarToInlineClassWithProvideDelegate.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 
 class Foo {
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateCompanionVarToInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateCompanionVarToInlineClass.kt
index 0d8d8c78f4b..8b4dfc0852a 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateCompanionVarToInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateCompanionVarToInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 
 class Foo {
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateLocalVarToInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateLocalVarToInlineClass.kt
index c676535dbfa..8bb46f4cfae 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateLocalVarToInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateLocalVarToInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 
 var setterInvoked = 0
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateObjectVarToInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateObjectVarToInlineClass.kt
index 64880c7ee7a..a922e92f032 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateObjectVarToInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateObjectVarToInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 
 object Foo {
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatePrivateCompanionVarToInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatePrivateCompanionVarToInlineClass.kt
index 386a83b8246..7df0669e63a 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatePrivateCompanionVarToInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatePrivateCompanionVarToInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 
 class Foo {
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateTopLevelVarToInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateTopLevelVarToInlineClass.kt
index 8e71f010747..72780aa35d6 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateTopLevelVarToInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegateTopLevelVarToInlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 
 var setterInvoked = 0
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatedPropertyOfInlineClassType.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatedPropertyOfInlineClassType.kt
index f3f308eca92..5f17fc07444 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatedPropertyOfInlineClassType.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatedPropertyOfInlineClassType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty
 
 inline class ICInt(val i: Int)
diff --git a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/kt27070.kt b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/kt27070.kt
index 17ac0d3d836..ae5c8b8e209 100644
--- a/compiler/testData/codegen/box/inlineClasses/propertyDelegation/kt27070.kt
+++ b/compiler/testData/codegen/box/inlineClasses/propertyDelegation/kt27070.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt b/compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt
index 1f60cdb2230..0872b6e5685 100644
--- a/compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt
+++ b/compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/inlineClasses/resultRunCatchingOrElse.kt b/compiler/testData/codegen/box/inlineClasses/resultRunCatchingOrElse.kt
index 96b882ed7d9..6c014fe77ef 100644
--- a/compiler/testData/codegen/box/inlineClasses/resultRunCatchingOrElse.kt
+++ b/compiler/testData/codegen/box/inlineClasses/resultRunCatchingOrElse.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 inline class Result<out T>(val value: Any?) {
     fun exceptionOrNull(): Throwable? =
         when (value) {
diff --git a/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt b/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt
index 4174055d643..8236dc3f275 100644
--- a/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt
+++ b/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS, JS_IR, NATIVE, JVM
 // IGNORE_BACKEND: JS_IR_ES6
 // !LANGUAGE: +InlineClasses
diff --git a/compiler/testData/codegen/box/inlineClasses/stringPlus.kt b/compiler/testData/codegen/box/inlineClasses/stringPlus.kt
new file mode 100644
index 00000000000..37fd5117c83
--- /dev/null
+++ b/compiler/testData/codegen/box/inlineClasses/stringPlus.kt
@@ -0,0 +1,9 @@
+// !LANGUAGE: +InlineClasses
+
+fun <T> foo(a: IC): T = a.value as T
+
+inline class IC(val value: String)
+
+fun box(): String {
+    return foo<String>(IC("O")) + "K"
+}
diff --git a/compiler/testData/codegen/box/inlineClasses/toStringOfUnboxedNullable.kt b/compiler/testData/codegen/box/inlineClasses/toStringOfUnboxedNullable.kt
index 1fa1e77dc94..fafb9d1de16 100644
--- a/compiler/testData/codegen/box/inlineClasses/toStringOfUnboxedNullable.kt
+++ b/compiler/testData/codegen/box/inlineClasses/toStringOfUnboxedNullable.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +InlineClasses
 // IGNORE_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_LIGHT_ANALYSIS
 inline class IC(val x: String)
 
diff --git a/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/string.kt b/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/string.kt
index fda16c3a330..9d84cf1a01c 100644
--- a/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/string.kt
+++ b/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/string.kt
@@ -1,6 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun <T> underlying(a: IC): T = bar(a) {
     it.value as T
@@ -48,4 +46,4 @@ fun box(): String {
     if (res != "OK") return "FAIL 3: $res"
 
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/string.kt b/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/string.kt
index c8ec62c787c..0922f4ef605 100644
--- a/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/string.kt
+++ b/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/string.kt
@@ -1,6 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun <T> underlying(a: IC): T = bar(a) {
     it.value as T
@@ -44,4 +42,4 @@ fun box(): String {
     if (res != "OK") return "FAIL 3: $res"
 
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/string.kt b/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/string.kt
index a44ea4108e5..2a911bc1760 100644
--- a/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/string.kt
+++ b/compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/string.kt
@@ -1,6 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun <T> underlying(a: IC): T = bar(a, object : IFace<IC, T> {
     override fun call(ic: IC): T = ic.value as T
@@ -48,4 +46,4 @@ fun box(): String {
     if (res != "OK") return "FAIL 3: $res"
 
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/inlineClasses/unboxParameterOfSuspendLambdaBeforeInvoke.kt b/compiler/testData/codegen/box/inlineClasses/unboxParameterOfSuspendLambdaBeforeInvoke.kt
index 3ef1b7db138..da5ad223329 100644
--- a/compiler/testData/codegen/box/inlineClasses/unboxParameterOfSuspendLambdaBeforeInvoke.kt
+++ b/compiler/testData/codegen/box/inlineClasses/unboxParameterOfSuspendLambdaBeforeInvoke.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // WITH_COROUTINES
 // WITH_RUNTIME
 // IGNORE_BACKEND: JS_IR
diff --git a/compiler/testData/codegen/box/inlineClasses/unboxValueFromPlatformType.kt b/compiler/testData/codegen/box/inlineClasses/unboxValueFromPlatformType.kt
index 009c34768bc..61385ac690a 100644
--- a/compiler/testData/codegen/box/inlineClasses/unboxValueFromPlatformType.kt
+++ b/compiler/testData/codegen/box/inlineClasses/unboxValueFromPlatformType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/inlineClasses/unboxValueOfAnyBeforeMethodInvocation.kt b/compiler/testData/codegen/box/inlineClasses/unboxValueOfAnyBeforeMethodInvocation.kt
index c4804187c7e..fa5a65b18e2 100644
--- a/compiler/testData/codegen/box/inlineClasses/unboxValueOfAnyBeforeMethodInvocation.kt
+++ b/compiler/testData/codegen/box/inlineClasses/unboxValueOfAnyBeforeMethodInvocation.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt b/compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt
new file mode 100644
index 00000000000..733e0efbee8
--- /dev/null
+++ b/compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt
@@ -0,0 +1,24 @@
+
+// KT-40686
+
+
+class Outer(val o: String, val oo: String) {
+    inner class InnerArg(val i: String) {
+        val result: String get() = o + i
+    }
+
+    inner class InnerParam(val i: InnerArg = InnerArg("B")) {
+        fun foo() = i.result + oo
+    }
+}
+
+
+fun box(): String {
+    val o = Outer("A", "C")
+    val i = o.InnerParam()
+
+    val rr = i.foo()
+    if (rr != "ABC") return "FAIL: $rr"
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/intrinsics/kt8666.kt b/compiler/testData/codegen/box/intrinsics/kt8666.kt
index 540bd21a93f..dd0743af72c 100644
--- a/compiler/testData/codegen/box/intrinsics/kt8666.kt
+++ b/compiler/testData/codegen/box/intrinsics/kt8666.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 val MAX_LONG = "9223372036854775807"
diff --git a/compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt b/compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt
index f6550bbbd0c..9412cc06799 100644
--- a/compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt
+++ b/compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 fun box(): String {
     val list = ArrayList<IntRange>()
diff --git a/compiler/testData/codegen/box/intrinsics/stringFromCollection.kt b/compiler/testData/codegen/box/intrinsics/stringFromCollection.kt
index a889f52b9c7..340cee612c2 100644
--- a/compiler/testData/codegen/box/intrinsics/stringFromCollection.kt
+++ b/compiler/testData/codegen/box/intrinsics/stringFromCollection.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 fun box(): String {
     val list = ArrayList<String>()
diff --git a/compiler/testData/codegen/box/intrinsics/throwable.kt b/compiler/testData/codegen/box/intrinsics/throwable.kt
index 3d184341f22..e44b519b2a9 100644
--- a/compiler/testData/codegen/box/intrinsics/throwable.kt
+++ b/compiler/testData/codegen/box/intrinsics/throwable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt b/compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt
index c6846ea663b..7e64cdfe17c 100644
--- a/compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt
+++ b/compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/intrinsics/trimMarginWithBlankString.kt b/compiler/testData/codegen/box/intrinsics/trimMarginWithBlankString.kt
index 01b8b277680..2238cdca26a 100644
--- a/compiler/testData/codegen/box/intrinsics/trimMarginWithBlankString.kt
+++ b/compiler/testData/codegen/box/intrinsics/trimMarginWithBlankString.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ir/anonymousClassLeak.kt b/compiler/testData/codegen/box/ir/anonymousClassLeak.kt
index 48910947ecb..ca47d4e4e8c 100644
--- a/compiler/testData/codegen/box/ir/anonymousClassLeak.kt
+++ b/compiler/testData/codegen/box/ir/anonymousClassLeak.kt
@@ -1,3 +1,6 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
+// WITH_RUNTIME
 
 // MODULE: lib
 // FILE: lib.kt
@@ -51,6 +54,16 @@ object FunTest {
     fun bbb() = qqq().biq().also { it.caz() }
 }
 
+object DelegateTest {
+    var result = ""
+
+    val f by lazy {
+        object { }.also { result += "OK" }
+    }
+
+    fun bbb() = f
+}
+
 // MODULE: lib2(lib)
 // FILE: lib2.kt
 fun test1(): String {
@@ -62,11 +75,16 @@ fun test2(): String {
     return FunTest.result
 }
 
+fun test3(): String {
+    DelegateTest.bbb()
+    return DelegateTest.result
+}
+
 // MODULE: main(lib2)
 // FILE: main.kt
 
 fun box(): String {
     if (test1() != "!abcd") return "FAIL 1: ${test1()}"
     if (test2() != "zyxw") return "FAIL 2: ${test2()}"
-    return "OK"
+    return test3()
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/ir/anonymousObjectInForLoopIteratorAndBody.kt b/compiler/testData/codegen/box/ir/anonymousObjectInForLoopIteratorAndBody.kt
index ec7c2b79840..041a5eadf6f 100644
--- a/compiler/testData/codegen/box/ir/anonymousObjectInForLoopIteratorAndBody.kt
+++ b/compiler/testData/codegen/box/ir/anonymousObjectInForLoopIteratorAndBody.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ir/kt25405.kt b/compiler/testData/codegen/box/ir/kt25405.kt
index 485922deed7..4a4cf08c3d9 100644
--- a/compiler/testData/codegen/box/ir/kt25405.kt
+++ b/compiler/testData/codegen/box/ir/kt25405.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun <T> tableView(init: Table<T>.() -> Unit) {
     Table<T>().init()
 }
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/deepGenericDelegatedProperty.kt b/compiler/testData/codegen/box/ir/serializationRegressions/deepGenericDelegatedProperty.kt
index 22930985a50..9f682ba712d 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/deepGenericDelegatedProperty.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/deepGenericDelegatedProperty.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: NATIVE
 //For KT-6020
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/dispatchReceiverValue.kt b/compiler/testData/codegen/box/ir/serializationRegressions/dispatchReceiverValue.kt
index 5d31be2b7e3..19cb4bb541f 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/dispatchReceiverValue.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/dispatchReceiverValue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt b/compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt
index 58fc45eb26a..93d92e76267 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // IGNORE_BACKEND: NATIVE
 //For KT-6020
 
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt b/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt
index 197bfd2f9ac..5c77a53a785 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SERIALIZATION_REGRESSION
 // IGNORE_BACKEND: JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
index 937253f148d..cb91e2572d7 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SERIALIZATION_REGRESSION
 // IGNORE_BACKEND_FIR: JVM_IR
 // EXPECTED_REACHABLE_NODES: 1304
 // IGNORE_BACKEND: JS_IR
diff --git a/compiler/testData/codegen/box/ir/suppressConflictingSignatureErrors.kt b/compiler/testData/codegen/box/ir/suppressConflictingSignatureErrors.kt
new file mode 100644
index 00000000000..323dfc09ec9
--- /dev/null
+++ b/compiler/testData/codegen/box/ir/suppressConflictingSignatureErrors.kt
@@ -0,0 +1,25 @@
+// This test checks that suppressing conflicting signature / accidental override errors works.
+// This is used in libraries for binary-compatible migration, as well as in some cases in multiplatform projects.
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND_FIR: JVM_IR
+// FILE: box.kt
+
+open class B {
+    open val s: String
+        get() = "Fail"
+}
+
+class C : B() {
+    @Suppress("ACCIDENTAL_OVERRIDE")
+    fun getS(): String = "O"
+}
+
+fun box(): String = C().getS() + D().getS()
+
+// FILE: another.kt
+
+@file:Suppress("ACCIDENTAL_OVERRIDE")
+
+class D : B() {
+    fun getS(): String = "K"
+}
diff --git a/compiler/testData/codegen/box/javaInterop/generics/kt42824.kt b/compiler/testData/codegen/box/javaInterop/generics/kt42824.kt
new file mode 100644
index 00000000000..c2bc5b7f38c
--- /dev/null
+++ b/compiler/testData/codegen/box/javaInterop/generics/kt42824.kt
@@ -0,0 +1,24 @@
+// FILE: DiagnosticFactory0.java
+
+import org.jetbrains.annotations.NotNull;
+
+public class DiagnosticFactory0<E> {
+    @NotNull
+    public SimpleDiagnostic<E> on(@NotNull E element) {
+        return new SimpleDiagnostic<E>(element);
+    }
+}
+
+// FILE: test.kt
+// DONT_TARGET_EXACT_BACKEND: WASM
+// IGNORE_BACKEND: JS
+// IGNORE_BACKEND: JS_IR
+
+class SimpleDiagnostic<E>(val element: E)
+interface KtAnnotationEntry
+
+fun foo(error: DiagnosticFactory0<in KtAnnotationEntry>, entry: KtAnnotationEntry) {
+    error.on(entry) // used to be INAPPLICABLE_CANDIDATE
+}
+
+fun box() = "OK"
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/javaInterop/generics/kt42825.kt b/compiler/testData/codegen/box/javaInterop/generics/kt42825.kt
new file mode 100644
index 00000000000..deae821819a
--- /dev/null
+++ b/compiler/testData/codegen/box/javaInterop/generics/kt42825.kt
@@ -0,0 +1,26 @@
+// FILE: Processor.java
+
+public interface Processor<T> {
+    boolean process(T t);
+}
+
+// FILE: test.kt
+// DONT_TARGET_EXACT_BACKEND: WASM
+// IGNORE_BACKEND: JS
+// IGNORE_BACKEND: JS_IR
+
+interface PsiModifierListOwner
+interface KtClassOrObject {
+    fun toLightClass(): PsiModifierListOwner?
+}
+
+fun execute(declaration: Any, consumer: Processor<in PsiModifierListOwner>) {
+    when (declaration) {
+        is KtClassOrObject -> {
+            val lightClass = declaration.toLightClass()
+            consumer.process(lightClass)
+        }
+    }
+}
+
+fun box(): String = "OK"
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/javaInterop/kt43217.kt b/compiler/testData/codegen/box/javaInterop/kt43217.kt
new file mode 100644
index 00000000000..942bed1bcd3
--- /dev/null
+++ b/compiler/testData/codegen/box/javaInterop/kt43217.kt
@@ -0,0 +1,58 @@
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// FILE: kt43217.kt
+class A {
+    private val b =
+        object : DoubleExpression() {
+            override fun get(): Double {
+                return 0.0
+            }
+        }
+
+    val test: DoubleExpression = b
+}
+
+class C : DoubleExpression() {
+    override fun get() = 0.0
+}
+
+fun box(): String {
+    if (A().test.get() != 0.0) throw AssertionError("A().test.get() != 0.0")
+
+    if (C().get() != 0.0) throw AssertionError("C().get() != 0.0")
+
+    return "OK"
+}
+
+// FILE: DoubleExpression.java
+import org.jetbrains.annotations.NotNull;
+
+public abstract class DoubleExpression implements ObservableDouble {
+    @NotNull
+    @Override
+    public Object isEqualTo(double value) {
+        return null;
+    }
+}
+
+// FILE: ObservableValue.java
+import org.jetbrains.annotations.NotNull;
+
+public interface ObservableValue<T> {
+    @NotNull
+    T get();
+
+    @NotNull
+    default Object isEqualTo(@NotNull T value) {
+        return null;
+    }
+}
+
+// FILE: ObservableDouble.java
+import org.jetbrains.annotations.NotNull;
+
+public interface ObservableDouble extends ObservableValue<Double> {
+    @NotNull
+    Object isEqualTo(double value);
+}
+
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt
index e85957c8e19..b979afffc2e 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// SKIP_JDK6
 // See KT-8135
 // We could generate runtime assertion on call site for 'generic<NOT_NULL_TYPE>()' below.
 
@@ -24,11 +23,12 @@ fun <T> generic(j: J) = j.nullT<T>()
 import org.jetbrains.annotations.NotNull;
 
 public class J {
-    public <T> @NotNull T nullT() {
+    @NotNull
+    public <T> T nullT() {
         return null;
     }
 
     public void test() {
         TestKt.withAssertion(this);
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLambdaReturnWithExpectedType.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLambdaReturnWithExpectedType.kt
index 2ca7b63cdc6..1961949d271 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLambdaReturnWithExpectedType.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLambdaReturnWithExpectedType.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: inLambdaReturnWithExpectedType.kt
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/errorMessage.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/errorMessage.kt
index f75c88a32e9..ce426fcf75d 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/errorMessage.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/errorMessage.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: test.kt
 fun f(x: String) = "Fail 1"
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt
index a9331b0a576..0d0f966597d 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 
 fun <K: Any, V: Any> foo(k: K, v: V) {
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/nnStringVsT.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/nnStringVsT.kt
index 04b0eb2de71..996466da788 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/nnStringVsT.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/nnStringVsT.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: nnStringVsT.kt
 fun <T> useT(fn: () -> T) = fn()
 
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/nnStringVsTAny.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/nnStringVsTAny.kt
index dc9b2752e44..15e6fc82292 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/nnStringVsTAny.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/nnStringVsTAny.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: nnStringVsTAny.kt
 fun <T : Any> useTAny(fn: () -> T) = fn()
 
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/stringVsTConstrained.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/stringVsTConstrained.kt
index f6e9bbf03be..6d2e7491f41 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/stringVsTConstrained.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue/stringVsTConstrained.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: stringVsTConstrained.kt
 fun <T> useTConstrained(xs: Array<T>, fn: () -> T) = fn()
 
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/privateOperatorParameterAssertions.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/privateOperatorParameterAssertions.kt
new file mode 100644
index 00000000000..fa6abf27faa
--- /dev/null
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/privateOperatorParameterAssertions.kt
@@ -0,0 +1,62 @@
+// TARGET_BACKEND: JVM
+// WITH_REFLECT
+
+var result: String? = "fail"
+
+class X
+
+class A {
+    // There should be a null check on the extension receiver of private
+    // operator functions, but no null checks on all other arguments.
+
+    private operator fun X.get(name: String) = "$name$result"
+
+    private operator fun X.set(name: String, v: String) {
+        result = v
+    }
+
+    private fun getMethod(name: String) =
+        A::class.java.getDeclaredMethods().first { it.name == name }
+
+    fun test(): String {
+        val setter = getMethod("set")
+        try {
+            setter.invoke(this, X(), null, null)
+        } catch (e: Throwable) {
+            return "Fail 1"
+        }
+
+        try {
+            setter.invoke(this, null, null, null)
+            return "Fail 2"
+        } catch (e: Throwable) {
+            // expected
+            if (e.cause !is NullPointerException) {
+                return "Fail 3"
+            }
+        }
+
+        val getter = getMethod("get")
+        val s = try {
+            getter.invoke(this, X(), null) as String
+        } catch (e: Throwable) {
+            return "Fail 4"
+        }
+
+        try {
+            getter.invoke(this, null, null)
+            return "Fail 5"
+        } catch (e: Throwable) {
+            // expected
+            if (e.cause !is NullPointerException) {
+                return "Fail 6"
+            }
+        }
+
+        return if (s == "nullnull") "OK" else "Fail 7"
+    }
+}
+
+fun box(): String {
+    return A().test()
+}
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/staticCallErrorMessage.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/staticCallErrorMessage.kt
index e45b126c20d..9255c5d583c 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/staticCallErrorMessage.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/staticCallErrorMessage.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: test.kt
 fun f(x: String) = "Fail 1"
diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsConstructor.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsConstructor.kt
index 5d3c19faf6b..db066398bb6 100644
--- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsConstructor.kt
+++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsConstructor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt
index bae9abe4546..da7000fcc6e 100644
--- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt
+++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt
index 0592dde415b..033eb6ece26 100644
--- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt
+++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneableClassWithoutClone.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneableClassWithoutClone.kt
index 675635ce024..4d64c076929 100644
--- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneableClassWithoutClone.kt
+++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneableClassWithoutClone.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/jdk/arrayList.kt b/compiler/testData/codegen/box/jdk/arrayList.kt
index d0ceaccac7f..96396bad55e 100644
--- a/compiler/testData/codegen/box/jdk/arrayList.kt
+++ b/compiler/testData/codegen/box/jdk/arrayList.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/jdk/hashMap.kt b/compiler/testData/codegen/box/jdk/hashMap.kt
index 6bdb266364b..4f971645c29 100644
--- a/compiler/testData/codegen/box/jdk/hashMap.kt
+++ b/compiler/testData/codegen/box/jdk/hashMap.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt b/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt
index bdbdbfbf127..da05dd4d9ea 100644
--- a/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt
+++ b/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 
 fun box() : String {
diff --git a/compiler/testData/codegen/box/jdk/kt1397.kt b/compiler/testData/codegen/box/jdk/kt1397.kt
index 33116232260..46f4cda8163 100644
--- a/compiler/testData/codegen/box/jdk/kt1397.kt
+++ b/compiler/testData/codegen/box/jdk/kt1397.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
 
diff --git a/compiler/testData/codegen/box/jdk/removeIf.kt b/compiler/testData/codegen/box/jdk/removeIf.kt
index d31d222dca8..17eb3f5578f 100644
--- a/compiler/testData/codegen/box/jdk/removeIf.kt
+++ b/compiler/testData/codegen/box/jdk/removeIf.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt
new file mode 100644
index 00000000000..e79d895b5d4
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt
@@ -0,0 +1,11 @@
+// !JVM_DEFAULT_MODE: all-compatibility
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+
+interface I {
+    @Deprecated("message")
+    fun result() = "OK"
+}
+
+fun box(): String = object : I {}.result()
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt
new file mode 100644
index 00000000000..139018d21c1
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt
@@ -0,0 +1,12 @@
+// !JVM_DEFAULT_MODE: compatibility
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+
+interface I {
+    @Deprecated("message")
+    @JvmDefault
+    fun result() = "OK"
+}
+
+fun box(): String = object : I {}.result()
diff --git a/compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodOverride.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodOverride.kt
index 287f7458c32..6deb9b3d6e9 100644
--- a/compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodOverride.kt
+++ b/compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodOverride.kt
@@ -1,4 +1,3 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: Simple.java
 
@@ -9,6 +8,7 @@ public interface Simple {
 }
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
 
 interface KInterface: Simple {
     override fun test(s: String): String {
diff --git a/compiler/testData/codegen/box/jvm8/javaDefaults/dontDelegateToDefaultMethods.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/dontDelegateToDefaultMethods.kt
index 148aaf82fed..b1d313c5b4b 100644
--- a/compiler/testData/codegen/box/jvm8/javaDefaults/dontDelegateToDefaultMethods.kt
+++ b/compiler/testData/codegen/box/jvm8/javaDefaults/dontDelegateToDefaultMethods.kt
@@ -1,4 +1,3 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: Test.java
 
@@ -12,6 +11,7 @@ interface Test<T> {
 }
 
 // FILE: main.kt
+// JVM_TARGET: 1.8
 
 class Child : Test<String> {
     override fun call() : String {
diff --git a/compiler/testData/codegen/box/jvm8/javaDefaults/kt40920.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/kt40920.kt
index f39c8b7b653..a923ce45f98 100644
--- a/compiler/testData/codegen/box/jvm8/javaDefaults/kt40920.kt
+++ b/compiler/testData/codegen/box/jvm8/javaDefaults/kt40920.kt
@@ -1,7 +1,6 @@
 // !JVM_DEFAULT_MODE: disable
 // JVM_TARGET: 1.8
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: JBase.java
 
 public interface JBase extends Base {
diff --git a/compiler/testData/codegen/box/jvm8/javaDefaults/samOnInterfaceWithDefaultMethod.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/samOnInterfaceWithDefaultMethod.kt
index a69fb2b71df..9afd98732b1 100644
--- a/compiler/testData/codegen/box/jvm8/javaDefaults/samOnInterfaceWithDefaultMethod.kt
+++ b/compiler/testData/codegen/box/jvm8/javaDefaults/samOnInterfaceWithDefaultMethod.kt
@@ -1,4 +1,3 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // FILE: JavaCall.java
 
@@ -24,6 +23,7 @@ interface Test {
 }
 
 // FILE: sam.kt
+// JVM_TARGET: 1.8
 
 fun box(): String {
     val lambda = { "X" }
diff --git a/compiler/testData/codegen/box/jvmStatic/functionReference.kt b/compiler/testData/codegen/box/jvmStatic/functionReference.kt
new file mode 100644
index 00000000000..93f187f3904
--- /dev/null
+++ b/compiler/testData/codegen/box/jvmStatic/functionReference.kt
@@ -0,0 +1,13 @@
+// TARGET_BACKEND: JVM
+
+// WITH_RUNTIME
+// FILE: u1.kt
+
+object O {
+    @JvmStatic
+    fun foo() = "OK"
+}
+
+// FILE: u2.kt
+
+fun box() = (O::foo)()
diff --git a/compiler/testData/codegen/box/jvmStatic/kt35716.kt b/compiler/testData/codegen/box/jvmStatic/kt35716.kt
new file mode 100644
index 00000000000..65d1cec9aeb
--- /dev/null
+++ b/compiler/testData/codegen/box/jvmStatic/kt35716.kt
@@ -0,0 +1,46 @@
+// JVM_TARGET: 1.8
+// TARGET_BACKEND: JVM
+
+// WITH_RUNTIME
+// FILE: Test.java
+
+class Test {
+
+    public static String test1() {
+        return A.sayHello();
+    }
+
+    public static String test2() {
+        return B.sayHello();
+    }
+}
+
+// FILE: simpleCompanionObject.kt
+
+interface A {
+    companion object {
+        @JvmStatic
+        @JvmOverloads
+        fun sayHello(greeting: String = "OK"): String {
+            return greeting
+        }
+    }
+}
+
+annotation class B {
+    companion object {
+        @JvmStatic
+        @JvmOverloads
+        fun sayHello(greeting: String = "OK"): String {
+            return greeting
+        }
+    }
+}
+
+fun box(): String {
+    if (Test.test1() != "OK") return "fail 1"
+
+    if (Test.test2() != "OK") return "fail 2"
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/lazyCodegen/exceptionInFieldInitializer.kt b/compiler/testData/codegen/box/lazyCodegen/exceptionInFieldInitializer.kt
index f086e0ca2ff..4104557fbe6 100644
--- a/compiler/testData/codegen/box/lazyCodegen/exceptionInFieldInitializer.kt
+++ b/compiler/testData/codegen/box/lazyCodegen/exceptionInFieldInitializer.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class A(val p: String) {
     val prop: String = throw RuntimeException()
 }
diff --git a/compiler/testData/codegen/box/lazyCodegen/safeCallAndArray.kt b/compiler/testData/codegen/box/lazyCodegen/safeCallAndArray.kt
index 90b61d66b5f..59b14a96e31 100644
--- a/compiler/testData/codegen/box/lazyCodegen/safeCallAndArray.kt
+++ b/compiler/testData/codegen/box/lazyCodegen/safeCallAndArray.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: NULLABLE_BOX_FUNCTION
 class C {
     fun calc() : String {
         return "OK"
diff --git a/compiler/testData/codegen/box/lazyCodegen/tryCatchExpression.kt b/compiler/testData/codegen/box/lazyCodegen/tryCatchExpression.kt
index 8617a79e1cf..13a575ecf26 100644
--- a/compiler/testData/codegen/box/lazyCodegen/tryCatchExpression.kt
+++ b/compiler/testData/codegen/box/lazyCodegen/tryCatchExpression.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class A {
     val p : Int = try{
         1
diff --git a/compiler/testData/codegen/box/localClasses/closureWithSelfInstantiation.kt b/compiler/testData/codegen/box/localClasses/closureWithSelfInstantiation.kt
index 20727829c28..102e9d67efc 100644
--- a/compiler/testData/codegen/box/localClasses/closureWithSelfInstantiation.kt
+++ b/compiler/testData/codegen/box/localClasses/closureWithSelfInstantiation.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNKNOWN
 // Enable for JVM backend when KT-8120 gets fixed
 // IGNORE_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/localClasses/localGenericWithTypeParameters.kt b/compiler/testData/codegen/box/localClasses/localGenericWithTypeParameters.kt
index 769b77915ef..a93ac89fe39 100644
--- a/compiler/testData/codegen/box/localClasses/localGenericWithTypeParameters.kt
+++ b/compiler/testData/codegen/box/localClasses/localGenericWithTypeParameters.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 class Q<TT> {
     fun <T> qz(x: T, block: (T) -> String) = block(x)
 
diff --git a/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt b/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt
index 0128446c2d7..c9de3c01073 100644
--- a/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt
+++ b/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/box/mangling/parentheses.kt b/compiler/testData/codegen/box/mangling/parentheses.kt
index 220f88e6242..dbb951c4e5f 100644
--- a/compiler/testData/codegen/box/mangling/parentheses.kt
+++ b/compiler/testData/codegen/box/mangling/parentheses.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !SANITIZE_PARENTHESES
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/mixedNamedPosition/varargs.kt b/compiler/testData/codegen/box/mixedNamedPosition/varargs.kt
index e680a11a175..d2ae696d2c3 100644
--- a/compiler/testData/codegen/box/mixedNamedPosition/varargs.kt
+++ b/compiler/testData/codegen/box/mixedNamedPosition/varargs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // !LANGUAGE: +NewInference +MixedNamedArgumentsInTheirOwnPosition
 
 fun foo1(
diff --git a/compiler/testData/codegen/box/mixedNamedPosition/varargsEvaluationOrder.kt b/compiler/testData/codegen/box/mixedNamedPosition/varargsEvaluationOrder.kt
index 2ce370a8eb0..2202c7b0c4a 100644
--- a/compiler/testData/codegen/box/mixedNamedPosition/varargsEvaluationOrder.kt
+++ b/compiler/testData/codegen/box/mixedNamedPosition/varargsEvaluationOrder.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // !LANGUAGE: +NewInference +MixedNamedArgumentsInTheirOwnPosition
 // IGNORE_BACKEND: JVM
 // See KT-17691: Wrong argument order in resolved call with varargs. (fixed in JVM_IR)
diff --git a/compiler/testData/codegen/box/multiDecl/component.kt b/compiler/testData/codegen/box/multiDecl/component.kt
index b021d1a2e2c..b8334d92b84 100644
--- a/compiler/testData/codegen/box/multiDecl/component.kt
+++ b/compiler/testData/codegen/box/multiDecl/component.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt
index e96af75d108..63055b18f06 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class C(val i: Int) {
   operator fun component1() = i + 1
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt
index 0105f400e8f..fa433144020 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class C(val i: Int) {
 }
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt
index b471446f2a5..d056b6a8162 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class C(val i: Int) {
 }
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
index c80a394568c..2f13c73517d 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class C(val i: Int) {
 }
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt
index b1776f685f3..a8afbba9011 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class C(val i: Int) {
   operator fun component1() = i + 1
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt
index 872d2a9545b..166b7cd8e79 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 operator fun Long.component1() = this + 1
 operator fun Long.component2() = this + 2
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt b/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt
index 814344fba6e..914bfa2dbf4 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 operator fun Long.component1() = this + 1
 operator fun Long.component2() = this + 2
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt
index 3c8e9e671e8..d066aadc089 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class M {
   operator fun Long.component1() = this + 1
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
index dc8fc860e69..c13cab0358d 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 class M {
   operator fun Long.component1() = this + 1
diff --git a/compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt b/compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt
index e2b24dbde61..573dc1e86ad 100644
--- a/compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt
+++ b/compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt
index b93a0c189ab..5f9679996b6 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS
 // !LANGUAGE: +MultiPlatformProjects
 
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt
index 3b824cb7fcf..855d40b78d9 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/suspend.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/suspend.kt
index edf4b923c79..cc9bd0a6a7e 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/suspend.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/suspend.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/nothingValue/nothingValueException.kt b/compiler/testData/codegen/box/nothingValue/nothingValueException.kt
index f680d56adc6..25c4469ac1f 100644
--- a/compiler/testData/codegen/box/nothingValue/nothingValueException.kt
+++ b/compiler/testData/codegen/box/nothingValue/nothingValueException.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // IGNORE_BACKEND: JS
 
 fun <T> something(): T = Any() as T
diff --git a/compiler/testData/codegen/box/objectIntrinsics/objects.kt b/compiler/testData/codegen/box/objectIntrinsics/objects.kt
index 3eddefd5794..dc3bb8738aa 100644
--- a/compiler/testData/codegen/box/objectIntrinsics/objects.kt
+++ b/compiler/testData/codegen/box/objectIntrinsics/objects.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 package foo
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/objects/kt1047.kt b/compiler/testData/codegen/box/objects/kt1047.kt
index 52aa34dd1e2..cfb4ca092a9 100644
--- a/compiler/testData/codegen/box/objects/kt1047.kt
+++ b/compiler/testData/codegen/box/objects/kt1047.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/objects/kt1737.kt b/compiler/testData/codegen/box/objects/kt1737.kt
index b34628e3451..382dac83225 100644
--- a/compiler/testData/codegen/box/objects/kt1737.kt
+++ b/compiler/testData/codegen/box/objects/kt1737.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/objects/kt2663_2.kt b/compiler/testData/codegen/box/objects/kt2663_2.kt
index 5ede08cc8d9..fd4a25a4312 100644
--- a/compiler/testData/codegen/box/objects/kt2663_2.kt
+++ b/compiler/testData/codegen/box/objects/kt2663_2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/objects/kt3238.kt b/compiler/testData/codegen/box/objects/kt3238.kt
index 1e4bae1e664..20b60cef963 100644
--- a/compiler/testData/codegen/box/objects/kt3238.kt
+++ b/compiler/testData/codegen/box/objects/kt3238.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/objects/kt42758.kt b/compiler/testData/codegen/box/objects/kt42758.kt
new file mode 100644
index 00000000000..54e3680f3a4
--- /dev/null
+++ b/compiler/testData/codegen/box/objects/kt42758.kt
@@ -0,0 +1,23 @@
+// TARGET_BACKEND: JVM
+// FULL_JDK
+// WITH_RUNTIME
+
+import java.io.*
+
+object Thing : Serializable {
+    private fun readResolve(): Any = Thing
+}
+
+private inline fun <reified T : Serializable> roundTrip(value: T): T {
+    val outputStream = ByteArrayOutputStream()
+    ObjectOutputStream(outputStream).use { it.writeObject(value) }
+    val inputStream = ByteArrayInputStream(outputStream.toByteArray())
+    return ObjectInputStream(inputStream).use { it.readObject() } as T
+}
+
+fun box(): String {
+    if (Thing !== roundTrip(Thing))
+        throw Exception("Thing !== roundTrip(Thing)")
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/objects/kt535.kt b/compiler/testData/codegen/box/objects/kt535.kt
index 2c9c2f9f286..6f495c7316b 100644
--- a/compiler/testData/codegen/box/objects/kt535.kt
+++ b/compiler/testData/codegen/box/objects/kt535.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt b/compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt
index b86b48aee52..942a4aabeec 100644
--- a/compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt
+++ b/compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 
 object O {
diff --git a/compiler/testData/codegen/box/objects/objectVsClassInitialization_kt5291.kt b/compiler/testData/codegen/box/objects/objectVsClassInitialization_kt5291.kt
index 82a84f5745a..46b10af7f3c 100644
--- a/compiler/testData/codegen/box/objects/objectVsClassInitialization_kt5291.kt
+++ b/compiler/testData/codegen/box/objects/objectVsClassInitialization_kt5291.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 public inline fun <T> T.with(f: T.() -> Unit): T {
     this.f()
diff --git a/compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt b/compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt
index 9ee31d60fad..f119ed303d2 100644
--- a/compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt
+++ b/compiler/testData/codegen/box/oldLanguageVersions/dataClassEqualsHashCodeToString.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // !LANGUAGE: -DataClassInheritance
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt b/compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt
index 1dd13185e96..88ff5984d07 100644
--- a/compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt
+++ b/compiler/testData/codegen/box/oldLanguageVersions/functions/bigArity/noBigFunctionTypes.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BIG_ARITY
 // !LANGUAGE: -FunctionTypesWithBigArity
 
 // This test does not make sense for JVM because a diagnostic is reported when function types with big arity are not available
diff --git a/compiler/testData/codegen/box/operatorConventions/kt14227.kt b/compiler/testData/codegen/box/operatorConventions/kt14227.kt
index 2c2047b91a3..97bc64010da 100644
--- a/compiler/testData/codegen/box/operatorConventions/kt14227.kt
+++ b/compiler/testData/codegen/box/operatorConventions/kt14227.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/operatorConventions/plusAssignWithComplexRHS.kt b/compiler/testData/codegen/box/operatorConventions/plusAssignWithComplexRHS.kt
index 090deebc2fb..b2bc3676247 100644
--- a/compiler/testData/codegen/box/operatorConventions/plusAssignWithComplexRHS.kt
+++ b/compiler/testData/codegen/box/operatorConventions/plusAssignWithComplexRHS.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/optimizations/kt20844.kt b/compiler/testData/codegen/box/optimizations/kt20844.kt
index 3f5b613e05a..3964a5f1bdf 100644
--- a/compiler/testData/codegen/box/optimizations/kt20844.kt
+++ b/compiler/testData/codegen/box/optimizations/kt20844.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 //WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/package/initializationOrder.kt b/compiler/testData/codegen/box/package/initializationOrder.kt
index 9df27c40c3e..f64a2384fb2 100644
--- a/compiler/testData/codegen/box/package/initializationOrder.kt
+++ b/compiler/testData/codegen/box/package/initializationOrder.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/package/invokespecial.kt b/compiler/testData/codegen/box/package/invokespecial.kt
index 240ffb5b5d4..ba476e8b635 100644
--- a/compiler/testData/codegen/box/package/invokespecial.kt
+++ b/compiler/testData/codegen/box/package/invokespecial.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/package/referenceWithTheSameNameAsPackage.kt b/compiler/testData/codegen/box/package/referenceWithTheSameNameAsPackage.kt
index 9ac3ac1385f..567b0bdaefe 100644
--- a/compiler/testData/codegen/box/package/referenceWithTheSameNameAsPackage.kt
+++ b/compiler/testData/codegen/box/package/referenceWithTheSameNameAsPackage.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +NewInference
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/parametersMetadata/delegation.kt b/compiler/testData/codegen/box/parametersMetadata/delegation.kt
index d81430d184f..d1635e5111d 100644
--- a/compiler/testData/codegen/box/parametersMetadata/delegation.kt
+++ b/compiler/testData/codegen/box/parametersMetadata/delegation.kt
@@ -1,10 +1,9 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
 // JAVAC_OPTIONS: -parameters
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
-
+// JVM_TARGET: 1.8
 // FILE: JavaInterface.java
 
 public interface JavaInterface {
diff --git a/compiler/testData/codegen/box/primitiveTypes/ea35963.kt b/compiler/testData/codegen/box/primitiveTypes/ea35963.kt
index bdd1b87f613..223c639f715 100644
--- a/compiler/testData/codegen/box/primitiveTypes/ea35963.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/ea35963.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: WASM
 
 fun box(): String {
     if (1 != 0) {
diff --git a/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt b/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt
new file mode 100644
index 00000000000..31954d73b8a
--- /dev/null
+++ b/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+// KJS_WITH_FULL_RUNTIME
+
+fun box(): String {
+    return if (run { 123 != intArrayOf() as Any }) "OK" else "Fail"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/primitiveTypes/kt684.kt b/compiler/testData/codegen/box/primitiveTypes/kt684.kt
index e4b22208182..0ef3f453ad6 100644
--- a/compiler/testData/codegen/box/primitiveTypes/kt684.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/kt684.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/primitiveTypes/kt752.kt b/compiler/testData/codegen/box/primitiveTypes/kt752.kt
index dcb7cc232e5..8e7eb60ca9b 100644
--- a/compiler/testData/codegen/box/primitiveTypes/kt752.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/kt752.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/primitiveTypes/kt753.kt b/compiler/testData/codegen/box/primitiveTypes/kt753.kt
index f7199d4755c..596eb4103a5 100644
--- a/compiler/testData/codegen/box/primitiveTypes/kt753.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/kt753.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/primitiveTypes/kt756.kt b/compiler/testData/codegen/box/primitiveTypes/kt756.kt
index e2874694a23..2864024d1d1 100644
--- a/compiler/testData/codegen/box/primitiveTypes/kt756.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/kt756.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/primitiveTypes/kt757.kt b/compiler/testData/codegen/box/primitiveTypes/kt757.kt
index e5bfe97d3d9..bae3f2a9a89 100644
--- a/compiler/testData/codegen/box/primitiveTypes/kt757.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/kt757.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/primitiveTypes/kt935.kt b/compiler/testData/codegen/box/primitiveTypes/kt935.kt
index c80451219d2..d18766ac276 100644
--- a/compiler/testData/codegen/box/primitiveTypes/kt935.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/kt935.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt b/compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt
index a9273088e10..e30c1d3aadd 100644
--- a/compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String {
     try {
         if ((null as Int?)!! == 10) return "Fail #1"
diff --git a/compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt b/compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt
index 4916436b4d2..96c53bef210 100644
--- a/compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: String.hashCode()
 // IGNORE_BACKEND: NATIVE
 
 fun test(s: String) {
diff --git a/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt b/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt
index 43351b8a432..c3c08d50bfa 100644
--- a/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/properties/accessToPrivateSetter.kt b/compiler/testData/codegen/box/properties/accessToPrivateSetter.kt
index 0fd75b1a33f..7f8207ec70f 100644
--- a/compiler/testData/codegen/box/properties/accessToPrivateSetter.kt
+++ b/compiler/testData/codegen/box/properties/accessToPrivateSetter.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/properties/augmentedAssignmentsAndIncrements.kt b/compiler/testData/codegen/box/properties/augmentedAssignmentsAndIncrements.kt
index bde3c09d5c4..939a462b86f 100644
--- a/compiler/testData/codegen/box/properties/augmentedAssignmentsAndIncrements.kt
+++ b/compiler/testData/codegen/box/properties/augmentedAssignmentsAndIncrements.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // Enable when KT-14833 is fixed.
 // IGNORE_BACKEND: JVM
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/codegen/box/properties/commonPropertiesKJK.kt b/compiler/testData/codegen/box/properties/commonPropertiesKJK.kt
index 84e89ab5b5c..10b61c5fdfc 100644
--- a/compiler/testData/codegen/box/properties/commonPropertiesKJK.kt
+++ b/compiler/testData/codegen/box/properties/commonPropertiesKJK.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: J.java
diff --git a/compiler/testData/codegen/box/properties/complexPropertyInitializer.kt b/compiler/testData/codegen/box/properties/complexPropertyInitializer.kt
index 02c5661994a..d961a8d49d7 100644
--- a/compiler/testData/codegen/box/properties/complexPropertyInitializer.kt
+++ b/compiler/testData/codegen/box/properties/complexPropertyInitializer.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: COROUTINES
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt b/compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt
index 5922a3102b6..0defd7bf64b 100644
--- a/compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt
+++ b/compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // WITH_RUNTIME
 // MODULE: lib
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/properties/kt1159.kt b/compiler/testData/codegen/box/properties/kt1159.kt
index d53c1c2c00b..2f091cd6061 100644
--- a/compiler/testData/codegen/box/properties/kt1159.kt
+++ b/compiler/testData/codegen/box/properties/kt1159.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/properties/kt1398.kt b/compiler/testData/codegen/box/properties/kt1398.kt
index 85e4416c689..fa0cdd105ae 100644
--- a/compiler/testData/codegen/box/properties/kt1398.kt
+++ b/compiler/testData/codegen/box/properties/kt1398.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/properties/kt1714.kt b/compiler/testData/codegen/box/properties/kt1714.kt
index 692a5ce3d11..9624bc8f496 100644
--- a/compiler/testData/codegen/box/properties/kt1714.kt
+++ b/compiler/testData/codegen/box/properties/kt1714.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/properties/kt4383.kt b/compiler/testData/codegen/box/properties/kt4383.kt
index 3a8d6e0a1e3..d4b8fe6bfec 100644
--- a/compiler/testData/codegen/box/properties/kt4383.kt
+++ b/compiler/testData/codegen/box/properties/kt4383.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty
 
 class D {
diff --git a/compiler/testData/codegen/box/properties/lateinit/accessorException.kt b/compiler/testData/codegen/box/properties/lateinit/accessorException.kt
index bf4be90c919..19eb4747432 100644
--- a/compiler/testData/codegen/box/properties/lateinit/accessorException.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/accessorException.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 public class A {
     fun getFromClass(): Boolean {
         try {
diff --git a/compiler/testData/codegen/box/properties/lateinit/accessorExceptionPublic.kt b/compiler/testData/codegen/box/properties/lateinit/accessorExceptionPublic.kt
index bcfa741a789..b5e2cf5e05a 100644
--- a/compiler/testData/codegen/box/properties/lateinit/accessorExceptionPublic.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/accessorExceptionPublic.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 public class A {
     fun getFromClass(): Boolean {
         try {
diff --git a/compiler/testData/codegen/box/properties/lateinit/exceptionField.kt b/compiler/testData/codegen/box/properties/lateinit/exceptionField.kt
index 76120e7eff5..4e8b24630d4 100644
--- a/compiler/testData/codegen/box/properties/lateinit/exceptionField.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/exceptionField.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class A {
     private lateinit var str: String
 
diff --git a/compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt b/compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt
index 35449a38fad..1b8c960328e 100644
--- a/compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class A {
     public lateinit var str: String
 }
diff --git a/compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt b/compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt
index c5e7fcee0da..246cd4f44cb 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt
index 8735a8ec7e2..c390ea80d87 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException
diff --git a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt
index fed7824d7d5..8fb7dba2e16 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException
diff --git a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt
index d3d8acc31e5..e115e5dad5e 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException
diff --git a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt
index 9a58e3280b3..4e5c97f7a23 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException
diff --git a/compiler/testData/codegen/box/properties/lateinit/localClass.kt b/compiler/testData/codegen/box/properties/lateinit/localClass.kt
index 9408c85507b..6a53283de4e 100644
--- a/compiler/testData/codegen/box/properties/lateinit/localClass.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/localClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException
diff --git a/compiler/testData/codegen/box/properties/lateinit/overrideException.kt b/compiler/testData/codegen/box/properties/lateinit/overrideException.kt
index ffc98f1f128..438ab58eb7c 100644
--- a/compiler/testData/codegen/box/properties/lateinit/overrideException.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/overrideException.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 interface Intf {
     val str: String
 }
diff --git a/compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt b/compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt
index 16bc04a0a8b..704530d3200 100644
--- a/compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 // FILE: lateinit.kt
 private lateinit var s: String
diff --git a/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt b/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt
index ac24a14335f..6a668e76795 100644
--- a/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException
diff --git a/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt b/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt
index 9cc162d805c..f8ae570e96d 100644
--- a/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException
diff --git a/compiler/testData/codegen/box/properties/primitiveOverrideDelegateAccessor.kt b/compiler/testData/codegen/box/properties/primitiveOverrideDelegateAccessor.kt
index 008ef946010..790cf9f42f9 100644
--- a/compiler/testData/codegen/box/properties/primitiveOverrideDelegateAccessor.kt
+++ b/compiler/testData/codegen/box/properties/primitiveOverrideDelegateAccessor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty
 
 class Holder(var value: Int) {
diff --git a/compiler/testData/codegen/box/properties/substituteJavaSuperField.kt b/compiler/testData/codegen/box/properties/substituteJavaSuperField.kt
index dc83b8337c5..1c605b2dabe 100644
--- a/compiler/testData/codegen/box/properties/substituteJavaSuperField.kt
+++ b/compiler/testData/codegen/box/properties/substituteJavaSuperField.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: Test.java
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForCollection.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForCollection.kt
index ba4462fc97c..47812e4ad8e 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForCollection.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForCollection.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt
index f7338fc62cd..50d1f75f772 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForDownTo.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForDownTo.kt
index 6ea04b67d1c..a02f6358d2c 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForDownTo.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForDownToReversed.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForDownToReversed.kt
index fe5c62edf7f..d80af48de9f 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForDownToReversed.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForDownToReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForNullableArgument.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForNullableArgument.kt
index 0e5899de254..3403cbd73a8 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForNullableArgument.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForNullableArgument.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForRangeLiteral.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForRangeLiteral.kt
index 5ab2d3d3794..74fc0ec6d45 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForRangeLiteral.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForRangeLiteral.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForRangeLiteralReversed.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForRangeLiteralReversed.kt
index 5f96894b6ae..29c64a8c5bc 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForRangeLiteralReversed.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForRangeLiteralReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForUntil.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForUntil.kt
index d28c1f585f1..51f5880e247 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForUntil.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForUntil.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForUntilReversed.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForUntilReversed.kt
index e6ae37cdddd..bef63e1e570 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForUntilReversed.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForUntilReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/contains/generated/charDownTo.kt b/compiler/testData/codegen/box/ranges/contains/generated/charDownTo.kt
index 031343a1659..e65f1041412 100644
--- a/compiler/testData/codegen/box/ranges/contains/generated/charDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/contains/generated/charDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/contains/generated/intDownTo.kt b/compiler/testData/codegen/box/ranges/contains/generated/intDownTo.kt
index 5aab0a26ce3..5ce62bfc8f2 100644
--- a/compiler/testData/codegen/box/ranges/contains/generated/intDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/contains/generated/intDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/contains/generated/longDownTo.kt b/compiler/testData/codegen/box/ranges/contains/generated/longDownTo.kt
index 2c0561beab1..2f8709a8145 100644
--- a/compiler/testData/codegen/box/ranges/contains/generated/longDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/contains/generated/longDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/contains/inCharSequence.kt b/compiler/testData/codegen/box/ranges/contains/inCharSequence.kt
index 2ea22d9bc65..78913bbb258 100644
--- a/compiler/testData/codegen/box/ranges/contains/inCharSequence.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inCharSequence.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inComparableRange.kt b/compiler/testData/codegen/box/ranges/contains/inComparableRange.kt
index 8aad5a2332d..e045704d275 100644
--- a/compiler/testData/codegen/box/ranges/contains/inComparableRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inComparableRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inExtensionRange.kt b/compiler/testData/codegen/box/ranges/contains/inExtensionRange.kt
index f6b5dd0e28e..35ad6714156 100644
--- a/compiler/testData/codegen/box/ranges/contains/inExtensionRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inExtensionRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inIntRange.kt b/compiler/testData/codegen/box/ranges/contains/inIntRange.kt
index 488c32c72d9..084443f69d4 100644
--- a/compiler/testData/codegen/box/ranges/contains/inIntRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inIntRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inOptimizableDoubleRange.kt b/compiler/testData/codegen/box/ranges/contains/inOptimizableDoubleRange.kt
index 7e2835d5809..22dbb55077e 100644
--- a/compiler/testData/codegen/box/ranges/contains/inOptimizableDoubleRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inOptimizableDoubleRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inOptimizableFloatRange.kt b/compiler/testData/codegen/box/ranges/contains/inOptimizableFloatRange.kt
index 54392597ad7..9afe687aec5 100644
--- a/compiler/testData/codegen/box/ranges/contains/inOptimizableFloatRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inOptimizableFloatRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inOptimizableIntRange.kt b/compiler/testData/codegen/box/ranges/contains/inOptimizableIntRange.kt
index 377ced92278..71c39a1d74b 100644
--- a/compiler/testData/codegen/box/ranges/contains/inOptimizableIntRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inOptimizableIntRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inOptimizableLongRange.kt b/compiler/testData/codegen/box/ranges/contains/inOptimizableLongRange.kt
index 22a087970f5..7e4c4ed80b5 100644
--- a/compiler/testData/codegen/box/ranges/contains/inOptimizableLongRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inOptimizableLongRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inPrimitiveProgression.kt b/compiler/testData/codegen/box/ranges/contains/inPrimitiveProgression.kt
index b3328aba6d9..5734064a7ea 100644
--- a/compiler/testData/codegen/box/ranges/contains/inPrimitiveProgression.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inPrimitiveProgression.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inRangeWithCustomContains.kt b/compiler/testData/codegen/box/ranges/contains/inRangeWithCustomContains.kt
index a03a60539d4..f2ca30dc4a7 100644
--- a/compiler/testData/codegen/box/ranges/contains/inRangeWithCustomContains.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inRangeWithCustomContains.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inRangeWithImplicitReceiver.kt b/compiler/testData/codegen/box/ranges/contains/inRangeWithImplicitReceiver.kt
index 8a700cd7644..b474c6ed2dd 100644
--- a/compiler/testData/codegen/box/ranges/contains/inRangeWithImplicitReceiver.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inRangeWithImplicitReceiver.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inRangeWithNonmatchingArguments.kt b/compiler/testData/codegen/box/ranges/contains/inRangeWithNonmatchingArguments.kt
index c675f47decf..352a565237b 100644
--- a/compiler/testData/codegen/box/ranges/contains/inRangeWithNonmatchingArguments.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inRangeWithNonmatchingArguments.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // WITH_RUNTIME
 import kotlin.test.*
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inRangeWithSmartCast.kt b/compiler/testData/codegen/box/ranges/contains/inRangeWithSmartCast.kt
index c5a0bfe5fce..e6b5bf670f6 100644
--- a/compiler/testData/codegen/box/ranges/contains/inRangeWithSmartCast.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inRangeWithSmartCast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: KOTLIN_TEST_LIB
 // IGNORE_BACKEND: NATIVE
 // WITH_RUNTIME
 import kotlin.test.assertTrue
diff --git a/compiler/testData/codegen/box/ranges/contains/inUntilMaxValue.kt b/compiler/testData/codegen/box/ranges/contains/inUntilMaxValue.kt
index 627c02c94c2..6d7eaa554f5 100644
--- a/compiler/testData/codegen/box/ranges/contains/inUntilMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inUntilMaxValue.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 fun box(): String {
     if (Char.MAX_VALUE in Char.MAX_VALUE until Char.MAX_VALUE) return "Fail in Char.MAX_VALUE"
diff --git a/compiler/testData/codegen/box/ranges/contains/inUntilMinValue.kt b/compiler/testData/codegen/box/ranges/contains/inUntilMinValue.kt
index a1775190c84..02e05512f22 100644
--- a/compiler/testData/codegen/box/ranges/contains/inUntilMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inUntilMinValue.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 fun box(): String {
     if ('b' in 'a' until Char.MIN_VALUE) return "Fail in Char.MIN_VALUE"
diff --git a/compiler/testData/codegen/box/ranges/contains/inUntilMinValueNonConst.kt b/compiler/testData/codegen/box/ranges/contains/inUntilMinValueNonConst.kt
index 118d6284350..cbd0898d652 100644
--- a/compiler/testData/codegen/box/ranges/contains/inUntilMinValueNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inUntilMinValueNonConst.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 fun box(): String {
     val charBound = Char.MIN_VALUE
diff --git a/compiler/testData/codegen/box/ranges/contains/kt20106.kt b/compiler/testData/codegen/box/ranges/contains/kt20106.kt
index 52d5764705a..0635eb2d6d1 100644
--- a/compiler/testData/codegen/box/ranges/contains/kt20106.kt
+++ b/compiler/testData/codegen/box/ranges/contains/kt20106.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownTo.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownTo.kt
index d4d195a083f..877dc4ee760 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownTo.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownToReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownToReversed.kt
index fad30bf9921..0561a2e8040 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownToReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownToReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownToReversedReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownToReversedReversed.kt
index 6dc1db94367..22d72ceaf6d 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownToReversedReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInDownToReversedReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteral.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteral.kt
index fae58fac6ae..a8216b266b4 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteral.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteral.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteralReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteralReversed.kt
index 09b90f3f3e0..345f9ba369f 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteralReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteralReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteralReversedReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteralReversedReversed.kt
index 6a2397628b4..a45aced9721 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteralReversedReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInRangeLiteralReversedReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntil.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntil.kt
index 8864b09d443..e69c8ef80d0 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntil.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntil.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntilReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntilReversed.kt
index 2e1eb651377..995a59464e8 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntilReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntilReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntilReversedReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntilReversedReversed.kt
index 0a6f11dc70c..fe31169853c 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntilReversedReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/forInUntilReversedReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStep.kt
index 8d0f4686480..d9da7ce2c02 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversed.kt
index 4fd070cbf37..f060967218b 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversedStep.kt
index fc37dd3a01a..2fbad7323a1 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStep.kt
index 2e718a0a471..c9be7b49b8d 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversed.kt
index 2fec56814cd..0658b080261 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStep.kt
index 6e04eba982d..bdcedf158e1 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStepReversed.kt
index bdd3a01c906..496d354fd99 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepStep.kt
index 11915f827a7..194b78b1922 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStep.kt
index 4c58b930d6c..84d579173cf 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversed.kt
index 5f802dcad28..f361ed95672 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversedStep.kt
index 54842128a97..2576f4fa698 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStep.kt
index 1866a7cf17a..2be9bba4df4 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversed.kt
index 9cb7555e957..d78af3fabe1 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStep.kt
index a5b685169f7..82e6bd16052 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStepReversed.kt
index 4b857b76258..91c42096828 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepStep.kt
index 687eea1b142..352c0559b6d 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStep.kt
index a8f066ba207..4b8c1212d20 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversed.kt
index ffc6592f0e3..939edcfcf5a 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversedStep.kt
index e85cc6ff2fd..6822d8ea2d5 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStep.kt
index d349928ef90..3bfbbbc0e6f 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversed.kt
index ec98b9436f2..1690865e696 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStep.kt
index bbef32df651..d4dabd36dba 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStepReversed.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStepReversed.kt
index 194262dfd85..81aaf538064 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStepReversed.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStepReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepStep.kt b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepStep.kt
index a694fcd9c96..e5d886ce2ba 100644
--- a/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepStep.kt
+++ b/compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepStep.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/expression/emptyDownto.kt b/compiler/testData/codegen/box/ranges/expression/emptyDownto.kt
index a49a4d9f8b6..3e59268f861 100644
--- a/compiler/testData/codegen/box/ranges/expression/emptyDownto.kt
+++ b/compiler/testData/codegen/box/ranges/expression/emptyDownto.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/emptyRange.kt b/compiler/testData/codegen/box/ranges/expression/emptyRange.kt
index a7c6fbee514..87491f1b501 100644
--- a/compiler/testData/codegen/box/ranges/expression/emptyRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/emptyRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/inexactDownToMinValue.kt b/compiler/testData/codegen/box/ranges/expression/inexactDownToMinValue.kt
index 65b2dc73b44..6e5bbcf4e17 100644
--- a/compiler/testData/codegen/box/ranges/expression/inexactDownToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/inexactDownToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/inexactSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/expression/inexactSteppedDownTo.kt
index 4f20935fbe9..2e4a2734f08 100644
--- a/compiler/testData/codegen/box/ranges/expression/inexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/expression/inexactSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/inexactSteppedRange.kt b/compiler/testData/codegen/box/ranges/expression/inexactSteppedRange.kt
index 3b58dfb0323..27f11dc1221 100644
--- a/compiler/testData/codegen/box/ranges/expression/inexactSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/inexactSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/inexactToMaxValue.kt b/compiler/testData/codegen/box/ranges/expression/inexactToMaxValue.kt
index 12e7fa96657..dc1e9008f75 100644
--- a/compiler/testData/codegen/box/ranges/expression/inexactToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/inexactToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/expression/maxValueMinusTwoToMaxValue.kt
index 95e444a9c9e..5328baccf1b 100644
--- a/compiler/testData/codegen/box/ranges/expression/maxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/maxValueMinusTwoToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/maxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/expression/maxValueToMaxValue.kt
index 0d21d4fc7ca..cb969f5ccb8 100644
--- a/compiler/testData/codegen/box/ranges/expression/maxValueToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/maxValueToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/maxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/expression/maxValueToMinValue.kt
index 0779afde7c6..357e781b5e4 100644
--- a/compiler/testData/codegen/box/ranges/expression/maxValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/maxValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/oneElementDownTo.kt b/compiler/testData/codegen/box/ranges/expression/oneElementDownTo.kt
index e1e501bd110..69a5234916d 100644
--- a/compiler/testData/codegen/box/ranges/expression/oneElementDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/expression/oneElementDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/oneElementRange.kt b/compiler/testData/codegen/box/ranges/expression/oneElementRange.kt
index ec086574042..cb450711aac 100644
--- a/compiler/testData/codegen/box/ranges/expression/oneElementRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/oneElementRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/openRange.kt b/compiler/testData/codegen/box/ranges/expression/openRange.kt
index 965ed9d8e8d..5d19f155526 100644
--- a/compiler/testData/codegen/box/ranges/expression/openRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/openRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/overflowZeroDownToMaxValue.kt b/compiler/testData/codegen/box/ranges/expression/overflowZeroDownToMaxValue.kt
index c2fbd02c31d..cc596c7bfc3 100644
--- a/compiler/testData/codegen/box/ranges/expression/overflowZeroDownToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/overflowZeroDownToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/overflowZeroToMinValue.kt b/compiler/testData/codegen/box/ranges/expression/overflowZeroToMinValue.kt
index b8eb8a5dbda..aabb30dde85 100644
--- a/compiler/testData/codegen/box/ranges/expression/overflowZeroToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/overflowZeroToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/progressionDownToMinValue.kt b/compiler/testData/codegen/box/ranges/expression/progressionDownToMinValue.kt
index bb6ba102fc7..cb22f176cfa 100644
--- a/compiler/testData/codegen/box/ranges/expression/progressionDownToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/progressionDownToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
index 0909fbaaf23..5158292543a 100644
--- a/compiler/testData/codegen/box/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMaxValue.kt
index 9165b07671c..b2f2fae365b 100644
--- a/compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMinValue.kt
index e7332bc0e9b..25a9870784b 100644
--- a/compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/progressionMinValueToMinValue.kt b/compiler/testData/codegen/box/ranges/expression/progressionMinValueToMinValue.kt
index c7b83b80f07..0f8e7ade089 100644
--- a/compiler/testData/codegen/box/ranges/expression/progressionMinValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/expression/progressionMinValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/reversedBackSequence.kt b/compiler/testData/codegen/box/ranges/expression/reversedBackSequence.kt
index cfa33912e6a..437e9ee1854 100644
--- a/compiler/testData/codegen/box/ranges/expression/reversedBackSequence.kt
+++ b/compiler/testData/codegen/box/ranges/expression/reversedBackSequence.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/reversedEmptyBackSequence.kt b/compiler/testData/codegen/box/ranges/expression/reversedEmptyBackSequence.kt
index bc07848c373..6d376b03ebb 100644
--- a/compiler/testData/codegen/box/ranges/expression/reversedEmptyBackSequence.kt
+++ b/compiler/testData/codegen/box/ranges/expression/reversedEmptyBackSequence.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/reversedEmptyRange.kt b/compiler/testData/codegen/box/ranges/expression/reversedEmptyRange.kt
index 05f396742ec..cf6f2a70d4b 100644
--- a/compiler/testData/codegen/box/ranges/expression/reversedEmptyRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/reversedEmptyRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/expression/reversedInexactSteppedDownTo.kt
index 81940e97584..766ef2ff02f 100644
--- a/compiler/testData/codegen/box/ranges/expression/reversedInexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/expression/reversedInexactSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/reversedRange.kt b/compiler/testData/codegen/box/ranges/expression/reversedRange.kt
index 51da1df8774..83b625cb501 100644
--- a/compiler/testData/codegen/box/ranges/expression/reversedRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/reversedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/box/ranges/expression/reversedSimpleSteppedRange.kt
index 9e22b65f8c0..73ba1c83ba2 100644
--- a/compiler/testData/codegen/box/ranges/expression/reversedSimpleSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/reversedSimpleSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/simpleDownTo.kt b/compiler/testData/codegen/box/ranges/expression/simpleDownTo.kt
index 015ec164730..17625677df1 100644
--- a/compiler/testData/codegen/box/ranges/expression/simpleDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/expression/simpleDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/simpleRange.kt b/compiler/testData/codegen/box/ranges/expression/simpleRange.kt
index 634155eea17..53f342ccb1f 100644
--- a/compiler/testData/codegen/box/ranges/expression/simpleRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/simpleRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/box/ranges/expression/simpleRangeWithNonConstantEnds.kt
index 2d56b9890c2..aa585af9f64 100644
--- a/compiler/testData/codegen/box/ranges/expression/simpleRangeWithNonConstantEnds.kt
+++ b/compiler/testData/codegen/box/ranges/expression/simpleRangeWithNonConstantEnds.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/simpleSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/expression/simpleSteppedDownTo.kt
index 14997ebbf2e..90ea42cb902 100644
--- a/compiler/testData/codegen/box/ranges/expression/simpleSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/expression/simpleSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/expression/simpleSteppedRange.kt b/compiler/testData/codegen/box/ranges/expression/simpleSteppedRange.kt
index 128176fe584..cb1985ec3dd 100644
--- a/compiler/testData/codegen/box/ranges/expression/simpleSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/expression/simpleSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/forInCharSequenceLengthDecreasedInLoopBody.kt b/compiler/testData/codegen/box/ranges/forInCharSequenceLengthDecreasedInLoopBody.kt
index a1c065de731..3d5e11505b2 100644
--- a/compiler/testData/codegen/box/ranges/forInCharSequenceLengthDecreasedInLoopBody.kt
+++ b/compiler/testData/codegen/box/ranges/forInCharSequenceLengthDecreasedInLoopBody.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/forInCharSequenceLengthIncreasedInLoopBody.kt b/compiler/testData/codegen/box/ranges/forInCharSequenceLengthIncreasedInLoopBody.kt
index 827a056e7c5..4a74c6f6486 100644
--- a/compiler/testData/codegen/box/ranges/forInCharSequenceLengthIncreasedInLoopBody.kt
+++ b/compiler/testData/codegen/box/ranges/forInCharSequenceLengthIncreasedInLoopBody.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/forInCharSequenceWithCustomIterator.kt b/compiler/testData/codegen/box/ranges/forInCharSequenceWithCustomIterator.kt
index cbe68b5f5ee..b989a01c6e0 100644
--- a/compiler/testData/codegen/box/ranges/forInCharSequenceWithCustomIterator.kt
+++ b/compiler/testData/codegen/box/ranges/forInCharSequenceWithCustomIterator.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/forInCharSequenceWithMultipleGetFunctions.kt b/compiler/testData/codegen/box/ranges/forInCharSequenceWithMultipleGetFunctions.kt
index 968e2762f14..75e0cd79d53 100644
--- a/compiler/testData/codegen/box/ranges/forInCharSequenceWithMultipleGetFunctions.kt
+++ b/compiler/testData/codegen/box/ranges/forInCharSequenceWithMultipleGetFunctions.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/forInCustomCharSequence.kt b/compiler/testData/codegen/box/ranges/forInCustomCharSequence.kt
index ed53c560f44..f880d551193 100644
--- a/compiler/testData/codegen/box/ranges/forInCustomCharSequence.kt
+++ b/compiler/testData/codegen/box/ranges/forInCustomCharSequence.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInCustomIterable.kt b/compiler/testData/codegen/box/ranges/forInCustomIterable.kt
index c31564a45ea..ff7076709c1 100644
--- a/compiler/testData/codegen/box/ranges/forInCustomIterable.kt
+++ b/compiler/testData/codegen/box/ranges/forInCustomIterable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInIndices/forInArrayListIndices.kt b/compiler/testData/codegen/box/ranges/forInIndices/forInArrayListIndices.kt
index dcc1c58d479..f6edb542853 100644
--- a/compiler/testData/codegen/box/ranges/forInIndices/forInArrayListIndices.kt
+++ b/compiler/testData/codegen/box/ranges/forInIndices/forInArrayListIndices.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt b/compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt
new file mode 100644
index 00000000000..1fe5fc5ec69
--- /dev/null
+++ b/compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt
@@ -0,0 +1,16 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+// IGNORE_BACKEND: JVM, JVM_IR
+
+fun <T : IntArray> test(array: T): Int {
+    var sum = 0
+    for (i in array.indices) {
+        sum = sum * 10 + i
+    }
+    return sum
+}
+
+fun box(): String {
+    if (test(intArrayOf(0, 0, 0, 0)) != 123) return "fail"
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt b/compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt
new file mode 100644
index 00000000000..00e29d1305c
--- /dev/null
+++ b/compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt
@@ -0,0 +1,20 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+
+class Value<T>(val value: T) {
+    inline fun <R> runBlock(block: (T) -> R) = block(value)
+}
+
+fun <T> Value<Array<T>>.test() =
+    runBlock {
+        var sum = 0
+        for (i in it.indices)
+            sum = sum * 10 + i
+        sum
+    }
+
+fun box(): String {
+    if (Value<Array<Int>>(Array<Int>(4) { 0 }).test() != 123) return "fail"
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInDownToWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInDownToWithIndex.kt
index 98c87b1dc81..f29252c6d5c 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInDownToWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInDownToWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInIndicesWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInIndicesWithIndex.kt
index 7dd8a96ad9a..23756d0147c 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInIndicesWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInIndicesWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInRangeToWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInRangeToWithIndex.kt
index 3fe1c8fb9df..6297c28fe40 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInRangeToWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInRangeToWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedStepWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedStepWithIndex.kt
index 9e81c0bb604..41e6227cbc6 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedStepWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedStepWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedWithIndex.kt
index 3f9c217af18..efdd1f9cc6d 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInStepReversedWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInStepReversedWithIndex.kt
index 891b409f125..a62e83b92e4 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInStepReversedWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInStepReversedWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInStepWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInStepWithIndex.kt
index 5910b69d52d..f346214e8b4 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInStepWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInStepWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInUntilWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInUntilWithIndex.kt
index 081f66ac43a..30ebcf944e2 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInUntilWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInUntilWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexBreakAndContinue.kt
index d11c9b4d262..68716864d05 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexBreakAndContinue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNoIndexOrElementVar.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNoIndexOrElementVar.kt
index e78bc9473fc..c99d850dd68 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNoIndexOrElementVar.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNoIndexOrElementVar.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNotDestructured.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNotDestructured.kt
index 7b4f47ecf94..926bbb5d46b 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNotDestructured.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNotDestructured.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexReversed.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexReversed.kt
index 1bc3860a203..b626a8f73c1 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexReversed.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexReversed.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithDestructuringInLoop.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithDestructuringInLoop.kt
index db09432b9fe..704ce043c08 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithDestructuringInLoop.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithDestructuringInLoop.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithIndex.kt
index 08c7ccb7ddc..66b2021de0e 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithIndex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt b/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt
index dd0029787d2..a30811ac523 100644
--- a/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt
+++ b/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt
@@ -1,6 +1,7 @@
 // IGNORE_BACKEND: JVM
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     // These should all be empty progressions
diff --git a/compiler/testData/codegen/box/ranges/kt37370.kt b/compiler/testData/codegen/box/ranges/kt37370.kt
index b795fca4f5d..cb347b1e2b4 100644
--- a/compiler/testData/codegen/box/ranges/kt37370.kt
+++ b/compiler/testData/codegen/box/ranges/kt37370.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 fun testContinue1() {
diff --git a/compiler/testData/codegen/box/ranges/literal/emptyDownto.kt b/compiler/testData/codegen/box/ranges/literal/emptyDownto.kt
index 433910468ac..1fd4cb79169 100644
--- a/compiler/testData/codegen/box/ranges/literal/emptyDownto.kt
+++ b/compiler/testData/codegen/box/ranges/literal/emptyDownto.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/emptyRange.kt b/compiler/testData/codegen/box/ranges/literal/emptyRange.kt
index 73583591445..87e06b99dae 100644
--- a/compiler/testData/codegen/box/ranges/literal/emptyRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/emptyRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/inexactDownToMinValue.kt b/compiler/testData/codegen/box/ranges/literal/inexactDownToMinValue.kt
index cb2ea5e30e2..bb4cdd20640 100644
--- a/compiler/testData/codegen/box/ranges/literal/inexactDownToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/inexactDownToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/inexactSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/literal/inexactSteppedDownTo.kt
index 6aa1f97b884..791c45f0a2e 100644
--- a/compiler/testData/codegen/box/ranges/literal/inexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/literal/inexactSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/inexactSteppedRange.kt b/compiler/testData/codegen/box/ranges/literal/inexactSteppedRange.kt
index 9b82086ecfd..3eb6cac051a 100644
--- a/compiler/testData/codegen/box/ranges/literal/inexactSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/inexactSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/inexactToMaxValue.kt b/compiler/testData/codegen/box/ranges/literal/inexactToMaxValue.kt
index d1927194478..dba8da8d8b9 100644
--- a/compiler/testData/codegen/box/ranges/literal/inexactToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/inexactToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/literal/maxValueMinusTwoToMaxValue.kt
index b4e3652832e..0519f3b9794 100644
--- a/compiler/testData/codegen/box/ranges/literal/maxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/maxValueMinusTwoToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/maxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/literal/maxValueToMaxValue.kt
index a75f5773a31..120ca7f4872 100644
--- a/compiler/testData/codegen/box/ranges/literal/maxValueToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/maxValueToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/maxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/literal/maxValueToMinValue.kt
index c27b51836aa..c296cf71035 100644
--- a/compiler/testData/codegen/box/ranges/literal/maxValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/maxValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/oneElementDownTo.kt b/compiler/testData/codegen/box/ranges/literal/oneElementDownTo.kt
index 4d7b46d6ae0..be8767c4fac 100644
--- a/compiler/testData/codegen/box/ranges/literal/oneElementDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/literal/oneElementDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/oneElementRange.kt b/compiler/testData/codegen/box/ranges/literal/oneElementRange.kt
index ff2067aeb18..675631ddee8 100644
--- a/compiler/testData/codegen/box/ranges/literal/oneElementRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/oneElementRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/openRange.kt b/compiler/testData/codegen/box/ranges/literal/openRange.kt
index 9102b06fc3a..3b5f23dafe0 100644
--- a/compiler/testData/codegen/box/ranges/literal/openRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/openRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/overflowZeroDownToMaxValue.kt b/compiler/testData/codegen/box/ranges/literal/overflowZeroDownToMaxValue.kt
index c1c95024da5..d1606af92f5 100644
--- a/compiler/testData/codegen/box/ranges/literal/overflowZeroDownToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/overflowZeroDownToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/overflowZeroToMinValue.kt b/compiler/testData/codegen/box/ranges/literal/overflowZeroToMinValue.kt
index feed8bc7d1b..07050afed47 100644
--- a/compiler/testData/codegen/box/ranges/literal/overflowZeroToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/overflowZeroToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/progressionDownToMinValue.kt b/compiler/testData/codegen/box/ranges/literal/progressionDownToMinValue.kt
index 264dc4c291c..de7375cc9a6 100644
--- a/compiler/testData/codegen/box/ranges/literal/progressionDownToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/progressionDownToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
index 46b0a4a0707..0f7b90feb30 100644
--- a/compiler/testData/codegen/box/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/literal/progressionMaxValueToMaxValue.kt
index 15ae24f3a0f..709653fce69 100644
--- a/compiler/testData/codegen/box/ranges/literal/progressionMaxValueToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/progressionMaxValueToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/literal/progressionMaxValueToMinValue.kt
index 47c0357d405..996bf71b4d9 100644
--- a/compiler/testData/codegen/box/ranges/literal/progressionMaxValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/progressionMaxValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/progressionMinValueToMinValue.kt b/compiler/testData/codegen/box/ranges/literal/progressionMinValueToMinValue.kt
index 28d129c2ab4..9b19a9ad4ab 100644
--- a/compiler/testData/codegen/box/ranges/literal/progressionMinValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/literal/progressionMinValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/reversedBackSequence.kt b/compiler/testData/codegen/box/ranges/literal/reversedBackSequence.kt
index 4719e88a19b..a28cab111fa 100644
--- a/compiler/testData/codegen/box/ranges/literal/reversedBackSequence.kt
+++ b/compiler/testData/codegen/box/ranges/literal/reversedBackSequence.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/reversedEmptyBackSequence.kt b/compiler/testData/codegen/box/ranges/literal/reversedEmptyBackSequence.kt
index 56385626b0f..f8a4b969819 100644
--- a/compiler/testData/codegen/box/ranges/literal/reversedEmptyBackSequence.kt
+++ b/compiler/testData/codegen/box/ranges/literal/reversedEmptyBackSequence.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/reversedEmptyRange.kt b/compiler/testData/codegen/box/ranges/literal/reversedEmptyRange.kt
index 409b818d6c3..e85dcf517d2 100644
--- a/compiler/testData/codegen/box/ranges/literal/reversedEmptyRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/reversedEmptyRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/literal/reversedInexactSteppedDownTo.kt
index 50b9486fa09..2af043d9747 100644
--- a/compiler/testData/codegen/box/ranges/literal/reversedInexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/literal/reversedInexactSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/reversedRange.kt b/compiler/testData/codegen/box/ranges/literal/reversedRange.kt
index 38bec62cd9a..b72801bbf52 100644
--- a/compiler/testData/codegen/box/ranges/literal/reversedRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/reversedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/box/ranges/literal/reversedSimpleSteppedRange.kt
index e55d9732629..ac53741107e 100644
--- a/compiler/testData/codegen/box/ranges/literal/reversedSimpleSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/reversedSimpleSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/simpleDownTo.kt b/compiler/testData/codegen/box/ranges/literal/simpleDownTo.kt
index 57ae1158e3f..bf8ea4b1b20 100644
--- a/compiler/testData/codegen/box/ranges/literal/simpleDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/literal/simpleDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/simpleRange.kt b/compiler/testData/codegen/box/ranges/literal/simpleRange.kt
index 9e60bfb7645..8246181780d 100644
--- a/compiler/testData/codegen/box/ranges/literal/simpleRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/simpleRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/box/ranges/literal/simpleRangeWithNonConstantEnds.kt
index 05642cd81e2..f6b09ae6810 100644
--- a/compiler/testData/codegen/box/ranges/literal/simpleRangeWithNonConstantEnds.kt
+++ b/compiler/testData/codegen/box/ranges/literal/simpleRangeWithNonConstantEnds.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/simpleSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/literal/simpleSteppedDownTo.kt
index 2de0daf85e8..724375467c4 100644
--- a/compiler/testData/codegen/box/ranges/literal/simpleSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/literal/simpleSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/literal/simpleSteppedRange.kt b/compiler/testData/codegen/box/ranges/literal/simpleSteppedRange.kt
index 650e13c4b1e..3a90009a363 100644
--- a/compiler/testData/codegen/box/ranges/literal/simpleSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/literal/simpleSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/multiAssignmentIterationOverIntRange.kt b/compiler/testData/codegen/box/ranges/multiAssignmentIterationOverIntRange.kt
index 7d76e00ffec..7a1471666f8 100644
--- a/compiler/testData/codegen/box/ranges/multiAssignmentIterationOverIntRange.kt
+++ b/compiler/testData/codegen/box/ranges/multiAssignmentIterationOverIntRange.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/safeCallRangeTo.kt b/compiler/testData/codegen/box/ranges/safeCallRangeTo.kt
index 524f5d21000..ce8430a4d96 100644
--- a/compiler/testData/codegen/box/ranges/safeCallRangeTo.kt
+++ b/compiler/testData/codegen/box/ranges/safeCallRangeTo.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/emptyProgression.kt
index 6f0cfef97b8..9f159184603 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/emptyProgression.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepNegative.kt
index c315db324d5..7b8499d71f1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepNegative.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepNonConst.kt
index 23c6d858efd..86ddcce41c1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepThenLegalStep.kt
index 683d19dc8fa..6ca4106c3da 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepThenLegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepZero.kt
index 84cafa454b8..f4b5ca50429 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/illegalStepZero.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/legalStepThenIllegalStep.kt
index ec09945cf2e..5d505405a8b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/legalStepThenIllegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToMinValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToMinValueStepMaxValue.kt
index 8afc4ddd45f..71e67ec184b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToMinValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToMinValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToOneStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToOneStepMaxValue.kt
index 071bd39161c..8fb4c68444e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToOneStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToOneStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToZeroStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToZeroStepMaxValue.kt
index 72e798d2533..5b1d2d20d24 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToZeroStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/maxValueToZeroStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/mixedTypeStep.kt
index 424396a89a9..fae1bfa5ad0 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/mixedTypeStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepOneThenStepOne.kt
index 5f610042289..3f5dd9ca385 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepThenSameStep.kt
index 30dd1825543..0f4d17fa0ec 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepOne.kt
index 093451482b9..eb2e7c20851 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
index 1fd072a26dc..6dbcad49410 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index 2a1e0dc40ac..5e53a68e5c2 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
index d48bd23379f..92d0247d5cb 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index 269be1bd85e..fbff55b723d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index 2309028fa7a..09d536fc7bf 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStep.kt
index 6d13ff089b6..4254441f1f9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStepThenReversed.kt
index 3fc28d97217..56ab82d1825 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStepThenReversedThenStep.kt
index fdd896ba069..f9deab6af6b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversed.kt
index 181a5a3cc77..4532a33c6fe 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversedThenStep.kt
index 219df8dbc40..e859ae91e53 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversedThenStepThenReversed.kt
index 5e5c5becc48..c7591059d15 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/singleElementStepTwo.kt
index 8dbf9464a9e..43fb5868458 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/singleElementStepTwo.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepNonConst.kt
index 10f6d8868fa..3ee75b5c18e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepOne.kt
index 8698f11f718..bfa6c017f75 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToOutsideRange.kt
index cdb5f08da40..822ae571b2a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToOutsideRange.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToSameLast.kt
index bae285566f6..cfece3f836a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToSmallerLast.kt
index 8aef71449cd..56cfb06150c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/downTo/stepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/emptyProgression.kt
index bc5fd024fda..6f49ac6c79c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/emptyProgression.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepNegative.kt
index 605c6d38b23..1d1ce374339 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepNegative.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepNonConst.kt
index 9044c70aeec..ecca9447b1f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepThenLegalStep.kt
index 07455f8b013..040c64da37a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepThenLegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepZero.kt
index d8967548604..6f33ba9ea95 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/illegalStepZero.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/legalStepThenIllegalStep.kt
index 67675a0b0ff..1e9ba68d70b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/legalStepThenIllegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/minValueToMaxValueStepMaxValue.kt
index ae8588bfc30..0efdc55110d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/minValueToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/minValueToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/mixedTypeStep.kt
index 86d6444b8b6..af8669db6db 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/mixedTypeStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepOneThenStepOne.kt
index d99686d1e66..c66e9664687 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepThenSameStep.kt
index e6849747721..13ff3ad3024 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
index f21328e3156..0afada60ef4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
index ea62cb7b7b5..36f8ead4f2b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index e8911d0cbb4..4a5d0855755 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
index 2fafc8f9929..ee79f8e3329 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index ea550457391..f67439cbe44 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index f1828ed10ea..95631381a91 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/oneToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/oneToMaxValueStepMaxValue.kt
index 75534998b14..b934cc79b61 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/oneToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/oneToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStep.kt
index 6ab3858e680..22f67c51e29 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStepThenReversed.kt
index 1d2a625d425..1a2249e9f27 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
index 782c4f7debe..8e2db1afd2b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversed.kt
index c26c85f5eae..1538522975b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversedThenStep.kt
index 839c5783cc0..ec56ebfae48 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
index c60d8c5254c..3f12982746d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/singleElementStepTwo.kt
index 75ea6a544bc..a9d8076fc84 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/singleElementStepTwo.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepNonConst.kt
index 1d0319fea76..4a7d4800a7f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepOne.kt
index bec2eaf2b3e..b9b4cf50ade 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToOutsideRange.kt
index ba1ec8f33a0..5158dcfa3c0 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToOutsideRange.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToSameLast.kt
index 41fa84a76bd..c7d366942bd 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToSmallerLast.kt
index a289587c703..7c638f1b10c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/stepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/zeroToMaxValueStepMaxValue.kt
index a9961799e03..c86d962be0c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/zeroToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/zeroToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/emptyProgression.kt
index 1c59dbb21b1..88dce5c7b7c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/emptyProgression.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/emptyProgressionToMinValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/emptyProgressionToMinValue.kt
index 1f6de2f61e5..b7e7904de9d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/emptyProgressionToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/emptyProgressionToMinValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepNegative.kt
index 8ee8c5f4b19..99e2cacb340 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepNegative.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepNonConst.kt
index b51aeb2453b..173ebf8e958 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepThenLegalStep.kt
index 026b2da6c99..992f5bc0142 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepThenLegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepZero.kt
index 933e2978ec0..53e1ae06b02 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/illegalStepZero.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/legalStepThenIllegalStep.kt
index 000f898f893..a0cffc6f692 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/legalStepThenIllegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/minValueToMaxValueStepMaxValue.kt
index 7a47e95b19f..f38278ac312 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/minValueToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/minValueToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/mixedTypeStep.kt
index 1ceb9bec7a2..9e9e60fd986 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/mixedTypeStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepOneThenStepOne.kt
index f75f798ba6c..75b686c8f56 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepThenSameStep.kt
index ddac8c155f6..897322e9985 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepOne.kt
index f56de2c19eb..f5cdd1663e7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepToSameLast.kt
index 1df82ca4a7f..b6ee4fa11b1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index 2e541e05233..6c7d32106c8 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepOne.kt
index 5f8c7093441..b28be646998 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index 529a3f73d98..d2095d79749 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index 28df0e89054..eebb9567279 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/progressionToNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/progressionToNonConst.kt
index 91e2d4755d3..e7a16570241 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/progressionToNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/progressionToNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStep.kt
index 0d26524d594..3f912916317 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStepThenReversed.kt
index 5833042508e..6a58c17a743 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStepThenReversedThenStep.kt
index 57572890dea..26091635e0c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversed.kt
index 418c03d86cd..1638a4ca7f2 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversedThenStep.kt
index 6d2f4c7bcc5..02479387fe4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversedThenStepThenReversed.kt
index 42eeb4072a1..b45230beaa5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/singleElementStepTwo.kt
index 7bef33bfc6f..1ad18f58ccc 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/singleElementStepTwo.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepNonConst.kt
index ad2bcf8206f..1be754925e0 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepOne.kt
index 3ecd62cde83..886916e9e41 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToOutsideRange.kt
index 7407affe5d7..530dea9b46b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToOutsideRange.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToSameLast.kt
index f088b385fe8..142a44fd3b3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToSmallerLast.kt
index a068c74ee0f..71126c845a2 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/stepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/expression/until/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/expression/until/zeroToMaxValueStepMaxValue.kt
index 726f3fe9f03..ab77219475e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/expression/until/zeroToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/expression/until/zeroToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/emptyProgression.kt
index 25772418994..ed339203336 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/emptyProgression.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepNegative.kt
index 68d9f35206c..8ed1910af9e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepNegative.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepNonConst.kt
index 48a3b202d37..59359331acb 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepThenLegalStep.kt
index a1d0ab868d6..f9cd5dd5677 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepThenLegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepZero.kt
index 47b36011ec1..24b8c26d7fc 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/illegalStepZero.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/legalStepThenIllegalStep.kt
index 81ed6a3d1e3..4c79581440a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/legalStepThenIllegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToMinValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToMinValueStepMaxValue.kt
index b7a64c00a7c..0f6a7bd8f29 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToMinValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToMinValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToOneStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToOneStepMaxValue.kt
index e6d93a96a39..d55c9b6c1ae 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToOneStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToOneStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToZeroStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToZeroStepMaxValue.kt
index 22f66590857..820e9a8f28d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToZeroStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/maxValueToZeroStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/mixedTypeStep.kt
index b8c9d749f38..e9ae7a15aff 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/mixedTypeStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepOneThenStepOne.kt
index 48ba23af731..4f09de6c6b8 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepThenSameStep.kt
index 7a960789a8b..e537fd43502 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepOne.kt
index 7133d9931f4..9dd1437299e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
index 0793a2a548f..36c06a490c8 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index 7cc7c4a5954..c451bdabbb3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
index 801bcd25bbb..fbe81df4bf1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index d8be6a1b6ec..a6d8fd716f4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index ec84adedd77..5b7103ba6c5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStep.kt
index dbd11d202c4..367158c572f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStepThenReversed.kt
index 9b134cc271b..bf6b76437b0 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStepThenReversedThenStep.kt
index df0f86c6313..1f7d2cab32a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversed.kt
index 9795b226dc5..a0654615c40 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversedThenStep.kt
index be42d07af7d..55f7bca2de9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversedThenStepThenReversed.kt
index 8ec37d6f545..3b78a77b7f5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/singleElementStepTwo.kt
index 469fa75015a..177a7842a05 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/singleElementStepTwo.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepNonConst.kt
index 82aad8644f1..cd96e4df7cf 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepOne.kt
index 916ff0c2bf7..2d63f5ee11a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToOutsideRange.kt
index 2cc8d2d8694..122302f005c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToOutsideRange.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToSameLast.kt
index 0c202ae7bae..2af0c9294a1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToSmallerLast.kt
index 58f624770a2..8c78c911cd4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/downTo/stepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/emptyProgression.kt
index d7f17054d7b..78b8e2cc303 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/emptyProgression.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepNegative.kt
index 46918dbe4a7..01c2032571a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepNegative.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepNonConst.kt
index 540a720d28c..b130864810a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepThenLegalStep.kt
index 50d661732f6..30854c7ad17 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepThenLegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepZero.kt
index 1185bdd2e05..5b2b2e963c0 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/illegalStepZero.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/legalStepThenIllegalStep.kt
index f401356292d..dbb149dcc7a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/legalStepThenIllegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/minValueToMaxValueStepMaxValue.kt
index 88027551d59..a09aef2eea1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/minValueToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/minValueToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/mixedTypeStep.kt
index e480e609660..636b014be84 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/mixedTypeStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepOneThenStepOne.kt
index 96392b7e06f..1082e3980af 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepThenSameStep.kt
index 2e8c9a10af8..1348edb5223 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
index 7e489c1b5a4..709df094ac4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
index ed991a8c807..451e58c77af 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index 84196843d05..54cafb05b1b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
index b29914cfdb9..14f0bc5e258 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index 0eb24433e67..475a1ea7302 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index 42df39f27d1..9b6a24034d1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/oneToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/oneToMaxValueStepMaxValue.kt
index d79493b8bab..51c70425d7f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/oneToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/oneToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStep.kt
index a9face85d4f..6434d6a4ec3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStepThenReversed.kt
index 2d121893473..5a968c8ece7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
index 10d6286ca1c..04f7dd22336 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversed.kt
index bf5b33f1cef..f71c5c98899 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversedThenStep.kt
index 20cfe6da567..ae1c7708d1f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
index 03ffe907d10..855215b61f3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/singleElementStepTwo.kt
index bdbf8cdf57f..4fc64f373f7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/singleElementStepTwo.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepNonConst.kt
index 72a19b0b785..8227e141ce9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepOne.kt
index b8a4c17dc60..9e0d582da8a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToOutsideRange.kt
index fd053d2e1d8..ef51ac0a38f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToOutsideRange.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToSameLast.kt
index 250cefffdeb..3dee49186dd 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToSmallerLast.kt
index 963db28bd62..53de1c7524c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/stepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/zeroToMaxValueStepMaxValue.kt
index 376e1f67463..dc4edeb502d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/zeroToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/zeroToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/emptyProgression.kt
index 9b1689ab432..e1f1741528e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/emptyProgression.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/emptyProgressionToMinValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/emptyProgressionToMinValue.kt
index 95ccbeeb8ff..0236a4ea06c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/emptyProgressionToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/emptyProgressionToMinValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepNegative.kt
index ebde24567c6..d2c8c00453e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepNegative.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepNonConst.kt
index 7b29b0b53be..8cb501ff80e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepThenLegalStep.kt
index a6a04a31524..138ed3292f5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepThenLegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepZero.kt
index db07226b3d2..f6b12c296d7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/illegalStepZero.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/legalStepThenIllegalStep.kt
index fb8f078c6f5..357e0d8b7f2 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/legalStepThenIllegalStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/minValueToMaxValueStepMaxValue.kt
index 8176a766ef3..6a45a8c2880 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/minValueToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/minValueToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/mixedTypeStep.kt
index 5a9dcac6cc8..81ead5cdc80 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/mixedTypeStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepOneThenStepOne.kt
index 9c2b9e3350e..9fc5621b19c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepThenSameStep.kt
index 7753b06ffa6..c13c0ac6a05 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepOne.kt
index bb647abec15..41c5027d95d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepToSameLast.kt
index 5a0ef513834..d06ebf89035 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index 18b9d64105d..697c68d1bd3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepOne.kt
index 7729ee17791..624dc9c1631 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index 19cf455e07e..c43634ecf04 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index 85a69b4a998..95b1657770f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/progressionToNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/progressionToNonConst.kt
index 8f5ff81b92f..d976c485e71 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/progressionToNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/progressionToNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStep.kt
index c0e5acc29e1..bb387ea4184 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStepThenReversed.kt
index fee9efbe784..e6caa12301d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStepThenReversedThenStep.kt
index 7d7e8310812..2a696e1b4c1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversed.kt
index c5ad07fe191..31a82ad4321 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversedThenStep.kt
index 37398c54cb7..52d907c8fcf 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversedThenStepThenReversed.kt
index f55dc8c3bd7..1b1b8b7b603 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/singleElementStepTwo.kt
index 8e936779659..b04db025e4e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/singleElementStepTwo.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepNonConst.kt
index 07715b11e0b..448a1f20b2d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepNonConst.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepOne.kt
index 67d8a0a0153..d22d619513c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepOne.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToOutsideRange.kt
index c55c96d67d7..d82a5de5848 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToOutsideRange.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToSameLast.kt
index 27e271c4a9a..a0a5d614297 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToSameLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToSmallerLast.kt
index 5141bc5446f..8ca97e8c0db 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/stepToSmallerLast.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/literal/until/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/literal/until/zeroToMaxValueStepMaxValue.kt
index 3998f56dacf..252b0f9df2e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/literal/until/zeroToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/literal/until/zeroToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/emptyProgression.kt
index 28ec5251fa0..d2595be0ecd 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/emptyProgression.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepNegative.kt
index 4059407965e..f2ca380839c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepNegative.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepNonConst.kt
index 4bfbb0e157b..58aa88d6ea6 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepThenLegalStep.kt
index b11835673a0..eca9416108b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepThenLegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepZero.kt
index 4d8f7578a5b..9c921fdfdc8 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/illegalStepZero.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/legalStepThenIllegalStep.kt
index 9fb3308573a..df1a8f297dc 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/legalStepThenIllegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToMinValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToMinValueStepMaxValue.kt
index 0a341b4bbac..114dc408d2e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToMinValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToMinValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToOneStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToOneStepMaxValue.kt
index ccfc49f2816..835e060801b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToOneStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToOneStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToZeroStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToZeroStepMaxValue.kt
index 795ecc71c92..1821b205590 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToZeroStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToZeroStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/mixedTypeStep.kt
index a69111557c4..0a4b5f0bafe 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/mixedTypeStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepOneThenStepOne.kt
index 5f4c38e44ec..d0ca8a305e2 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepThenSameStep.kt
index f3fcab0911e..e1021430af5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepOne.kt
index 908fa8a56b7..da288d320fe 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
index fbe69da2ee6..5a9e289ad83 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index 526d7c5136d..fa2c1c3df12 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
index c02f653bdfd..7bb9608b6f4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index 629ffc5880a..6f95fd391fb 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index a3163b71207..dbe3618a1be 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStep.kt
index baacf6f8231..86db9205d8f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStepThenReversed.kt
index 2e7603e3149..1e3bddb2750 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStepThenReversedThenStep.kt
index 9d08d61a6b0..3a5d16b7d40 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversed.kt
index 7529a2e60d8..85b6bad91ac 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversedThenStep.kt
index 65f5f80107c..55cc777f867 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversedThenStepThenReversed.kt
index 3eb5aa09134..7fe0049a3d8 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/singleElementStepTwo.kt
index 7bafff48aba..d765861bec9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/singleElementStepTwo.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepNonConst.kt
index 89d445d7ca8..d23cc7dcaab 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepOne.kt
index 712ab0f373d..641d41321f5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToOutsideRange.kt
index dfa9cd0ad06..1ee43a1ca5c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToOutsideRange.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToSameLast.kt
index 63524bcb543..e3711a3cd7f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToSmallerLast.kt
index d83f9150771..5a96da65752 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/stepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/emptyProgression.kt
index 91bf49f20fd..d378730a38b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/emptyProgression.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepNegative.kt
index fb1e0eb9d53..3b37575c22a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepNegative.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepNonConst.kt
index 43d1cd2a120..f42246da113 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepThenLegalStep.kt
index 9bebf6f2b95..d4fced8bee6 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepThenLegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepZero.kt
index e0dcb770ace..7205370683f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/illegalStepZero.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/legalStepThenIllegalStep.kt
index cab81d9639c..c35a20983d7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/legalStepThenIllegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/minValueToMaxValueStepMaxValue.kt
index dca73f8d250..325208ff524 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/minValueToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/minValueToMaxValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/mixedTypeStep.kt
index c2b2cb43aa8..efdd645e1cd 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/mixedTypeStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepOneThenStepOne.kt
index 5a1e472c95d..f7264661e75 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepThenSameStep.kt
index 4ba8228860a..ce4b6288cd7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
index 8997e1db48f..4cdbec4305e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
index 732275ef95b..54126aa86a2 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index b70df5e44e4..d5e021e2bde 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
index d2607da8f9d..1312be13ad5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index f7ee65411f9..d237778c1a7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index 62f716a1773..21d4951e333 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/oneToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/oneToMaxValueStepMaxValue.kt
index 4c3cc84c351..2e35d2d27d1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/oneToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/oneToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStep.kt
index 3b8f4c67734..a174eefb703 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStepThenReversed.kt
index bfa5ea1431c..7de6094551f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
index 8d7d13edbf9..57508ba6f8e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversed.kt
index 7538c78167d..a14a82905ad 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversedThenStep.kt
index 6cb250f68e2..31f3574dc56 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
index 95554ffd030..229745047e2 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/singleElementStepTwo.kt
index 8d8d5f84e95..8b157c37c5d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/singleElementStepTwo.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepNonConst.kt
index 5adac93e69c..e59c04804ba 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepOne.kt
index 3a3b115cf60..f316ef0676c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToOutsideRange.kt
index 7e2999a2a36..59083a8a4f8 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToOutsideRange.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToSameLast.kt
index e25f80b4ffa..4b43cd2a3d9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToSmallerLast.kt
index 0dd665b1fd9..7e33173e563 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/stepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/zeroToMaxValueStepMaxValue.kt
index 506d39a0f3f..ef8310d6036 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/zeroToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/zeroToMaxValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgression.kt
index f012f0d524e..22d5bc8ad7c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgression.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgressionToMinValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgressionToMinValue.kt
index 94ef50aa51f..9ff3dabbc97 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgressionToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgressionToMinValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepNegative.kt
index a1cec13bba5..017dda50c53 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepNegative.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepNonConst.kt
index a835e4c4696..0b240543f17 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepThenLegalStep.kt
index 290e61850fd..544f56facbc 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepThenLegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepZero.kt
index 31f20d82bb8..ec5238be3cb 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/illegalStepZero.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/legalStepThenIllegalStep.kt
index 629ccfabbef..124737e3191 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/legalStepThenIllegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/minValueToMaxValueStepMaxValue.kt
index 790f63c3b3e..ac0ed0e00fb 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/minValueToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/minValueToMaxValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/mixedTypeStep.kt
index d88883542fa..658b2ea69c4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/mixedTypeStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepOneThenStepOne.kt
index 371ffa168c5..4c052f4e66d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepThenSameStep.kt
index 9295154131c..3347b85b82e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepOne.kt
index 51d446daa1b..442b67ddf6c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepToSameLast.kt
index 7460a007a9e..8599aef2281 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index db522e214ce..fd62bdbec7f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepOne.kt
index 764e3ac8ef4..b8548f7a4dd 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index 35e93f87395..97244dd3f88 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index f2c34289ff3..57b9c6b975e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/progressionToNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/progressionToNonConst.kt
index 9f72749c9a8..a164e0df489 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/progressionToNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/progressionToNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStep.kt
index 3c44f55302d..6a2be56dd6c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStepThenReversed.kt
index 7a2add865b7..9aaf7b44d16 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStepThenReversedThenStep.kt
index ea13e5baa72..5f5d450af42 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversed.kt
index 1c67f3b8398..b42933009d3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversedThenStep.kt
index 5fe5a1f3511..84510e3a912 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversedThenStepThenReversed.kt
index c22a7fd472d..9865c876ba1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/singleElementStepTwo.kt
index 8fbf7690631..29f4368b2ac 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/singleElementStepTwo.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepNonConst.kt
index 505fe2e794c..caf7d2147bb 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepOne.kt
index 7d490069007..d92e95ace88 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToOutsideRange.kt
index 4dbd4cec779..5d18bd5c81b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToOutsideRange.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToSameLast.kt
index 1469e983358..c9a9cc94ee9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToSmallerLast.kt
index faf6edaba50..ce1aa3aa207 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/stepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/zeroToMaxValueStepMaxValue.kt
index eaee238aa7a..f36aec2b92b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/zeroToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/zeroToMaxValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/emptyProgression.kt
index a263caac6b0..4f65d12b173 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/emptyProgression.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepNegative.kt
index 8d797294ad3..c3f136182ed 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepNegative.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepNonConst.kt
index 3f1b329d72d..498a3375f5c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepThenLegalStep.kt
index 1d481f5726b..e1abc71728c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepThenLegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepZero.kt
index 869e53de0cf..e3f6cbc8843 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/illegalStepZero.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/legalStepThenIllegalStep.kt
index c1e1e55e39c..0e9611cf2e3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/legalStepThenIllegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToMinValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToMinValueStepMaxValue.kt
index 4aa1ce62319..e843680781c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToMinValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToMinValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToOneStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToOneStepMaxValue.kt
index b81147e54ba..eeabe5d3c38 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToOneStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToOneStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToZeroStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToZeroStepMaxValue.kt
index ebed1788519..1c4707bc3f0 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToZeroStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToZeroStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/mixedTypeStep.kt
index 4164c0337a3..2799e6711b1 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/mixedTypeStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepOneThenStepOne.kt
index ba6ac0b3541..1468248e843 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepThenSameStep.kt
index ead64bb55b1..1eb34dbf358 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepOne.kt
index 366f2530bc8..6b6ed4215a6 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
index c747b05f355..857929ffc7c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index 9a00ef57054..74f6be3090f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
index b9c2c8ecb98..a2e3f3df35b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index edcf0d9ae68..f82e939ec57 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index 8186a183653..aaffba50e5d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStep.kt
index 5182789de41..b11e92bf82f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStepThenReversed.kt
index 3146aa09dd4..922c46f59e9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStepThenReversedThenStep.kt
index 0c5453484cb..c870405d1b9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversed.kt
index e06dbc2ae48..e7ee0b4c7ec 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversedThenStep.kt
index 1dddc926f91..7ed9094d28b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversedThenStepThenReversed.kt
index 5eba927440f..2d588b0fffc 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/singleElementStepTwo.kt
index 8e727483005..8c109a11d6a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/singleElementStepTwo.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepNonConst.kt
index 9be7c4be8d4..fe3321a97ad 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepOne.kt
index d090b52af22..d8a4fb780a3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToOutsideRange.kt
index b2b77493d68..92375dd2f69 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToOutsideRange.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToSameLast.kt
index 89078be53d6..9a284206af6 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToSmallerLast.kt
index 65b55ae70e8..101204de0b4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/stepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/emptyProgression.kt
index b39f815a483..c5d95f4fb0f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/emptyProgression.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepNegative.kt
index 9d83e6d274e..dd2a035fcee 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepNegative.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepNonConst.kt
index b783e91d77f..3ebe4136885 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepThenLegalStep.kt
index 5455b1b0b6d..cdae926995a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepThenLegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepZero.kt
index 6fa01aeafcb..b1a3a51cd00 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/illegalStepZero.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/legalStepThenIllegalStep.kt
index 887bdeaa6f8..64fd3a3e750 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/legalStepThenIllegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/minValueToMaxValueStepMaxValue.kt
index 22b379be03a..ec8cece3c51 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/minValueToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/minValueToMaxValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/mixedTypeStep.kt
index ee11002c4fc..f562f4c0283 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/mixedTypeStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepOneThenStepOne.kt
index f53dfd90cc6..540c6195377 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepThenSameStep.kt
index e0b411e89a7..9f5515c0006 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
index 6b1dc6fbc6b..79957acda44 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
index 377f004655d..3b3e83c206a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index bb0ae9fae4e..4ce6ed051f5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
index c5a52dffa17..6b70c542b5e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index ba44ea177bb..ab2e1e43cfc 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index d5d56cd951d..8b0d50a2361 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/oneToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/oneToMaxValueStepMaxValue.kt
index 05cd6325a82..94577554c48 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/oneToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/oneToMaxValueStepMaxValue.kt
@@ -1,4 +1,5 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStep.kt
index 45cc15a531c..3aea419716e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStepThenReversed.kt
index 12c7a3860c7..cbba0412e2b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
index cc00adc71f0..85059994291 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversed.kt
index db7f5e60fb0..d78ed307185 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversedThenStep.kt
index 2473a758efc..8fd34c7a7aa 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
index 15a4ed69a95..8516bf1adef 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/singleElementStepTwo.kt
index fde3fea78a8..c0946571062 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/singleElementStepTwo.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepNonConst.kt
index 79982cf52c2..a5855936985 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepOne.kt
index 0710359d743..08fe2774e12 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToOutsideRange.kt
index 89b13aadd9f..769d68a975c 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToOutsideRange.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToSameLast.kt
index 2da3fad18c0..0bb8d7b21cf 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToSmallerLast.kt
index 1d476974216..942bbfded75 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/stepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/zeroToMaxValueStepMaxValue.kt
index 64736ef6357..44441eae4fb 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/zeroToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/zeroToMaxValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgression.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgression.kt
index 042afef7456..67203d73f82 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgression.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgression.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgressionToMinValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgressionToMinValue.kt
index a73ff83bb51..6cb39d7524b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgressionToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgressionToMinValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepNegative.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepNegative.kt
index ad8a6e36a48..aef17bd08f9 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepNegative.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepNegative.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepNonConst.kt
index c25d1994b9b..f0ab9644d18 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepThenLegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepThenLegalStep.kt
index 9f40c02f23d..3d1b077381e 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepThenLegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepThenLegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepZero.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepZero.kt
index 72e65b84396..e15a40bac39 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepZero.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/illegalStepZero.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // KT-34166: Translation of loop over literal completely removes the validation of step
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/legalStepThenIllegalStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/legalStepThenIllegalStep.kt
index cf5cc061ad5..64806cd1eeb 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/legalStepThenIllegalStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/legalStepThenIllegalStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/minValueToMaxValueStepMaxValue.kt
index 63fee4f0f1c..78c38c2255a 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/minValueToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/minValueToMaxValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/mixedTypeStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/mixedTypeStep.kt
index 21806217fb0..01b2ed890e6 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/mixedTypeStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/mixedTypeStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepOneThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepOneThenStepOne.kt
index f2a2996fa81..0a1bb990372 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepOneThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepOneThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepThenSameStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepThenSameStep.kt
index ae922b4e896..0c31791a626 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepThenSameStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepThenSameStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepOne.kt
index 5c6707f525a..635ebf4ef2b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepToSameLast.kt
index e62f16e4a29..b8de4834c31 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
index 796ce706cdb..1e234e86ae7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSameLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepOne.kt
index 81015e606c8..6ade5afc300 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
index 27bc27d59d8..aee2ac4ff5d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
index 218cc844b1b..dc5493312a7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/nestedStep/stepToSmallerLastThenStepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/progressionToNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/progressionToNonConst.kt
index b718ed6ca74..7118ad31171 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/progressionToNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/progressionToNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStep.kt
index 42188d20878..b4284849d34 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStepThenReversed.kt
index edda45da6c0..d0b950f7cf2 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStepThenReversedThenStep.kt
index 3e5f602344b..fb93f7be63b 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/reversedThenStepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversed.kt
index 7a57ee8f8fb..3f001847fa7 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversedThenStep.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversedThenStep.kt
index 33186d2c0ad..52fc4961ac3 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversedThenStep.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversedThenStep.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversedThenStepThenReversed.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversedThenStepThenReversed.kt
index 5094c60c63b..f4645352b0f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversedThenStepThenReversed.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/reversed/stepThenReversedThenStepThenReversed.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/singleElementStepTwo.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/singleElementStepTwo.kt
index d83c3c7a3dc..65f9e8c470f 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/singleElementStepTwo.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/singleElementStepTwo.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepNonConst.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepNonConst.kt
index 8f49ec3d62a..9cd1bd57ef5 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepNonConst.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepNonConst.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepOne.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepOne.kt
index f24ea7b2dc3..b190baf2ece 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepOne.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepOne.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToOutsideRange.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToOutsideRange.kt
index 9314f9f29e2..a7e3ed2fb4d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToOutsideRange.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToOutsideRange.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToSameLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToSameLast.kt
index 88b5633e6eb..208b42282c4 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToSameLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToSameLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToSmallerLast.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToSmallerLast.kt
index f24364b000a..47df12a9f6d 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToSmallerLast.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/stepToSmallerLast.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/zeroToMaxValueStepMaxValue.kt
index f6d8a91b8e7..b5588df8204 100644
--- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/zeroToMaxValueStepMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/zeroToMaxValueStepMaxValue.kt
@@ -1,4 +1,6 @@
 // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit!
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/emptyDownto.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/emptyDownto.kt
index 42bc3fd915e..1ff9e282c4f 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/emptyDownto.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/emptyDownto.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/emptyRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/emptyRange.kt
index 6add0ae2d34..09dbe0d55d0 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/emptyRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/emptyRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt
index 71be0101509..8bbb74d69e5 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactSteppedDownTo.kt
index ac6b7bfda7a..1d5bff89e9a 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactSteppedDownTo.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactSteppedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactSteppedRange.kt
index 6a95d0cefe2..a88b1329950 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt
index 1757d6c08d2..439c294a09a 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MaxUI = UInt.MAX_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt
index 2ff1a388003..c4fb4602186 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MaxUI = UInt.MAX_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMaxValue.kt
index eff345d81b2..d937fe82eb2 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMinValue.kt
index f085cb9de1c..de189ca387a 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementDownTo.kt
index 82527214111..f4fe1419e50 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementDownTo.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementRange.kt
index 8a247245b29..7adef77fab5 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/openRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/openRange.kt
index 9a815778fc1..c5e1e00da67 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/openRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/openRange.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroDownToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroDownToMaxValue.kt
index e185469021f..feb4e3f0896 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroDownToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroDownToMaxValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MaxUI = UInt.MAX_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroToMinValue.kt
index 9d0ead69173..888397e8db4 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroToMinValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt
index 792268865ee..5827077a824 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt
index 5c0aaf389b4..7bdd1a3b648 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MaxUI = UInt.MAX_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMaxValue.kt
index 3bf7b520b89..878300bec9a 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMinValue.kt
index 63cd9da9e68..ad12c6b7d09 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMinValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMinValueToMinValue.kt
index 68182aee7cd..17ff6acfce9 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMinValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMinValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedBackSequence.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedBackSequence.kt
index a0205a86024..f2e2e7a908b 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedBackSequence.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedBackSequence.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedEmptyBackSequence.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedEmptyBackSequence.kt
index 19503035d32..8b8b436009a 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedEmptyBackSequence.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedEmptyBackSequence.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedEmptyRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedEmptyRange.kt
index 6b1ac78fe26..86cec6938c1 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedEmptyRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedEmptyRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedInexactSteppedDownTo.kt
index fe5e2843db4..2cfaa03b3af 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedInexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedInexactSteppedDownTo.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedRange.kt
index d11b0242c84..8fe46c1f2a7 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedSimpleSteppedRange.kt
index 28e9e494f07..6f44889ace3 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/reversedSimpleSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/reversedSimpleSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleDownTo.kt
index ba82cbff8d6..47aad514755 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleDownTo.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRange.kt
index d7812817982..84d0b377713 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt
index f46d7ce9f96..9ef611a0595 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleSteppedDownTo.kt
index 6f9fb59b9e6..d82af91cad8 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleSteppedDownTo.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleSteppedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleSteppedRange.kt
index f7e218327e3..98077e8c5b8 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt
index 132819b96ae..b23d54112ce 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt
@@ -1,5 +1,6 @@
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun ub_ub(x: UByte, a: UByte, b: UByte) = x in a..b
 fun ub_us(x: UByte, a: UShort, b: UShort) = x in a..b
diff --git a/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt b/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt
index d8e6459244d..ecee127b474 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt
@@ -1,5 +1,6 @@
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun ULong.foobar() =
     when (this) {
diff --git a/compiler/testData/codegen/box/ranges/unsigned/kt36953.kt b/compiler/testData/codegen/box/ranges/unsigned/kt36953.kt
index 61b204783d0..64a6a6210ef 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/kt36953.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/kt36953.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/emptyDownto.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/emptyDownto.kt
index fb3296321fd..9f352315f74 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/emptyDownto.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/emptyDownto.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/emptyRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/emptyRange.kt
index 7ca5e45f608..68d1e6deedb 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/emptyRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/emptyRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt
index 83ac75d74c9..9bef579e85c 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactSteppedDownTo.kt
index 017cfa2c18d..8d1b5337f60 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactSteppedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactSteppedRange.kt
index 46c75e303e8..2b3eed65e78 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt
index 9afcca63eb4..6804272a2fc 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MaxUI = UInt.MAX_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt
index 7d51595017e..e1dc3314485 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MaxUI = UInt.MAX_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMaxValue.kt
index f6f4644d912..7ec6d3bc01f 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMinValue.kt
index fd19977f3b3..50024ec5ad0 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/oneElementDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/oneElementDownTo.kt
index 32249933a9c..1e0149c3db2 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/oneElementDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/oneElementDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/oneElementRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/oneElementRange.kt
index 99b77a02b4d..a7654e85e3c 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/oneElementRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/oneElementRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/openRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/openRange.kt
index 1e56cfc81db..6d03c4b82f4 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/openRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/openRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroDownToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroDownToMaxValue.kt
index 89e09aeb8e4..62caddeaa53 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroDownToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroDownToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroToMinValue.kt
index 7ad278920dc..b5ce15e0eb9 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroToMinValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt
index 7b3f68b51ac..72b09f093f1 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt
index f0095b0732c..a929162283a 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 val MaxUI = UInt.MAX_VALUE
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMaxValue.kt
index 93323a7e66e..2903a2a636c 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMaxValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMaxValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMinValue.kt
index 6051b5d7137..72bbb338ea7 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMinValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMinValueToMinValue.kt
index 7104a0b9db8..8a2d799dd07 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMinValueToMinValue.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMinValueToMinValue.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedBackSequence.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedBackSequence.kt
index f933445fb51..57bfd36cbe4 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedBackSequence.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedBackSequence.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedEmptyBackSequence.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedEmptyBackSequence.kt
index 9a691e754ee..fd0eb26c2fa 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedEmptyBackSequence.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedEmptyBackSequence.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedEmptyRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedEmptyRange.kt
index d5ad10d0763..3ec8219375f 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedEmptyRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedEmptyRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedInexactSteppedDownTo.kt
index b7c37de4af8..3015ebe55f7 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedInexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedInexactSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedRange.kt
index 4fe0e8bc9d7..b9ff3930fbd 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedSimpleSteppedRange.kt
index c8c3e4dd741..fee6d077bc6 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/reversedSimpleSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/reversedSimpleSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleDownTo.kt
index 1e0d09523d0..d920ad750e9 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRange.kt
index 7538c5a1630..9e759fcd1c6 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRangeWithNonConstantEnds.kt
index 3769013108f..23dd06b15f4 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRangeWithNonConstantEnds.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRangeWithNonConstantEnds.kt
@@ -1,6 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 
 
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleSteppedDownTo.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleSteppedDownTo.kt
index bc2ede6762a..d76b90b7bb3 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleSteppedDownTo.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleSteppedDownTo.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleSteppedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleSteppedRange.kt
index feffef146e5..dbd8ee6748e 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleSteppedRange.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleSteppedRange.kt
@@ -1,3 +1,4 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
 // KJS_WITH_FULL_RUNTIME
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt
index e6be182814b..4a9d45bb045 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt
@@ -3,6 +3,7 @@
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var result = 0u
diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt
index bef0270964f..720130b8084 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt
@@ -3,6 +3,7 @@
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var result = 0u
diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt
index f1646d783e0..850050f8e40 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt
@@ -3,6 +3,7 @@
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var result = 0u
diff --git a/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt b/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt
index 99830393053..ef200ef7e00 100644
--- a/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt
+++ b/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt
@@ -1,5 +1,6 @@
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun testIn(x: ULong) =
     x in UInt.MIN_VALUE..UInt.MAX_VALUE
diff --git a/compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt b/compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt
new file mode 100644
index 00000000000..f41c33180e6
--- /dev/null
+++ b/compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt
@@ -0,0 +1,34 @@
+// TARGET_BACKEND: JVM
+// WITH_REFLECT
+// WITH_COROUTINES
+
+package test
+
+import kotlin.coroutines.startCoroutine
+import kotlin.reflect.full.callSuspend
+import helpers.*
+
+inline class Z(val value: String)
+
+class S {
+    private var value: Z = Z("")
+
+    suspend fun consumeZ(z: Z) { value = z }
+    suspend fun produceZ(): Z = value
+    suspend fun consumeAndProduceZ(z: Z): Z = z
+}
+
+private fun run0(f: suspend () -> String): String {
+    var result = ""
+    f.startCoroutine(handleResultContinuation { result = it })
+    return result
+}
+
+fun box(): String =
+    run0 {
+        val s = S()
+        S::consumeZ.callSuspend(s, Z("z"))
+        val v = S::produceZ.callSuspend(s)
+        if (v != Z("z")) "Fail: $v"
+        else S::consumeAndProduceZ.callSuspend(s, Z("OK")).value
+    }
diff --git a/compiler/testData/codegen/box/reflection/mapping/inlineClassPrimaryVal.kt b/compiler/testData/codegen/box/reflection/mapping/inlineClasses/inlineClassPrimaryVal.kt
similarity index 100%
rename from compiler/testData/codegen/box/reflection/mapping/inlineClassPrimaryVal.kt
rename to compiler/testData/codegen/box/reflection/mapping/inlineClasses/inlineClassPrimaryVal.kt
diff --git a/compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt b/compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt
new file mode 100644
index 00000000000..fea4c73c5d3
--- /dev/null
+++ b/compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt
@@ -0,0 +1,47 @@
+// TARGET_BACKEND: JVM
+// WITH_REFLECT
+
+package test
+
+import kotlin.reflect.*
+import kotlin.reflect.jvm.*
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+inline class Z(val value: String)
+
+class S {
+    suspend fun consumeZ(z: Z) {}
+    suspend fun produceZ(): Z = Z("")
+    suspend fun consumeAndProduceZ(z: Z): Z = z
+}
+
+fun box(): String {
+    val members = S::class.members.filterIsInstance<KFunction<*>>().associateBy(KFunction<*>::name)
+
+    members["consumeZ"]!!.let { cz ->
+        val czj = cz.javaMethod!!
+        assertTrue(czj.name.startsWith("consumeZ-"), czj.name)
+        assertEquals("java.lang.String, kotlin.coroutines.Continuation", czj.parameterTypes.joinToString { it.name })
+        val czjk = czj.kotlinFunction
+        assertEquals(cz, czjk)
+    }
+
+    members["produceZ"]!!.let { pz ->
+        val pzj = pz.javaMethod!!
+        assertTrue(pzj.name.startsWith("produceZ-"), pzj.name)
+        assertEquals("kotlin.coroutines.Continuation", pzj.parameterTypes.joinToString { it.name })
+        val pzjk = pzj!!.kotlinFunction
+        assertEquals(pz, pzjk)
+    }
+
+    members["consumeAndProduceZ"]!!.let { cpz ->
+        val cpzj = cpz.javaMethod!!
+        assertTrue(cpzj.name.startsWith("consumeAndProduceZ-"), cpzj.name)
+        assertEquals("java.lang.String, kotlin.coroutines.Continuation", cpzj.parameterTypes.joinToString { it.name })
+        val cpzjk = cpzj!!.kotlinFunction
+        assertEquals(cpz, cpzjk)
+    }
+
+    return "OK"
+}
diff --git a/compiler/testData/codegen/box/reflection/methodsFromAny/builtinFunctionsToString.kt b/compiler/testData/codegen/box/reflection/methodsFromAny/builtinFunctionsToString.kt
index 5cc381840d4..5c7bc1de260 100644
--- a/compiler/testData/codegen/box/reflection/methodsFromAny/builtinFunctionsToString.kt
+++ b/compiler/testData/codegen/box/reflection/methodsFromAny/builtinFunctionsToString.kt
@@ -1,6 +1,5 @@
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // FULL_JDK
 // WITH_REFLECT
 
diff --git a/compiler/testData/codegen/box/reflection/methodsFromAny/fakeOverrideToString2.kt b/compiler/testData/codegen/box/reflection/methodsFromAny/fakeOverrideToString2.kt
index 80f45d65c78..587c0a2ad35 100644
--- a/compiler/testData/codegen/box/reflection/methodsFromAny/fakeOverrideToString2.kt
+++ b/compiler/testData/codegen/box/reflection/methodsFromAny/fakeOverrideToString2.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR, JS, NATIVE
 // IGNORE_BACKEND: JS_IR_ES6
 // WITH_REFLECT
diff --git a/compiler/testData/codegen/box/reflection/parameters/realParameterNames.kt b/compiler/testData/codegen/box/reflection/parameters/realParameterNames.kt
index e582ee69a7c..bfa79bc36bf 100644
--- a/compiler/testData/codegen/box/reflection/parameters/realParameterNames.kt
+++ b/compiler/testData/codegen/box/reflection/parameters/realParameterNames.kt
@@ -1,7 +1,7 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
 // WITH_REFLECT
 // JAVAC_OPTIONS: -parameters
+// JVM_TARGET: 1.8
 // FILE: J.java
 
 public class J {
diff --git a/compiler/testData/codegen/box/reflection/properties/overrideKotlinPropertyByJavaMethod.kt b/compiler/testData/codegen/box/reflection/properties/overrideKotlinPropertyByJavaMethod.kt
index 90729d2180f..f413cb7f806 100644
--- a/compiler/testData/codegen/box/reflection/properties/overrideKotlinPropertyByJavaMethod.kt
+++ b/compiler/testData/codegen/box/reflection/properties/overrideKotlinPropertyByJavaMethod.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_REFLECT
diff --git a/compiler/testData/codegen/box/regressions/Kt1149.kt b/compiler/testData/codegen/box/regressions/Kt1149.kt
index 985e1628eab..1fe81b1069c 100644
--- a/compiler/testData/codegen/box/regressions/Kt1149.kt
+++ b/compiler/testData/codegen/box/regressions/Kt1149.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/regressions/Kt1619Test.kt b/compiler/testData/codegen/box/regressions/Kt1619Test.kt
index 2540b77d307..332b18424da 100644
--- a/compiler/testData/codegen/box/regressions/Kt1619Test.kt
+++ b/compiler/testData/codegen/box/regressions/Kt1619Test.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/regressions/Kt2495Test.kt b/compiler/testData/codegen/box/regressions/Kt2495Test.kt
index 8fd6f97bbb9..1e18e4e2b94 100644
--- a/compiler/testData/codegen/box/regressions/Kt2495Test.kt
+++ b/compiler/testData/codegen/box/regressions/Kt2495Test.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/regressions/generic.kt b/compiler/testData/codegen/box/regressions/generic.kt
index ede3a824d0f..fdac2c87a6a 100644
--- a/compiler/testData/codegen/box/regressions/generic.kt
+++ b/compiler/testData/codegen/box/regressions/generic.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/regressions/kt1172.kt b/compiler/testData/codegen/box/regressions/kt1172.kt
index 75260322148..db345ec2b8b 100644
--- a/compiler/testData/codegen/box/regressions/kt1172.kt
+++ b/compiler/testData/codegen/box/regressions/kt1172.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/regressions/kt1800.kt b/compiler/testData/codegen/box/regressions/kt1800.kt
index 80abfaa72ee..770b00cc49a 100644
--- a/compiler/testData/codegen/box/regressions/kt1800.kt
+++ b/compiler/testData/codegen/box/regressions/kt1800.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 //KT-1800 error/NonExistentClass generated on runtime
diff --git a/compiler/testData/codegen/box/regressions/kt18779.kt b/compiler/testData/codegen/box/regressions/kt18779.kt
index d72aec3b877..228b827bb4e 100644
--- a/compiler/testData/codegen/box/regressions/kt18779.kt
+++ b/compiler/testData/codegen/box/regressions/kt18779.kt
@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 
 sealed class Result {
     class Failure(val exception: Exception) : Result()
diff --git a/compiler/testData/codegen/box/regressions/kt2017.kt b/compiler/testData/codegen/box/regressions/kt2017.kt
index c28300c2f54..60b1e7e1e6f 100644
--- a/compiler/testData/codegen/box/regressions/kt2017.kt
+++ b/compiler/testData/codegen/box/regressions/kt2017.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/regressions/kt3107.kt b/compiler/testData/codegen/box/regressions/kt3107.kt
index 851d6931058..a7af15e5592 100644
--- a/compiler/testData/codegen/box/regressions/kt3107.kt
+++ b/compiler/testData/codegen/box/regressions/kt3107.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun foo(): String {
     val s = try {
         "OK"
diff --git a/compiler/testData/codegen/box/regressions/kt344.kt b/compiler/testData/codegen/box/regressions/kt344.kt
index dd730dfcfbf..7a4b4c33b21 100644
--- a/compiler/testData/codegen/box/regressions/kt344.kt
+++ b/compiler/testData/codegen/box/regressions/kt344.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/regressions/kt3442.kt b/compiler/testData/codegen/box/regressions/kt3442.kt
index 19c49d33516..78f56c96710 100644
--- a/compiler/testData/codegen/box/regressions/kt3442.kt
+++ b/compiler/testData/codegen/box/regressions/kt3442.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/regressions/kt5056.kt b/compiler/testData/codegen/box/regressions/kt5056.kt
index 646c8cbe443..31183afd06d 100644
--- a/compiler/testData/codegen/box/regressions/kt5056.kt
+++ b/compiler/testData/codegen/box/regressions/kt5056.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/regressions/kt5953.kt b/compiler/testData/codegen/box/regressions/kt5953.kt
index 3ccb46f328a..63d15a2f3cc 100644
--- a/compiler/testData/codegen/box/regressions/kt5953.kt
+++ b/compiler/testData/codegen/box/regressions/kt5953.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/regressions/kt6153.kt b/compiler/testData/codegen/box/regressions/kt6153.kt
index d2b703a5520..9d964b2a507 100644
--- a/compiler/testData/codegen/box/regressions/kt6153.kt
+++ b/compiler/testData/codegen/box/regressions/kt6153.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // KT-6153 java.lang.IllegalStateException while building
 object Bug {
diff --git a/compiler/testData/codegen/box/regressions/kt6434.kt b/compiler/testData/codegen/box/regressions/kt6434.kt
index 58a4f20c451..d89e12e6936 100644
--- a/compiler/testData/codegen/box/regressions/kt6434.kt
+++ b/compiler/testData/codegen/box/regressions/kt6434.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/regressions/kt789.kt b/compiler/testData/codegen/box/regressions/kt789.kt
index d3df588ce1f..c4b65c2efe4 100644
--- a/compiler/testData/codegen/box/regressions/kt789.kt
+++ b/compiler/testData/codegen/box/regressions/kt789.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 package foo
 
diff --git a/compiler/testData/codegen/box/regressions/objectInsideDelegation.kt b/compiler/testData/codegen/box/regressions/objectInsideDelegation.kt
index f2f9caf960d..441b9b5161f 100644
--- a/compiler/testData/codegen/box/regressions/objectInsideDelegation.kt
+++ b/compiler/testData/codegen/box/regressions/objectInsideDelegation.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // WITH_RUNTIME
 
 val b: First by lazy {
diff --git a/compiler/testData/codegen/box/regressions/resolvedCallForGetOperator.kt b/compiler/testData/codegen/box/regressions/resolvedCallForGetOperator.kt
index 19841190362..d58741aaa56 100644
--- a/compiler/testData/codegen/box/regressions/resolvedCallForGetOperator.kt
+++ b/compiler/testData/codegen/box/regressions/resolvedCallForGetOperator.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: NULLABLE_BOX_FUNCTION
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reified/arraysReification/instanceOf.kt b/compiler/testData/codegen/box/reified/arraysReification/instanceOf.kt
index 71517c9e4aa..84fc4baa06a 100644
--- a/compiler/testData/codegen/box/reified/arraysReification/instanceOf.kt
+++ b/compiler/testData/codegen/box/reified/arraysReification/instanceOf.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: NATIVE
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/reified/arraysReification/instanceOfArrays.kt b/compiler/testData/codegen/box/reified/arraysReification/instanceOfArrays.kt
index 851f55b63dd..1b47ffdcf9d 100644
--- a/compiler/testData/codegen/box/reified/arraysReification/instanceOfArrays.kt
+++ b/compiler/testData/codegen/box/reified/arraysReification/instanceOfArrays.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: NATIVE
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/reified/checkcast.kt b/compiler/testData/codegen/box/reified/checkcast.kt
index 3b10a4bd5f8..7c534d47c4a 100644
--- a/compiler/testData/codegen/box/reified/checkcast.kt
+++ b/compiler/testData/codegen/box/reified/checkcast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals
diff --git a/compiler/testData/codegen/box/reified/copyToArray.kt b/compiler/testData/codegen/box/reified/copyToArray.kt
index 43564bbd88e..1274b471d07 100644
--- a/compiler/testData/codegen/box/reified/copyToArray.kt
+++ b/compiler/testData/codegen/box/reified/copyToArray.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reified/filterIsInstance.kt b/compiler/testData/codegen/box/reified/filterIsInstance.kt
index 400a08a4fd3..20ae572ed5a 100644
--- a/compiler/testData/codegen/box/reified/filterIsInstance.kt
+++ b/compiler/testData/codegen/box/reified/filterIsInstance.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgument.kt b/compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgument.kt
index f042f5db330..bcdeeddd831 100644
--- a/compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgument.kt
+++ b/compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgument.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgumentCrossModule.kt b/compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgumentCrossModule.kt
index f627328a70e..58107262155 100644
--- a/compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgumentCrossModule.kt
+++ b/compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgumentCrossModule.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reified/reifiedTypeArgumentWithIntersectionTypeAsTypeArgument.kt b/compiler/testData/codegen/box/reified/reifiedTypeArgumentWithIntersectionTypeAsTypeArgument.kt
index be1965b57fd..91d35ae921c 100644
--- a/compiler/testData/codegen/box/reified/reifiedTypeArgumentWithIntersectionTypeAsTypeArgument.kt
+++ b/compiler/testData/codegen/box/reified/reifiedTypeArgumentWithIntersectionTypeAsTypeArgument.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reified/reifiedTypeArgumentWithRecursion.kt b/compiler/testData/codegen/box/reified/reifiedTypeArgumentWithRecursion.kt
index 8dcff939afe..f8a58f7b81c 100644
--- a/compiler/testData/codegen/box/reified/reifiedTypeArgumentWithRecursion.kt
+++ b/compiler/testData/codegen/box/reified/reifiedTypeArgumentWithRecursion.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reified/spreads.kt b/compiler/testData/codegen/box/reified/spreads.kt
index 3ef1765c97b..40c8f187256 100644
--- a/compiler/testData/codegen/box/reified/spreads.kt
+++ b/compiler/testData/codegen/box/reified/spreads.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reified/varargs.kt b/compiler/testData/codegen/box/reified/varargs.kt
index a3cd0cbb9d4..32ce927095a 100644
--- a/compiler/testData/codegen/box/reified/varargs.kt
+++ b/compiler/testData/codegen/box/reified/varargs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/safeCall/kt232.kt b/compiler/testData/codegen/box/safeCall/kt232.kt
index 2e3a1225d35..f24f123382c 100644
--- a/compiler/testData/codegen/box/safeCall/kt232.kt
+++ b/compiler/testData/codegen/box/safeCall/kt232.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/sam/constructors/comparator.kt b/compiler/testData/codegen/box/sam/constructors/comparator.kt
index 2970617d582..8db96272fa0 100644
--- a/compiler/testData/codegen/box/sam/constructors/comparator.kt
+++ b/compiler/testData/codegen/box/sam/constructors/comparator.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 // SKIP_DCE_DRIVEN
diff --git a/compiler/testData/codegen/box/sam/constructors/nonLiteralComparator.kt b/compiler/testData/codegen/box/sam/constructors/nonLiteralComparator.kt
index 87722bd3110..3ed46508728 100644
--- a/compiler/testData/codegen/box/sam/constructors/nonLiteralComparator.kt
+++ b/compiler/testData/codegen/box/sam/constructors/nonLiteralComparator.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 // SKIP_DCE_DRIVEN
diff --git a/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt b/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt
index 6df35e72ea4..9e678745924 100644
--- a/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt
+++ b/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization.kt b/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization.kt
index 395fcfb46a1..76a698344ca 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization_inlineClass.kt b/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization_inlineClass.kt
index 4d82bd9a2d9..6ea6ea3c94e 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization_inlineClass.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization_inlineClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/secondaryConstructors/varargs.kt b/compiler/testData/codegen/box/secondaryConstructors/varargs.kt
index 39bfb8bf7a9..3e439918592 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/varargs.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/varargs.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 fun join(x: Array<out String>): String {
     var result = ""
     for (i in x) {
diff --git a/compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt b/compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt
index 4ab9a4450b1..0079a2dade7 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 inline fun run2(block: () -> Unit) = block()
 
 class A {
diff --git a/compiler/testData/codegen/box/secondaryConstructors/withReturn.kt b/compiler/testData/codegen/box/secondaryConstructors/withReturn.kt
index b6cb18cf2af..3ce661208cf 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/withReturn.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/withReturn.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 class A {
     val prop: Int
     constructor(arg: Boolean) {
diff --git a/compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt b/compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt
index 956c6db367e..b8785eef427 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 class A {
     val prop: Int
     constructor(arg: Boolean) {
diff --git a/compiler/testData/codegen/box/signatureAnnotations/defaultWithKotlinBase.kt b/compiler/testData/codegen/box/signatureAnnotations/defaultWithKotlinBase.kt
index 0a015dc5051..ac18373d15f 100644
--- a/compiler/testData/codegen/box/signatureAnnotations/defaultWithKotlinBase.kt
+++ b/compiler/testData/codegen/box/signatureAnnotations/defaultWithKotlinBase.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: A.kt
@@ -21,4 +20,4 @@ fun box(): String {
     }
 
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/smartCasts/kt19058.kt b/compiler/testData/codegen/box/smartCasts/kt19058.kt
index 1f558682449..8f92195d0f2 100644
--- a/compiler/testData/codegen/box/smartCasts/kt19058.kt
+++ b/compiler/testData/codegen/box/smartCasts/kt19058.kt
@@ -1,5 +1,5 @@
-// SKIP_JDK6
 // TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
 // FILE: Test.kt
 open class KFoo {
     fun foo(): String {
@@ -17,4 +17,4 @@ public interface JBar {
     default String getBar() {
         return "OK";
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/smartCasts/kt42517.kt b/compiler/testData/codegen/box/smartCasts/kt42517.kt
index 55746dd9a93..8a914df7fa4 100644
--- a/compiler/testData/codegen/box/smartCasts/kt42517.kt
+++ b/compiler/testData/codegen/box/smartCasts/kt42517.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: JAVA
 // WITH_RUNTIME
 // FULL_JDK
 // IGNORE_BACKEND: JS_IR
diff --git a/compiler/testData/codegen/box/smartCasts/lambdaArgumentWithoutType.kt b/compiler/testData/codegen/box/smartCasts/lambdaArgumentWithoutType.kt
index d61d8b3c707..c7e572430d3 100644
--- a/compiler/testData/codegen/box/smartCasts/lambdaArgumentWithoutType.kt
+++ b/compiler/testData/codegen/box/smartCasts/lambdaArgumentWithoutType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: MINOR: JS_NAME_CLASH
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/smartCasts/nullSmartCast.kt b/compiler/testData/codegen/box/smartCasts/nullSmartCast.kt
index 9f1935c7851..41cd6812690 100644
--- a/compiler/testData/codegen/box/smartCasts/nullSmartCast.kt
+++ b/compiler/testData/codegen/box/smartCasts/nullSmartCast.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: NULL_REF_CAST
 // IGNORE_BACKEND_FIR: JVM_IR
 fun String?.foo() = this ?: "OK"
 
diff --git a/compiler/testData/codegen/box/specialBuiltins/bridges.kt b/compiler/testData/codegen/box/specialBuiltins/bridges.kt
index 8f40a4bea0d..ebad83489a5 100644
--- a/compiler/testData/codegen/box/specialBuiltins/bridges.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/bridges.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/specialBuiltins/commonBridgesTarget.kt b/compiler/testData/codegen/box/specialBuiltins/commonBridgesTarget.kt
index 638ea3eca78..5437eb7b6b0 100644
--- a/compiler/testData/codegen/box/specialBuiltins/commonBridgesTarget.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/commonBridgesTarget.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt b/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt
index c96ea032fa2..435cbae40c9 100644
--- a/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
diff --git a/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt b/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt
index 434c332237d..60eeded27c5 100644
--- a/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BRIDGE_ISSUES
 interface Ordinaled {
     val ordinal: Int
 }
diff --git a/compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt b/compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt
index 6c0a3b7f566..f9f912f3ab6 100644
--- a/compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt
@@ -1,3 +1,6 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
+// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
 
diff --git a/compiler/testData/codegen/box/specialBuiltins/removeSetInt.kt b/compiler/testData/codegen/box/specialBuiltins/removeSetInt.kt
index 48dcbc92e93..fc1c32139c8 100644
--- a/compiler/testData/codegen/box/specialBuiltins/removeSetInt.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/removeSetInt.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
 class MySet : HashSet<Int>() {
diff --git a/compiler/testData/codegen/box/specialBuiltins/throwable.kt b/compiler/testData/codegen/box/specialBuiltins/throwable.kt
index e4040a63794..c6b5f4770e5 100644
--- a/compiler/testData/codegen/box/specialBuiltins/throwable.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/throwable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun box(): String {
     try {
         throw Throwable("OK", null)
diff --git a/compiler/testData/codegen/box/specialBuiltins/throwableComplex.kt b/compiler/testData/codegen/box/specialBuiltins/throwableComplex.kt
index 94e41cbfa77..9fa821dd303 100644
--- a/compiler/testData/codegen/box/specialBuiltins/throwableComplex.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/throwableComplex.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // Super calls to Throwable properties are not supported
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
@@ -43,4 +45,4 @@ fun check(t: Throwable, msg: String) {
         val m = if (c != null) t.message!! + c.message!! else t.message!!
         if (m != msg) throw AssertionError(m)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/specialBuiltins/throwableImpl.kt b/compiler/testData/codegen/box/specialBuiltins/throwableImpl.kt
index 0d4ed1d6824..120ddbba4a6 100644
--- a/compiler/testData/codegen/box/specialBuiltins/throwableImpl.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/throwableImpl.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 // Super calls to Throwable properties are not supported
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/specialBuiltins/throwableImplWithSecondaryConstructor.kt b/compiler/testData/codegen/box/specialBuiltins/throwableImplWithSecondaryConstructor.kt
index afa627c4598..785989e1ccb 100644
--- a/compiler/testData/codegen/box/specialBuiltins/throwableImplWithSecondaryConstructor.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/throwableImplWithSecondaryConstructor.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 class MyThrowable : Throwable {
     val x: String
 
diff --git a/compiler/testData/codegen/box/strings/constInStringTemplate.kt b/compiler/testData/codegen/box/strings/constInStringTemplate.kt
index 5595599889d..2251d329391 100644
--- a/compiler/testData/codegen/box/strings/constInStringTemplate.kt
+++ b/compiler/testData/codegen/box/strings/constInStringTemplate.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: Float.toString()
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals
diff --git a/compiler/testData/codegen/box/strings/kt2592.kt b/compiler/testData/codegen/box/strings/kt2592.kt
index 013ad56f0d6..7d5e21f4eb4 100644
--- a/compiler/testData/codegen/box/strings/kt2592.kt
+++ b/compiler/testData/codegen/box/strings/kt2592.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB
 fun box(): String {
     String()
     return String() + "OK" + String()
diff --git a/compiler/testData/codegen/box/strings/kt5389_stringBuilderGet.kt b/compiler/testData/codegen/box/strings/kt5389_stringBuilderGet.kt
index 49855350814..9dc2d6d776d 100644
--- a/compiler/testData/codegen/box/strings/kt5389_stringBuilderGet.kt
+++ b/compiler/testData/codegen/box/strings/kt5389_stringBuilderGet.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_STRING_BUILDER
 // KJS_WITH_FULL_RUNTIME
 fun box(): String {
     val sb = StringBuilder("OK")
diff --git a/compiler/testData/codegen/box/strings/kt889.kt b/compiler/testData/codegen/box/strings/kt889.kt
index 2736e0176e6..ea43a1050a8 100644
--- a/compiler/testData/codegen/box/strings/kt889.kt
+++ b/compiler/testData/codegen/box/strings/kt889.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/strings/stringBuilderAppend.kt b/compiler/testData/codegen/box/strings/stringBuilderAppend.kt
index 30c2eb17951..4b4612a9981 100644
--- a/compiler/testData/codegen/box/strings/stringBuilderAppend.kt
+++ b/compiler/testData/codegen/box/strings/stringBuilderAppend.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS
 
 class A() {
diff --git a/compiler/testData/codegen/box/strings/stringPlusOnlyWorksOnString.kt b/compiler/testData/codegen/box/strings/stringPlusOnlyWorksOnString.kt
index 69806f7415b..ed4e3a97673 100644
--- a/compiler/testData/codegen/box/strings/stringPlusOnlyWorksOnString.kt
+++ b/compiler/testData/codegen/box/strings/stringPlusOnlyWorksOnString.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/super/basicmethodSuperClass.kt b/compiler/testData/codegen/box/super/basicmethodSuperClass.kt
index 4165898b355..cc404cfe15b 100644
--- a/compiler/testData/codegen/box/super/basicmethodSuperClass.kt
+++ b/compiler/testData/codegen/box/super/basicmethodSuperClass.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
 
diff --git a/compiler/testData/codegen/box/super/superConstructor/kt13846.kt b/compiler/testData/codegen/box/super/superConstructor/kt13846.kt
index c066d8e6ce5..d8d7883cc5b 100644
--- a/compiler/testData/codegen/box/super/superConstructor/kt13846.kt
+++ b/compiler/testData/codegen/box/super/superConstructor/kt13846.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: BOUND_RECEIVER
 open class SuperClass(val arg: () -> String)
 
 object obj {
diff --git a/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt b/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt
index b4d06baa10b..68554bda49b 100644
--- a/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt
+++ b/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/super/superConstructor/kt18356_2.kt b/compiler/testData/codegen/box/super/superConstructor/kt18356_2.kt
index 9773342f5fa..c0e685bc9ff 100644
--- a/compiler/testData/codegen/box/super/superConstructor/kt18356_2.kt
+++ b/compiler/testData/codegen/box/super/superConstructor/kt18356_2.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 abstract class Base(val s: String, vararg ints: Int)
 
 fun foo(s: String, ints: IntArray) = object : Base(ints = *ints, s = s) {}
diff --git a/compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt b/compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt
new file mode 100644
index 00000000000..dd2159e74b3
--- /dev/null
+++ b/compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt
@@ -0,0 +1,15 @@
+interface A {
+    fun foo(): String = "Fail"
+}
+
+abstract class B : A {
+    abstract override fun foo(): String
+}
+
+abstract class C : B()
+
+class D : C() {
+    override fun foo(): String = "OK"
+}
+
+fun box() = D().foo()
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/traits/kt2399.kt b/compiler/testData/codegen/box/traits/kt2399.kt
index 3531a36633c..1cf6b20d19f 100644
--- a/compiler/testData/codegen/box/traits/kt2399.kt
+++ b/compiler/testData/codegen/box/traits/kt2399.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/traits/multipleImplFromJava.kt b/compiler/testData/codegen/box/traits/multipleImplFromJava.kt
index 748dceeecb8..276f901456f 100644
--- a/compiler/testData/codegen/box/traits/multipleImplFromJava.kt
+++ b/compiler/testData/codegen/box/traits/multipleImplFromJava.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// SKIP_JDK6
 // FILE: I.java
 interface I {
     default String ifun() { return "fail"; }
@@ -14,6 +13,7 @@ public class Z {
 public class Zz extends Z implements I {}
 
 // FILE: multipleImplFromJava.kt
+// JVM_TARGET: 1.8
 
 class Cc : Zz()
 
diff --git a/compiler/testData/codegen/box/traits/noPrivateDelegation.kt b/compiler/testData/codegen/box/traits/noPrivateDelegation.kt
index 28546541852..bb94e8ead2d 100644
--- a/compiler/testData/codegen/box/traits/noPrivateDelegation.kt
+++ b/compiler/testData/codegen/box/traits/noPrivateDelegation.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/typeMapping/kt3863.kt b/compiler/testData/codegen/box/typeMapping/kt3863.kt
index 21b6b4acd63..81c2d49e430 100644
--- a/compiler/testData/codegen/box/typeMapping/kt3863.kt
+++ b/compiler/testData/codegen/box/typeMapping/kt3863.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty
 
 // java.lang.VerifyError: (class: NotImplemented, method: get signature: (Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;) Unable to pop operand off an empty stack
diff --git a/compiler/testData/codegen/box/typeMapping/kt3976.kt b/compiler/testData/codegen/box/typeMapping/kt3976.kt
index 47110878e72..46cfe76a477 100644
--- a/compiler/testData/codegen/box/typeMapping/kt3976.kt
+++ b/compiler/testData/codegen/box/typeMapping/kt3976.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 import kotlin.reflect.KProperty
 
 // java.lang.ClassNotFoundException: kotlin.Nothing
diff --git a/compiler/testData/codegen/box/typealias/typeAliasAsBareType.kt b/compiler/testData/codegen/box/typealias/typeAliasAsBareType.kt
index 165de444126..9316639067a 100644
--- a/compiler/testData/codegen/box/typealias/typeAliasAsBareType.kt
+++ b/compiler/testData/codegen/box/typealias/typeAliasAsBareType.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/unit/UnitValue.kt b/compiler/testData/codegen/box/unit/UnitValue.kt
index 243b563dba8..a13c0e6e54b 100644
--- a/compiler/testData/codegen/box/unit/UnitValue.kt
+++ b/compiler/testData/codegen/box/unit/UnitValue.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun foo() {}
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/unit/closureReturnsNullableUnit.kt b/compiler/testData/codegen/box/unit/closureReturnsNullableUnit.kt
index 604b35ab71f..ec1d4db35f3 100644
--- a/compiler/testData/codegen/box/unit/closureReturnsNullableUnit.kt
+++ b/compiler/testData/codegen/box/unit/closureReturnsNullableUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun isNull(x: Unit?) = x == null
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/unit/kt3634.kt b/compiler/testData/codegen/box/unit/kt3634.kt
index 4dcbf3f5bfe..41b355ce56a 100644
--- a/compiler/testData/codegen/box/unit/kt3634.kt
+++ b/compiler/testData/codegen/box/unit/kt3634.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 val c = Unit
 val d = c
 
diff --git a/compiler/testData/codegen/box/unit/kt4212.kt b/compiler/testData/codegen/box/unit/kt4212.kt
index 5d9db4097e7..f90e272af85 100644
--- a/compiler/testData/codegen/box/unit/kt4212.kt
+++ b/compiler/testData/codegen/box/unit/kt4212.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun foo(): Any? = bar()
 
 fun bar() {}
diff --git a/compiler/testData/codegen/box/unit/kt4265.kt b/compiler/testData/codegen/box/unit/kt4265.kt
index 3c1aaf9d462..ccde5f60ef7 100644
--- a/compiler/testData/codegen/box/unit/kt4265.kt
+++ b/compiler/testData/codegen/box/unit/kt4265.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun <T : Any, R> T.let(f: (T) -> R): R = f(this)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/unit/nullableUnit.kt b/compiler/testData/codegen/box/unit/nullableUnit.kt
index 0289cca09ba..c9d1772bc5a 100644
--- a/compiler/testData/codegen/box/unit/nullableUnit.kt
+++ b/compiler/testData/codegen/box/unit/nullableUnit.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun isNull(x: Unit?) = x == null
 
 fun <T : Any> isNullGeneric(x: T?) = x == null
diff --git a/compiler/testData/codegen/box/unit/nullableUnitInWhen3.kt b/compiler/testData/codegen/box/unit/nullableUnitInWhen3.kt
index b2e2b0ae439..dec7f2b7a1f 100644
--- a/compiler/testData/codegen/box/unit/nullableUnitInWhen3.kt
+++ b/compiler/testData/codegen/box/unit/nullableUnitInWhen3.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun foo() {}
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/unit/unitClassObject.kt b/compiler/testData/codegen/box/unit/unitClassObject.kt
index e4cdbacbe14..6d29747589a 100644
--- a/compiler/testData/codegen/box/unit/unitClassObject.kt
+++ b/compiler/testData/codegen/box/unit/unitClassObject.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 fun box(): String {
     Unit
 
diff --git a/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt b/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt
index 0950cc04632..b6f577af500 100644
--- a/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     val good = 42.toUInt()
diff --git a/compiler/testData/codegen/box/unsignedTypes/forEachIndexedInListOfUInts.kt b/compiler/testData/codegen/box/unsignedTypes/forEachIndexedInListOfUInts.kt
index c5b1fb680c4..884682c5ee6 100644
--- a/compiler/testData/codegen/box/unsignedTypes/forEachIndexedInListOfUInts.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/forEachIndexedInListOfUInts.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt
index ffc80bfeefa..9bfd25fba24 100644
--- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt
index d1246849750..7e19fe5610b 100644
--- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt
index 87ada5cdb3e..7884c066cce 100644
--- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt
index 87f11adc429..828605c752d 100644
--- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt
index 86ef6034e61..d18f1b00de4 100644
--- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val UB_MAX = UByte.MAX_VALUE
 val UB_START = (UB_MAX - 10u).toUByte()
diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt
index 377a90e66af..10c81177a1a 100644
--- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt
index bbd6b7bd505..8d3a75a8a1b 100644
--- a/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt
index f87d766e4fa..9ebf6e83f73 100644
--- a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt
index 5b0cc5eab28..47cdcd81f87 100644
--- a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt
index df040cb2512..c1eda749a21 100644
--- a/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE
diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt
index e3ef1d808f9..52aa896b8a3 100644
--- a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNSIGNED_ARRAYS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var sum = 0u
diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt
index fdd7ee8188a..0aaf9aa8006 100644
--- a/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var sum = 0u
diff --git a/compiler/testData/codegen/box/unsignedTypes/kt25784.kt b/compiler/testData/codegen/box/unsignedTypes/kt25784.kt
index 41b3aa34a06..2fd166341e2 100644
--- a/compiler/testData/codegen/box/unsignedTypes/kt25784.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/kt25784.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 import kotlin.reflect.KProperty
 import kotlin.reflect.KProperty0
diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt
index 0f2412922a2..8ff522f2cc0 100644
--- a/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234U
 val ub = 5678U
diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt
index 5052b82ebea..f94a54880c2 100644
--- a/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234U
 val ub = 5678U
diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt
index c9436d97084..5fb5226ab2b 100644
--- a/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234UL
 val ub = 5678UL
diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt
index 09ca73b544d..254e71c600a 100644
--- a/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234UL
 val ub = 5678UL
diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLongToString.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLongToString.kt
index de80a1a7b62..5600a0751bd 100644
--- a/compiler/testData/codegen/box/unsignedTypes/unsignedLongToString.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/unsignedLongToString.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedRangeIterator.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedRangeIterator.kt
index a3f547cf1cb..4932f2971e6 100644
--- a/compiler/testData/codegen/box/unsignedTypes/unsignedRangeIterator.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/unsignedRangeIterator.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 
 fun testUIntRangeForEach() {
     var s = 0
diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedTypePrefixIncrementDecrementBoxing.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedTypePrefixIncrementDecrementBoxing.kt
index 69204a99b26..9c6543edddf 100644
--- a/compiler/testData/codegen/box/unsignedTypes/unsignedTypePrefixIncrementDecrementBoxing.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/unsignedTypePrefixIncrementDecrementBoxing.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: CLASS_REFERENCES
 // KJS_WITH_FULL_RUNTIME
 // WITH_REFLECT
 
diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt
index 12bb49a4795..a59aec5f3ad 100644
--- a/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_TEXT
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MAX_BYTE: UByte = 0xFFu
 const val HUNDRED: UByte = 100u
diff --git a/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt b/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt
index 93b631ec9ae..bf1ebbbace5 100644
--- a/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt
@@ -1,5 +1,8 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 fun uint(vararg us: UInt): UIntArray = us
 
diff --git a/compiler/testData/codegen/box/unsignedTypes/whenByUnsigned.kt b/compiler/testData/codegen/box/unsignedTypes/whenByUnsigned.kt
index a400de3e431..463344912ea 100644
--- a/compiler/testData/codegen/box/unsignedTypes/whenByUnsigned.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/whenByUnsigned.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/box/vararg/doNotCopyImmediatelyCreatedArrays.kt b/compiler/testData/codegen/box/vararg/doNotCopyImmediatelyCreatedArrays.kt
index 6cc4d47dc23..944304246c5 100644
--- a/compiler/testData/codegen/box/vararg/doNotCopyImmediatelyCreatedArrays.kt
+++ b/compiler/testData/codegen/box/vararg/doNotCopyImmediatelyCreatedArrays.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 fun booleanVararg(vararg xs: Boolean) {
     if (xs.size != 1 && xs[0] != true) throw AssertionError()
 }
diff --git a/compiler/testData/codegen/box/vararg/kt37715.kt b/compiler/testData/codegen/box/vararg/kt37715.kt
index 023b7340e9e..880a0c327f0 100644
--- a/compiler/testData/codegen/box/vararg/kt37715.kt
+++ b/compiler/testData/codegen/box/vararg/kt37715.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/vararg/kt37779.kt b/compiler/testData/codegen/box/vararg/kt37779.kt
index df99fcd9bf4..8cb0f18e726 100644
--- a/compiler/testData/codegen/box/vararg/kt37779.kt
+++ b/compiler/testData/codegen/box/vararg/kt37779.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // !LANGUAGE: +AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 
 fun test(vararg s: String) = s[1] + s.size
diff --git a/compiler/testData/codegen/box/vararg/kt581.kt b/compiler/testData/codegen/box/vararg/kt581.kt
index 9e7c41a3e9a..2407d54ef35 100644
--- a/compiler/testData/codegen/box/vararg/kt581.kt
+++ b/compiler/testData/codegen/box/vararg/kt581.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 package whats.the.difference
 
diff --git a/compiler/testData/codegen/box/vararg/kt6192.kt b/compiler/testData/codegen/box/vararg/kt6192.kt
index d442cda5937..daa118b13e0 100644
--- a/compiler/testData/codegen/box/vararg/kt6192.kt
+++ b/compiler/testData/codegen/box/vararg/kt6192.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 fun barB(vararg args: Byte) = args
 fun barC(vararg args: Char) = args
 fun barD(vararg args: Double) = args
diff --git a/compiler/testData/codegen/box/vararg/spreadCopiesArray.kt b/compiler/testData/codegen/box/vararg/spreadCopiesArray.kt
index d5b7fc1fe65..5582075eda9 100644
--- a/compiler/testData/codegen/box/vararg/spreadCopiesArray.kt
+++ b/compiler/testData/codegen/box/vararg/spreadCopiesArray.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 // WITH_RUNTIME
 
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/vararg/varargInFunParam.kt b/compiler/testData/codegen/box/vararg/varargInFunParam.kt
index 6f0d02a20d0..abfb078be71 100644
--- a/compiler/testData/codegen/box/vararg/varargInFunParam.kt
+++ b/compiler/testData/codegen/box/vararg/varargInFunParam.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: SPREAD_OPERATOR
 fun box(): String {
     if (test1() != "") return "fail 1"
     if (test1(1) != "1") return "fail 2"
diff --git a/compiler/testData/codegen/box/when/exceptionOnNoMatch.kt b/compiler/testData/codegen/box/when/exceptionOnNoMatch.kt
index 15a1b759082..a2b7d5348a9 100644
--- a/compiler/testData/codegen/box/when/exceptionOnNoMatch.kt
+++ b/compiler/testData/codegen/box/when/exceptionOnNoMatch.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
 fun isZero(x: Int) = when(x) {
     0 -> true
     else -> throw Exception()
diff --git a/compiler/testData/codegen/box/when/integralWhenWithNoInlinedConstants.kt b/compiler/testData/codegen/box/when/integralWhenWithNoInlinedConstants.kt
index 1b86e600a2d..3adbc2fa578 100644
--- a/compiler/testData/codegen/box/when/integralWhenWithNoInlinedConstants.kt
+++ b/compiler/testData/codegen/box/when/integralWhenWithNoInlinedConstants.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: IGNORED_IN_JS
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: muted automatically, investigate should it be ran for JS or not
diff --git a/compiler/testData/codegen/box/when/is.kt b/compiler/testData/codegen/box/when/is.kt
index 3e1088b8656..a8827fb098d 100644
--- a/compiler/testData/codegen/box/when/is.kt
+++ b/compiler/testData/codegen/box/when/is.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 fun typeName(a: Any?) : String {
     return when(a) {
diff --git a/compiler/testData/codegen/box/when/kt43242.kt b/compiler/testData/codegen/box/when/kt43242.kt
new file mode 100644
index 00000000000..5a6c48a85f3
--- /dev/null
+++ b/compiler/testData/codegen/box/when/kt43242.kt
@@ -0,0 +1,28 @@
+// TARGET_BACKEND: JVM
+// FILE: kt43242.kt
+
+fun fromJson() {
+    test = Bar().fromJson()?.let {
+        when (it) {
+            0 -> false
+            1 -> true
+            else -> true
+        }
+    }
+}
+
+var test: Any? = "xxx"
+
+fun box(): String {
+    fromJson()
+    return if (test != null) "Fail: $test" else "OK"
+}
+
+// FILE: Bar.java
+import org.jetbrains.annotations.Nullable;
+
+public class Bar {
+    public final @Nullable Integer fromJson() {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/when/kt5448.kt b/compiler/testData/codegen/box/when/kt5448.kt
index e7bb0376b21..9a19e4ac6d9 100644
--- a/compiler/testData/codegen/box/when/kt5448.kt
+++ b/compiler/testData/codegen/box/when/kt5448.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt b/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt
index 2c69069abac..12e50f90e8e 100644
--- a/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt
+++ b/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: UNIT_ISSUES
 enum class En {
     A,
     B
diff --git a/compiler/testData/codegen/box/when/range.kt b/compiler/testData/codegen/box/when/range.kt
index 661765305ac..de4fca5498d 100644
--- a/compiler/testData/codegen/box/when/range.kt
+++ b/compiler/testData/codegen/box/when/range.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 fun isDigit(a: Int) : String {
     val aa = ArrayList<Int> ()
diff --git a/compiler/testData/codegen/box/when/stringOptimization/temporaryVarInWhenByStringIsDisposedProperly.kt b/compiler/testData/codegen/box/when/stringOptimization/temporaryVarInWhenByStringIsDisposedProperly.kt
index b452b5a85d6..4e32bbaf047 100644
--- a/compiler/testData/codegen/box/when/stringOptimization/temporaryVarInWhenByStringIsDisposedProperly.kt
+++ b/compiler/testData/codegen/box/when/stringOptimization/temporaryVarInWhenByStringIsDisposedProperly.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_GENERATED
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/when/switchOptimizationDense.kt b/compiler/testData/codegen/box/when/switchOptimizationDense.kt
index 02eee6b6ca9..cd1e54f3596 100644
--- a/compiler/testData/codegen/box/when/switchOptimizationDense.kt
+++ b/compiler/testData/codegen/box/when/switchOptimizationDense.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // CHECK_CASES_COUNT: function=dense count=10
diff --git a/compiler/testData/codegen/box/when/switchOptimizationMultipleConditions.kt b/compiler/testData/codegen/box/when/switchOptimizationMultipleConditions.kt
index 9fa88043b27..a610f2b5abb 100644
--- a/compiler/testData/codegen/box/when/switchOptimizationMultipleConditions.kt
+++ b/compiler/testData/codegen/box/when/switchOptimizationMultipleConditions.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 // CHECK_CASES_COUNT: function=foo count=9
diff --git a/compiler/testData/codegen/box/when/switchOptimizationSparse.kt b/compiler/testData/codegen/box/when/switchOptimizationSparse.kt
index 59c7a10cd02..34760d9f3f4 100644
--- a/compiler/testData/codegen/box/when/switchOptimizationSparse.kt
+++ b/compiler/testData/codegen/box/when/switchOptimizationSparse.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // CHECK_CASES_COUNT: function=sparse count=3
diff --git a/compiler/testData/codegen/box/when/switchOptimizationStatement.kt b/compiler/testData/codegen/box/when/switchOptimizationStatement.kt
index fed77d9e5a1..cb19a31a809 100644
--- a/compiler/testData/codegen/box/when/switchOptimizationStatement.kt
+++ b/compiler/testData/codegen/box/when/switchOptimizationStatement.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // CHECK_CASES_COUNT: function=exhaustive count=3
diff --git a/compiler/testData/codegen/box/when/switchOptimizationTypes.kt b/compiler/testData/codegen/box/when/switchOptimizationTypes.kt
index 6f0137bd7cf..f795ba581d1 100644
--- a/compiler/testData/codegen/box/when/switchOptimizationTypes.kt
+++ b/compiler/testData/codegen/box/when/switchOptimizationTypes.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // CHECK_CASES_COUNT: function=intFoo count=3
diff --git a/compiler/testData/codegen/box/when/switchOptimizationUnordered.kt b/compiler/testData/codegen/box/when/switchOptimizationUnordered.kt
index 32a1dc501f7..25bde3c69bc 100644
--- a/compiler/testData/codegen/box/when/switchOptimizationUnordered.kt
+++ b/compiler/testData/codegen/box/when/switchOptimizationUnordered.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // CHECK_CASES_COUNT: function=foo count=3
diff --git a/compiler/testData/codegen/box/when/switchOptimizationWithGap.kt b/compiler/testData/codegen/box/when/switchOptimizationWithGap.kt
index 8e22f547c87..a2280401a83 100644
--- a/compiler/testData/codegen/box/when/switchOptimizationWithGap.kt
+++ b/compiler/testData/codegen/box/when/switchOptimizationWithGap.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // CHECK_CASES_COUNT: function=foo count=4
diff --git a/compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt b/compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt
index 665d10d7d3a..290af098c87 100644
--- a/compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt
+++ b/compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 var x = 0
 fun inc(): Int {
diff --git a/compiler/testData/codegen/box/when/whenSubjectVariable/denseIntSwitchWithSubjectVariable.kt b/compiler/testData/codegen/box/when/whenSubjectVariable/denseIntSwitchWithSubjectVariable.kt
index 17116b208d0..f807f43c8c2 100644
--- a/compiler/testData/codegen/box/when/whenSubjectVariable/denseIntSwitchWithSubjectVariable.kt
+++ b/compiler/testData/codegen/box/when/whenSubjectVariable/denseIntSwitchWithSubjectVariable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +VariableDeclarationInWhenSubject
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/when/whenSubjectVariable/sparseIntSwitchWithSubjectVariable.kt b/compiler/testData/codegen/box/when/whenSubjectVariable/sparseIntSwitchWithSubjectVariable.kt
index e6b7d06b2d2..4cbfa4c5f64 100644
--- a/compiler/testData/codegen/box/when/whenSubjectVariable/sparseIntSwitchWithSubjectVariable.kt
+++ b/compiler/testData/codegen/box/when/whenSubjectVariable/sparseIntSwitchWithSubjectVariable.kt
@@ -1,3 +1,5 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // !LANGUAGE: +VariableDeclarationInWhenSubject
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/boxAgainstJava/platformTypes/specializedMapFull.kt b/compiler/testData/codegen/boxAgainstJava/platformTypes/specializedMapFull.kt
index 6829b8262f8..8beed0ad8ed 100644
--- a/compiler/testData/codegen/boxAgainstJava/platformTypes/specializedMapFull.kt
+++ b/compiler/testData/codegen/boxAgainstJava/platformTypes/specializedMapFull.kt
@@ -1,4 +1,5 @@
 // FILE: AbstractSpecializedMap.java
+// IGNORE_BACKEND_FIR: JVM_IR
 public abstract class AbstractSpecializedMap implements java.util.Map<Integer, Double> {
     public abstract double put(int x, double y);
     public abstract double remove(int k);
diff --git a/compiler/testData/codegen/boxAgainstJava/platformTypes/specializedMapPut.kt b/compiler/testData/codegen/boxAgainstJava/platformTypes/specializedMapPut.kt
index abeca9a65b3..fbd978d172a 100644
--- a/compiler/testData/codegen/boxAgainstJava/platformTypes/specializedMapPut.kt
+++ b/compiler/testData/codegen/boxAgainstJava/platformTypes/specializedMapPut.kt
@@ -1,4 +1,5 @@
 // FILE: A.java
+// IGNORE_BACKEND_FIR: JVM_IR
 import java.util.HashMap;
 
 public class A extends HashMap<Integer, Double> {
diff --git a/compiler/testData/codegen/boxAgainstJava/specialBuiltins/charBuffer.kt b/compiler/testData/codegen/boxAgainstJava/specialBuiltins/charBuffer.kt
index 73db39b2d4d..4c5410fd6fa 100644
--- a/compiler/testData/codegen/boxAgainstJava/specialBuiltins/charBuffer.kt
+++ b/compiler/testData/codegen/boxAgainstJava/specialBuiltins/charBuffer.kt
@@ -1,4 +1,5 @@
 // FILE: CharBuffer.java
+// IGNORE_BACKEND_FIR: JVM_IR
 
 public abstract class CharBuffer implements CharSequence {
     public final int length() {
diff --git a/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride.kt b/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride.kt
new file mode 100644
index 00000000000..f0bd8bceb3c
--- /dev/null
+++ b/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride.kt
@@ -0,0 +1,18 @@
+// FILE: A.java
+
+public abstract class A<T> {
+    protected abstract String doIt(T... args);
+
+    public String test(T... args) {
+        return doIt(args);
+    }
+}
+
+// FILE: 1.kt
+
+val a: A<Void> =
+    object : A<Void>() {
+        override fun doIt(vararg parameters: Void): String = "OK"
+    }
+
+fun box(): String = a.test()
diff --git a/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride2.kt b/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride2.kt
new file mode 100644
index 00000000000..68e8a7e1704
--- /dev/null
+++ b/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride2.kt
@@ -0,0 +1,21 @@
+// FILE: A.java
+
+public abstract class A<T> {
+    protected abstract String doIt(T... args);
+
+    public <S extends T> String test(S... args) {
+        return doIt(args);
+    }
+}
+
+// FILE: 1.kt
+
+open class Super
+class Sub: Super()
+
+val a: A<Super> =
+    object : A<Super>() {
+        override fun doIt(vararg parameters: Super): String = "OK"
+    }
+
+fun box(): String = a.test<Sub>()
diff --git a/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride3.kt b/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride3.kt
new file mode 100644
index 00000000000..643002804b5
--- /dev/null
+++ b/compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride3.kt
@@ -0,0 +1,37 @@
+// FILE: A.java
+
+public abstract class A<T> {
+    protected abstract String doIt(T... args);
+
+    class B<S extends T, U extends S> {
+        public String test(T... args) {
+            return doIt(args);
+        }
+
+        public String test2(S... args) {
+            return doIt(args);
+        }
+
+        public String test3(U... args) {
+            return doIt(args);
+        }
+    }
+}
+
+// FILE: 1.kt
+
+open class Super
+open class Sub: Super()
+class Sub2: Sub()
+
+val a: A<Super> =
+    object : A<Super>() {
+        override fun doIt(vararg parameters: Super): String = "OK"
+    }
+
+fun box(): String {
+    val b = a.B<Sub, Sub2>()
+    if (b.test() != "OK") return "FAIL1"
+    if (b.test2() != "OK") return "FAIL2"
+    return b.test3()
+}
diff --git a/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/funInterface/string.kt b/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/funInterface/string.kt
index cbe2a024d65..7cb7cea35e1 100644
--- a/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/funInterface/string.kt
+++ b/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/funInterface/string.kt
@@ -1,8 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-
 // FILE: inline.kt
 
 inline class IC(val value: String) {
@@ -47,4 +43,4 @@ fun box(): String {
     if (res != "OK") return "FAIL 3: $res"
 
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/lambda/string.kt b/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/lambda/string.kt
index 3c5cf7bed69..0072106d1cc 100644
--- a/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/lambda/string.kt
+++ b/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/lambda/string.kt
@@ -1,8 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-
 // FILE: inline.kt
 
 inline class IC(val value: String) {
@@ -43,4 +39,4 @@ fun box(): String {
     if (res != "OK") return "FAIL 3: $res"
 
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/objectLiteral/string.kt b/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/objectLiteral/string.kt
index f8293ece19c..bdf6307c30c 100644
--- a/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/objectLiteral/string.kt
+++ b/compiler/testData/codegen/boxInline/inlineClasses/unboxGenericParameter/objectLiteral/string.kt
@@ -1,8 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-
 // FILE: inline.kt
 
 inline class IC(val value: String) {
@@ -47,4 +43,4 @@ fun box(): String {
     if (res != "OK") return "FAIL 3: $res"
 
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/bytecodeListing/annotations/annotationsOnDelegatedMembers.kt b/compiler/testData/codegen/bytecodeListing/annotations/annotationsOnDelegatedMembers.kt
new file mode 100644
index 00000000000..807a2746c15
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/annotations/annotationsOnDelegatedMembers.kt
@@ -0,0 +1,10 @@
+annotation class Ann
+
+interface IFoo {
+    @Ann val testVal: String
+    @Ann fun testFun()
+    @Ann val String.testExtVal: String
+    @Ann fun String.testExtFun()
+}
+
+class DFoo(d: IFoo) : IFoo by d
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/annotations/annotationsOnDelegatedMembers.txt b/compiler/testData/codegen/bytecodeListing/annotations/annotationsOnDelegatedMembers.txt
new file mode 100644
index 00000000000..7400c511c83
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/annotations/annotationsOnDelegatedMembers.txt
@@ -0,0 +1,34 @@
+@java.lang.annotation.Retention
+@kotlin.Metadata
+public annotation class Ann {
+    // source: 'annotationsOnDelegatedMembers.kt'
+}
+
+@kotlin.Metadata
+public final class DFoo {
+    // source: 'annotationsOnDelegatedMembers.kt'
+    private synthetic final field $$delegate_0: IFoo
+    public method <init>(@org.jetbrains.annotations.NotNull p0: IFoo): void
+    public @org.jetbrains.annotations.NotNull method getTestExtVal(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public @org.jetbrains.annotations.NotNull method getTestVal(): java.lang.String
+    public @Ann method testExtFun(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public @Ann method testFun(): void
+}
+
+@kotlin.Metadata
+public final class IFoo$DefaultImpls {
+    // source: 'annotationsOnDelegatedMembers.kt'
+    public synthetic deprecated static @Ann method getTestExtVal$annotations(p0: java.lang.String): void
+    public synthetic deprecated static @Ann method getTestVal$annotations(): void
+    public final inner class IFoo$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface IFoo {
+    // source: 'annotationsOnDelegatedMembers.kt'
+    public abstract @org.jetbrains.annotations.NotNull method getTestExtVal(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public abstract @org.jetbrains.annotations.NotNull method getTestVal(): java.lang.String
+    public abstract @Ann method testExtFun(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public abstract @Ann method testFun(): void
+    public final inner class IFoo$DefaultImpls
+}
diff --git a/compiler/testData/codegen/bytecodeListing/cloneable.kt b/compiler/testData/codegen/bytecodeListing/cloneable.kt
new file mode 100644
index 00000000000..5326350fbb9
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/cloneable.kt
@@ -0,0 +1,19 @@
+class A : Cloneable
+
+interface I : Cloneable
+
+interface I2 : Cloneable {
+    override fun clone(): Any
+}
+
+class C : I
+
+class OC : I {
+    override fun clone(): OC = OC()
+}
+
+abstract class ACC : Cloneable
+
+abstract class ACI : I
+
+abstract class ACI2 : I2
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/cloneable.txt b/compiler/testData/codegen/bytecodeListing/cloneable.txt
new file mode 100644
index 00000000000..7f697cf1fb3
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/cloneable.txt
@@ -0,0 +1,60 @@
+@kotlin.Metadata
+public final class A {
+    // source: 'cloneable.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method clone(): java.lang.Object
+}
+
+@kotlin.Metadata
+public abstract class ACC {
+    // source: 'cloneable.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method clone(): java.lang.Object
+}
+
+@kotlin.Metadata
+public abstract class ACI {
+    // source: 'cloneable.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method clone(): java.lang.Object
+}
+
+@kotlin.Metadata
+public abstract class ACI2 {
+    // source: 'cloneable.kt'
+    public method <init>(): void
+}
+
+@kotlin.Metadata
+public final class C {
+    // source: 'cloneable.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method clone(): java.lang.Object
+}
+
+@kotlin.Metadata
+public final class I$DefaultImpls {
+    // source: 'cloneable.kt'
+    public static @org.jetbrains.annotations.NotNull method clone(@org.jetbrains.annotations.NotNull p0: I): java.lang.Object
+    public final inner class I$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface I {
+    // source: 'cloneable.kt'
+    public final inner class I$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface I2 {
+    // source: 'cloneable.kt'
+    public abstract @org.jetbrains.annotations.NotNull method clone(): java.lang.Object
+}
+
+@kotlin.Metadata
+public final class OC {
+    // source: 'cloneable.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method clone(): OC
+    public synthetic bridge method clone(): java.lang.Object
+}
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractCollections.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractCollections.kt
new file mode 100644
index 00000000000..a3e90dca181
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractCollections.kt
@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+
+abstract class AIterD : AbstractIterator<Double>()
+
+abstract class ACollD : AbstractCollection<Double>()
+
+abstract class AMCollD : AbstractMutableCollection<Double>()
+
+abstract class ASetD : AbstractSet<Double>()
+
+abstract class AMSetD : AbstractMutableSet<Double>()
+
+abstract class AListD : AbstractList<Double>()
+
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractCollections.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractCollections.txt
new file mode 100644
index 00000000000..5c006aa336b
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractCollections.txt
@@ -0,0 +1,54 @@
+@kotlin.Metadata
+public abstract class ACollD {
+    // source: 'inheritingFromAbstractCollections.kt'
+    public method <init>(): void
+    public bridge method contains(p0: double): boolean
+    public bridge final method contains(p0: java.lang.Object): boolean
+    public method iterator(): java.util.Iterator
+}
+
+@kotlin.Metadata
+public abstract class AIterD {
+    // source: 'inheritingFromAbstractCollections.kt'
+    public method <init>(): void
+}
+
+@kotlin.Metadata
+public abstract class AListD {
+    // source: 'inheritingFromAbstractCollections.kt'
+    public method <init>(): void
+    public bridge method contains(p0: double): boolean
+    public bridge final method contains(p0: java.lang.Object): boolean
+    public bridge method indexOf(p0: double): int
+    public bridge final method indexOf(p0: java.lang.Object): int
+    public bridge method lastIndexOf(p0: double): int
+    public bridge final method lastIndexOf(p0: java.lang.Object): int
+}
+
+@kotlin.Metadata
+public abstract class AMCollD {
+    // source: 'inheritingFromAbstractCollections.kt'
+    public method <init>(): void
+    public bridge method contains(p0: double): boolean
+    public bridge final method contains(p0: java.lang.Object): boolean
+    public bridge method remove(p0: double): boolean
+    public bridge final method remove(p0: java.lang.Object): boolean
+}
+
+@kotlin.Metadata
+public abstract class AMSetD {
+    // source: 'inheritingFromAbstractCollections.kt'
+    public method <init>(): void
+    public bridge method contains(p0: double): boolean
+    public bridge final method contains(p0: java.lang.Object): boolean
+    public bridge method remove(p0: double): boolean
+    public bridge final method remove(p0: java.lang.Object): boolean
+}
+
+@kotlin.Metadata
+public abstract class ASetD {
+    // source: 'inheritingFromAbstractCollections.kt'
+    public method <init>(): void
+    public bridge method contains(p0: double): boolean
+    public bridge final method contains(p0: java.lang.Object): boolean
+}
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt
new file mode 100644
index 00000000000..42477cbfc77
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt
@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+abstract class AMapSD : AbstractMap<String, Double>()
+
+abstract class AMMapSD : AbstractMutableMap<String, Double>()
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.txt
new file mode 100644
index 00000000000..b1f248a0427
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.txt
@@ -0,0 +1,25 @@
+@kotlin.Metadata
+public abstract class AMMapSD {
+    // source: 'inheritingFromAbstractMap.kt'
+    public method <init>(): void
+    public bridge final method containsKey(p0: java.lang.Object): boolean
+    public bridge method containsKey(p0: java.lang.String): boolean
+    public bridge method containsValue(p0: double): boolean
+    public bridge final method containsValue(p0: java.lang.Object): boolean
+    public bridge final method get(p0: java.lang.Object): java.lang.Object
+    public bridge method get(p0: java.lang.String): java.lang.Double
+    public bridge final method remove(p0: java.lang.Object): java.lang.Object
+    public bridge method remove(p0: java.lang.String): java.lang.Double
+}
+
+@kotlin.Metadata
+public abstract class AMapSD {
+    // source: 'inheritingFromAbstractMap.kt'
+    public method <init>(): void
+    public bridge final method containsKey(p0: java.lang.Object): boolean
+    public bridge method containsKey(p0: java.lang.String): boolean
+    public bridge method containsValue(p0: double): boolean
+    public bridge final method containsValue(p0: java.lang.Object): boolean
+    public bridge final method get(p0: java.lang.Object): java.lang.Object
+    public bridge method get(p0: java.lang.String): java.lang.Double
+}
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap_ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap_ir.txt
new file mode 100644
index 00000000000..b9b79d2fef4
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap_ir.txt
@@ -0,0 +1,25 @@
+@kotlin.Metadata
+public abstract class AMMapSD {
+    // source: 'inheritingFromAbstractMap.kt'
+    public method <init>(): void
+    public bridge final method containsKey(p0: java.lang.Object): boolean
+    public bridge method containsKey(p0: java.lang.String): boolean
+    public bridge method containsValue(p0: double): boolean
+    public bridge final method containsValue(p0: java.lang.Object): boolean
+    public bridge final method get(p0: java.lang.Object): java.lang.Double
+    public bridge method get(p0: java.lang.String): java.lang.Double
+    public bridge final method remove(p0: java.lang.Object): java.lang.Double
+    public bridge method remove(p0: java.lang.String): java.lang.Double
+}
+
+@kotlin.Metadata
+public abstract class AMapSD {
+    // source: 'inheritingFromAbstractMap.kt'
+    public method <init>(): void
+    public bridge final method containsKey(p0: java.lang.Object): boolean
+    public bridge method containsKey(p0: java.lang.String): boolean
+    public bridge method containsValue(p0: double): boolean
+    public bridge final method containsValue(p0: java.lang.Object): boolean
+    public bridge final method get(p0: java.lang.Object): java.lang.Double
+    public bridge method get(p0: java.lang.String): java.lang.Double
+}
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.kt
new file mode 100644
index 00000000000..23ef37cb5fa
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.kt
@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+
+abstract class AMListD : AbstractMutableList<Double>()
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.txt
new file mode 100644
index 00000000000..5d105afc626
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.txt
@@ -0,0 +1,15 @@
+@kotlin.Metadata
+public abstract class AMListD {
+    // source: 'inheritingFromAbstractMutableList.kt'
+    public method <init>(): void
+    public bridge method contains(p0: double): boolean
+    public bridge final method contains(p0: java.lang.Object): boolean
+    public bridge method indexOf(p0: double): int
+    public bridge final method indexOf(p0: java.lang.Object): int
+    public bridge method lastIndexOf(p0: double): int
+    public bridge final method lastIndexOf(p0: java.lang.Object): int
+    public bridge method remove(p0: double): boolean
+    public bridge final method remove(p0: int): double
+    public bridge final method remove(p0: java.lang.Object): boolean
+    public synthetic bridge method removeAt(p0: int): java.lang.Object
+}
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList_ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList_ir.txt
new file mode 100644
index 00000000000..c51fc23b2d5
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList_ir.txt
@@ -0,0 +1,16 @@
+@kotlin.Metadata
+public abstract class AMListD {
+    // source: 'inheritingFromAbstractMutableList.kt'
+    public method <init>(): void
+    public bridge method contains(p0: double): boolean
+    public bridge final method contains(p0: java.lang.Object): boolean
+    public bridge method indexOf(p0: double): int
+    public bridge final method indexOf(p0: java.lang.Object): int
+    public bridge method lastIndexOf(p0: double): int
+    public bridge final method lastIndexOf(p0: java.lang.Object): int
+    public bridge method remove(p0: double): boolean
+    public bridge final method remove(p0: int): double
+    public bridge final method remove(p0: java.lang.Object): boolean
+    public abstract method removeAt(p0: int): java.lang.Double
+    public synthetic bridge method removeAt(p0: int): java.lang.Object
+}
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubLikeMethodSignatures.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubLikeMethodSignatures.kt
new file mode 100644
index 00000000000..c0c0db5053a
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubLikeMethodSignatures.kt
@@ -0,0 +1,28 @@
+// WITH_SIGNATURES
+
+class MyList<T>(val v: T): List<T> {
+    override val size: Int get() = 0
+    override fun isEmpty(): Boolean = true
+    override fun contains(o: T): Boolean = false
+    override fun iterator(): Iterator<T> = throw Error()
+    override fun containsAll(c: Collection<T>): Boolean = false
+    override fun get(index: Int): T = v
+    override fun indexOf(o: T): Int = -1
+    override fun lastIndexOf(o: T): Int = -1
+    override fun listIterator(): ListIterator<T> = throw Error()
+    override fun listIterator(index: Int): ListIterator<T> = throw Error()
+    override fun subList(fromIndex: Int, toIndex: Int): List<T> = throw Error()
+    override fun hashCode(): Int = 0
+    override fun equals(other: Any?): Boolean = false
+
+    public fun add(e: T): Boolean = true
+    public fun remove(o: T): Boolean = true
+    public fun addAll(c: Collection<T>): Boolean = true
+    public fun addAll(index: Int, c: Collection<T>): Boolean = true
+    public fun removeAll(c: Collection<T>): Boolean = true
+    public fun retainAll(c: Collection<T>): Boolean = true
+    public fun clear() {}
+    public fun set(index: Int, element: T): T = element
+    public fun add(index: Int, element: T) {}
+    public fun removeAt(index: Int): T = v
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubLikeMethodSignatures.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubLikeMethodSignatures.txt
new file mode 100644
index 00000000000..1895c74c7ca
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubLikeMethodSignatures.txt
@@ -0,0 +1,34 @@
+@kotlin.Metadata
+public final class<<T:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/List<TT;>;Lkotlin/jvm/internal/markers/KMappedMarker;>  MyList {
+    // source: 'stubLikeMethodSignatures.kt'
+    public @org.jetbrains.annotations.NotNull <()Ljava/util/Iterator<TT;>;> method iterator(): java.util.Iterator
+    public @org.jetbrains.annotations.NotNull <()Ljava/util/ListIterator<TT;>;> method listIterator(): java.util.ListIterator
+    public final <()TT;> method getV(): java.lang.Object
+    public @org.jetbrains.annotations.NotNull <(I)Ljava/util/ListIterator<TT;>;> method listIterator(p0: int): java.util.ListIterator
+    public <(I)TT;> method get(p0: int): java.lang.Object
+    public bridge final <(I)TT;> method remove(p0: int): java.lang.Object
+    public final <(I)TT;> method removeAt(p0: int): java.lang.Object
+    public @org.jetbrains.annotations.NotNull <(II)Ljava/util/List<TT;>;> method subList(p0: int, p1: int): java.util.List
+    public final <(ILjava/util/Collection<+TT;>;)Z> method addAll(p0: int, @org.jetbrains.annotations.NotNull p1: java.util.Collection): boolean
+    public final <(ITT;)TT;> method set(p0: int, p1: java.lang.Object): java.lang.Object
+    public final <(ITT;)V> method add(p0: int, p1: java.lang.Object): void
+    public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean
+    public final <(Ljava/util/Collection<+TT;>;)Z> method addAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean
+    public final <(Ljava/util/Collection<+TT;>;)Z> method removeAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean
+    public final <(Ljava/util/Collection<+TT;>;)Z> method retainAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean
+    public <(TT;)V> method <init>(p0: java.lang.Object): void
+    public final <(TT;)Z> method add(p0: java.lang.Object): boolean
+    public final <(TT;)Z> method remove(p0: java.lang.Object): boolean
+    public <<T:Ljava/lang/Object;>([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[]
+    public final <null> method clear(): void
+    public <null> method contains(p0: java.lang.Object): boolean
+    public <null> method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
+    public <null> method getSize(): int
+    public <null> method hashCode(): int
+    public <null> method indexOf(p0: java.lang.Object): int
+    public <null> method isEmpty(): boolean
+    public <null> method lastIndexOf(p0: java.lang.Object): int
+    public bridge final <null> method size(): int
+    public <null> method toArray(): java.lang.Object[]
+    private final field <TT;> v: java.lang.Object
+}
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt
index 8823ca00dd0..ccdab5c96ac 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt
@@ -51,7 +51,8 @@ final class CoroutineFieldsKt$box$1 {
     inner (anonymous) class CoroutineFieldsKt$box$1
     method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.Nullable p1: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter_ir.txt
index ddeea63203d..f2782e96fed 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter_ir.txt
@@ -10,7 +10,8 @@ final class BooleanParameterKt$box$1 {
     inner (anonymous) class BooleanParameterKt$box$1
     method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.jvm.functions.Function2, p2: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
@@ -24,7 +25,8 @@ final class BooleanParameterKt$box$lambda$1 {
     inner (anonymous) class BooleanParameterKt$box$lambda$1
     method <init>(p0: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(p0: boolean, @org.jetbrains.annotations.Nullable p1: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1_ir.txt
index 937d21bbe3b..c9795b136d8 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1_ir.txt
@@ -8,7 +8,8 @@ final class Component1Kt$test$1 {
     inner (anonymous) class Component1Kt$test$1
     method <init>(p0: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: Foo, @org.jetbrains.annotations.Nullable p1: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field_ir.txt
index 0d3665da494..b3850efd1d4 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field_ir.txt
@@ -8,7 +8,8 @@ final class FieldKt$test$1 {
     inner (anonymous) class FieldKt$test$1
     method <init>(p0: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
-    public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: Foo, @org.jetbrains.annotations.Nullable p1: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt
index 46a4489bb9a..c7c92a1dce2 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt
@@ -96,7 +96,7 @@ public final class TcoContinuationKt$foo$$inlined$map$1$2$1 {
 public final class TcoContinuationKt$foo$$inlined$map$1$2 {
     // source: 'tcoContinuation.kt'
     enclosing method TcoContinuationKt$foo$$inlined$map$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    synthetic final field $this_anonymous$inlined: FlowCollector
+    synthetic final field $this_flow$inlined: FlowCollector
     inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2
     inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1
     public method <init>(p0: FlowCollector): void
@@ -143,7 +143,7 @@ public final class TcoContinuationKt$map$$inlined$transform$1$2$1 {
 public final class TcoContinuationKt$map$$inlined$transform$1$2 {
     // source: 'tcoContinuation.kt'
     enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    synthetic final field $this_anonymous$inlined: FlowCollector
+    synthetic final field $this_flow$inlined: FlowCollector
     synthetic final field $transformer$inlined$1: kotlin.jvm.functions.Function2
     inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2
     inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1
@@ -206,7 +206,7 @@ public final class TcoContinuationKt$transform$lambda-1$$inlined$collect$1$1 {
 public final class TcoContinuationKt$transform$lambda-1$$inlined$collect$1 {
     // source: 'tcoContinuation.kt'
     enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow;
-    synthetic final field $this_anonymous$inlined: FlowCollector
+    synthetic final field $this_flow$inlined: FlowCollector
     synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3
     inner (anonymous) class TcoContinuationKt$transform$lambda-1$$inlined$collect$1
     inner (anonymous) class TcoContinuationKt$transform$lambda-1$$inlined$collect$1$1
diff --git a/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClass.kt b/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClass.kt
new file mode 100644
index 00000000000..faca4eae220
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClass.kt
@@ -0,0 +1,23 @@
+// WITH_RUNTIME
+// FILE: test.kt
+
+@file:JvmMultifileClass
+@file:JvmName("A")
+
+private fun private(x: String = "") {}
+
+private inline fun privateInline(x: String, y: Int = 0) {}
+
+internal fun internal(x: String = "") {}
+
+internal inline fun internalInline(x: String, y: Int = 0) {}
+
+@PublishedApi
+internal fun published(x: String = "") {}
+
+@PublishedApi
+internal fun publishedInline(x: String = "") {}
+
+public fun public(x: String = "") {}
+
+public inline fun publicInline(x: String, y: Int = 0) {}
diff --git a/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClass.txt b/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClass.txt
new file mode 100644
index 00000000000..6ef21de0dbd
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClass.txt
@@ -0,0 +1,37 @@
+@kotlin.Metadata
+public final class A {
+    // source: 'test.kt'
+    public synthetic static method internal$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static method internal(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method internalInline$default(p0: java.lang.String, p1: int, p2: int, p3: java.lang.Object): void
+    public final static method internalInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void
+    public synthetic static method public$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static method public(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method publicInline$default(p0: java.lang.String, p1: int, p2: int, p3: java.lang.Object): void
+    public final static method publicInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void
+    public synthetic static method published$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static @kotlin.PublishedApi method published(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method publishedInline$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static @kotlin.PublishedApi method publishedInline(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+}
+
+@kotlin.Metadata
+synthetic final class A__TestKt {
+    // source: 'test.kt'
+    public synthetic static method internal$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static method internal(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method internalInline$default(p0: java.lang.String, p1: int, p2: int, p3: java.lang.Object): void
+    public final static method internalInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void
+    synthetic static method private$A__TestKt$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    private final static method private$A__TestKt(p0: java.lang.String): void
+    synthetic static method privateInline$A__TestKt$default(p0: java.lang.String, p1: int, p2: int, p3: java.lang.Object): void
+    private final static method privateInline$A__TestKt(p0: java.lang.String, p1: int): void
+    public synthetic static method public$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static method public(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method publicInline$default(p0: java.lang.String, p1: int, p2: int, p3: java.lang.Object): void
+    public final static method publicInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void
+    public synthetic static method published$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static @kotlin.PublishedApi method published(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method publishedInline$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static @kotlin.PublishedApi method publishedInline(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClassWithInheritedParts.kt b/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClassWithInheritedParts.kt
new file mode 100644
index 00000000000..f6f0a00b501
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClassWithInheritedParts.kt
@@ -0,0 +1,24 @@
+// WITH_RUNTIME
+// !INHERIT_MULTIFILE_PARTS
+// FILE: test.kt
+
+@file:JvmMultifileClass
+@file:JvmName("A")
+
+private fun private(x: String = "") {}
+
+private inline fun privateInline(x: String, y: Int = 0) {}
+
+internal fun internal(x: String = "") {}
+
+internal inline fun internalInline(x: String, y: Int = 0) {}
+
+@PublishedApi
+internal fun published(x: String = "") {}
+
+@PublishedApi
+internal fun publishedInline(x: String = "") {}
+
+public fun public(x: String = "") {}
+
+public inline fun publicInline(x: String, y: Int = 0) {}
diff --git a/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClassWithInheritedParts.txt b/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClassWithInheritedParts.txt
new file mode 100644
index 00000000000..5a2b67bfad9
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClassWithInheritedParts.txt
@@ -0,0 +1,27 @@
+@kotlin.Metadata
+public final class A {
+    // source: 'test.kt'
+    private method <init>(): void
+}
+
+@kotlin.Metadata
+class A__TestKt {
+    // source: 'test.kt'
+    public method <init>(): void
+    public synthetic static method internal$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static method internal(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method internalInline$default(p0: java.lang.String, p1: int, p2: int, p3: java.lang.Object): void
+    public final static method internalInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void
+    synthetic static method private$A__TestKt$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    private final static method private$A__TestKt(p0: java.lang.String): void
+    synthetic static method privateInline$A__TestKt$default(p0: java.lang.String, p1: int, p2: int, p3: java.lang.Object): void
+    private final static method privateInline$A__TestKt(p0: java.lang.String, p1: int): void
+    public synthetic static method public$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static method public(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method publicInline$default(p0: java.lang.String, p1: int, p2: int, p3: java.lang.Object): void
+    public final static method publicInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void
+    public synthetic static method published$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static @kotlin.PublishedApi method published(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic static method publishedInline$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
+    public final static @kotlin.PublishedApi method publishedInline(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart.kt b/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart.kt
deleted file mode 100644
index 95174ba172d..00000000000
--- a/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// WITH_RUNTIME
-// The remaining difference of JVM and JVM_IR here is reported at KT-41841.
-
-@file:JvmMultifileClass
-@file:JvmName("A")
-
-private fun foo(x: String = "") {}
diff --git a/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart.txt b/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart.txt
deleted file mode 100644
index ed08c63abd7..00000000000
--- a/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@kotlin.Metadata
-public final class A {
-    // source: 'privateFunctionInMultifilePart.kt'
-}
-
-@kotlin.Metadata
-synthetic final class A__PrivateFunctionInMultifilePartKt {
-    // source: 'privateFunctionInMultifilePart.kt'
-    synthetic static method foo$A__PrivateFunctionInMultifilePartKt$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
-    private final static method foo$A__PrivateFunctionInMultifilePartKt(p0: java.lang.String): void
-}
diff --git a/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart_ir.txt b/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart_ir.txt
deleted file mode 100644
index ad00dcdd25a..00000000000
--- a/compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart_ir.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-@kotlin.Metadata
-public final class A {
-    // source: 'privateFunctionInMultifilePart.kt'
-    final static method foo$A__PrivateFunctionInMultifilePartKt$default(@org.jetbrains.annotations.Nullable p0: java.lang.String, p1: int, p2: java.lang.Object): void
-}
-
-@kotlin.Metadata
-synthetic final class A__PrivateFunctionInMultifilePartKt {
-    // source: 'privateFunctionInMultifilePart.kt'
-    synthetic static method foo$A__PrivateFunctionInMultifilePartKt$default(p0: java.lang.String, p1: int, p2: java.lang.Object): void
-    private final static method foo$A__PrivateFunctionInMultifilePartKt(p0: java.lang.String): void
-}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedInMultifileClass.kt b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedInMultifileClass.kt
new file mode 100644
index 00000000000..d711fdfb500
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedInMultifileClass.kt
@@ -0,0 +1,22 @@
+// WITH_RUNTIME
+// FILE: part.kt
+
+@file:JvmMultifileClass
+@file:JvmName("A")
+
+package test
+
+@Deprecated("")
+val str: String
+    get() = ""
+
+@Deprecated("")
+fun f() {}
+
+@Deprecated("")
+val Int.ext: Int get() = this
+
+var Int.extA: Int
+    get() = this
+    @Deprecated("")
+    set(value) {}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedInMultifileClass.txt b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedInMultifileClass.txt
new file mode 100644
index 00000000000..69d960c5e50
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedInMultifileClass.txt
@@ -0,0 +1,21 @@
+@kotlin.Metadata
+public final class test/A {
+    // source: 'part.kt'
+    public deprecated final static @kotlin.Deprecated method f(): void
+    public deprecated final static method getExt(p0: int): int
+    public final static method getExtA(p0: int): int
+    public deprecated final static @org.jetbrains.annotations.NotNull method getStr(): java.lang.String
+    public deprecated final static @kotlin.Deprecated method setExtA(p0: int, p1: int): void
+}
+
+@kotlin.Metadata
+synthetic final class test/A__PartKt {
+    // source: 'part.kt'
+    public deprecated final static @kotlin.Deprecated method f(): void
+    public synthetic deprecated static @kotlin.Deprecated method getExt$annotations(p0: int): void
+    public deprecated final static method getExt(p0: int): int
+    public final static method getExtA(p0: int): int
+    public synthetic deprecated static @kotlin.Deprecated method getStr$annotations(): void
+    public deprecated final static @org.jetbrains.annotations.NotNull method getStr(): java.lang.String
+    public deprecated final static @kotlin.Deprecated method setExtA(p0: int, p1: int): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.kt b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.kt
index 921f1172114..1167e2ab082 100644
--- a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.kt
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.kt
@@ -51,3 +51,8 @@ var <T> List<T>.textGenExtVar
     get() = 1
     set(v) {}
 
+interface I {
+    @Deprecated("")
+    val <T> T.id: T
+        get() = this
+}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.txt b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.txt
index b9bc3f1e940..739b7115338 100644
--- a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.txt
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.txt
@@ -44,3 +44,18 @@ public final class DeprecatedPropertyKt {
     public deprecated final static method setTextExtVar(@org.jetbrains.annotations.NotNull p0: java.lang.Object, p1: int): void
     public deprecated final static method setTextGenExtVar(@org.jetbrains.annotations.NotNull p0: java.util.List, p1: int): void
 }
+
+@kotlin.Metadata
+public final class I$DefaultImpls {
+    // source: 'deprecatedProperty.kt'
+    public synthetic deprecated static @kotlin.Deprecated method getId$annotations(p0: java.lang.Object): void
+    public deprecated static method getId(@org.jetbrains.annotations.NotNull p0: I, p1: java.lang.Object): java.lang.Object
+    public final inner class I$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface I {
+    // source: 'deprecatedProperty.kt'
+    public deprecated abstract method getId(p0: java.lang.Object): java.lang.Object
+    public final inner class I$DefaultImpls
+}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/hidden.kt b/compiler/testData/codegen/bytecodeListing/deprecated/hidden.kt
new file mode 100644
index 00000000000..29eda695539
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/hidden.kt
@@ -0,0 +1,16 @@
+@Deprecated("")
+@Suppress("DEPRECATED_SINCE_KOTLIN_OUTSIDE_KOTLIN_SUBPACKAGE")
+@DeprecatedSinceKotlin(hiddenSince = "1.0")
+fun hidden() {}
+
+open class Base {
+    @Deprecated("", level = DeprecationLevel.HIDDEN)
+    open fun f() {}
+}
+
+class Derived : Base {
+    @Deprecated("", level = DeprecationLevel.HIDDEN)
+    constructor()
+
+    override fun f() {}
+}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/hidden.txt b/compiler/testData/codegen/bytecodeListing/deprecated/hidden.txt
new file mode 100644
index 00000000000..2df2d4e4037
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/hidden.txt
@@ -0,0 +1,19 @@
+@kotlin.Metadata
+public class Base {
+    // source: 'hidden.kt'
+    public method <init>(): void
+    public synthetic deprecated @kotlin.Deprecated method f(): void
+}
+
+@kotlin.Metadata
+public final class Derived {
+    // source: 'hidden.kt'
+    public synthetic deprecated @kotlin.Deprecated method <init>(): void
+    public synthetic method f(): void
+}
+
+@kotlin.Metadata
+public final class HiddenKt {
+    // source: 'hidden.kt'
+    public synthetic deprecated final static @kotlin.Deprecated @kotlin.DeprecatedSinceKotlin method hidden(): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.kt b/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.kt
new file mode 100644
index 00000000000..6154d4ce155
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.kt
@@ -0,0 +1,27 @@
+interface IFoo {
+    @Deprecated("")
+    val prop: String get() = ""
+
+    @Deprecated("")
+    val String.extProp: String get() = ""
+}
+
+interface IFoo2 : IFoo
+
+class Delegated(foo: IFoo) : IFoo by foo
+
+class Delegated2(foo2: IFoo2) : IFoo2 by foo2
+
+class DefaultImpl : IFoo
+
+class DefaultImpl2 : IFoo2
+
+class ExplicitOverride : IFoo {
+    override val prop: String get() = ""
+    override val String.extProp: String get() = ""
+}
+
+class ExplicitOverride2 : IFoo2 {
+    override val prop: String get() = ""
+    override val String.extProp: String get() = ""
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.txt b/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.txt
new file mode 100644
index 00000000000..83b30249779
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.txt
@@ -0,0 +1,81 @@
+@kotlin.Metadata
+public final class DefaultImpl {
+    // source: 'inheritingDeprecation.kt'
+    public method <init>(): void
+    public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class DefaultImpl2 {
+    // source: 'inheritingDeprecation.kt'
+    public method <init>(): void
+    public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class Delegated {
+    // source: 'inheritingDeprecation.kt'
+    private synthetic final field $$delegate_0: IFoo
+    public method <init>(@org.jetbrains.annotations.NotNull p0: IFoo): void
+    public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class Delegated2 {
+    // source: 'inheritingDeprecation.kt'
+    private synthetic final field $$delegate_0: IFoo2
+    public method <init>(@org.jetbrains.annotations.NotNull p0: IFoo2): void
+    public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class ExplicitOverride {
+    // source: 'inheritingDeprecation.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class ExplicitOverride2 {
+    // source: 'inheritingDeprecation.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class IFoo$DefaultImpls {
+    // source: 'inheritingDeprecation.kt'
+    public synthetic deprecated static @kotlin.Deprecated method getExtProp$annotations(p0: java.lang.String): void
+    public deprecated static @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: IFoo, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
+    public synthetic deprecated static @kotlin.Deprecated method getProp$annotations(): void
+    public deprecated static @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: IFoo): java.lang.String
+    public final inner class IFoo$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface IFoo {
+    // source: 'inheritingDeprecation.kt'
+    public deprecated abstract @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public deprecated abstract @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+    public final inner class IFoo$DefaultImpls
+}
+
+@kotlin.Metadata
+public final class IFoo2$DefaultImpls {
+    // source: 'inheritingDeprecation.kt'
+    public deprecated static @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: IFoo2, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
+    public deprecated static @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: IFoo2): java.lang.String
+    public final inner class IFoo2$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface IFoo2 {
+    // source: 'inheritingDeprecation.kt'
+    public final inner class IFoo2$DefaultImpls
+}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/inlineClassTypesInSignature.kt b/compiler/testData/codegen/bytecodeListing/deprecated/inlineClassTypesInSignature.kt
new file mode 100644
index 00000000000..8c4f99a3631
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/inlineClassTypesInSignature.kt
@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+
+abstract class A {
+    @Deprecated("")
+    abstract var warn: UByte
+
+    @Deprecated("", level = DeprecationLevel.HIDDEN)
+    abstract var hidden: UByte
+}
diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/inlineClassTypesInSignature.txt b/compiler/testData/codegen/bytecodeListing/deprecated/inlineClassTypesInSignature.txt
new file mode 100644
index 00000000000..e95a23985ff
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/deprecated/inlineClassTypesInSignature.txt
@@ -0,0 +1,11 @@
+@kotlin.Metadata
+public abstract class A {
+    // source: 'inlineClassTypesInSignature.kt'
+    public method <init>(): void
+    public synthetic deprecated static @kotlin.Deprecated method getHidden-w2LRezQ$annotations(): void
+    public synthetic deprecated abstract method getHidden-w2LRezQ(): byte
+    public synthetic deprecated static @kotlin.Deprecated method getWarn-w2LRezQ$annotations(): void
+    public deprecated abstract method getWarn-w2LRezQ(): byte
+    public synthetic deprecated abstract method setHidden-7apg3OU(p0: byte): void
+    public deprecated abstract method setWarn-7apg3OU(p0: byte): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/inline/InlineOnlyPropertyMultifile.kt b/compiler/testData/codegen/bytecodeListing/inline/InlineOnlyPropertyMultifile.kt
index a97fd9f9179..f1cc0a1fee1 100644
--- a/compiler/testData/codegen/bytecodeListing/inline/InlineOnlyPropertyMultifile.kt
+++ b/compiler/testData/codegen/bytecodeListing/inline/InlineOnlyPropertyMultifile.kt
@@ -1,5 +1,3 @@
-// !LANGUAGE: +UseGetterNameForPropertyAnnotationsMethodOnJvm
-// IGNORE_BACKEND: JVM_IR
 // WITH_RUNTIME
 
 @file:[JvmName("Foo") JvmMultifileClass]
@@ -16,3 +14,9 @@ fun foo() {
 inline var prop: String
     get() = "12"
     set(value) {}
+
+inline var prop2: String
+    get() = "12"
+    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+    @kotlin.internal.InlineOnly
+    set(value) {}
diff --git a/compiler/testData/codegen/bytecodeListing/inline/InlineOnlyPropertyMultifile.txt b/compiler/testData/codegen/bytecodeListing/inline/InlineOnlyPropertyMultifile.txt
index 925ba201091..36b0cfaddbd 100644
--- a/compiler/testData/codegen/bytecodeListing/inline/InlineOnlyPropertyMultifile.txt
+++ b/compiler/testData/codegen/bytecodeListing/inline/InlineOnlyPropertyMultifile.txt
@@ -2,6 +2,7 @@
 public final class test/Foo {
     // source: 'InlineOnlyPropertyMultifile.kt'
     public final static method foo(): void
+    public final static @org.jetbrains.annotations.NotNull method getProp2(): java.lang.String
 }
 
 @kotlin.Metadata
@@ -10,5 +11,7 @@ synthetic final class test/Foo__InlineOnlyPropertyMultifileKt {
     public final static method foo(): void
     public synthetic deprecated static @kotlin.internal.InlineOnly method getProp$annotations(): void
     private final static method getProp(): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method getProp2(): java.lang.String
     private final static method setProp(p0: java.lang.String): void
+    private final static @kotlin.internal.InlineOnly method setProp2(p0: java.lang.String): void
 }
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.kt
new file mode 100644
index 00000000000..66824674360
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.kt
@@ -0,0 +1,11 @@
+// !LANGUAGE: +InlineClasses
+
+inline class IC1 public constructor(val i: Int)
+inline class IC11 internal constructor(val i: Int)
+inline class IC2 private constructor(val i: Int)
+inline class IC4 protected constructor(val i: Int)
+
+private inline class PIC1 public constructor(val i: Int)
+private inline class PIC11 internal constructor(val i: Int)
+private inline class PIC2 private constructor(val i: Int)
+private inline class PIC4 protected constructor(val i: Int)
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.txt
new file mode 100644
index 00000000000..ee562d2bb17
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.txt
@@ -0,0 +1,143 @@
+@kotlin.Metadata
+public final class IC1 {
+    // source: 'constructor.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): IC1
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+public final class IC11 {
+    // source: 'constructor.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): IC11
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+public final class IC2 {
+    // source: 'constructor.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): IC2
+    private static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+public final class IC4 {
+    // source: 'constructor.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): IC4
+    protected static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+final class PIC1 {
+    // source: 'constructor.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): PIC1
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+final class PIC11 {
+    // source: 'constructor.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): PIC11
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+final class PIC2 {
+    // source: 'constructor.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): PIC2
+    private static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+final class PIC4 {
+    // source: 'constructor.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): PIC4
+    protected static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.kt
new file mode 100644
index 00000000000..8a8691157ae
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.kt
@@ -0,0 +1,9 @@
+interface IFoo<T> {
+    fun foo(x: T): String = "OK"
+    fun T.bar(): String = "OK"
+    fun withDefault(x: T, y: Int = 42): String = "OK"
+}
+
+inline class L(val x: Long) : IFoo<L>
+
+class X : IFoo<L>
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.txt
new file mode 100644
index 00000000000..3f64b2996c7
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.txt
@@ -0,0 +1,57 @@
+@kotlin.Metadata
+public final class IFoo$DefaultImpls {
+    // source: 'defaultInterfaceMethodsInInlineClass.kt'
+    public static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: IFoo, p1: java.lang.Object): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: IFoo, p1: java.lang.Object): java.lang.String
+    public synthetic static method withDefault$default(p0: IFoo, p1: java.lang.Object, p2: int, p3: int, p4: java.lang.Object): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method withDefault(@org.jetbrains.annotations.NotNull p0: IFoo, p1: java.lang.Object, p2: int): java.lang.String
+    public final inner class IFoo$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface IFoo {
+    // source: 'defaultInterfaceMethodsInInlineClass.kt'
+    public abstract @org.jetbrains.annotations.NotNull method bar(p0: java.lang.Object): java.lang.String
+    public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String
+    public abstract @org.jetbrains.annotations.NotNull method withDefault(p0: java.lang.Object, p1: int): java.lang.String
+    public final inner class IFoo$DefaultImpls
+}
+
+@kotlin.Metadata
+public final class L {
+    // source: 'defaultInterfaceMethodsInInlineClass.kt'
+    private final field x: long
+    private synthetic method <init>(p0: long): void
+    public synthetic bridge method bar(p0: java.lang.Object): java.lang.String
+    public @org.jetbrains.annotations.NotNull method bar--h0D71M(p0: long): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar--h0D71M(p0: long, p1: long): java.lang.String
+    public synthetic final static method box-impl(p0: long): L
+    public static method constructor-impl(p0: long): long
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: long, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: long, p1: long): boolean
+    public synthetic bridge method foo(p0: java.lang.Object): java.lang.String
+    public @org.jetbrains.annotations.NotNull method foo--h0D71M(p0: long): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method foo--h0D71M(p0: long, p1: long): java.lang.String
+    public final method getX(): long
+    public method hashCode(): int
+    public static method hashCode-impl(p0: long): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: long): java.lang.String
+    public synthetic final method unbox-impl(): long
+    public synthetic bridge method withDefault(p0: java.lang.Object, p1: int): java.lang.String
+    public @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: int): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: long, p2: int): java.lang.String
+}
+
+@kotlin.Metadata
+public final class X {
+    // source: 'defaultInterfaceMethodsInInlineClass.kt'
+    public method <init>(): void
+    public synthetic bridge method bar(p0: java.lang.Object): java.lang.String
+    public @org.jetbrains.annotations.NotNull method bar--h0D71M(p0: long): java.lang.String
+    public synthetic bridge method foo(p0: java.lang.Object): java.lang.String
+    public @org.jetbrains.annotations.NotNull method foo--h0D71M(p0: long): java.lang.String
+    public synthetic bridge method withDefault(p0: java.lang.Object, p1: int): java.lang.String
+    public @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: int): java.lang.String
+}
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.txt
index 749284caf33..f0e8e34727a 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.txt
@@ -21,7 +21,7 @@ public final class InlineList {
     private synthetic method <init>(p0: java.util.List): void
     public synthetic method add(p0: int, p1: java.lang.Object): void
     public synthetic method add(p0: java.lang.Object): boolean
-    public method add-_bimVNw(p0: int, p1: int): void
+    public method add--AyYFnU(p0: int, p1: int): void
     public method add-jHY5zpA(p0: int): boolean
     public method addAll(p0: int, p1: java.util.Collection): boolean
     public method addAll(p0: java.util.Collection): boolean
@@ -37,8 +37,8 @@ public final class InlineList {
     public static method equals-impl(p0: java.util.List, p1: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.util.List, p1: java.util.List): boolean
     public synthetic bridge method get(p0: int): java.lang.Object
-    public method get-XAcLw3A(p0: int): int
-    public static method get-XAcLw3A(p0: java.util.List, p1: int): int
+    public method get-7aQB58E(p0: int): int
+    public static method get-7aQB58E(p0: java.util.List, p1: int): int
     public method getSize(): int
     public static method getSize-impl(p0: java.util.List): int
     public method hashCode(): int
@@ -63,7 +63,7 @@ public final class InlineList {
     public method removeAll(p0: java.util.Collection): boolean
     public method retainAll(p0: java.util.Collection): boolean
     public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object
-    public method set-_bimVNw(p0: int, p1: int): int
+    public method set-kAA0daY(p0: int, p1: int): int
     public bridge final method size(): int
     public method subList(p0: int, p1: int): java.util.List
     public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list_ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list_ir.txt
index 0ebc3e3c566..40a3cd61795 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list_ir.txt
@@ -21,7 +21,7 @@ public final class InlineList {
     private synthetic method <init>(p0: java.util.List): void
     public synthetic bridge method add(p0: int, p1: java.lang.Object): void
     public synthetic bridge method add(p0: java.lang.Object): boolean
-    public method add-_bimVNw(p0: int, p1: int): void
+    public method add--AyYFnU(p0: int, p1: int): void
     public method add-jHY5zpA(p0: int): boolean
     public method addAll(p0: int, p1: java.util.Collection): boolean
     public method addAll(p0: java.util.Collection): boolean
@@ -37,8 +37,8 @@ public final class InlineList {
     public static method equals-impl(p0: java.util.List, p1: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.util.List, p1: java.util.List): boolean
     public synthetic bridge method get(p0: int): java.lang.Object
-    public method get-XAcLw3A(p0: int): int
-    public static method get-XAcLw3A(p0: java.util.List, p1: int): int
+    public method get-7aQB58E(p0: int): int
+    public static method get-7aQB58E(p0: java.util.List, p1: int): int
     public method getSize(): int
     public static method getSize-impl(p0: java.util.List): int
     public method hashCode(): int
@@ -63,7 +63,7 @@ public final class InlineList {
     public method removeAll(p0: java.util.Collection): boolean
     public method retainAll(p0: java.util.Collection): boolean
     public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object
-    public method set-_bimVNw(p0: int, p1: int): int
+    public method set-kAA0daY(p0: int, p1: int): int
     public synthetic bridge method size(): int
     public method subList(p0: int, p1: int): java.util.List
     public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.txt
index f49fe34f3c4..24de24be2d7 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.txt
@@ -50,8 +50,8 @@ public final class InlineMap {
     public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean
     public bridge final method get(p0: java.lang.Object): java.lang.Object
-    public method get-FSIWiWE(p0: int): IV
-    public static method get-FSIWiWE(p0: java.util.Map, p1: int): IV
+    public method get-qgyy0Jc(p0: int): IV
+    public static method get-qgyy0Jc(p0: java.util.Map, p1: int): IV
     public method getEntries(): java.util.Set
     public static method getEntries-impl(p0: java.util.Map): java.util.Set
     public method getKeys(): java.util.Set
@@ -66,7 +66,7 @@ public final class InlineMap {
     public static method isEmpty-impl(p0: java.util.Map): boolean
     public bridge final method keySet(): java.util.Set
     public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
-    public method put-pjrbk2k(p0: int, p1: double): IV
+    public method put-t80dRTo(p0: int, p1: double): IV
     public method putAll(p0: java.util.Map): void
     public method remove(p0: java.lang.Object): java.lang.Object
     public bridge final method size(): int
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.txt
index 1e92d29064c..45a7fff750d 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.txt
@@ -50,7 +50,7 @@ public final class InlineMapEntry {
     public method hashCode(): int
     public static method hashCode-impl(p0: java.util.Map$Entry): int
     public synthetic method setValue(p0: java.lang.Object): java.lang.Object
-    public method setValue-jbX5DO8(p0: double): double
+    public method setValue-cYiyq8k(p0: double): double
     public method toString(): java.lang.String
     public static method toString-impl(p0: java.util.Map$Entry): java.lang.String
     public synthetic final method unbox-impl(): java.util.Map$Entry
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry_ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry_ir.txt
index 6564cf86e94..c93d273e7b4 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry_ir.txt
@@ -50,7 +50,7 @@ public final class InlineMapEntry {
     public method hashCode(): int
     public static method hashCode-impl(p0: java.util.Map$Entry): int
     public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object
-    public method setValue-jbX5DO8(p0: double): double
+    public method setValue-cYiyq8k(p0: double): double
     public method toString(): java.lang.String
     public static method toString-impl(p0: java.util.Map$Entry): java.lang.String
     public synthetic final method unbox-impl(): java.util.Map$Entry
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map_ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map_ir.txt
index cb491d7ac80..8e8a274d498 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map_ir.txt
@@ -50,8 +50,8 @@ public final class InlineMap {
     public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean
     public synthetic bridge method get(p0: java.lang.Object): java.lang.Object
-    public method get-FSIWiWE(p0: int): IV
-    public static method get-FSIWiWE(p0: java.util.Map, p1: int): IV
+    public method get-qgyy0Jc(p0: int): IV
+    public static method get-qgyy0Jc(p0: java.util.Map, p1: int): IV
     public method getEntries(): java.util.Set
     public static method getEntries-impl(p0: java.util.Map): java.util.Set
     public method getKeys(): java.util.Set
@@ -66,11 +66,11 @@ public final class InlineMap {
     public static method isEmpty-impl(p0: java.util.Map): boolean
     public synthetic bridge method keySet(): java.util.Set
     public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
-    public method put-pjrbk2k(p0: int, p1: double): IV
+    public method put-t80dRTo(p0: int, p1: double): IV
     public method putAll(p0: java.util.Map): void
     public bridge final method remove(p0: java.lang.Object): IV
     public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object
-    public method remove-i7hxwoc(p0: java.lang.Object): IV
+    public method remove-TbaaF6U(p0: java.lang.Object): IV
     public synthetic bridge method size(): int
     public method toString(): java.lang.String
     public static method toString-impl(p0: java.util.Map): java.lang.String
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.txt
index 1b78c07af56..4cbc2eb382d 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.txt
@@ -21,8 +21,8 @@ public final class InlineMutableList {
     private synthetic method <init>(p0: java.util.List): void
     public synthetic bridge method add(p0: int, p1: java.lang.Object): void
     public synthetic bridge method add(p0: java.lang.Object): boolean
-    public method add-_bimVNw(p0: int, p1: long): void
-    public static method add-_bimVNw(p0: java.util.List, p1: int, p2: long): void
+    public method add--AyYFnU(p0: int, p1: long): void
+    public static method add--AyYFnU(p0: java.util.List, p1: int, p2: long): void
     public static method add-jHY5zpA(p0: java.util.List, p1: long): boolean
     public method add-jHY5zpA(p0: long): boolean
     public method addAll(p0: int, p1: java.util.Collection): boolean
@@ -42,8 +42,8 @@ public final class InlineMutableList {
     public static method equals-impl(p0: java.util.List, p1: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.util.List, p1: java.util.List): boolean
     public synthetic bridge method get(p0: int): java.lang.Object
-    public method get-XAcLw3A(p0: int): long
-    public static method get-XAcLw3A(p0: java.util.List, p1: int): long
+    public method get-7aQB58E(p0: int): long
+    public static method get-7aQB58E(p0: java.util.List, p1: int): long
     public method getSize(): int
     public static method getSize-impl(p0: java.util.List): int
     public method hashCode(): int
@@ -69,13 +69,13 @@ public final class InlineMutableList {
     public method remove-jHY5zpA(p0: long): boolean
     public method removeAll(p0: java.util.Collection): boolean
     public static method removeAll-impl(p0: java.util.List, p1: java.util.Collection): boolean
-    public method removeAt-XAcLw3A(p0: int): long
-    public static method removeAt-XAcLw3A(p0: java.util.List, p1: int): long
+    public method removeAt-7aQB58E(p0: int): long
+    public static method removeAt-7aQB58E(p0: java.util.List, p1: int): long
     public method retainAll(p0: java.util.Collection): boolean
     public static method retainAll-impl(p0: java.util.List, p1: java.util.Collection): boolean
     public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object
-    public method set-_bimVNw(p0: int, p1: long): long
-    public static method set-_bimVNw(p0: java.util.List, p1: int, p2: long): long
+    public method set-kAA0daY(p0: int, p1: long): long
+    public static method set-kAA0daY(p0: java.util.List, p1: int, p2: long): long
     public bridge final method size(): int
     public method subList(p0: int, p1: int): java.util.List
     public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList_ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList_ir.txt
index c17c4e5d9c0..e95e8ff4ae3 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList_ir.txt
@@ -21,8 +21,8 @@ public final class InlineMutableList {
     private synthetic method <init>(p0: java.util.List): void
     public synthetic bridge method add(p0: int, p1: java.lang.Object): void
     public synthetic bridge method add(p0: java.lang.Object): boolean
-    public method add-_bimVNw(p0: int, p1: long): void
-    public static method add-_bimVNw(p0: java.util.List, p1: int, p2: long): void
+    public method add--AyYFnU(p0: int, p1: long): void
+    public static method add--AyYFnU(p0: java.util.List, p1: int, p2: long): void
     public static method add-jHY5zpA(p0: java.util.List, p1: long): boolean
     public method add-jHY5zpA(p0: long): boolean
     public method addAll(p0: int, p1: java.util.Collection): boolean
@@ -42,8 +42,8 @@ public final class InlineMutableList {
     public static method equals-impl(p0: java.util.List, p1: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.util.List, p1: java.util.List): boolean
     public synthetic bridge method get(p0: int): java.lang.Object
-    public method get-XAcLw3A(p0: int): long
-    public static method get-XAcLw3A(p0: java.util.List, p1: int): long
+    public method get-7aQB58E(p0: int): long
+    public static method get-7aQB58E(p0: java.util.List, p1: int): long
     public method getSize(): int
     public static method getSize-impl(p0: java.util.List): int
     public method hashCode(): int
@@ -69,13 +69,13 @@ public final class InlineMutableList {
     public method remove-jHY5zpA(p0: long): boolean
     public method removeAll(p0: java.util.Collection): boolean
     public static method removeAll-impl(p0: java.util.List, p1: java.util.Collection): boolean
-    public method removeAt-XAcLw3A(p0: int): long
-    public static method removeAt-XAcLw3A(p0: java.util.List, p1: int): long
+    public method removeAt-7aQB58E(p0: int): long
+    public static method removeAt-7aQB58E(p0: java.util.List, p1: int): long
     public method retainAll(p0: java.util.Collection): boolean
     public static method retainAll-impl(p0: java.util.List, p1: java.util.Collection): boolean
     public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object
-    public method set-_bimVNw(p0: int, p1: long): long
-    public static method set-_bimVNw(p0: java.util.List, p1: int, p2: long): long
+    public method set-kAA0daY(p0: int, p1: long): long
+    public static method set-kAA0daY(p0: java.util.List, p1: int, p2: long): long
     public synthetic bridge method size(): int
     public method subList(p0: int, p1: int): java.util.List
     public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.txt
index 7239d03d579..84f8aa84ae5 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.txt
@@ -51,8 +51,8 @@ public final class InlineMutableMap {
     public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean
     public bridge final method get(p0: java.lang.Object): java.lang.Object
-    public method get-FSIWiWE(p0: int): IV
-    public static method get-FSIWiWE(p0: java.util.Map, p1: int): IV
+    public method get-qgyy0Jc(p0: int): IV
+    public static method get-qgyy0Jc(p0: java.util.Map, p1: int): IV
     public method getEntries(): java.util.Set
     public static method getEntries-impl(p0: java.util.Map): java.util.Set
     public method getKeys(): java.util.Set
@@ -67,13 +67,13 @@ public final class InlineMutableMap {
     public static method isEmpty-impl(p0: java.util.Map): boolean
     public bridge final method keySet(): java.util.Set
     public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
-    public method put-pjrbk2k(p0: int, p1: double): IV
-    public static method put-pjrbk2k(p0: java.util.Map, p1: int, p2: double): IV
+    public method put-t80dRTo(p0: int, p1: double): IV
+    public static method put-t80dRTo(p0: java.util.Map, p1: int, p2: double): IV
     public method putAll(p0: java.util.Map): void
     public static method putAll-impl(p0: java.util.Map, p1: java.util.Map): void
     public bridge final method remove(p0: java.lang.Object): java.lang.Object
-    public method remove-FSIWiWE(p0: int): IV
-    public static method remove-FSIWiWE(p0: java.util.Map, p1: int): IV
+    public method remove-qgyy0Jc(p0: int): IV
+    public static method remove-qgyy0Jc(p0: java.util.Map, p1: int): IV
     public bridge final method size(): int
     public method toString(): java.lang.String
     public static method toString-impl(p0: java.util.Map): java.lang.String
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.txt
index a0e0083055f..c785efd7c01 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.txt
@@ -50,8 +50,8 @@ public final class InlineMutableMapEntry {
     public method hashCode(): int
     public static method hashCode-impl(p0: java.util.Map$Entry): int
     public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object
-    public method setValue-jbX5DO8(p0: double): double
-    public static method setValue-jbX5DO8(p0: java.util.Map$Entry, p1: double): double
+    public method setValue-cYiyq8k(p0: double): double
+    public static method setValue-cYiyq8k(p0: java.util.Map$Entry, p1: double): double
     public method toString(): java.lang.String
     public static method toString-impl(p0: java.util.Map$Entry): java.lang.String
     public synthetic final method unbox-impl(): java.util.Map$Entry
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap_ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap_ir.txt
index 657df961e74..3cd6ac061ca 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap_ir.txt
@@ -51,8 +51,8 @@ public final class InlineMutableMap {
     public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean
     public synthetic bridge method get(p0: java.lang.Object): java.lang.Object
-    public method get-FSIWiWE(p0: int): IV
-    public static method get-FSIWiWE(p0: java.util.Map, p1: int): IV
+    public method get-qgyy0Jc(p0: int): IV
+    public static method get-qgyy0Jc(p0: java.util.Map, p1: int): IV
     public method getEntries(): java.util.Set
     public static method getEntries-impl(p0: java.util.Map): java.util.Set
     public method getKeys(): java.util.Set
@@ -67,14 +67,14 @@ public final class InlineMutableMap {
     public static method isEmpty-impl(p0: java.util.Map): boolean
     public synthetic bridge method keySet(): java.util.Set
     public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
-    public method put-pjrbk2k(p0: int, p1: double): IV
-    public static method put-pjrbk2k(p0: java.util.Map, p1: int, p2: double): IV
+    public method put-t80dRTo(p0: int, p1: double): IV
+    public static method put-t80dRTo(p0: java.util.Map, p1: int, p2: double): IV
     public method putAll(p0: java.util.Map): void
     public static method putAll-impl(p0: java.util.Map, p1: java.util.Map): void
     public bridge final method remove(p0: java.lang.Object): IV
     public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object
-    public method remove-FSIWiWE(p0: int): IV
-    public static method remove-FSIWiWE(p0: java.util.Map, p1: int): IV
+    public method remove-qgyy0Jc(p0: int): IV
+    public static method remove-qgyy0Jc(p0: java.util.Map, p1: int): IV
     public synthetic bridge method size(): int
     public method toString(): java.lang.String
     public static method toString-impl(p0: java.util.Map): java.lang.String
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.kt
new file mode 100644
index 00000000000..4b319b0b470
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.kt
@@ -0,0 +1,15 @@
+inline class Z1(val s: Int) {
+    val String.ext: Int get() = 239
+}
+
+inline class Z2(val s: Int) {
+    val String.s: Int get() = 239
+}
+
+interface StrS {
+    val String.s: Int
+}
+
+inline class Z3(val s: Int) : StrS {
+    override val String.s: Int get() = 239
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.txt
new file mode 100644
index 00000000000..586ae04b510
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.txt
@@ -0,0 +1,63 @@
+@kotlin.Metadata
+public interface StrS {
+    // source: 'memberExtensionProperty.kt'
+    public abstract method getS(@org.jetbrains.annotations.NotNull p0: java.lang.String): int
+}
+
+@kotlin.Metadata
+public final class Z1 {
+    // source: 'memberExtensionProperty.kt'
+    private final field s: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): Z1
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final static method getExt-impl(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String): int
+    public final method getS(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+public final class Z2 {
+    // source: 'memberExtensionProperty.kt'
+    private final field s: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): Z2
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getS(): int
+    public final static method getS-impl(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+public final class Z3 {
+    // source: 'memberExtensionProperty.kt'
+    private final field s: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): Z3
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getS(): int
+    public method getS(@org.jetbrains.annotations.NotNull p0: java.lang.String): int
+    public static method getS-impl(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.kt
new file mode 100644
index 00000000000..1f14b212031
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.kt
@@ -0,0 +1,3 @@
+inline class Z(val z: Int)
+
+class Test(val z: Z = Z(42))
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.txt
new file mode 100644
index 00000000000..acfba7c79ca
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.txt
@@ -0,0 +1,27 @@
+@kotlin.Metadata
+public final class Test {
+    // source: 'noArgConstructorForInlineClassParameter.kt'
+    private final field z: int
+    private method <init>(p0: int): void
+    public synthetic method <init>(p0: int, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public synthetic method <init>(p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final method getZ-a_XrcN0(): int
+}
+
+@kotlin.Metadata
+public final class Z {
+    // source: 'noArgConstructorForInlineClassParameter.kt'
+    private final field z: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): Z
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getZ(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.kt
new file mode 100644
index 00000000000..f80a9a0f85f
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.kt
@@ -0,0 +1,6 @@
+// !LANGUAGE: +InlineClasses
+
+inline class IC(val i: Int)
+
+fun foo(i: Int, ic: IC) {}
+fun foo(i: Int?, ic: IC) {}
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.txt
new file mode 100644
index 00000000000..e05a34f7f14
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.txt
@@ -0,0 +1,24 @@
+@kotlin.Metadata
+public final class IC {
+    // source: 'nullableAndNotNullPrimitive.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): IC
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+public final class NullableAndNotNullPrimitiveKt {
+    // source: 'nullableAndNotNullPrimitive.kt'
+    public final static method foo--SqozA0(@org.jetbrains.annotations.Nullable p0: java.lang.Integer, p1: int): void
+    public final static method foo--SqozA0(p0: int, p1: int): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.kt
new file mode 100644
index 00000000000..6331d626656
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.kt
@@ -0,0 +1,5 @@
+package test
+
+inline class IC(val i: Int)
+
+fun foo(i: Int, ic: IC) {}
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.txt
new file mode 100644
index 00000000000..cdb5f8ffbcf
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.txt
@@ -0,0 +1,23 @@
+@kotlin.Metadata
+public final class test/IC {
+    // source: 'new.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): test.IC
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+public final class test/NewKt {
+    // source: 'new.kt'
+    public final static method foo-i2nDo8k(p0: int, p1: int): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.kt
new file mode 100644
index 00000000000..89041dadea2
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.kt
@@ -0,0 +1,13 @@
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+// !LANGUAGE: -MangleClassMembersReturningInlineClasses
+// FILE: 1.kt
+package test
+
+inline class IC(val i: Int)
+
+// FILE: 2.kt
+package kotlin
+
+import test.*
+
+fun foo(i: Int, ic: IC) {}
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.txt
new file mode 100644
index 00000000000..51401bcadfe
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.txt
@@ -0,0 +1,23 @@
+@kotlin.Metadata
+public final class kotlin/_2Kt {
+    // source: '2.kt'
+    public final static method foo-wfSZ3cc(p0: int, p1: int): void
+}
+
+@kotlin.Metadata
+public final class test/IC {
+    // source: '1.kt'
+    private final field i: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): test.IC
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getI(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
diff --git a/compiler/testData/codegen/bytecodeListing/javaDeprecated.kt b/compiler/testData/codegen/bytecodeListing/javaDeprecated.kt
new file mode 100644
index 00000000000..d33ced0088d
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/javaDeprecated.kt
@@ -0,0 +1,11 @@
+class Foo {
+    @field:java.lang.Deprecated
+    val bar: String = "123"
+
+    @java.lang.Deprecated
+    val bar2: String = "123"
+
+    @java.lang.Deprecated
+    fun test() {}
+
+}
diff --git a/compiler/testData/codegen/bytecodeListing/javaDeprecated.txt b/compiler/testData/codegen/bytecodeListing/javaDeprecated.txt
new file mode 100644
index 00000000000..ef52d56f0a7
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/javaDeprecated.txt
@@ -0,0 +1,10 @@
+@kotlin.Metadata
+public final class Foo {
+    // source: 'javaDeprecated.kt'
+    private final @java.lang.Deprecated @org.jetbrains.annotations.NotNull field bar2: java.lang.String
+    private final @java.lang.Deprecated @org.jetbrains.annotations.NotNull field bar: java.lang.String
+    public method <init>(): void
+    public final @org.jetbrains.annotations.NotNull method getBar(): java.lang.String
+    public final @org.jetbrains.annotations.NotNull method getBar2(): java.lang.String
+    public final @java.lang.Deprecated method test(): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/kt42137.kt b/compiler/testData/codegen/bytecodeListing/kt42137.kt
new file mode 100644
index 00000000000..cd2241255e8
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/kt42137.kt
@@ -0,0 +1,13 @@
+interface A<out T> {
+    val value: T
+}
+
+interface B<out T : CharSequence> : A<T>
+
+open class C(override val value: String) : B<CharSequence>
+
+interface X {
+    val value: CharSequence
+}
+
+class Y(value: String) : C(value), X
diff --git a/compiler/testData/codegen/bytecodeListing/kt42137.txt b/compiler/testData/codegen/bytecodeListing/kt42137.txt
new file mode 100644
index 00000000000..cffc874c371
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/kt42137.txt
@@ -0,0 +1,32 @@
+@kotlin.Metadata
+public interface A {
+    // source: 'kt42137.kt'
+    public abstract method getValue(): java.lang.Object
+}
+
+@kotlin.Metadata
+public interface B {
+    // source: 'kt42137.kt'
+}
+
+@kotlin.Metadata
+public class C {
+    // source: 'kt42137.kt'
+    private final @org.jetbrains.annotations.NotNull field value: java.lang.String
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic bridge method getValue(): java.lang.Object
+    public @org.jetbrains.annotations.NotNull method getValue(): java.lang.String
+}
+
+@kotlin.Metadata
+public interface X {
+    // source: 'kt42137.kt'
+    public abstract @org.jetbrains.annotations.NotNull method getValue(): java.lang.CharSequence
+}
+
+@kotlin.Metadata
+public final class Y {
+    // source: 'kt42137.kt'
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic bridge method getValue(): java.lang.CharSequence
+}
diff --git a/compiler/testData/codegen/bytecodeListing/kt42879.kt b/compiler/testData/codegen/bytecodeListing/kt42879.kt
new file mode 100644
index 00000000000..3333abea0f8
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/kt42879.kt
@@ -0,0 +1,12 @@
+// IGNORE_BACKEND: JVM
+inline class A(val value: Int)
+
+fun interface I {
+    fun compute(value: Int): A
+}
+
+fun f(i: I) {}
+
+fun g() {
+    f { it -> A(it) }
+}
diff --git a/compiler/testData/codegen/bytecodeListing/kt42879.txt b/compiler/testData/codegen/bytecodeListing/kt42879.txt
new file mode 100644
index 00000000000..4516c2dac3a
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/kt42879.txt
@@ -0,0 +1,42 @@
+@kotlin.Metadata
+public final class A {
+    // source: 'kt42879.kt'
+    private final field value: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): A
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getValue(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.Metadata
+public interface I {
+    // source: 'kt42879.kt'
+    public abstract method compute-p71pxCs(p0: int): int
+}
+
+@kotlin.Metadata
+final class Kt42879Kt$g$1 {
+    // source: 'kt42879.kt'
+    enclosing method Kt42879Kt.g()V
+    public final static field INSTANCE: Kt42879Kt$g$1
+    inner (anonymous) class Kt42879Kt$g$1
+    static method <clinit>(): void
+    method <init>(): void
+    public final method compute-p71pxCs(p0: int): int
+}
+
+@kotlin.Metadata
+public final class Kt42879Kt {
+    // source: 'kt42879.kt'
+    inner (anonymous) class Kt42879Kt$g$1
+    public final static method f(@org.jetbrains.annotations.NotNull p0: I): void
+    public final static method g(): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/kt43217.kt b/compiler/testData/codegen/bytecodeListing/kt43217.kt
new file mode 100644
index 00000000000..966f20378c3
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/kt43217.kt
@@ -0,0 +1,46 @@
+// FILE: kt43217.kt
+// JVM_TARGET: 1.8
+class A {
+    private val b =
+        object : DoubleExpression() {
+            override fun get(): Double {
+                return 0.0
+            }
+        }
+}
+
+class C : DoubleExpression() {
+    override fun get() = 0.0
+}
+
+// FILE: DoubleExpression.java
+import org.jetbrains.annotations.NotNull;
+
+public abstract class DoubleExpression implements ObservableDouble {
+    @NotNull
+    @Override
+    public Object isEqualTo(double value) {
+        return null;
+    }
+}
+
+// FILE: ObservableValue.java
+import org.jetbrains.annotations.NotNull;
+
+public interface ObservableValue<T> {
+    @NotNull
+    T get();
+
+    @NotNull
+    default Object isEqualTo(@NotNull T value) {
+        return null;
+    }
+}
+
+// FILE: ObservableDouble.java
+import org.jetbrains.annotations.NotNull;
+
+public interface ObservableDouble extends ObservableValue<Double> {
+    @NotNull
+    Object isEqualTo(double value);
+}
diff --git a/compiler/testData/codegen/bytecodeListing/kt43217.txt b/compiler/testData/codegen/bytecodeListing/kt43217.txt
new file mode 100644
index 00000000000..5f3451d1fac
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/kt43217.txt
@@ -0,0 +1,25 @@
+@kotlin.Metadata
+public final class A$b$1 {
+    // source: 'kt43217.kt'
+    enclosing method A.<init>()V
+    inner (anonymous) class A$b$1
+    method <init>(): void
+    public @org.jetbrains.annotations.NotNull method get(): java.lang.Double
+    public synthetic bridge method get(): java.lang.Object
+}
+
+@kotlin.Metadata
+public final class A {
+    // source: 'kt43217.kt'
+    private final field b: A$b$1
+    inner (anonymous) class A$b$1
+    public method <init>(): void
+}
+
+@kotlin.Metadata
+public final class C {
+    // source: 'kt43217.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method get(): java.lang.Double
+    public synthetic bridge method get(): java.lang.Object
+}
diff --git a/compiler/testData/codegen/bytecodeListing/kt43217_ir.txt b/compiler/testData/codegen/bytecodeListing/kt43217_ir.txt
new file mode 100644
index 00000000000..696384c44a5
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/kt43217_ir.txt
@@ -0,0 +1,25 @@
+@kotlin.Metadata
+public final class A$b$1 {
+    // source: 'kt43217.kt'
+    enclosing method A.<init>()V
+    inner (anonymous) class A$b$1
+    method <init>(): void
+    public @org.jetbrains.annotations.NotNull method get(): java.lang.Double
+    public synthetic bridge method get(): java.lang.Object
+}
+
+@kotlin.Metadata
+public final class A {
+    // source: 'kt43217.kt'
+    private final @org.jetbrains.annotations.NotNull field b: A$b$1
+    inner (anonymous) class A$b$1
+    public method <init>(): void
+}
+
+@kotlin.Metadata
+public final class C {
+    // source: 'kt43217.kt'
+    public method <init>(): void
+    public @org.jetbrains.annotations.NotNull method get(): java.lang.Double
+    public synthetic bridge method get(): java.lang.Object
+}
diff --git a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt
index 1e0999dfe5e..c5c61f10e4a 100644
--- a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt
@@ -1,8 +1,8 @@
 @kotlin.Metadata
 public final class Hello/Foo {
     // source: 'multifileSuspend.kt'
-    public final static method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
     public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+    public synthetic static method main(p0: java.lang.String[]): void
 }
 
 @kotlin.Metadata
@@ -21,5 +21,5 @@ synthetic final class Hello/Foo__MultifileSuspendKt {
     // source: 'multifileSuspend.kt'
     inner (anonymous) class Hello/Foo__MultifileSuspendKt$main$2
     public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
-    public synthetic final static method main(p0: java.lang.String[]): void
+    public synthetic static method main(p0: java.lang.String[]): void
 }
diff --git a/compiler/testData/codegen/bytecodeListing/main/parameterlessMain_ir.txt b/compiler/testData/codegen/bytecodeListing/main/parameterlessMain_ir.txt
deleted file mode 100644
index a2d861e938a..00000000000
--- a/compiler/testData/codegen/bytecodeListing/main/parameterlessMain_ir.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-@kotlin.Metadata
-public final class ParameterlessMainKt {
-    // source: 'parameterlessMain.kt'
-    public final static method main(): void
-    public synthetic final static method main(p0: java.lang.String[]): void
-}
diff --git a/compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt b/compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt
index b1c513c6f63..e6a7e09d002 100644
--- a/compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt
@@ -14,5 +14,5 @@ public final class SuspendMainKt {
     // source: 'suspendMain.kt'
     inner (anonymous) class SuspendMainKt$main$2
     public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
-    public synthetic final static method main(p0: java.lang.String[]): void
+    public synthetic static method main(p0: java.lang.String[]): void
 }
diff --git a/compiler/testData/codegen/bytecodeListing/privateCompanionFields.kt b/compiler/testData/codegen/bytecodeListing/privateCompanionFields.kt
new file mode 100644
index 00000000000..e20aa87dacd
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/privateCompanionFields.kt
@@ -0,0 +1,32 @@
+// WITH_RUNTIME
+class TestClass {
+
+    private companion object {
+        @JvmField
+        var test: String = "1"
+
+        @JvmField
+        @java.lang.Deprecated
+        var test2: String = "2"
+
+        @JvmField
+        val test3: String = "3"
+
+        const val testConst = 1
+    }
+}
+
+interface TestConst {
+
+    private companion object {
+        const val testConst = 1
+    }
+}
+
+interface TestJvmField {
+
+    private companion object {
+        @JvmField
+        val test3: String = "3"
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/privateCompanionFields.txt b/compiler/testData/codegen/bytecodeListing/privateCompanionFields.txt
new file mode 100644
index 00000000000..1dcbba75727
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/privateCompanionFields.txt
@@ -0,0 +1,57 @@
+@kotlin.Metadata
+final class TestClass$Companion {
+    // source: 'privateCompanionFields.kt'
+    private method <init>(): void
+    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    private final inner class TestClass$Companion
+}
+
+@kotlin.Metadata
+public final class TestClass {
+    // source: 'privateCompanionFields.kt'
+    private final static @org.jetbrains.annotations.NotNull field Companion: TestClass$Companion
+    public deprecated static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test2: java.lang.String
+    public deprecated final static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test3: java.lang.String
+    public deprecated static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test: java.lang.String
+    public deprecated final static @java.lang.Deprecated field testConst: int
+    static method <clinit>(): void
+    public method <init>(): void
+    private final inner class TestClass$Companion
+}
+
+@kotlin.Metadata
+final class TestConst$Companion {
+    // source: 'privateCompanionFields.kt'
+    synthetic final static field $$INSTANCE: TestConst$Companion
+    public final static field testConst: int
+    static method <clinit>(): void
+    private method <init>(): void
+    public final inner class TestConst$Companion
+}
+
+@kotlin.Metadata
+public interface TestConst {
+    // source: 'privateCompanionFields.kt'
+    public synthetic final static @org.jetbrains.annotations.NotNull field Companion: TestConst$Companion
+    public deprecated final static @java.lang.Deprecated field testConst: int
+    static method <clinit>(): void
+    public final inner class TestConst$Companion
+}
+
+@kotlin.Metadata
+final class TestJvmField$Companion {
+    // source: 'privateCompanionFields.kt'
+    synthetic final static field $$INSTANCE: TestJvmField$Companion
+    private method <init>(): void
+    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final inner class TestJvmField$Companion
+}
+
+@kotlin.Metadata
+public interface TestJvmField {
+    // source: 'privateCompanionFields.kt'
+    public synthetic final static @org.jetbrains.annotations.NotNull field Companion: TestJvmField$Companion
+    public deprecated final static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test3: java.lang.String
+    static method <clinit>(): void
+    public final inner class TestJvmField$Companion
+}
diff --git a/compiler/testData/codegen/bytecodeListing/privateCompanionFields_ir.txt b/compiler/testData/codegen/bytecodeListing/privateCompanionFields_ir.txt
new file mode 100644
index 00000000000..3655a8501c8
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/privateCompanionFields_ir.txt
@@ -0,0 +1,57 @@
+@kotlin.Metadata
+final class TestClass$Companion {
+    // source: 'privateCompanionFields.kt'
+    private method <init>(): void
+    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    private final inner class TestClass$Companion
+}
+
+@kotlin.Metadata
+public final class TestClass {
+    // source: 'privateCompanionFields.kt'
+    private final static @org.jetbrains.annotations.NotNull field Companion: TestClass$Companion
+    public deprecated static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test2: java.lang.String
+    public deprecated final static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test3: java.lang.String
+    public deprecated static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test: java.lang.String
+    public deprecated final static @java.lang.Deprecated field testConst: int
+    static method <clinit>(): void
+    public method <init>(): void
+    private final inner class TestClass$Companion
+}
+
+@kotlin.Metadata
+final class TestConst$Companion {
+    // source: 'privateCompanionFields.kt'
+    synthetic final static field $$INSTANCE: TestConst$Companion
+    public final static field testConst: int
+    static method <clinit>(): void
+    private method <init>(): void
+    public final inner class TestConst$Companion
+}
+
+@kotlin.Metadata
+public interface TestConst {
+    // source: 'privateCompanionFields.kt'
+    public synthetic final static field Companion: TestConst$Companion
+    public deprecated final static @java.lang.Deprecated field testConst: int
+    static method <clinit>(): void
+    public final inner class TestConst$Companion
+}
+
+@kotlin.Metadata
+final class TestJvmField$Companion {
+    // source: 'privateCompanionFields.kt'
+    synthetic final static field $$INSTANCE: TestJvmField$Companion
+    static method <clinit>(): void
+    private method <init>(): void
+    public final inner class TestJvmField$Companion
+}
+
+@kotlin.Metadata
+public interface TestJvmField {
+    // source: 'privateCompanionFields.kt'
+    public synthetic final static field Companion: TestJvmField$Companion
+    public deprecated final static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test3: java.lang.String
+    static method <clinit>(): void
+    public final inner class TestJvmField$Companion
+}
diff --git a/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.kt b/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.kt
index 41842c7243a..5fb0edbf713 100644
--- a/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.kt
+++ b/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND: JVM_IR
+// WITH_SIGNATURES
 package test
 
 inline fun <reified T> makeRunnable(noinline lambda: ()->Unit) : Runnable {
diff --git a/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.txt b/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.txt
index c5fa758a56b..81039b208ed 100644
--- a/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.txt
+++ b/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.txt
@@ -1,24 +1,24 @@
 @kotlin.Metadata
-public final class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0 {
+public final class<null>  test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0 {
     // source: 'samAdapterAndInlinedOne.kt'
-    private synthetic final field function: kotlin.jvm.functions.Function0
-    public method <init>(p0: kotlin.jvm.functions.Function0): void
-    public synthetic final method run(): void
+    public <null> method <init>(p0: kotlin.jvm.functions.Function0): void
+    public synthetic final <null> method run(): void
+    private synthetic final field <null> function: kotlin.jvm.functions.Function0
 }
 
 @kotlin.Metadata
-final class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 {
+final class<null>  test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 {
     // source: 'samAdapterAndInlinedOne.kt'
-    private synthetic final field function: kotlin.jvm.functions.Function0
-    method <init>(p0: kotlin.jvm.functions.Function0): void
-    public synthetic final method run(): void
+    <null> method <init>(p0: kotlin.jvm.functions.Function0): void
+    public synthetic final <null> method run(): void
+    private synthetic final field <null> function: kotlin.jvm.functions.Function0
 }
 
 @kotlin.Metadata
-public final class test/SamAdapterAndInlinedOneKt {
+public final class<null>  test/SamAdapterAndInlinedOneKt {
     // source: 'samAdapterAndInlinedOne.kt'
-    public synthetic final static method makeRunnable(p0: kotlin.jvm.functions.Function0): java.lang.Runnable
-    public final static @org.jetbrains.annotations.NotNull method makeRunnable2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
-    public final static @org.jetbrains.annotations.NotNull method noInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
-    public final static @org.jetbrains.annotations.NotNull method noInline2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method makeRunnable2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method noInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method noInline2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    public synthetic final static <<T:Ljava/lang/Object;>(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method makeRunnable(p0: kotlin.jvm.functions.Function0): java.lang.Runnable
 }
diff --git a/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne_ir.txt b/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne_ir.txt
new file mode 100644
index 00000000000..21760d85a83
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne_ir.txt
@@ -0,0 +1,28 @@
+@kotlin.Metadata
+public final class<null>  test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0 {
+    // source: 'samAdapterAndInlinedOne.kt'
+    public <null> method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
+    public synthetic final <null> method run(): void
+    private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    public final inner class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0
+}
+
+@kotlin.Metadata
+final class<null>  test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 {
+    // source: 'samAdapterAndInlinedOne.kt'
+    <null> method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
+    public synthetic final <null> method run(): void
+    private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    final inner class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0
+}
+
+@kotlin.Metadata
+public final class<null>  test/SamAdapterAndInlinedOneKt {
+    // source: 'samAdapterAndInlinedOne.kt'
+    public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method makeRunnable2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method noInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method noInline2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    public synthetic final static <null> method makeRunnable(p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    final inner class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0
+    public final inner class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0
+}
diff --git a/compiler/testData/codegen/bytecodeListing/varargsBridge.kt b/compiler/testData/codegen/bytecodeListing/varargsBridge.kt
new file mode 100644
index 00000000000..acaf8fb1a19
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/varargsBridge.kt
@@ -0,0 +1,8 @@
+abstract class A<T> {
+    protected abstract fun doIt(vararg args: T): String
+    fun test() = doIt()
+}
+
+class B : A<Void>() {
+    override fun doIt(vararg args: Void): String = "OK"
+}
diff --git a/compiler/testData/codegen/bytecodeListing/varargsBridge.txt b/compiler/testData/codegen/bytecodeListing/varargsBridge.txt
new file mode 100644
index 00000000000..00944afe423
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/varargsBridge.txt
@@ -0,0 +1,15 @@
+@kotlin.Metadata
+public abstract class A {
+    // source: 'varargsBridge.kt'
+    public method <init>(): void
+    protected varargs abstract @org.jetbrains.annotations.NotNull method doIt(@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): java.lang.String
+    public final @org.jetbrains.annotations.NotNull method test(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class B {
+    // source: 'varargsBridge.kt'
+    public method <init>(): void
+    protected varargs @org.jetbrains.annotations.NotNull method doIt(@org.jetbrains.annotations.NotNull p0: java.lang.Void[]): java.lang.String
+    public synthetic bridge method doIt(p0: java.lang.Object[]): java.lang.String
+}
diff --git a/compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt b/compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt
index 5c27e142624..4422a29be04 100644
--- a/compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt
+++ b/compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 abstract class A1<Q> : MutableCollection<Q> {
     override fun contains(o: Q): Boolean {
         throw UnsupportedOperationException()
diff --git a/compiler/testData/codegen/bytecodeText/constructors/inlineArgumentPrimaryDefaults.kt b/compiler/testData/codegen/bytecodeText/constructors/inlineArgumentPrimaryDefaults.kt
index 4a16844dc7a..852453a3329 100644
--- a/compiler/testData/codegen/bytecodeText/constructors/inlineArgumentPrimaryDefaults.kt
+++ b/compiler/testData/codegen/bytecodeText/constructors/inlineArgumentPrimaryDefaults.kt
@@ -5,9 +5,4 @@ class B(val a: A = A(0))
 // 1 private <init>\(I\)V
 // 1 public synthetic <init>\(IILkotlin/jvm/internal/DefaultConstructorMarker;\)V
 // 1 public synthetic <init>\(ILkotlin/jvm/internal/DefaultConstructorMarker;\)V
-
-// JVM_TEMPLATES
-// 1 private <init>\(\)V
-
-// JVM_IR_TEMPLATES
-// 1 public <init>\(\)V
+// 0 private <init>\(\)V
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/thisAndResultInLvt.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/thisAndResultInLvt.kt
index 814a3bdd596..bd448d25da7 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/debug/thisAndResultInLvt.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/thisAndResultInLvt.kt
@@ -35,5 +35,5 @@ class A {
 // 1 LOCALVARIABLE this LThisAndResultInLvtKt\$c\$1;
 
 // JVM_IR_TEMPLATES
-// <init>, invoke, invokeSuspend
-// 3 LOCALVARIABLE this LThisAndResultInLvtKt\$c\$1; L0 L.* 0
+// <init>, invoke, invoke bridge, invokeSuspend
+// 4 LOCALVARIABLE this LThisAndResultInLvtKt\$c\$1; L0 L.* 0
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/boxThisOfInlineClass.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/boxThisOfInlineClass.kt
index 650dad0a430..93298f7e82c 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/boxThisOfInlineClass.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/boxThisOfInlineClass.kt
@@ -13,8 +13,17 @@ inline class UInt(val a: Int) {
 
 fun takeNullable(a: UInt?) {}
 
-// 2 INVOKESTATIC UInt\.box
-// 0 INVOKEVIRTUAL Foo.unbox
-
 // 1 valueOf
-// 0 intValue
\ No newline at end of file
+// 0 intValue
+
+// -- 1 before takeNullable
+// -- 1 before takeAnyInside
+// 2 INVOKESTATIC UInt\.box
+
+// JVM_TEMPLATES:
+// -- equals-impl
+// 1 INVOKEVIRTUAL UInt\.unbox
+
+// JVM_IR_TEMPLATES:
+// -- getA, toString, hashCode, equals-impl, equals
+// 5 INVOKEVIRTUAL UInt\.unbox
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/delegatedPropertyMangling.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/delegatedPropertyMangling.kt
index 6f0898a27cb..f23d758ada9 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/delegatedPropertyMangling.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/delegatedPropertyMangling.kt
@@ -18,6 +18,6 @@ class B : A {
     override val i by Delegate()
 }
 
-// 1 public final getValue-lPtA-2M\(Ljava/lang/Object;Lkotlin/reflect/KProperty;\)I
+// 1 public final getValue-MJRKSbM\(Ljava/lang/Object;Lkotlin/reflect/KProperty;\)I
 // 1 public getI-lPtA-2M\(\)I
 // 1 public abstract getI-lPtA-2M\(\)I
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingInMethod.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingInMethod.kt
new file mode 100644
index 00000000000..f212b8df7b9
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingInMethod.kt
@@ -0,0 +1,5 @@
+inline class IC(val value: Int) {
+    inline fun toLong(): Long = this.value.toLong()
+}
+
+// 0 INVOKESTATIC IC\.box-impl
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingUnboxingInAccessorsForDelegatedPropertyWithInlineClassDelegate.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingUnboxingInAccessorsForDelegatedPropertyWithInlineClassDelegate.kt
index a6a83e59960..2efa0fe76c6 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingUnboxingInAccessorsForDelegatedPropertyWithInlineClassDelegate.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingUnboxingInAccessorsForDelegatedPropertyWithInlineClassDelegate.kt
@@ -28,6 +28,6 @@ inline class Delegate(val default: Int) {
 // 0 DelegateFactory\.unbox
 // 0 Delegate\.box
 // 0 Delegate\.unbox
-// 1 INVOKESTATIC DelegateFactory\.provideDelegate-ARVzKNs \(ILjava/lang/Object;Ljava/lang/Object;\)I
+// 1 INVOKESTATIC DelegateFactory\.provideDelegate-fSJJ7ck \(ILjava/lang/Object;Ljava/lang/Object;\)I
 // 1 INVOKESTATIC Delegate\.getValue-impl \(ILjava/lang/Object;Ljava/lang/Object;\)I
 // 1 INVOKESTATIC Delegate\.setValue-impl \(ILjava/lang/Object;Ljava/lang/Object;I\)V
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/suspendFunctionMangling.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/suspendFunctionMangling.kt
index 730fcca579d..41c925d32c0 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/suspendFunctionMangling.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/suspendFunctionMangling.kt
@@ -13,7 +13,7 @@ suspend fun bar(p: P) {}
 // The mangled name for a suspend function includes the continuation parameter in the hash computation, but not the
 // default argument mask and handler.
 
-// 1 public final static foo-zMJ7EWY\(ILkotlin/coroutines/Continuation;\)Ljava/lang/Object;
-// 1 public static synthetic foo-zMJ7EWY\$default\(ILkotlin/coroutines/Continuation;ILjava/lang/Object;\)Ljava/lang/Object;
-// 1 INVOKESTATIC a/TestKt.foo-zMJ7EWY \(ILkotlin/coroutines/Continuation;\)Ljava/lang/Object;
-// 1 public final static bar-zMJ7EWY\(ILkotlin/coroutines/Continuation;\)Ljava/lang/Object;
\ No newline at end of file
+// 1 public final static foo-O6Ntpp4\(ILkotlin/coroutines/Continuation;\)Ljava/lang/Object;
+// 1 public static synthetic foo-O6Ntpp4\$default\(ILkotlin/coroutines/Continuation;ILjava/lang/Object;\)Ljava/lang/Object;
+// 1 INVOKESTATIC a/TestKt.foo-O6Ntpp4 \(ILkotlin/coroutines/Continuation;\)Ljava/lang/Object;
+// 1 public final static bar-O6Ntpp4\(ILkotlin/coroutines/Continuation;\)Ljava/lang/Object;
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/inlineJavaStaticFields.kt b/compiler/testData/codegen/bytecodeText/inlineJavaStaticFields.kt
index cbcec0a7313..f6ae773a90d 100644
--- a/compiler/testData/codegen/bytecodeText/inlineJavaStaticFields.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineJavaStaticFields.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: JClass.java
 
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/testData/codegen/bytecodeText/multifileClasses/privateFunctionName.kt b/compiler/testData/codegen/bytecodeText/multifileClasses/privateFunctionName.kt
index 8510f7e1603..9c8b20ce1d2 100644
--- a/compiler/testData/codegen/bytecodeText/multifileClasses/privateFunctionName.kt
+++ b/compiler/testData/codegen/bytecodeText/multifileClasses/privateFunctionName.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // FILE: part1.kt
 
diff --git a/compiler/testData/codegen/bytecodeText/notNullAssertions/arrayListGet.kt b/compiler/testData/codegen/bytecodeText/notNullAssertions/arrayListGet.kt
index c6c2eae56f3..6c89da9e8a8 100644
--- a/compiler/testData/codegen/bytecodeText/notNullAssertions/arrayListGet.kt
+++ b/compiler/testData/codegen/bytecodeText/notNullAssertions/arrayListGet.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 import java.util.ArrayList
 
 fun foo(): Any {
diff --git a/compiler/testData/codegen/bytecodeText/notNullAssertions/assertionForNotNullCaptured.kt b/compiler/testData/codegen/bytecodeText/notNullAssertions/assertionForNotNullCaptured.kt
index de9551a47ab..3633b5db67b 100644
--- a/compiler/testData/codegen/bytecodeText/notNullAssertions/assertionForNotNullCaptured.kt
+++ b/compiler/testData/codegen/bytecodeText/notNullAssertions/assertionForNotNullCaptured.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A<T> {
     fun add(element: T) {}
 }
diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/deterministicNotNullChecks.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/deterministicNotNullChecks.kt
index f180d292a36..9ba12a721a6 100644
--- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/deterministicNotNullChecks.kt
+++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/deterministicNotNullChecks.kt
@@ -1,8 +1,4 @@
 // FILE: test/CallableDescriptor.java
-// IGNORE_BACKEND_FIR: JVM_IR
-// Here FIR adds implicit NOT_NULL cast for `origin`, resulting in an assertion being added,
-// which is the correct (yet mismatching) behavior, according to https://youtrack.jetbrains.com/issue/KT-35656
-
 // JVM_IR:
 // Here in 'original in emptySet<D>()' T = '@EnhancedNullability CallableDescriptor' is inferred for 'Iterable<T>.contains(T)'.
 // Using value of '@EnhancedNullability CallableDescriptor' type where '@EnhancedNullability CallableDescriptor' is expected
diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNull.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNull.kt
index 8db917deb8a..758216e51e3 100644
--- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNull.kt
+++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNull.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: j/J.java
 
 package j;
diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNullTwice.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNullTwice.kt
index 01ac2aa4da5..ff2f16e7fda 100644
--- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNullTwice.kt
+++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNullTwice.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: j/J.java
 
 package j;
diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/notNullExpressionValueTwice_1_4.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/notNullExpressionValueTwice_1_4.kt
index a80f2c8a9e1..6cfa2e956a5 100644
--- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/notNullExpressionValueTwice_1_4.kt
+++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/notNullExpressionValueTwice_1_4.kt
@@ -1,5 +1,4 @@
 // !API_VERSION: LATEST
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: j/J.java
 
 package j;
diff --git a/compiler/testData/codegen/bytecodeText/sam/samWrapperInInlineLambda.kt b/compiler/testData/codegen/bytecodeText/sam/samWrapperInInlineLambda.kt
new file mode 100644
index 00000000000..b4f83ded013
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/sam/samWrapperInInlineLambda.kt
@@ -0,0 +1,18 @@
+// FILE: J.java
+
+public class J {
+    public static void g(Runnable r) {
+        r.run();
+    }
+}
+
+// FILE: test.kt
+
+fun box(): String {
+    var result = "Fail"
+    val setter = { result = "OK" }
+    1.apply { J.g(setter) }
+    return result
+}
+
+// 1 INVOKESPECIAL TestKt\$sam\$i\$java_lang_Runnable\$0.<init> \(Lkotlin/jvm/functions/Function0;\)V
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/sam/samWrapperRawTypes.kt b/compiler/testData/codegen/bytecodeText/sam/samWrapperRawTypes.kt
new file mode 100644
index 00000000000..5e2ee246fed
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/sam/samWrapperRawTypes.kt
@@ -0,0 +1,29 @@
+// FILE: J.java
+
+public class J {
+    public interface F {
+        public int call(String x)
+    }
+
+    public static void g(F r) {
+        r.call(null);
+    }
+}
+
+// FILE: test.kt
+
+fun nonInlineFun() {
+    val f: (String?) -> Int = { s -> 0 }
+    J.g(f)
+}
+
+inline fun inlineFun() {
+    val f: (String?) -> Int = { s -> 0 }
+    J.g(f)
+}
+
+// There should be no generic information in the SAM wrappers.
+// 0 declaration: void <init>\(kotlin.jvm.functions.Function1<.*, .*>\)
+// 0 declaration: function extends kotlin.jvm.functions.Function1<.*, .*>
+// 2 private final synthetic Lkotlin/jvm/functions/Function1; function
+// 2 <init>\(Lkotlin/jvm/functions/Function1;\)V
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt
index 6765deea354..ac0308002e3 100644
--- a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt
+++ b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt
@@ -1,5 +1,6 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234U
 val ub = 5678U
diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt
index cd5135f232b..ea97267b2a9 100644
--- a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt
+++ b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt
@@ -1,5 +1,6 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234U
 val ub = 5678U
diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt
index 795efb5e002..bf85cd0126c 100644
--- a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt
+++ b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt
@@ -1,5 +1,6 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234UL
 val ub = 5678UL
diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt
index de7b81bb0ed..15a7aba6f8a 100644
--- a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt
+++ b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt
@@ -1,5 +1,6 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234UL
 val ub = 5678UL
diff --git a/compiler/testData/codegen/script/kt22029.kts b/compiler/testData/codegen/script/kt22029.kts
index 179326ec8af..5c8e6a34805 100644
--- a/compiler/testData/codegen/script/kt22029.kts
+++ b/compiler/testData/codegen/script/kt22029.kts
@@ -1,3 +1,5 @@
+// IGNORE_BACKEND: JVM_IR
+
 data class Pair(val first: Int, val second: Int)
 
 inline fun <T> run(fn: () -> T) = fn()
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/library/lib.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/library/lib.kt
new file mode 100644
index 00000000000..c0655a02f05
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/library/lib.kt
@@ -0,0 +1,202 @@
+inline class ICString(val a: String)
+inline class ICStringNullable(val a: String?)
+inline class ICAny(val a: Any)
+inline class ICAnyNullable(val a: Any?)
+inline class ICInt(val a: Int)
+inline class ICIntNullable(val a: Int?)
+
+fun ordinaryNoninlineReturnsICString(): ICString = ICString("")
+fun ordinaryNoninlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("")
+fun ordinaryNoninlineReturnsICAny(): ICAny = ICAny("")
+fun ordinaryNoninlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("")
+fun ordinaryNoninlineReturnsICInt(): ICInt = ICInt(0)
+fun ordinaryNoninlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0)
+fun ordinaryNoninlineReturnsICString_Null(): ICString? = null
+fun ordinaryNoninlineReturnsICStringNullable_Null(): ICStringNullable? = null
+fun ordinaryNoninlineReturnsICAny_Null(): ICAny? = null
+fun ordinaryNoninlineReturnsICAnyNullable_Null(): ICAnyNullable? = null
+fun ordinaryNoninlineReturnsICInt_Null(): ICInt? = null
+fun ordinaryNoninlineReturnsICIntNullable_Null(): ICIntNullable? = null
+fun ordinaryNoninlineAcceptsICString(i: Int, ic: ICString) {}
+fun ordinaryNoninlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {}
+fun ordinaryNoninlineAcceptsICAny(i: Int, ic: ICAny) {}
+fun ordinaryNoninlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {}
+fun ordinaryNoninlineAcceptsICInt(i: Int, ic: ICInt) {}
+fun ordinaryNoninlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {}
+fun ordinaryNoninlineAcceptsICString_Null(i: Int, ic: ICString?) {}
+fun ordinaryNoninlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {}
+fun ordinaryNoninlineAcceptsICAny_Null(i: Int, ic: ICAny?) {}
+fun ordinaryNoninlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {}
+fun ordinaryNoninlineAcceptsICInt_Null(i: Int, ic: ICInt?) {}
+fun ordinaryNoninlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {}
+inline fun ordinaryInlineReturnsICString(): ICString = ICString("")
+inline fun ordinaryInlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("")
+inline fun ordinaryInlineReturnsICAny(): ICAny = ICAny("")
+inline fun ordinaryInlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("")
+inline fun ordinaryInlineReturnsICInt(): ICInt = ICInt(0)
+inline fun ordinaryInlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0)
+inline fun ordinaryInlineReturnsICString_Null(): ICString? = null
+inline fun ordinaryInlineReturnsICStringNullable_Null(): ICStringNullable? = null
+inline fun ordinaryInlineReturnsICAny_Null(): ICAny? = null
+inline fun ordinaryInlineReturnsICAnyNullable_Null(): ICAnyNullable? = null
+inline fun ordinaryInlineReturnsICInt_Null(): ICInt? = null
+inline fun ordinaryInlineReturnsICIntNullable_Null(): ICIntNullable? = null
+inline fun ordinaryInlineAcceptsICString(i: Int, ic: ICString) {}
+inline fun ordinaryInlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {}
+inline fun ordinaryInlineAcceptsICAny(i: Int, ic: ICAny) {}
+inline fun ordinaryInlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {}
+inline fun ordinaryInlineAcceptsICInt(i: Int, ic: ICInt) {}
+inline fun ordinaryInlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {}
+inline fun ordinaryInlineAcceptsICString_Null(i: Int, ic: ICString?) {}
+inline fun ordinaryInlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {}
+inline fun ordinaryInlineAcceptsICAny_Null(i: Int, ic: ICAny?) {}
+inline fun ordinaryInlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {}
+inline fun ordinaryInlineAcceptsICInt_Null(i: Int, ic: ICInt?) {}
+inline fun ordinaryInlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {}
+suspend fun suspendNoninlineReturnsICString(): ICString = ICString("")
+suspend fun suspendNoninlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("")
+suspend fun suspendNoninlineReturnsICAny(): ICAny = ICAny("")
+suspend fun suspendNoninlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("")
+suspend fun suspendNoninlineReturnsICInt(): ICInt = ICInt(0)
+suspend fun suspendNoninlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0)
+suspend fun suspendNoninlineReturnsICString_Null(): ICString? = null
+suspend fun suspendNoninlineReturnsICStringNullable_Null(): ICStringNullable? = null
+suspend fun suspendNoninlineReturnsICAny_Null(): ICAny? = null
+suspend fun suspendNoninlineReturnsICAnyNullable_Null(): ICAnyNullable? = null
+suspend fun suspendNoninlineReturnsICInt_Null(): ICInt? = null
+suspend fun suspendNoninlineReturnsICIntNullable_Null(): ICIntNullable? = null
+suspend fun suspendNoninlineAcceptsICString(i: Int, ic: ICString) {}
+suspend fun suspendNoninlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {}
+suspend fun suspendNoninlineAcceptsICAny(i: Int, ic: ICAny) {}
+suspend fun suspendNoninlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {}
+suspend fun suspendNoninlineAcceptsICInt(i: Int, ic: ICInt) {}
+suspend fun suspendNoninlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {}
+suspend fun suspendNoninlineAcceptsICString_Null(i: Int, ic: ICString?) {}
+suspend fun suspendNoninlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {}
+suspend fun suspendNoninlineAcceptsICAny_Null(i: Int, ic: ICAny?) {}
+suspend fun suspendNoninlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {}
+suspend fun suspendNoninlineAcceptsICInt_Null(i: Int, ic: ICInt?) {}
+suspend fun suspendNoninlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {}
+suspend inline fun suspendInlineReturnsICString(): ICString = ICString("")
+suspend inline fun suspendInlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("")
+suspend inline fun suspendInlineReturnsICAny(): ICAny = ICAny("")
+suspend inline fun suspendInlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("")
+suspend inline fun suspendInlineReturnsICInt(): ICInt = ICInt(0)
+suspend inline fun suspendInlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0)
+suspend inline fun suspendInlineReturnsICString_Null(): ICString? = null
+suspend inline fun suspendInlineReturnsICStringNullable_Null(): ICStringNullable? = null
+suspend inline fun suspendInlineReturnsICAny_Null(): ICAny? = null
+suspend inline fun suspendInlineReturnsICAnyNullable_Null(): ICAnyNullable? = null
+suspend inline fun suspendInlineReturnsICInt_Null(): ICInt? = null
+suspend inline fun suspendInlineReturnsICIntNullable_Null(): ICIntNullable? = null
+suspend inline fun suspendInlineAcceptsICString(i: Int, ic: ICString) {}
+suspend inline fun suspendInlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {}
+suspend inline fun suspendInlineAcceptsICAny(i: Int, ic: ICAny) {}
+suspend inline fun suspendInlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {}
+suspend inline fun suspendInlineAcceptsICInt(i: Int, ic: ICInt) {}
+suspend inline fun suspendInlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {}
+suspend inline fun suspendInlineAcceptsICString_Null(i: Int, ic: ICString?) {}
+suspend inline fun suspendInlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {}
+suspend inline fun suspendInlineAcceptsICAny_Null(i: Int, ic: ICAny?) {}
+suspend inline fun suspendInlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {}
+suspend inline fun suspendInlineAcceptsICInt_Null(i: Int, ic: ICInt?) {}
+suspend inline fun suspendInlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {}
+
+class C {
+    fun ordinaryNoninlineReturnsICString(): ICString = ICString("")
+    fun ordinaryNoninlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("")
+    fun ordinaryNoninlineReturnsICAny(): ICAny = ICAny("")
+    fun ordinaryNoninlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("")
+    fun ordinaryNoninlineReturnsICInt(): ICInt = ICInt(0)
+    fun ordinaryNoninlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0)
+    fun ordinaryNoninlineReturnsICString_Null(): ICString? = null
+    fun ordinaryNoninlineReturnsICStringNullable_Null(): ICStringNullable? = null
+    fun ordinaryNoninlineReturnsICAny_Null(): ICAny? = null
+    fun ordinaryNoninlineReturnsICAnyNullable_Null(): ICAnyNullable? = null
+    fun ordinaryNoninlineReturnsICInt_Null(): ICInt? = null
+    fun ordinaryNoninlineReturnsICIntNullable_Null(): ICIntNullable? = null
+    fun ordinaryNoninlineAcceptsICString(i: Int, ic: ICString) {}
+    fun ordinaryNoninlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {}
+    fun ordinaryNoninlineAcceptsICAny(i: Int, ic: ICAny) {}
+    fun ordinaryNoninlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {}
+    fun ordinaryNoninlineAcceptsICInt(i: Int, ic: ICInt) {}
+    fun ordinaryNoninlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {}
+    fun ordinaryNoninlineAcceptsICString_Null(i: Int, ic: ICString?) {}
+    fun ordinaryNoninlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {}
+    fun ordinaryNoninlineAcceptsICAny_Null(i: Int, ic: ICAny?) {}
+    fun ordinaryNoninlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {}
+    fun ordinaryNoninlineAcceptsICInt_Null(i: Int, ic: ICInt?) {}
+    fun ordinaryNoninlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {}
+    inline fun ordinaryInlineReturnsICString(): ICString = ICString("")
+    inline fun ordinaryInlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("")
+    inline fun ordinaryInlineReturnsICAny(): ICAny = ICAny("")
+    inline fun ordinaryInlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("")
+    inline fun ordinaryInlineReturnsICInt(): ICInt = ICInt(0)
+    inline fun ordinaryInlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0)
+    inline fun ordinaryInlineReturnsICString_Null(): ICString? = null
+    inline fun ordinaryInlineReturnsICStringNullable_Null(): ICStringNullable? = null
+    inline fun ordinaryInlineReturnsICAny_Null(): ICAny? = null
+    inline fun ordinaryInlineReturnsICAnyNullable_Null(): ICAnyNullable? = null
+    inline fun ordinaryInlineReturnsICInt_Null(): ICInt? = null
+    inline fun ordinaryInlineReturnsICIntNullable_Null(): ICIntNullable? = null
+    inline fun ordinaryInlineAcceptsICString(i: Int, ic: ICString) {}
+    inline fun ordinaryInlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {}
+    inline fun ordinaryInlineAcceptsICAny(i: Int, ic: ICAny) {}
+    inline fun ordinaryInlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {}
+    inline fun ordinaryInlineAcceptsICInt(i: Int, ic: ICInt) {}
+    inline fun ordinaryInlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {}
+    inline fun ordinaryInlineAcceptsICString_Null(i: Int, ic: ICString?) {}
+    inline fun ordinaryInlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {}
+    inline fun ordinaryInlineAcceptsICAny_Null(i: Int, ic: ICAny?) {}
+    inline fun ordinaryInlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {}
+    inline fun ordinaryInlineAcceptsICInt_Null(i: Int, ic: ICInt?) {}
+    inline fun ordinaryInlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {}
+    suspend fun suspendNoninlineReturnsICString(): ICString = ICString("")
+    suspend fun suspendNoninlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("")
+    suspend fun suspendNoninlineReturnsICAny(): ICAny = ICAny("")
+    suspend fun suspendNoninlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("")
+    suspend fun suspendNoninlineReturnsICInt(): ICInt = ICInt(0)
+    suspend fun suspendNoninlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0)
+    suspend fun suspendNoninlineReturnsICString_Null(): ICString? = null
+    suspend fun suspendNoninlineReturnsICStringNullable_Null(): ICStringNullable? = null
+    suspend fun suspendNoninlineReturnsICAny_Null(): ICAny? = null
+    suspend fun suspendNoninlineReturnsICAnyNullable_Null(): ICAnyNullable? = null
+    suspend fun suspendNoninlineReturnsICInt_Null(): ICInt? = null
+    suspend fun suspendNoninlineReturnsICIntNullable_Null(): ICIntNullable? = null
+    suspend fun suspendNoninlineAcceptsICString(i: Int, ic: ICString) {}
+    suspend fun suspendNoninlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {}
+    suspend fun suspendNoninlineAcceptsICAny(i: Int, ic: ICAny) {}
+    suspend fun suspendNoninlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {}
+    suspend fun suspendNoninlineAcceptsICInt(i: Int, ic: ICInt) {}
+    suspend fun suspendNoninlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {}
+    suspend fun suspendNoninlineAcceptsICString_Null(i: Int, ic: ICString?) {}
+    suspend fun suspendNoninlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {}
+    suspend fun suspendNoninlineAcceptsICAny_Null(i: Int, ic: ICAny?) {}
+    suspend fun suspendNoninlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {}
+    suspend fun suspendNoninlineAcceptsICInt_Null(i: Int, ic: ICInt?) {}
+    suspend fun suspendNoninlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {}
+    suspend inline fun suspendInlineReturnsICString(): ICString = ICString("")
+    suspend inline fun suspendInlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("")
+    suspend inline fun suspendInlineReturnsICAny(): ICAny = ICAny("")
+    suspend inline fun suspendInlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("")
+    suspend inline fun suspendInlineReturnsICInt(): ICInt = ICInt(0)
+    suspend inline fun suspendInlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0)
+    suspend inline fun suspendInlineReturnsICString_Null(): ICString? = null
+    suspend inline fun suspendInlineReturnsICStringNullable_Null(): ICStringNullable? = null
+    suspend inline fun suspendInlineReturnsICAny_Null(): ICAny? = null
+    suspend inline fun suspendInlineReturnsICAnyNullable_Null(): ICAnyNullable? = null
+    suspend inline fun suspendInlineReturnsICInt_Null(): ICInt? = null
+    suspend inline fun suspendInlineReturnsICIntNullable_Null(): ICIntNullable? = null
+    suspend inline fun suspendInlineAcceptsICString(i: Int, ic: ICString) {}
+    suspend inline fun suspendInlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {}
+    suspend inline fun suspendInlineAcceptsICAny(i: Int, ic: ICAny) {}
+    suspend inline fun suspendInlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {}
+    suspend inline fun suspendInlineAcceptsICInt(i: Int, ic: ICInt) {}
+    suspend inline fun suspendInlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {}
+    suspend inline fun suspendInlineAcceptsICString_Null(i: Int, ic: ICString?) {}
+    suspend inline fun suspendInlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {}
+    suspend inline fun suspendInlineAcceptsICAny_Null(i: Int, ic: ICAny?) {}
+    suspend inline fun suspendInlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {}
+    suspend inline fun suspendInlineAcceptsICInt_Null(i: Int, ic: ICInt?) {}
+    suspend inline fun suspendInlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {}
+}
\ No newline at end of file
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/output.txt
new file mode 100644
index 00000000000..53fc69e8ebb
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/output.txt
@@ -0,0 +1,10 @@
+warning: ATTENTION!
+This build uses unsafe internal compiler arguments:
+
+-XXLanguage:-MangleClassMembersReturningInlineClasses
+
+This mode is not recommended for production use,
+as no stability/compatibility guarantees are given on
+compiler or generated code. Use it at your own risk!
+
+OK
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/source.kt
new file mode 100644
index 00000000000..1c6a1ff1f7d
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/source.kt
@@ -0,0 +1,194 @@
+suspend fun main() {
+    ordinaryNoninlineReturnsICString()
+    ordinaryNoninlineReturnsICStringNullable()
+    ordinaryNoninlineReturnsICAny()
+    ordinaryNoninlineReturnsICAnyNullable()
+    ordinaryNoninlineReturnsICInt()
+    ordinaryNoninlineReturnsICIntNullable()
+    ordinaryNoninlineReturnsICString_Null()
+    ordinaryNoninlineReturnsICStringNullable_Null()
+    ordinaryNoninlineReturnsICAny_Null()
+    ordinaryNoninlineReturnsICAnyNullable_Null()
+    ordinaryNoninlineReturnsICInt_Null()
+    ordinaryNoninlineReturnsICIntNullable_Null()
+    ordinaryNoninlineAcceptsICString(1, ICString(""))
+    ordinaryNoninlineAcceptsICStringNullable(1, ICStringNullable(""))
+    ordinaryNoninlineAcceptsICAny(1, ICAny(""))
+    ordinaryNoninlineAcceptsICAnyNullable(1, ICAnyNullable(""))
+    ordinaryNoninlineAcceptsICInt(1, ICInt(0))
+    ordinaryNoninlineAcceptsICIntNullable(1, ICIntNullable(0))
+    ordinaryNoninlineAcceptsICString_Null(1, null)
+    ordinaryNoninlineAcceptsICStringNullable_Null(1, null)
+    ordinaryNoninlineAcceptsICAny_Null(1, null)
+    ordinaryNoninlineAcceptsICAnyNullable_Null(1, null)
+    ordinaryNoninlineAcceptsICInt_Null(1, null)
+    ordinaryNoninlineAcceptsICIntNullable_Null(1, null)
+    ordinaryInlineReturnsICString()
+    ordinaryInlineReturnsICStringNullable()
+    ordinaryInlineReturnsICAny()
+    ordinaryInlineReturnsICAnyNullable()
+    ordinaryInlineReturnsICInt()
+    ordinaryInlineReturnsICIntNullable()
+    ordinaryInlineReturnsICString_Null()
+    ordinaryInlineReturnsICStringNullable_Null()
+    ordinaryInlineReturnsICAny_Null()
+    ordinaryInlineReturnsICAnyNullable_Null()
+    ordinaryInlineReturnsICInt_Null()
+    ordinaryInlineReturnsICIntNullable_Null()
+    ordinaryInlineAcceptsICString(1, ICString(""))
+    ordinaryInlineAcceptsICStringNullable(1, ICStringNullable(""))
+    ordinaryInlineAcceptsICAny(1, ICAny(""))
+    ordinaryInlineAcceptsICAnyNullable(1, ICAnyNullable(""))
+    ordinaryInlineAcceptsICInt(1, ICInt(0))
+    ordinaryInlineAcceptsICIntNullable(1, ICIntNullable(0))
+    ordinaryInlineAcceptsICString_Null(1, null)
+    ordinaryInlineAcceptsICStringNullable_Null(1, null)
+    ordinaryInlineAcceptsICAny_Null(1, null)
+    ordinaryInlineAcceptsICAnyNullable_Null(1, null)
+    ordinaryInlineAcceptsICInt_Null(1, null)
+    ordinaryInlineAcceptsICIntNullable_Null(1, null)
+    suspendNoninlineReturnsICString()
+    suspendNoninlineReturnsICStringNullable()
+    suspendNoninlineReturnsICAny()
+    suspendNoninlineReturnsICAnyNullable()
+    suspendNoninlineReturnsICInt()
+    suspendNoninlineReturnsICIntNullable()
+    suspendNoninlineReturnsICString_Null()
+    suspendNoninlineReturnsICStringNullable_Null()
+    suspendNoninlineReturnsICAny_Null()
+    suspendNoninlineReturnsICAnyNullable_Null()
+    suspendNoninlineReturnsICInt_Null()
+    suspendNoninlineReturnsICIntNullable_Null()
+    suspendNoninlineAcceptsICString(1, ICString(""))
+    suspendNoninlineAcceptsICStringNullable(1, ICStringNullable(""))
+    suspendNoninlineAcceptsICAny(1, ICAny(""))
+    suspendNoninlineAcceptsICAnyNullable(1, ICAnyNullable(""))
+    suspendNoninlineAcceptsICInt(1, ICInt(0))
+    suspendNoninlineAcceptsICIntNullable(1, ICIntNullable(0))
+    suspendNoninlineAcceptsICString_Null(1, null)
+    suspendNoninlineAcceptsICStringNullable_Null(1, null)
+    suspendNoninlineAcceptsICAny_Null(1, null)
+    suspendNoninlineAcceptsICAnyNullable_Null(1, null)
+    suspendNoninlineAcceptsICInt_Null(1, null)
+    suspendNoninlineAcceptsICIntNullable_Null(1, null)
+    suspendInlineReturnsICString()
+    suspendInlineReturnsICStringNullable()
+    suspendInlineReturnsICAny()
+    suspendInlineReturnsICAnyNullable()
+    suspendInlineReturnsICInt()
+    suspendInlineReturnsICIntNullable()
+    suspendInlineReturnsICString_Null()
+    suspendInlineReturnsICStringNullable_Null()
+    suspendInlineReturnsICAny_Null()
+    suspendInlineReturnsICAnyNullable_Null()
+    suspendInlineReturnsICInt_Null()
+    suspendInlineReturnsICIntNullable_Null()
+    suspendInlineAcceptsICString(1, ICString(""))
+    suspendInlineAcceptsICStringNullable(1, ICStringNullable(""))
+    suspendInlineAcceptsICAny(1, ICAny(""))
+    suspendInlineAcceptsICAnyNullable(1, ICAnyNullable(""))
+    suspendInlineAcceptsICInt(1, ICInt(0))
+    suspendInlineAcceptsICIntNullable(1, ICIntNullable(0))
+    suspendInlineAcceptsICString_Null(1, null)
+    suspendInlineAcceptsICStringNullable_Null(1, null)
+    suspendInlineAcceptsICAny_Null(1, null)
+    suspendInlineAcceptsICAnyNullable_Null(1, null)
+    suspendInlineAcceptsICInt_Null(1, null)
+    suspendInlineAcceptsICIntNullable_Null(1, null)
+    C().ordinaryNoninlineReturnsICString()
+    C().ordinaryNoninlineReturnsICStringNullable()
+    C().ordinaryNoninlineReturnsICAny()
+    C().ordinaryNoninlineReturnsICAnyNullable()
+    C().ordinaryNoninlineReturnsICInt()
+    C().ordinaryNoninlineReturnsICIntNullable()
+    C().ordinaryNoninlineReturnsICString_Null()
+    C().ordinaryNoninlineReturnsICStringNullable_Null()
+    C().ordinaryNoninlineReturnsICAny_Null()
+    C().ordinaryNoninlineReturnsICAnyNullable_Null()
+    C().ordinaryNoninlineReturnsICInt_Null()
+    C().ordinaryNoninlineReturnsICIntNullable_Null()
+    C().ordinaryNoninlineAcceptsICString(1, ICString(""))
+    C().ordinaryNoninlineAcceptsICStringNullable(1, ICStringNullable(""))
+    C().ordinaryNoninlineAcceptsICAny(1, ICAny(""))
+    C().ordinaryNoninlineAcceptsICAnyNullable(1, ICAnyNullable(""))
+    C().ordinaryNoninlineAcceptsICInt(1, ICInt(0))
+    C().ordinaryNoninlineAcceptsICIntNullable(1, ICIntNullable(0))
+    C().ordinaryNoninlineAcceptsICString_Null(1, null)
+    C().ordinaryNoninlineAcceptsICStringNullable_Null(1, null)
+    C().ordinaryNoninlineAcceptsICAny_Null(1, null)
+    C().ordinaryNoninlineAcceptsICAnyNullable_Null(1, null)
+    C().ordinaryNoninlineAcceptsICInt_Null(1, null)
+    C().ordinaryNoninlineAcceptsICIntNullable_Null(1, null)
+    C().ordinaryInlineReturnsICString()
+    C().ordinaryInlineReturnsICStringNullable()
+    C().ordinaryInlineReturnsICAny()
+    C().ordinaryInlineReturnsICAnyNullable()
+    C().ordinaryInlineReturnsICInt()
+    C().ordinaryInlineReturnsICIntNullable()
+    C().ordinaryInlineReturnsICString_Null()
+    C().ordinaryInlineReturnsICStringNullable_Null()
+    C().ordinaryInlineReturnsICAny_Null()
+    C().ordinaryInlineReturnsICAnyNullable_Null()
+    C().ordinaryInlineReturnsICInt_Null()
+    C().ordinaryInlineReturnsICIntNullable_Null()
+    C().ordinaryInlineAcceptsICString(1, ICString(""))
+    C().ordinaryInlineAcceptsICStringNullable(1, ICStringNullable(""))
+    C().ordinaryInlineAcceptsICAny(1, ICAny(""))
+    C().ordinaryInlineAcceptsICAnyNullable(1, ICAnyNullable(""))
+    C().ordinaryInlineAcceptsICInt(1, ICInt(0))
+    C().ordinaryInlineAcceptsICIntNullable(1, ICIntNullable(0))
+    C().ordinaryInlineAcceptsICString_Null(1, null)
+    C().ordinaryInlineAcceptsICStringNullable_Null(1, null)
+    C().ordinaryInlineAcceptsICAny_Null(1, null)
+    C().ordinaryInlineAcceptsICAnyNullable_Null(1, null)
+    C().ordinaryInlineAcceptsICInt_Null(1, null)
+    C().ordinaryInlineAcceptsICIntNullable_Null(1, null)
+    C().suspendNoninlineReturnsICString()
+    C().suspendNoninlineReturnsICStringNullable()
+    C().suspendNoninlineReturnsICAny()
+    C().suspendNoninlineReturnsICAnyNullable()
+    C().suspendNoninlineReturnsICInt()
+    C().suspendNoninlineReturnsICIntNullable()
+    C().suspendNoninlineReturnsICString_Null()
+    C().suspendNoninlineReturnsICStringNullable_Null()
+    C().suspendNoninlineReturnsICAny_Null()
+    C().suspendNoninlineReturnsICAnyNullable_Null()
+    C().suspendNoninlineReturnsICInt_Null()
+    C().suspendNoninlineReturnsICIntNullable_Null()
+    C().suspendNoninlineAcceptsICString(1, ICString(""))
+    C().suspendNoninlineAcceptsICStringNullable(1, ICStringNullable(""))
+    C().suspendNoninlineAcceptsICAny(1, ICAny(""))
+    C().suspendNoninlineAcceptsICAnyNullable(1, ICAnyNullable(""))
+    C().suspendNoninlineAcceptsICInt(1, ICInt(0))
+    C().suspendNoninlineAcceptsICIntNullable(1, ICIntNullable(0))
+    C().suspendNoninlineAcceptsICString_Null(1, null)
+    C().suspendNoninlineAcceptsICStringNullable_Null(1, null)
+    C().suspendNoninlineAcceptsICAny_Null(1, null)
+    C().suspendNoninlineAcceptsICAnyNullable_Null(1, null)
+    C().suspendNoninlineAcceptsICInt_Null(1, null)
+    C().suspendNoninlineAcceptsICIntNullable_Null(1, null)
+    C().suspendInlineReturnsICString()
+    C().suspendInlineReturnsICStringNullable()
+    C().suspendInlineReturnsICAny()
+    C().suspendInlineReturnsICAnyNullable()
+    C().suspendInlineReturnsICInt()
+    C().suspendInlineReturnsICIntNullable()
+    C().suspendInlineReturnsICString_Null()
+    C().suspendInlineReturnsICStringNullable_Null()
+    C().suspendInlineReturnsICAny_Null()
+    C().suspendInlineReturnsICAnyNullable_Null()
+    C().suspendInlineReturnsICInt_Null()
+    C().suspendInlineReturnsICIntNullable_Null()
+    C().suspendInlineAcceptsICString(1, ICString(""))
+    C().suspendInlineAcceptsICStringNullable(1, ICStringNullable(""))
+    C().suspendInlineAcceptsICAny(1, ICAny(""))
+    C().suspendInlineAcceptsICAnyNullable(1, ICAnyNullable(""))
+    C().suspendInlineAcceptsICInt(1, ICInt(0))
+    C().suspendInlineAcceptsICIntNullable(1, ICIntNullable(0))
+    C().suspendInlineAcceptsICString_Null(1, null)
+    C().suspendInlineAcceptsICStringNullable_Null(1, null)
+    C().suspendInlineAcceptsICAny_Null(1, null)
+    C().suspendInlineAcceptsICAnyNullable_Null(1, null)
+    C().suspendInlineAcceptsICInt_Null(1, null)
+    C().suspendInlineAcceptsICIntNullable_Null(1, null)
+}
\ No newline at end of file
diff --git a/compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt b/compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt
index e09023c946a..41b939f57d8 100644
--- a/compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt
+++ b/compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt
@@ -1,3 +1,5 @@
+// IGNORE_BACKEND: JVM, JVM_IR
+
 package test
 
 interface KotlinInterface
diff --git a/compiler/testData/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt b/compiler/testData/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt
new file mode 100644
index 00000000000..541d2fa4276
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt
@@ -0,0 +1,18 @@
+// TARGET_BACKEND: JVM
+// FILE: A.kt
+
+abstract class A {
+    private val x = object {
+        fun foo() = "OK"
+    }
+
+    protected val y = x.foo()
+}
+
+// FILE: B.kt
+
+class B : A() {
+    val z = y
+}
+
+fun box() = B().z
\ No newline at end of file
diff --git a/compiler/testData/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt b/compiler/testData/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt
new file mode 100644
index 00000000000..2450ef6b97b
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt
@@ -0,0 +1,31 @@
+// TARGET_BACKEND: JVM
+// FILE: A.kt
+
+interface KotlinMangler<D : Any> {
+    val String.hashMangle: Long
+    val D.fqnString: String
+    val D.fqnMangle: Long get() = fqnString.hashMangle
+    val manglerName: String
+
+    interface IrMangler : KotlinMangler<String> {
+        override val manglerName: String
+            get() = "Ir"
+    }
+}
+
+abstract class AbstractKotlinMangler<D : Any> : KotlinMangler<D> {
+    override val String.hashMangle get() = 42L
+}
+
+abstract class IrBasedKotlinManglerImpl : AbstractKotlinMangler<String>(), KotlinMangler.IrMangler {
+    override val String.fqnString: String
+        get() = this
+}
+
+// FILE: B.kt
+
+abstract class AbstractJvmManglerIr : IrBasedKotlinManglerImpl()
+
+object JvmManglerIr : AbstractJvmManglerIr()
+
+fun box() = "OK"
\ No newline at end of file
diff --git a/compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt b/compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt
new file mode 100644
index 00000000000..4a5860fed44
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt
@@ -0,0 +1,28 @@
+// !LANGUAGE: +InlineClasses
+// IGNORE_BACKEND_FIR: JVM_IR
+// FILE: 1.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+package test
+
+inline class IC(val s: String)
+
+fun ordinary(s: String, ic: IC): String = s + ic.s
+
+suspend fun suspend(s: String, ic: IC): String = s + ic.s
+
+// FILE: 2.kt
+import kotlin.coroutines.*
+import test.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(Continuation(EmptyCoroutineContext) {})
+}
+
+fun box(): String {
+    var res = ordinary("O", IC("K"))
+    if (res != "OK") return "FAIL 1: $res"
+    builder {
+        res = suspend("O", IC("K"))
+    }
+    return res
+}
diff --git a/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt b/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt
new file mode 100644
index 00000000000..4dd7c6e5df2
--- /dev/null
+++ b/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt
@@ -0,0 +1,21 @@
+
+
+// FILE: test.kt
+class Foo {
+    inner class Bar {
+    }
+}
+
+fun box() {
+    val x = Foo()
+    x.Bar()
+}
+
+// LOCAL VARIABLES
+// test.kt:10 box:
+// test.kt:4 <init>:
+// test.kt:10 box:
+// test.kt:11 box: x:Foo=Foo
+// test.kt:5 <init>:
+// test.kt:11 box: x:Foo=Foo
+// test.kt:12 box: x:Foo=Foo
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt b/compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt
new file mode 100644
index 00000000000..00023618456
--- /dev/null
+++ b/compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt
@@ -0,0 +1,19 @@
+
+
+// FILE: test.kt
+fun blockFun(blockArg: String.() -> Unit) =
+    "OK".blockArg()
+
+fun box() {
+    blockFun {
+        println(this)
+    }
+}
+
+// LOCAL VARIABLES
+// test.kt:8 box:
+// test.kt:5 blockFun: blockArg:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 invoke: $this$blockFun:java.lang.String="OK":java.lang.String
+// test.kt:10 invoke: $this$blockFun:java.lang.String="OK":java.lang.String
+// test.kt:5 blockFun: blockArg:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:11 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/receiverMangling/lambdaWithExtensionReceiver.kt b/compiler/testData/debug/localVariables/receiverMangling/lambdaWithExtensionReceiver.kt
new file mode 100644
index 00000000000..43b04b00f66
--- /dev/null
+++ b/compiler/testData/debug/localVariables/receiverMangling/lambdaWithExtensionReceiver.kt
@@ -0,0 +1,19 @@
+
+// FILE: test.kt
+fun foo(block: Long.() -> String): String {
+    return 1L.block()
+}
+
+fun box() {
+    foo {
+        "OK"
+    }
+}
+
+// LOCAL VARIABLES
+// test.kt:8 box:
+// test.kt:4 foo: block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 invoke: $this$foo:long=1:long
+// test.kt:4 foo: block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:8 box:
+// test.kt:11 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/receiverParameter.kt b/compiler/testData/debug/localVariables/receiverMangling/receiverParameter.kt
similarity index 100%
rename from compiler/testData/debug/localVariables/receiverParameter.kt
rename to compiler/testData/debug/localVariables/receiverMangling/receiverParameter.kt
diff --git a/compiler/testData/debug/localVariables/receiverMangling/simple.kt b/compiler/testData/debug/localVariables/receiverMangling/simple.kt
new file mode 100644
index 00000000000..bf01739bc59
--- /dev/null
+++ b/compiler/testData/debug/localVariables/receiverMangling/simple.kt
@@ -0,0 +1,13 @@
+
+
+// FILE: test.kt
+fun String.foo(a: Int) {}
+
+fun box() {
+    "OK".foo(42)
+}
+
+// LOCAL VARIABLES
+// test.kt:7 box:
+// test.kt:4 foo: $this$foo:java.lang.String="OK":java.lang.String, a:int=42:int
+// test.kt:8 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt
new file mode 100644
index 00000000000..00023618456
--- /dev/null
+++ b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt
@@ -0,0 +1,19 @@
+
+
+// FILE: test.kt
+fun blockFun(blockArg: String.() -> Unit) =
+    "OK".blockArg()
+
+fun box() {
+    blockFun {
+        println(this)
+    }
+}
+
+// LOCAL VARIABLES
+// test.kt:8 box:
+// test.kt:5 blockFun: blockArg:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 invoke: $this$blockFun:java.lang.String="OK":java.lang.String
+// test.kt:10 invoke: $this$blockFun:java.lang.String="OK":java.lang.String
+// test.kt:5 blockFun: blockArg:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:11 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt
new file mode 100644
index 00000000000..30f489b6375
--- /dev/null
+++ b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt
@@ -0,0 +1,19 @@
+
+
+// FILE: test.kt
+fun blockFun(blockArg: String.() -> Unit) =
+    "OK".blockArg()
+
+fun box() {
+    blockFun label@{
+        println(this)
+    }
+}
+
+// LOCAL VARIABLES
+// test.kt:8 box:
+// test.kt:5 blockFun: blockArg:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 invoke: $this$label:java.lang.String="OK":java.lang.String
+// test.kt:10 invoke: $this$label:java.lang.String="OK":java.lang.String
+// test.kt:5 blockFun: blockArg:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:11 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt
new file mode 100644
index 00000000000..b955fc00b56
--- /dev/null
+++ b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt
@@ -0,0 +1,19 @@
+
+
+// FILE: test.kt
+fun blockFun(blockArg: String.() -> Unit) =
+    "OK".blockArg()
+
+fun box() {
+    blockFun ({
+                  println(this)
+              })
+}
+
+// LOCAL VARIABLES
+// test.kt:8 box:
+// test.kt:5 blockFun: blockArg:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 invoke: $this$blockFun:java.lang.String="OK":java.lang.String
+// test.kt:10 invoke: $this$blockFun:java.lang.String="OK":java.lang.String
+// test.kt:5 blockFun: blockArg:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:11 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
index 2de524ab586..e9910dae5f1 100644
--- a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
+++ b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
@@ -1,5 +1,5 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: test.kt
+
 inline fun alsoInline() = "OK"
 
 inline fun ifoo(s: String = alsoInline()): String {
@@ -10,9 +10,29 @@ fun box(): String {
     return ifoo()
 }
 
+// `alsoInline` is inlined in the `ifoo$default` stub. When exiting the inline
+// codegen, the line number is reset. Therefore any code generated with line
+// number information will emit a new line number so that stepping continues
+// in the caller.
+//
+// For JVM none of the code after `alsoInline` leads to line number generation.
+// This seems problematic as the line number for the inline function is then
+// in effect for instructions outside the scope of the `$i$f$alsoInline`
+// variable life time.
+//
+// For JVM_IR a line number is generated for the code following `alsoInline`.
+// Therefore, we stop on line 5 before entering `alsoInline`
+// and we step back to line 5 after `alsoInline` and before the body of
+// `ifoo`. This seems reasonable and also help ensure that line numbers
+// for the inline function are only used for instructions covered by
+// the `$i$f$alsoInline` variable life time.
+
 // LINENUMBERS
 // test.kt:10 box
 // test.kt:5 box
 // test.kt:3 box
+// LINENUMBERS JVM_IR
+// test.kt:5 box
+// LINENUMBERS
 // test.kt:6 box
 // test.kt:10 box
\ No newline at end of file
diff --git a/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt b/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt
new file mode 100644
index 00000000000..2bad5f79a4c
--- /dev/null
+++ b/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt
@@ -0,0 +1,19 @@
+// WITH_COROUTINES
+// FILE: test.kt
+suspend fun foo(block: Long.() -> String): String {
+    return 1L.block()
+}
+
+suspend fun box() {
+    foo {
+        "OK"
+    }
+}
+
+// LINENUMBERS
+// test.kt:8 box
+// test.kt:4 foo
+// test.kt:9 invoke
+// test.kt:4 foo
+// test.kt:8 box
+// test.kt:11 box
diff --git a/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt b/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt
new file mode 100644
index 00000000000..e0cd02adac2
--- /dev/null
+++ b/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt
@@ -0,0 +1,25 @@
+// WITH_COROUTINES
+// FILE: test.kt
+suspend fun foo(block: suspend Long.() -> String): String {
+    return 1L.block()
+}
+
+suspend fun box() {
+    foo {
+        "OK"
+    }
+}
+
+// LINENUMBERS
+// test.kt:8 box
+// test.kt:4 foo
+// CoroutineUtil.kt:28 getContext
+// test.kt:-1 <init>
+// test.kt:-1 create
+// test.kt:-1 invoke
+// test.kt:8 invokeSuspend
+// test.kt:9 invokeSuspend
+// test.kt:-1 invoke
+// test.kt:4 foo
+// test.kt:8 box
+// test.kt:11 box
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/helpers/types/checkType.kt b/compiler/testData/diagnostics/helpers/types/checkType.kt
index 1e4869bc28b..43b66629058 100644
--- a/compiler/testData/diagnostics/helpers/types/checkType.kt
+++ b/compiler/testData/diagnostics/helpers/types/checkType.kt
@@ -1,7 +1,5 @@
-package tests._checkType
-
 fun <T> checkSubtype(t: T) = t
-class Inv<T>
-fun <E> Inv<E>._() {}
+class CheckTypeInv<T>
+fun <E> CheckTypeInv<E>._() {}
 
-infix fun <T> T.checkType(f: Inv<T>.() -> Unit) {}
+infix fun <T> T.checkType(f: CheckTypeInv<T>.() -> Unit) {}
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
index 5d8592d2732..6a62617d900 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
@@ -3,6 +3,9 @@
 
 package foo
 
+import checkType
+import checkSubtype
+
 fun Any.foo() : () -> Unit {
   return {}
 }
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
index d08dc66e872..5263624e844 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
@@ -3,6 +3,9 @@
 
 package foo
 
+import checkType
+import checkSubtype
+
 fun Any.foo() : () -> Unit {
   return {}
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.fir.kt b/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.fir.kt
new file mode 100644
index 00000000000..8ca3f58b4ca
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.fir.kt
@@ -0,0 +1,23 @@
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Anno(vararg val x: String, val y: String)
+
+@Anno(x = [["a", "b"], ["a", "b"]], y = "a")
+fun foo1() {}
+
+@Anno(x = ["a", "b"], y = "a")
+fun foo2() {}
+
+<!INAPPLICABLE_CANDIDATE!>@Anno(x = arrayOf(arrayOf("a"), arrayOf("b")), y = "a")<!>
+fun foo3() {}
+
+@Anno(x = arrayOf("a", "b"), y = "a")
+fun foo4() {}
+
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Anno1(val x: Array<in String>, val y: String)
+
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Anno2(vararg val x: String, val y: String)
+
+@Anno1(x = ["", Anno2(x = [""], y = "")], y = "")
+fun foo5() {}
diff --git a/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.kt b/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.kt
new file mode 100644
index 00000000000..94956926244
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.kt
@@ -0,0 +1,23 @@
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Anno(vararg val x: String, val y: String)
+
+@Anno(x = [<!TYPE_MISMATCH, TYPE_MISMATCH!>["a", "b"]<!>, <!TYPE_MISMATCH, TYPE_MISMATCH!>["a", "b"]<!>], y = "a")
+fun foo1() {}
+
+@Anno(x = ["a", "b"], y = "a")
+fun foo2() {}
+
+@Anno(x = <!TYPE_MISMATCH, TYPE_MISMATCH!>arrayOf(arrayOf("a"), arrayOf("b"))<!>, y = "a")
+fun foo3() {}
+
+@Anno(x = arrayOf("a", "b"), y = "a")
+fun foo4() {}
+
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Anno1(val x: Array<in String>, val y: String)
+
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Anno2(vararg val x: String, val y: String)
+
+@Anno1(x = ["", Anno2(x = [""], y = "")], y = "")
+fun foo5() {}
diff --git a/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.txt b/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.txt
new file mode 100644
index 00000000000..fb9586c3c83
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.txt
@@ -0,0 +1,34 @@
+package
+
+@Anno(x = {{"a", "b"}, {"a", "b"}}, y = "a") public fun foo1(): kotlin.Unit
+@Anno(x = {"a", "b"}, y = "a") public fun foo2(): kotlin.Unit
+@Anno(x = {{"a"}, {"b"}}, y = "a") public fun foo3(): kotlin.Unit
+@Anno(x = {"a", "b"}, y = "a") public fun foo4(): kotlin.Unit
+@Anno1(x = {"", Anno2(x = {""}, y = "")}, y = "") public fun foo5(): kotlin.Unit
+
+@kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class Anno : kotlin.Annotation {
+    public constructor Anno(/*0*/ vararg x: kotlin.String /*kotlin.Array<out kotlin.String>*/, /*1*/ y: kotlin.String)
+    public final val x: kotlin.Array<out kotlin.String>
+    public final val y: kotlin.String
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+@kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class Anno1 : kotlin.Annotation {
+    public constructor Anno1(/*0*/ x: kotlin.Array<in kotlin.String>, /*1*/ y: kotlin.String)
+    public final val x: kotlin.Array<in kotlin.String>
+    public final val y: kotlin.String
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+@kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class Anno2 : kotlin.Annotation {
+    public constructor Anno2(/*0*/ vararg x: kotlin.String /*kotlin.Array<out kotlin.String>*/, /*1*/ y: kotlin.String)
+    public final val x: kotlin.Array<out kotlin.String>
+    public final val y: kotlin.String
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/companionObject.fir.kt b/compiler/testData/diagnostics/tests/callableReference/bound/companionObject.fir.kt
index bd6cd6dc7e3..c14f2527175 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bound/companionObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/bound/companionObject.fir.kt
@@ -3,6 +3,8 @@
 
 package test
 
+import checkSubtype
+
 class C {
     companion object {
         fun foo(): String = "companion"
diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/companionObject.kt b/compiler/testData/diagnostics/tests/callableReference/bound/companionObject.kt
index d053ab877fa..58734c704a7 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bound/companionObject.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/bound/companionObject.kt
@@ -3,6 +3,8 @@
 
 package test
 
+import checkSubtype
+
 class C {
     companion object {
         fun foo(): String = "companion"
diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/expressionWithNullableType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/bound/expressionWithNullableType.fir.kt
index 2d28635fbe5..90bcf400396 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bound/expressionWithNullableType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/bound/expressionWithNullableType.fir.kt
@@ -7,8 +7,8 @@ public interface J {
 // FILE: test.kt
 
 fun f1(x: Int?): Any = <!UNRESOLVED_REFERENCE!>x::hashCode<!>
-fun <T> f2(t: T): Any = t::hashCode
-fun <S : String?> f3(s: S): Any = s::hashCode
+fun <T> f2(t: T): Any = <!UNRESOLVED_REFERENCE!>t::hashCode<!>
+fun <S : String?> f3(s: S): Any = <!UNRESOLVED_REFERENCE!>s::hashCode<!>
 fun <U : Any> f4(u: U?): Any = <!UNRESOLVED_REFERENCE!>u::hashCode<!>
 fun f5(c: List<*>): Any = <!UNRESOLVED_REFERENCE!>c[0]::hashCode<!>
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.fir.kt
index f25fc6ddbc7..073282b9ab2 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.fir.kt
@@ -3,6 +3,8 @@
 
 package first
 
+import checkSubtype
+
 class A {
     fun foo() {}
     fun bar(x: Int) {}
@@ -14,7 +16,7 @@ class A {
 package other
 
 import kotlin.reflect.*
-
+import checkSubtype
 import first.A
 
 fun main() {
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt
index 1d0c327455f..6202b9f2179 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt
@@ -3,6 +3,8 @@
 
 package first
 
+import checkSubtype
+
 class A {
     fun foo() {}
     fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
@@ -14,7 +16,7 @@ class A {
 package other
 
 import kotlin.reflect.*
-
+import checkSubtype
 import first.A
 
 fun main() {
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.fir.kt
index fda9de85f94..67f25303cc8 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.fir.kt
@@ -4,6 +4,8 @@
 
 package first
 
+import checkSubtype
+
 class A
 
 fun A.foo() {}
@@ -18,6 +20,7 @@ import kotlin.reflect.KFunction1
 
 import first.A
 import first.foo
+import checkSubtype
 
 fun main() {
     val x = first.A::foo
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt
index 6b26e8a0b3b..13d0f4e6cc4 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt
@@ -4,6 +4,8 @@
 
 package first
 
+import checkSubtype
+
 class A
 
 fun A.foo() {}
@@ -18,6 +20,7 @@ import kotlin.reflect.KFunction1
 
 import first.A
 import first.foo
+import checkSubtype
 
 fun main() {
     val x = first.A::foo
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.fir.kt
index 0f7f02af9f8..c9a4ed9b01a 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.fir.kt
@@ -3,6 +3,8 @@
 
 package first
 
+import checkSubtype
+
 fun foo() {}
 fun bar(x: Int) {}
 fun baz() = "OK"
@@ -16,6 +18,7 @@ import kotlin.reflect.*
 import first.foo
 import first.bar
 import first.baz
+import checkSubtype
 
 fun main() {
     val x = ::foo
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt
index b1d196fd7e2..63d9bcbbfb4 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt
@@ -3,6 +3,8 @@
 
 package first
 
+import checkSubtype
+
 fun foo() {}
 fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
 fun baz() = "OK"
@@ -16,6 +18,7 @@ import kotlin.reflect.*
 import first.foo
 import first.bar
 import first.baz
+import checkSubtype
 
 fun main() {
     val x = ::foo
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.fir.kt
index 4362e431590..33d81eee6f6 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.fir.kt
@@ -4,10 +4,10 @@ class A {
     fun A.extA(x: String) = x
     
     fun main() {
-        <!UNRESOLVED_REFERENCE!>Int::extInt<!>
+        Int::extInt
         A::extA
 
-        <!INAPPLICABLE_CANDIDATE!>eat<!>(<!UNRESOLVED_REFERENCE!>Int::extInt<!>)
+        eat(Int::extInt)
         eat(A::extA)
     }
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/referenceToCompanionObjectMemberViaClassNameCompatibility.fir.kt b/compiler/testData/diagnostics/tests/callableReference/referenceToCompanionObjectMemberViaClassNameCompatibility.fir.kt
index 2fe0def1097..8ad8bae69a0 100644
--- a/compiler/testData/diagnostics/tests/callableReference/referenceToCompanionObjectMemberViaClassNameCompatibility.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/referenceToCompanionObjectMemberViaClassNameCompatibility.fir.kt
@@ -22,7 +22,7 @@ fun B.foo(): Double = 0.0
 fun call(a: Any) {}
 
 fun testA(a: A) {
-    call(A::foo)
+    call(<!UNRESOLVED_REFERENCE!>A::foo<!>)
     call(A.Companion::foo)
 }
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.fir.kt
deleted file mode 100644
index 8fffcbe4ad4..00000000000
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.fir.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// WITH_RUNTIME
-
-
-fun <T> List<Option<T>>.flatten(): List<T> = <!AMBIGUITY!>flatMap<!> { <!UNRESOLVED_REFERENCE!>it<!>.<!NONE_APPLICABLE!>fold<!>(::emptyList, <!UNRESOLVED_REFERENCE!>::listOf<!>) }
-
-class Option<out T> {
-    fun <R> fold(ifEmpty: () -> R, ifSome: (T) -> R): R = TODO()
-}
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.kt
index 3dcd7353331..da4dbd9b553 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // WITH_RUNTIME
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.fir.kt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.fir.kt
index e50193d6d83..68fe795f84c 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.fir.kt
@@ -28,7 +28,7 @@ object O {
 fun f() {
     A.c
     A.hashCode()
-    A().Nested
+    A().<!UNRESOLVED_REFERENCE!>Nested<!>
     A.Nested()
     A().Inner()
     A.Companion.<!UNRESOLVED_REFERENCE!>Nested<!>
@@ -42,10 +42,10 @@ fun f() {
     A.Companion.c
     A.Obj
     A.Companion.Obj2
-    A.Obj2
-    A.Obj2.c
-    A.Nested2
+    A.<!UNRESOLVED_REFERENCE!>Obj2<!>
+    A.<!UNRESOLVED_REFERENCE!>Obj2<!>.<!UNRESOLVED_REFERENCE!>c<!>
+    A.<!UNRESOLVED_REFERENCE!>Nested2<!>
 
     O.O
     O.A()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.fir.kt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.fir.kt
index bd84df04f12..fe5a977f93d 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.fir.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.fir.kt
@@ -33,12 +33,12 @@ enum class C {
 }
 
 fun f() {
-    C.E1.A
+    C.E1.<!UNRESOLVED_REFERENCE!>A<!>
     C.E1.<!UNRESOLVED_REFERENCE!>A<!>()
     C.E2.B()
 
-    C.E2.O
-    C.E3.O.InO
+    C.E2.<!UNRESOLVED_REFERENCE!>O<!>
+    C.E3.<!UNRESOLVED_REFERENCE!>O<!>.<!UNRESOLVED_REFERENCE!>InO<!>
 
     C.O
     C.O.InO
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.fir.kt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.fir.kt
index b4178c69923..21659f70c73 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.fir.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.fir.kt
@@ -33,12 +33,12 @@ enum class C {
 }
 
 fun f() {
-    C.E1.A
+    C.E1.<!UNRESOLVED_REFERENCE!>A<!>
     C.E1.<!UNRESOLVED_REFERENCE!>A<!>()
     C.E2.B()
 
-    C.E2.O
-    C.E3.O.InO
+    C.E2.<!UNRESOLVED_REFERENCE!>O<!>
+    C.E3.<!UNRESOLVED_REFERENCE!>O<!>.<!UNRESOLVED_REFERENCE!>InO<!>
 
     C.O
     C.O.InO
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
index 374e2afb643..b6236178bb0 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
@@ -14,11 +14,11 @@ fun test() {
 }
 
 fun check() {
-    [1, 2] checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<Int>>() }
-    [""] checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<String>>() }
+    [1, 2] <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Array<Int>>() }
+    [""] <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Array<String>>() }
 
     val f: IntArray = [1]
-    [f] checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<IntArray>>() }
+    [f] <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Array<IntArray>>() }
 
-    [1, ""] checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<Any>>() }
-}
\ No newline at end of file
+    [1, ""] <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Array<Any>>() }
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.fir.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.fir.kt
index ef40ac1e577..79dc1230d06 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.fir.kt
@@ -31,7 +31,7 @@ enum class Fruit(personal: Int) {
 
 // Another example from KT-11769
 enum class EnumCompanion1(val x: Int) {
-    INSTANCE(<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>foo<!>()),
+    INSTANCE(Companion.foo()),
     ANOTHER(foo());
 
     companion object {
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.fir.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.fir.kt
index 7bf4b2deb91..91107e9017d 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.fir.kt
@@ -14,7 +14,7 @@ fun tryCatchFinally(x: Int?) {
     } catch (e: Exception) {
         x!!
     } finally {
-        checkSubtype<Int>(x)
+        <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(x)
         x!!
     }
     checkSubtype<Int>(x)
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.fir.kt
index 3a8cba18859..a87fe97c06a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.fir.kt
@@ -3,6 +3,8 @@
 //KT-2631 Check multiple assignment
 package a
 
+import checkSubtype
+
 class MyClass {
     operator fun component1() = 1
     operator fun component2() = "a"
@@ -24,4 +26,4 @@ fun test(mc1: MyClass, mc2: MyClass2) {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Boolean>(a)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Boolean>(b)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Boolean>(c)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt
index 99728930b1f..916878dd56f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt
@@ -3,6 +3,8 @@
 //KT-2631 Check multiple assignment
 package a
 
+import checkSubtype
+
 class MyClass {
     operator fun component1() = 1
     operator fun component2() = "a"
@@ -24,4 +26,4 @@ fun test(mc1: MyClass, mc2: MyClass2) {
     checkSubtype<Boolean>(<!TYPE_MISMATCH!>a<!>)
     checkSubtype<Boolean>(<!TYPE_MISMATCH!>b<!>)
     checkSubtype<Boolean>(<!TYPE_MISMATCH!>c<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt
index aadaa644da0..0da46b5fa6e 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt
@@ -17,4 +17,4 @@ fun test() {
 class Delegate<F> {
     operator fun getValue(thisRef: Any?, property: KProperty<*>): String = ""
     operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt
index e805b1b2abc..7e71a1f6c70 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt
@@ -17,4 +17,4 @@ fun test() {
 class Delegate<F> {
     operator fun getValue(thisRef: Any?, property: KProperty<*>): String = ""
     operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
index 4e839cc1292..2937d8e871a 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
@@ -3,6 +3,8 @@
 
 package m
 
+import checkSubtype
+
 fun test(i: Int?) {
     if (i != null) {
         foo(l1@ i)
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
index 8e89a8ad7f3..20ed233ab7c 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
+++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
@@ -3,6 +3,8 @@
 
 package m
 
+import checkSubtype
+
 fun test(i: Int?) {
     if (i != null) {
         foo(<!REDUNDANT_LABEL_WARNING!>l1@<!> <!DEBUG_INFO_SMARTCAST!>i<!>)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt6541_extensionForExtensionFunction.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt6541_extensionForExtensionFunction.fir.kt
index 32a662a6ce9..db815efa470 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt6541_extensionForExtensionFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt6541_extensionForExtensionFunction.fir.kt
@@ -7,4 +7,4 @@ object Z {
     infix fun add(b : Foo.() -> Unit) : Z = Z
 }
 
-val t2 = Z <!INAPPLICABLE_CANDIDATE!>add<!> { } { }
+val t2 = Z <!INAPPLICABLE_CANDIDATE!>add<!> <!INAPPLICABLE_CANDIDATE!>{ } { }<!>
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/functionalBound.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/functionalBound.fir.kt
index 1a95bf72e24..f5a37d10a32 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/functionalBound.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/functionalBound.fir.kt
@@ -1,6 +1,6 @@
 fun <E : String?, T : ((CharSequence) -> Unit)?> foo(x: E, y: T) {
     if (x != null) {
-        y(x)
+        <!INAPPLICABLE_CANDIDATE!>y<!>(x)
     }
 
     if (y != null) {
@@ -10,4 +10,4 @@ fun <E : String?, T : ((CharSequence) -> Unit)?> foo(x: E, y: T) {
     if (x != null && y != null) {
         y(x)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastRefinedClass.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastRefinedClass.fir.kt
index 914151e3715..b00a969aac8 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastRefinedClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastRefinedClass.fir.kt
@@ -1,6 +1,6 @@
 fun <T : Any?> foo(x: T) {
     if (x is String?) {
-        x.length
+        x.<!INAPPLICABLE_CANDIDATE!>length<!>
 
         if (x != null) {
             x.length
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt
index f829414ef7f..1a3b014fcf5 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt
@@ -24,7 +24,7 @@ fun <T : CharSequence?> foo(x: T) {
         x?.bar1()
     }
 
-    x.length
+    x.<!INAPPLICABLE_CANDIDATE!>length<!>
 
     if (x is String) {
         x.length
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.fir.kt
index afd4d5b9a6a..49bf2c04035 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.fir.kt
@@ -23,7 +23,7 @@ fun <T : String?> T.foo() {
         this?.bar1()
     }
 
-    length
+    <!INAPPLICABLE_CANDIDATE!>length<!>
 
     if (this is String) {
         length
@@ -33,4 +33,4 @@ fun <T : String?> T.foo() {
         bar2()
         bar3()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.fir.kt
index c8f52d3f8cc..dd30e3ef6da 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.fir.kt
@@ -7,7 +7,7 @@ fun CharSequence?.bar2() {}
 fun <T : CharSequence> T.bar3() {}
 
 fun <T : String?> foo(x: T) {
-    x.length
+    x.<!INAPPLICABLE_CANDIDATE!>length<!>
     x?.length
 
     if (1 == 1) {
diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
index 7848dde3efe..e2f422cf43c 100644
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
@@ -3,6 +3,8 @@
 
 package d
 
+import checkSubtype
+
 fun <T: Any> joinT(x: Int, vararg a: T): T? {
     return null
 }
diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
index 7f26973a7af..dacf903b75b 100644
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
+++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
@@ -3,6 +3,8 @@
 
 package d
 
+import checkSubtype
+
 fun <T: Any> joinT(<!UNUSED_PARAMETER!>x<!>: Int, vararg <!UNUSED_PARAMETER!>a<!>: T): T? {
     return null
 }
@@ -14,4 +16,4 @@ fun <T: Any> joinT(<!UNUSED_PARAMETER!>x<!>: Comparable<*>, <!UNUSED_PARAMETER!>
 fun test() {
     val x2 = <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>joinT<!>(<!TYPE_MISMATCH!>Unit<!>, "2")
     checkSubtype<String?>(x2)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.fir.kt
index bae7a552814..d26254bef7c 100644
--- a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.fir.kt
@@ -3,6 +3,7 @@
 package h
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun <T> id(t: T) : T = t
 
diff --git a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.kt b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.kt
index a08c09e8bde..2a227938921 100644
--- a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.kt
@@ -3,6 +3,7 @@
 package h
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun <T> id(t: T) : T = t
 
diff --git a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.fir.kt b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.fir.kt
index 790d98a513a..998c43024e6 100644
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.fir.kt
@@ -3,6 +3,8 @@
 
 package a
 
+import checkSubtype
+
 fun <T> emptyList(): List<T> = throw Exception()
 
 fun <T> foo(f: T.() -> Unit, l: List<T>): T = throw Exception("$f$l")
@@ -12,4 +14,4 @@ fun test() {
     checkSubtype<Int>(q)
 
     foo({}, emptyList())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
index 3ee7c4cc974..9f543b11387 100644
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
+++ b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
@@ -3,6 +3,8 @@
 
 package a
 
+import checkSubtype
+
 fun <T> emptyList(): List<T> = throw Exception()
 
 fun <T> foo(f: T.() -> Unit, l: List<T>): T = throw Exception("$f$l")
@@ -12,4 +14,4 @@ fun test() {
     checkSubtype<Int>(q)
 
     <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>({}, <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/listConstructor.fir.kt b/compiler/testData/diagnostics/tests/inference/listConstructor.fir.kt
index af1c0fc71be..aab8f8b1fbc 100644
--- a/compiler/testData/diagnostics/tests/inference/listConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/listConstructor.fir.kt
@@ -3,6 +3,7 @@
 package a
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun <A> cons(x: A, xs: List<A>): List<A> = xs
 
diff --git a/compiler/testData/diagnostics/tests/inference/listConstructor.kt b/compiler/testData/diagnostics/tests/inference/listConstructor.kt
index 65e308bcd3a..cb496c0591f 100644
--- a/compiler/testData/diagnostics/tests/inference/listConstructor.kt
+++ b/compiler/testData/diagnostics/tests/inference/listConstructor.kt
@@ -3,6 +3,7 @@
 package a
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun <A> cons(<!UNUSED_PARAMETER!>x<!>: A, xs: List<A>): List<A> = xs
 
diff --git a/compiler/testData/diagnostics/tests/inference/mapFunction.fir.kt b/compiler/testData/diagnostics/tests/inference/mapFunction.fir.kt
index b9232a4cf5f..54cf1e0dc54 100644
--- a/compiler/testData/diagnostics/tests/inference/mapFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/mapFunction.fir.kt
@@ -4,6 +4,7 @@ package a
 
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun foo() {
     val v = array(1, 2, 3)
@@ -32,4 +33,4 @@ fun <T> array(vararg t : T) : Array<T> = t as Array<T>
 
 infix fun <T, R> Array<T>.map(transform : (T) -> R) : List<R> {}
 
-infix fun <T, R> Iterable<T>.map(transform : (T) -> R) : List<R> {}
\ No newline at end of file
+infix fun <T, R> Iterable<T>.map(transform : (T) -> R) : List<R> {}
diff --git a/compiler/testData/diagnostics/tests/inference/mapFunction.kt b/compiler/testData/diagnostics/tests/inference/mapFunction.kt
index c5bfc0765f4..a87b00b7de4 100644
--- a/compiler/testData/diagnostics/tests/inference/mapFunction.kt
+++ b/compiler/testData/diagnostics/tests/inference/mapFunction.kt
@@ -4,6 +4,7 @@ package a
 
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun foo() {
     val v = array(1, 2, 3)
@@ -32,4 +33,4 @@ fun <T> array(vararg t : T) : Array<T> = t as Array<T>
 
 infix fun <T, R> Array<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
-infix fun <T, R> Iterable<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+infix fun <T, R> Iterable<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.fir.kt b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.fir.kt
index 5907bf98364..a64c7fa2700 100644
--- a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.fir.kt
@@ -4,6 +4,7 @@ package i
 
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun <T, R> Collection<T>.map1(f : (T) -> R) : List<R> {}
 fun <T, R> java.lang.Iterable<T>.map1(f : (T) -> R) : List<R> {}
@@ -21,4 +22,4 @@ fun test1(list: List<Int>) {
     val res = list.foo()
     //check res is not of error type
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><String>(res)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.kt b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.kt
index 8296c47e6b5..7bf485ee7d2 100644
--- a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.kt
+++ b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.kt
@@ -4,6 +4,7 @@ package i
 
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun <T, R> Collection<T>.map1(<!UNUSED_PARAMETER!>f<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 fun <T, R> <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Iterable<T><!>.map1(<!UNUSED_PARAMETER!>f<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
@@ -21,4 +22,4 @@ fun test1(list: List<Int>) {
     val res = list.foo()
     //check res is not of error type
     checkSubtype<String>(<!TYPE_MISMATCH!>res<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.kt b/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.kt
index afe3f7f76dc..8823d4a7e12 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.kt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.kt
@@ -3,6 +3,8 @@
 
 package aaa
 
+import checkSubtype
+
 infix fun <T> T.foo(t: T) = t
 
 fun <T> id(t: T) = t
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.fir.kt
index 3d020b79bfd..c7fe8b75d3a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.fir.kt
@@ -3,6 +3,8 @@
 //KT-1029 Wrong type inference
 package i
 
+import checkSubtype
+
 public fun<T> from(yielder: ()->Iterable<T>) : Iterable<T> {
 }
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt
index 20da0c58420..b3f15256803 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt
@@ -3,6 +3,8 @@
 //KT-1029 Wrong type inference
 package i
 
+import checkSubtype
+
 public fun<T> from(<!UNUSED_PARAMETER!>yielder<!>: ()->Iterable<T>) : Iterable<T> {
 <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.fir.kt
index 5574b422d33..69964f68375 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.fir.kt
@@ -4,6 +4,7 @@
 package i
 
 import java.util.ArrayList
+import checkSubtype
 
 public infix fun<TItem> Iterable<TItem>.where(predicate : (TItem)->Boolean) : ()->Iterable<TItem> {
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt
index c9fdca53736..6eb7c9fb878 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt
@@ -4,6 +4,7 @@
 package i
 
 import java.util.ArrayList
+import checkSubtype
 
 public infix fun<TItem> Iterable<TItem>.where(<!UNUSED_PARAMETER!>predicate<!> : (TItem)->Boolean) : ()->Iterable<TItem> {
 <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.fir.kt
index c4a1ff3b486..12d9a7c5a9f 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.fir.kt
@@ -4,6 +4,8 @@
 
 package d
 
+import checkSubtype
+
 fun test(numbers: Iterable<Int>) {
     val s = numbers.map{it.toString()}.fold(""){it, it2 -> it + it2}
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(s)
@@ -12,4 +14,4 @@ fun test(numbers: Iterable<Int>) {
 //from library
 fun <T, R> Iterable<T>.map(transform : (T) -> R) : List<R> {}
 
-fun <T> Iterable<T>.fold(initial: T, operation: (T, T) -> T): T {}
\ No newline at end of file
+fun <T> Iterable<T>.fold(initial: T, operation: (T, T) -> T): T {}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt
index 2a4961ab24e..bd015e993c3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt
@@ -4,6 +4,8 @@
 
 package d
 
+import checkSubtype
+
 fun test(numbers: Iterable<Int>) {
     val s = numbers.map{it.toString()}.fold(""){it, it2 -> it + it2}
     checkSubtype<Int>(<!TYPE_MISMATCH!>s<!>)
@@ -12,4 +14,4 @@ fun test(numbers: Iterable<Int>) {
 //from library
 fun <T, R> Iterable<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
-fun <T> Iterable<T>.fold(<!UNUSED_PARAMETER!>initial<!>: T, <!UNUSED_PARAMETER!>operation<!>: (T, T) -> T): T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun <T> Iterable<T>.fold(<!UNUSED_PARAMETER!>initial<!>: T, <!UNUSED_PARAMETER!>operation<!>: (T, T) -> T): T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.fir.kt
index 56da5d551cd..5a6978651e5 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.fir.kt
@@ -4,6 +4,8 @@
 //+JDK
 package d
 
+import checkSubtype
+
 public fun <T> MutableCollection<out T>.filterToMy(result : MutableList<in T>, filter : (T) -> Boolean) : MutableCollection<out T> {
     for (t in this){
         if (filter(t)){
@@ -23,4 +25,4 @@ fun test(result: MutableList<in Any>, collection: MutableCollection<String>, pre
 }
 
 //from library
-fun String.startsWith(prefix: String) : Boolean {}
\ No newline at end of file
+fun String.startsWith(prefix: String) : Boolean {}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt
index bd566d78ae6..3a83b1d871d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt
@@ -4,6 +4,8 @@
 //+JDK
 package d
 
+import checkSubtype
+
 public fun <T> MutableCollection<out T>.filterToMy(result : MutableList<in T>, filter : (T) -> Boolean) : MutableCollection<out T> {
     for (t in this){
         if (filter(t)){
@@ -23,4 +25,4 @@ fun test(result: MutableList<in Any>, collection: MutableCollection<String>, pre
 }
 
 //from library
-fun String.startsWith(<!UNUSED_PARAMETER!>prefix<!>: String) : Boolean {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun String.startsWith(<!UNUSED_PARAMETER!>prefix<!>: String) : Boolean {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.fir.kt
index 1fbdb53e7c0..b7727bba810 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.fir.kt
@@ -4,6 +4,7 @@
 package n
 
 import java.util.ArrayList
+import checkSubtype
 
 fun test() {
     val list = arrayList("foo", "bar") + arrayList("cheese", "wine")
@@ -14,4 +15,4 @@ fun test() {
 
 //from library
 fun <T> arrayList(vararg values: T) : ArrayList<T> {}
-operator fun <T> Iterable<T>.plus(elements: Iterable<T>): List<T> {}
\ No newline at end of file
+operator fun <T> Iterable<T>.plus(elements: Iterable<T>): List<T> {}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt
index c43277d871f..d36c5f1a055 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt
@@ -4,6 +4,7 @@
 package n
 
 import java.util.ArrayList
+import checkSubtype
 
 fun test() {
     val list = arrayList("foo", "bar") + arrayList("cheese", "wine")
@@ -14,4 +15,4 @@ fun test() {
 
 //from library
 fun <T> arrayList(vararg <!UNUSED_PARAMETER!>values<!>: T) : ArrayList<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
-operator fun <T> Iterable<T>.plus(<!UNUSED_PARAMETER!>elements<!>: Iterable<T>): List<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+operator fun <T> Iterable<T>.plus(<!UNUSED_PARAMETER!>elements<!>: Iterable<T>): List<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1944.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1944.kt
index 2d4ec214c35..dcc5ba3389e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1944.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1944.kt
@@ -4,6 +4,8 @@
 //KT-1944 Inference fails on run()
 package j
 
+import checkSubtype
+
 class P {
     var x : Int = 0
         private set
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.fir.kt
index b19c3e751d1..fb41c0fca46 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.fir.kt
@@ -5,6 +5,7 @@ package i
 
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun test() {
     val sample1: List<List<Int?>> = arrayList(arrayList<Int?>(1, 7, null, 8))
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt
index 6101e0ebdc4..cdea6f5db14 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt
@@ -5,6 +5,7 @@ package i
 
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun test() {
     val sample1: List<List<Int?>> = arrayList(arrayList<Int?>(1, 7, null, 8))
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.fir.kt
index ce35fed156d..ba6eafc3e00 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.fir.kt
@@ -3,6 +3,7 @@
 
 //KT-2200 array(array()) breaks compiler
 package n
+import checkSubtype
 
 fun main() {
     val a = array(array())
@@ -15,4 +16,4 @@ fun main() {
 
 //from library
 @Suppress("UNCHECKED_CAST")
-fun <T> array(vararg t : T) : Array<T> = t as Array<T>
\ No newline at end of file
+fun <T> array(vararg t : T) : Array<T> = t as Array<T>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
index bf6cb78a2a6..531db47b897 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
@@ -3,6 +3,7 @@
 
 //KT-2200 array(array()) breaks compiler
 package n
+import checkSubtype
 
 fun main() {
     val <!UNUSED_VARIABLE!>a<!> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>array<!>(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>array<!>())
@@ -15,4 +16,4 @@ fun main() {
 
 //from library
 @Suppress("UNCHECKED_CAST")
-fun <T> array(vararg t : T) : Array<T> = t as Array<T>
\ No newline at end of file
+fun <T> array(vararg t : T) : Array<T> = t as Array<T>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt
index 12c8a18d952..f1c6224d45d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt
@@ -3,6 +3,7 @@
 
 //KT-2294 Type inference infers DONT_CARE instead of correct type
 package a
+import checkSubtype
 
 public fun <E> foo(array: Array<E>): Array<E> = array
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.fir.kt
index 5ff13eabd11..1cb99c46ae3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.fir.kt
@@ -5,6 +5,7 @@ package i
 
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun <T, K> someFunction(list: List<T>, transform: (T) -> K): List<K> {
     val result = arrayList<K>()
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt
index 3af09afefac..2d4bb7f7453 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt
@@ -5,6 +5,7 @@ package i
 
 //+JDK
 import java.util.*
+import checkSubtype
 
 fun <T, K> someFunction(list: List<T>, transform: (T) -> K): List<K> {
     val result = arrayList<K>()
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.fir.kt
index 836e667aec3..b9c208001d8 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.fir.kt
@@ -3,6 +3,7 @@
 package n
 
 import java.util.*
+import checkSubtype
 
 fun test() {
     val foo = arrayList("").map { it -> it.length }.fold(0, { x, y -> Math.max(x, y) })
@@ -15,4 +16,4 @@ fun <T> arrayList(vararg values: T) : ArrayList<T> {}
 
 fun <T, R> Collection<T>.map(transform : (T) -> R) : List<R> {}
 
-fun <T> Iterable<T>.fold(initial: T, operation: (T, T) -> T): T {}
\ No newline at end of file
+fun <T> Iterable<T>.fold(initial: T, operation: (T, T) -> T): T {}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt
index a68067cba50..4188db5e35b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt
@@ -3,6 +3,7 @@
 package n
 
 import java.util.*
+import checkSubtype
 
 fun test() {
     val foo = arrayList("").map { it -> it.length }.fold(0, { x, y -> Math.max(x, y) })
@@ -15,4 +16,4 @@ fun <T> arrayList(vararg <!UNUSED_PARAMETER!>values<!>: T) : ArrayList<T> {<!NO_
 
 fun <T, R> Collection<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
-fun <T> Iterable<T>.fold(<!UNUSED_PARAMETER!>initial<!>: T, <!UNUSED_PARAMETER!>operation<!>: (T, T) -> T): T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun <T> Iterable<T>.fold(<!UNUSED_PARAMETER!>initial<!>: T, <!UNUSED_PARAMETER!>operation<!>: (T, T) -> T): T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2505.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2505.kt
index b8497562454..180bc52e28d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2505.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2505.kt
@@ -5,6 +5,8 @@
 
 package a
 
+import checkSubtype
+
 interface MyType {}
 class MyClass<T> : MyType {}
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt731.fir.kt
index 566f5cef041..0c046e44916 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.fir.kt
@@ -4,6 +4,8 @@
 //KT-731 Missing error from type inference
 package a
 
+import checkSubtype
+
 class A<T>(x: T) {
     val p = x
 }
@@ -16,4 +18,4 @@ fun main() {
     val a = A(1)
     val t: String = a.foo({p -> p})
     checkSubtype<String>(t)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
index d81bbf95be4..e8a55a78751 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
@@ -4,6 +4,8 @@
 //KT-731 Missing error from type inference
 package a
 
+import checkSubtype
+
 class A<T>(x: T) {
     val p = x
 }
@@ -16,4 +18,4 @@ fun main() {
     val a = A(1)
     val t: String = <!NI;TYPE_MISMATCH!>a.<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>foo({p -> <!TYPE_MISMATCH!>p<!>})<!><!>
     checkSubtype<String>(t)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt943.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt943.fir.kt
index 6d899167b02..de262a10f93 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt943.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt943.fir.kt
@@ -6,6 +6,7 @@ package maze
 //+JDK
 import java.util.Collections.*
 import java.util.*
+import checkSubtype
 
 fun foo(lines: List<String>) {
     val w = max(lines, comparator {o1, o2 ->
@@ -19,4 +20,4 @@ fun foo(lines: List<String>) {
 //standard library
 fun <T : Any> T?.sure() : T = this!!
 
-public inline fun <T> comparator(fn: (T,T) -> Int): Comparator<T> {}
\ No newline at end of file
+public inline fun <T> comparator(fn: (T,T) -> Int): Comparator<T> {}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt943.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt943.kt
index afebc4c5fdc..7933a758ce5 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt943.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt943.kt
@@ -6,6 +6,7 @@ package maze
 //+JDK
 import java.util.Collections.*
 import java.util.*
+import checkSubtype
 
 fun foo(lines: List<String>) {
     val w = max(lines, comparator {o1, o2 ->
@@ -19,4 +20,4 @@ fun foo(lines: List<String>) {
 //standard library
 fun <T : Any> T?.sure() : T = this!!
 
-public inline fun <T> comparator(<!UNUSED_PARAMETER!>fn<!>: (T,T) -> Int): Comparator<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+public inline fun <T> comparator(<!UNUSED_PARAMETER!>fn<!>: (T,T) -> Int): Comparator<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt948.fir.kt
index 8d783455714..4b8a09505af 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt948.fir.kt
@@ -6,6 +6,7 @@
 package a
 
 import java.util.*
+import checkSubtype
 
 fun <T> emptyList() : List<T>? = ArrayList<T>()
 
@@ -20,4 +21,4 @@ fun foo() {
     doWithList(emptyList()!!)
 }
 
-fun doWithList(list: List<Int>) = list
\ No newline at end of file
+fun doWithList(list: List<Int>) = list
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
index 88507dd8e6e..4459f60c7a4 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
@@ -6,6 +6,7 @@
 package a
 
 import java.util.*
+import checkSubtype
 
 fun <T> emptyList() : List<T>? = ArrayList<T>()
 
@@ -20,4 +21,4 @@ fun foo() {
     doWithList(emptyList()!!)
 }
 
-fun doWithList(list: List<Int>) = list
\ No newline at end of file
+fun doWithList(list: List<Int>) = list
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt
index b3631d69542..ff6404686aa 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt
@@ -4,6 +4,9 @@
 package g
 
 import java.util.HashSet
+import checkType
+import _
+
 fun <T, C: Collection<T>> convert(src: Collection<T>, dest: C): C = throw Exception("$src $dest")
 
 fun test(l: List<Int>) {
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.fir.kt
index 3569deeff8a..133d2feda13 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.fir.kt
@@ -3,6 +3,8 @@
 
 package s
 
+import checkSubtype
+
 interface In<in T>
 
 interface A
@@ -30,4 +32,4 @@ fun test(inA: In<A>) {
     checkSubtype<C>(r)
 }
 
-fun use(vararg a: Any?) = a
\ No newline at end of file
+fun use(vararg a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
index 21a558161a9..9c7631f212b 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
@@ -3,6 +3,8 @@
 
 package s
 
+import checkSubtype
+
 interface In<in T>
 
 interface A
@@ -30,4 +32,4 @@ fun test(inA: In<A>) {
     checkSubtype<C>(r)
 }
 
-fun use(vararg a: Any?) = a
\ No newline at end of file
+fun use(vararg a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/inline/kt15410.kt b/compiler/testData/diagnostics/tests/inline/kt15410.kt
index 1bfe158cd71..f2421a1319f 100644
--- a/compiler/testData/diagnostics/tests/inline/kt15410.kt
+++ b/compiler/testData/diagnostics/tests/inline/kt15410.kt
@@ -6,5 +6,5 @@ open class Foo protected constructor()
 inline fun foo(f: () -> Unit) = object: Foo() {}
 
 class A : Foo() {
-    inline fun foo(f: () -> Unit) = <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>Foo<!>()
+    inline fun foo(f: () -> Unit) = <!NI;PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE, PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>Foo<!>()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inline/kt21177.fir.kt b/compiler/testData/diagnostics/tests/inline/kt21177.fir.kt
new file mode 100644
index 00000000000..45412c060c0
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inline/kt21177.fir.kt
@@ -0,0 +1,18 @@
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+class SomeContainer {
+    protected class Limit
+
+    protected fun makeLimit(): Limit = TODO()
+
+    public inline fun foo(f: () -> Unit) {
+        Limit()
+        makeLimit()
+    }
+}
+
+open class A protected constructor() {
+    inline fun foo(f: () -> Unit) {
+        A()
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/kt21177.kt b/compiler/testData/diagnostics/tests/inline/kt21177.kt
new file mode 100644
index 00000000000..9d8dcdd28a1
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inline/kt21177.kt
@@ -0,0 +1,18 @@
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+class SomeContainer {
+    protected class Limit
+
+    protected fun makeLimit(): Limit = TODO()
+
+    public inline fun foo(f: () -> Unit) {
+        <!PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE!>Limit<!>()
+        <!PROTECTED_CALL_FROM_PUBLIC_INLINE_ERROR!>makeLimit<!>()
+    }
+}
+
+open class A protected constructor() {
+    inline fun foo(f: () -> Unit) {
+        <!PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE!>A<!>()
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/kt21177.txt b/compiler/testData/diagnostics/tests/inline/kt21177.txt
new file mode 100644
index 00000000000..dfe110aad4e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inline/kt21177.txt
@@ -0,0 +1,25 @@
+package
+
+public open class A {
+    protected constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final inline fun foo(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class SomeContainer {
+    public constructor SomeContainer()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final inline fun foo(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    protected final fun makeLimit(): SomeContainer.Limit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    protected final class Limit {
+        public constructor Limit()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt
new file mode 100644
index 00000000000..3ad0a8a9070
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt
@@ -0,0 +1,7 @@
+// !LANGUAGE: +InlineClasses
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+inline class IC(val i: Int)
+
+fun foo(a: Any, ic: IC) {}
+fun foo(a: Any?, ic: IC) {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt
new file mode 100644
index 00000000000..f0d500dabbd
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt
@@ -0,0 +1,7 @@
+// !LANGUAGE: +InlineClasses
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+inline class IC(val i: Int)
+
+<!CONFLICTING_JVM_DECLARATIONS!>fun foo(a: Any, ic: IC)<!> {}
+<!CONFLICTING_JVM_DECLARATIONS!>fun foo(a: Any?, ic: IC)<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt
new file mode 100644
index 00000000000..bf10ceb74b6
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt
@@ -0,0 +1,12 @@
+package
+
+public fun foo(/*0*/ a: kotlin.Any, /*1*/ ic: IC): kotlin.Unit
+public fun foo(/*0*/ a: kotlin.Any?, /*1*/ ic: IC): kotlin.Unit
+
+public final inline class IC {
+    public constructor IC(/*0*/ i: kotlin.Int)
+    public final val i: kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.fir.kt b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.fir.kt
deleted file mode 100644
index 338b20f53b4..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.fir.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !LANGUAGE: +InlineClasses
-// !DIAGNOSTICS: -UNUSED_VARIABLE
-
-inline class Foo(val x: Int) {
-    init {}
-
-    init {
-        val f = 1
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.kt b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.kt
index 0156027ca4a..78df5903e38 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.kt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.kt
@@ -1,10 +1,11 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
+// FIR_IDENTICAL
 
 inline class Foo(val x: Int) {
-    <!INLINE_CLASS_WITH_INITIALIZER!>init<!> {}
+    init {}
 
-    <!INLINE_CLASS_WITH_INITIALIZER!>init<!> {
+    init {
         val f = 1
     }
 }
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.fir.kt b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.fir.kt
deleted file mode 100644
index 3d4387b1ec7..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.fir.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// !LANGUAGE: +InlineClasses
-
-inline class ConstructorWithDefaultVisibility(val x: Int)
-inline class PublicConstructor public constructor(val x: Int)
-inline class InternalConstructor internal constructor(val x: Int)
-inline class ProtectedConstructor protected constructor(val x: Int)
-inline class PrivateConstructor private constructor(val x: Int)
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.kt b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.kt
index 3b33f655c0c..a0863381f7e 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.kt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.kt
@@ -1,7 +1,8 @@
 // !LANGUAGE: +InlineClasses
+// FIR_IDENTICAL
 
 inline class ConstructorWithDefaultVisibility(val x: Int)
 inline class PublicConstructor public constructor(val x: Int)
-inline class InternalConstructor <!NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS!>internal<!> constructor(val x: Int)
-inline class ProtectedConstructor <!NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS!>protected<!> constructor(val x: Int)
-inline class PrivateConstructor <!NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS!>private<!> constructor(val x: Int)
+inline class InternalConstructor internal constructor(val x: Int)
+inline class ProtectedConstructor protected constructor(val x: Int)
+inline class PrivateConstructor private constructor(val x: Int)
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.fir.kt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.fir.kt
index 69bdc184c13..5a56033aae3 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.fir.kt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.fir.kt
@@ -25,29 +25,29 @@ object Obj {
 
 fun test(with: WithClassObject, without: WithoutClassObject, obj: Obj) {
     with.<!UNRESOLVED_REFERENCE!>Nested<!>()
-    with.NestedWithClassObject
+    with.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>
     with.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>()
-    with.NestedWithClassObject.foo()
-    with.NestedEnum.A
-    with.NestedObj
-    with.NestedObj()
-    with.NestedObj.foo()
+    with.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
+    with.<!UNRESOLVED_REFERENCE!>NestedEnum<!>.<!UNRESOLVED_REFERENCE!>A<!>
+    with.<!UNRESOLVED_REFERENCE!>NestedObj<!>
+    with.<!UNRESOLVED_REFERENCE!>NestedObj<!>()
+    with.<!UNRESOLVED_REFERENCE!>NestedObj<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
 
     without.<!UNRESOLVED_REFERENCE!>Nested<!>()
-    without.NestedWithClassObject
+    without.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>
     without.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>()
-    without.NestedWithClassObject.foo()
-    without.NestedEnum.A
-    without.NestedObj
-    without.NestedObj()
-    without.NestedObj.foo()
+    without.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
+    without.<!UNRESOLVED_REFERENCE!>NestedEnum<!>.<!UNRESOLVED_REFERENCE!>A<!>
+    without.<!UNRESOLVED_REFERENCE!>NestedObj<!>
+    without.<!UNRESOLVED_REFERENCE!>NestedObj<!>()
+    without.<!UNRESOLVED_REFERENCE!>NestedObj<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
 
     obj.<!UNRESOLVED_REFERENCE!>Nested<!>()
-    obj.NestedWithClassObject
+    obj.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>
     obj.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>()
-    obj.NestedWithClassObject.foo()
-    obj.NestedEnum.A
-    obj.NestedObj
-    obj.NestedObj()
-    obj.NestedObj.foo()
-}
\ No newline at end of file
+    obj.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
+    obj.<!UNRESOLVED_REFERENCE!>NestedEnum<!>.<!UNRESOLVED_REFERENCE!>A<!>
+    obj.<!UNRESOLVED_REFERENCE!>NestedObj<!>
+    obj.<!UNRESOLVED_REFERENCE!>NestedObj<!>()
+    obj.<!UNRESOLVED_REFERENCE!>NestedObj<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.fir.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.fir.kt
index 94b462adcc4..7b3f6352e90 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.fir.kt
@@ -37,7 +37,7 @@ fun foo(
         cs: Collection<String>, ca: Collection<Any?>
 ) {
     a.containsAll(cs)
-    a.containsAll(ca)
+    a.<!INAPPLICABLE_CANDIDATE!>containsAll<!>(ca)
 
     b.containsAll(cs)
     b.containsAll(ca)
@@ -46,11 +46,11 @@ fun foo(
     ic.containsAll(ca)
 
     ka.containsAll(cs)
-    ka.containsAll(ca)
+    ka.<!INAPPLICABLE_CANDIDATE!>containsAll<!>(ca)
 
     kb.containsAll(cs)
     kb.containsAll(ca)
 
     al.containsAll(cs)
-    al.containsAll(ca)
+    al.<!INAPPLICABLE_CANDIDATE!>containsAll<!>(ca)
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2394.kt b/compiler/testData/diagnostics/tests/j+k/kt2394.kt
index 26365f9af3b..99839c02cc0 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2394.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2394.kt
@@ -4,6 +4,8 @@
 //KT-2394 java.lang.Iterable<T> should be visible as kotlin.Iterable<out T>
 package d
 
+import checkSubtype
+
 fun foo(iterable: Iterable<Int>, iterator: Iterator<Int>, comparable: Comparable<Any>) {
     checkSubtype<Iterable<Any>>(iterable)
     checkSubtype<Iterator<Any>>(iterator)
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2641.fir.kt b/compiler/testData/diagnostics/tests/j+k/kt2641.fir.kt
index ea101ae4fc6..19abd5e7c48 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2641.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2641.fir.kt
@@ -5,6 +5,8 @@ package a
 import java.util.Iterator
 import java.lang.Comparable as Comp
 
+import checkSubtype
+
 fun bar(any: Any): java.lang.Iterable<Int>? {
     val a: java.lang.Comparable<String>? = null
     val b: Iterable<Integer>
@@ -15,4 +17,4 @@ fun bar(any: Any): java.lang.Iterable<Int>? {
     }
     any as Iterator<*>
     return null
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2641.kt b/compiler/testData/diagnostics/tests/j+k/kt2641.kt
index 022be5d88ed..c2f999dd1de 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2641.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2641.kt
@@ -5,6 +5,8 @@ package a
 import <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util.Iterator<!>
 import <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Comparable<!> as Comp
 
+import checkSubtype
+
 fun bar(any: Any): <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Iterable<Int><!>? {
     val <!UNUSED_VARIABLE!>a<!>: <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Comparable<String><!>? = null
     val <!UNUSED_VARIABLE!>b<!>: Iterable<<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>Integer<!>>
@@ -15,4 +17,4 @@ fun bar(any: Any): <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Iterable<Int><!>
     }
     any as <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>Iterator<*><!>
     return null
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.fir.kt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.fir.kt
deleted file mode 100644
index 648e6875297..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.fir.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-// !CHECK_TYPE
-// FILE: Function.java
-public interface Function<E extends java.util.Map<String, Integer>, F extends CharSequence> {
-    F handle(E e);
-}
-
-// FILE: A.java
-public class A {
-    public void foo(Function<?, ?> l) {
-    }
-
-    public static void bar(Function<?, ?> l) {
-    }
-}
-
-// FILE: main.kt
-fun main() {
-    A().foo {
-        x ->
-        x checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Map<String, Int>?>() }
-        ""
-    }
-
-    A.bar {
-        x ->
-        x checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Map<String, Int>>() }
-        ""
-    }
-
-    val block: (Map<String, Int>) -> CharSequence = { x -> x.toString() }
-    A().<!INAPPLICABLE_CANDIDATE!>foo<!>(block)
-    A.<!INAPPLICABLE_CANDIDATE!>bar<!>(block)
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.kt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.kt
index efd82efc5b7..2c235efb746 100644
--- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // FILE: Function.java
 public interface Function<E extends java.util.Map<String, Integer>, F extends CharSequence> {
diff --git a/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/defaultNullAndParameter.fir.kt b/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/defaultNullAndParameter.fir.kt
deleted file mode 100644
index 444e281e4cf..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/defaultNullAndParameter.fir.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-// FILE: A.java
-// ANDROID_ANNOTATIONS
-
-import kotlin.annotations.jvm.internal.*;
-
-public class A {
-    public void foo(@DefaultNull Integer i) {}
-
-    public void bar(@DefaultNull Integer a) {}
-
-    public void bam(@DefaultNull Integer a) {}
-
-    public void baz(@DefaultValue("42") Integer a) {}
-}
-
-// FILE: AInt.java
-import kotlin.annotations.jvm.internal.*;
-
-public interface AInt {
-    public void foo(@DefaultValue("42") Integer i) {}
-    public void bar(@DefaultNull Integer a) {}
-}
-
-// FILE: B.java
-import kotlin.annotations.jvm.internal.*;
-
-public class B extends A {
-    public void foo(Integer i) {}
-
-    public void bar(@DefaultValue("42") Integer a) {}
-
-    public void bam(@DefaultNull @DefaultValue("42") Integer a) {}
-}
-
-// FILE: C.java
-public class C extends A implements AInt {
-}
-
-// FILE: test.kt
-
-fun test(b: B, c: C) {
-    b.<!INAPPLICABLE_CANDIDATE!>foo<!>()
-    b.foo(5)
-    b.bar()
-    b.bar(5)
-    b.bam()
-    b.bam(5)
-
-    c.foo()
-    c.foo(5)
-    c.bar()
-    c.bar(5)
-    c.bam()
-    c.bam(5)
-    c.baz()
-    c.baz(42)
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/defaultNullAndParameter.kt b/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/defaultNullAndParameter.kt
index c6f326e7877..f18e0a87d41 100644
--- a/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/defaultNullAndParameter.kt
+++ b/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/defaultNullAndParameter.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: A.java
 // ANDROID_ANNOTATIONS
 
diff --git a/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/overridesDefaultValue.fir.kt b/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/overridesDefaultValue.fir.kt
index a5f9e3e5c1f..fe5fecb195c 100644
--- a/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/overridesDefaultValue.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/signatureAnnotations/overridesDefaultValue.fir.kt
@@ -87,14 +87,14 @@ fun main() {
     d.<!INAPPLICABLE_CANDIDATE!>first<!>()
     bd.<!INAPPLICABLE_CANDIDATE!>first<!>()
 
-    e.<!INAPPLICABLE_CANDIDATE!>first<!>()
+    e.first()
 
     val g = G()
-    g.<!INAPPLICABLE_CANDIDATE!>foo<!>()
+    g.foo()
     g.foo("ok")
 
     val m = M()
-    m.<!INAPPLICABLE_CANDIDATE!>foo<!>()
+    m.foo()
 
 }
 
diff --git a/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.fir.kt b/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.fir.kt
new file mode 100644
index 00000000000..9e7525245ad
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.fir.kt
@@ -0,0 +1,37 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+// TODO: .fir.kt version is just a stub.
+
+expect interface My {
+    open fun bar()
+    open fun bas() {}
+    <!REDUNDANT_MODIFIER!>open<!> abstract fun bat(): Int
+
+    fun foo()
+
+
+    open val a: Int
+    open val b: String
+    open val c: String get() = ""
+    <!REDUNDANT_MODIFIER!>open<!> abstract val e: Int
+
+    val f: Int
+}
+
+class MyImpl1: My
+
+class MyImpl2: My {
+    override fun foo() {}
+    override val f = 0
+    override val e = 1
+}
+
+expect interface Outer {
+    interface Inner {
+        open fun bar()
+        open fun bas() {}
+        <!REDUNDANT_MODIFIER!>open<!> abstract fun bat(): Int
+        fun foo()
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.kt b/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.kt
new file mode 100644
index 00000000000..c55f44d63ab
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.kt
@@ -0,0 +1,37 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+// TODO: .fir.kt version is just a stub.
+
+expect interface My {
+    open fun bar()
+    <!EXPECTED_DECLARATION_WITH_BODY!>open fun bas()<!> {}
+    <!REDUNDANT_MODIFIER!>open<!> abstract fun bat(): Int
+
+    fun foo()
+
+
+    open val a: Int
+    open val b: String
+    open val c: String <!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = ""
+    <!REDUNDANT_MODIFIER!>open<!> abstract val e: Int
+
+    val f: Int
+}
+
+<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyImpl1<!>: My
+
+class MyImpl2: My {
+    override fun foo() {}
+    override val f = 0
+    override val e = 1
+}
+
+expect interface Outer {
+    interface Inner {
+        open fun bar()
+        <!EXPECTED_DECLARATION_WITH_BODY!>open fun bas()<!> {}
+        <!REDUNDANT_MODIFIER!>open<!> abstract fun bat(): Int
+        fun foo()
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.txt b/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.txt
new file mode 100644
index 00000000000..5e5244be796
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.txt
@@ -0,0 +1,64 @@
+package
+
+public expect interface My {
+    public expect open val a: kotlin.Int
+    public expect open val b: kotlin.String
+    public expect open val c: kotlin.String
+    public expect open val e: kotlin.Int
+    public expect abstract val f: kotlin.Int
+    public open expect fun bar(): kotlin.Unit
+    public open expect fun bas(): kotlin.Unit
+    public open expect fun bat(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public abstract expect fun foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class MyImpl1 : My {
+    public constructor MyImpl1()
+    public expect open override /*1*/ /*fake_override*/ val a: kotlin.Int
+    public expect open override /*1*/ /*fake_override*/ val b: kotlin.String
+    public expect open override /*1*/ /*fake_override*/ val c: kotlin.String
+    public expect open override /*1*/ /*fake_override*/ val e: kotlin.Int
+    public expect abstract override /*1*/ /*fake_override*/ val f: kotlin.Int
+    public open expect override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
+    public open expect override /*1*/ /*fake_override*/ fun bas(): kotlin.Unit
+    public open expect override /*1*/ /*fake_override*/ fun bat(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public abstract expect override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class MyImpl2 : My {
+    public constructor MyImpl2()
+    public expect open override /*1*/ /*fake_override*/ val a: kotlin.Int
+    public expect open override /*1*/ /*fake_override*/ val b: kotlin.String
+    public expect open override /*1*/ /*fake_override*/ val c: kotlin.String
+    public open override /*1*/ val e: kotlin.Int = 1
+    public open override /*1*/ val f: kotlin.Int = 0
+    public open expect override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
+    public open expect override /*1*/ /*fake_override*/ fun bas(): kotlin.Unit
+    public open expect override /*1*/ /*fake_override*/ fun bat(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ fun foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public expect interface Outer {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public expect interface Inner {
+        public open expect fun bar(): kotlin.Unit
+        public open expect fun bas(): kotlin.Unit
+        public open expect fun bat(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public abstract expect fun foo(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.fir.kt
new file mode 100644
index 00000000000..14ed539ef7f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.fir.kt
@@ -0,0 +1,25 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+// TODO: .fir.kt version is just a stub.
+expect interface My {
+    open fun openFunPositive()
+    open fun openFunNegative()
+    abstract fun abstractFun()
+
+    open val openValPositive: Int
+    open val openValNegative: Int
+    abstract val abstractVal: Int
+}
+
+// MODULE: m1-jvm(m1-common)
+// FILE: jvm.kt
+actual interface My {
+    actual fun openFunPositive() = Unit
+    actual fun openFunNegative()
+    actual fun abstractFun()
+
+    actual val openValPositive: Int get() = 0
+    actual val openValNegative: Int
+    actual val abstractVal: Int
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt
new file mode 100644
index 00000000000..5c42615b114
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt
@@ -0,0 +1,25 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+// TODO: .fir.kt version is just a stub.
+expect interface My {
+    open fun openFunPositive()
+    open fun openFunNegative()
+    abstract fun abstractFun()
+
+    open val openValPositive: Int
+    open val openValNegative: Int
+    abstract val abstractVal: Int
+}
+
+// MODULE: m1-jvm(m1-common)
+// FILE: jvm.kt
+actual interface My {
+    actual fun openFunPositive() = Unit
+    actual fun <!ACTUAL_WITHOUT_EXPECT!>openFunNegative<!>()
+    actual fun abstractFun()
+
+    actual val openValPositive: Int get() = 0
+    actual val <!ACTUAL_WITHOUT_EXPECT!>openValNegative<!>: Int
+    actual val abstractVal: Int
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.txt b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.txt
new file mode 100644
index 00000000000..9b270da5a3b
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.txt
@@ -0,0 +1,30 @@
+// -- Module: <m1-common> --
+package
+
+public expect interface My {
+    public expect abstract val abstractVal: kotlin.Int
+    public expect open val openValNegative: kotlin.Int
+    public expect open val openValPositive: kotlin.Int
+    public abstract expect fun abstractFun(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open expect fun openFunNegative(): kotlin.Unit
+    public open expect fun openFunPositive(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+
+// -- Module: <m1-jvm> --
+package
+
+public actual interface My {
+    public actual abstract val abstractVal: kotlin.Int
+    public actual abstract val openValNegative: kotlin.Int
+    public actual open val openValPositive: kotlin.Int
+    public abstract actual fun abstractFun(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public abstract actual fun openFunNegative(): kotlin.Unit
+    public open actual fun openFunPositive(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.fir.kt
index 803bcad34ce..f4c80d04a33 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.fir.kt
@@ -30,7 +30,7 @@ fun A.test2() {
 }
 
 fun A?.test3() {
-    foo() // error
+    <!INAPPLICABLE_CANDIDATE!>foo<!>() // error
     <!INAPPLICABLE_CANDIDATE!>bar<!>() // error
     buzz()
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.fir.kt
index 1530d65eb5f..e0bfec66a76 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.fir.kt
@@ -2,6 +2,8 @@
 //KT-1778 Automatically cast error
 package kt1778
 
+import checkSubtype
+
 fun main(args : Array<String>) {
     val x = checkSubtype<Any>(args[0])
     if(x is java.lang.CharSequence) {
@@ -9,4 +11,4 @@ fun main(args : Array<String>) {
         if ("a" == x || "b" == x) x.<!UNRESOLVED_REFERENCE!>length<!> else x.length() // <– THEN ERROR
         if ("a" == x && "a" == x) x.<!UNRESOLVED_REFERENCE!>length<!> else x.length() // <– ELSE ERROR
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt
index 1d1bf593f1d..b016144bed1 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt
@@ -2,6 +2,8 @@
 //KT-1778 Automatically cast error
 package kt1778
 
+import checkSubtype
+
 fun main(args : Array<String>) {
     val x = checkSubtype<Any>(args[0])
     if(x is <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.CharSequence<!>) {
@@ -9,4 +11,4 @@ fun main(args : Array<String>) {
         if ("a" == x || "b" == x) <!DEBUG_INFO_SMARTCAST!>x<!>.length else <!DEBUG_INFO_SMARTCAST!>x<!>.length() // <– THEN ERROR
         if ("a" == x && "a" == x) <!DEBUG_INFO_SMARTCAST!>x<!>.length else <!DEBUG_INFO_SMARTCAST!>x<!>.length() // <– ELSE ERROR
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.fir.kt
index 67c08638cce..ea93bce992c 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.fir.kt
@@ -3,6 +3,8 @@
 //KT-2176 non-nullability is not inferred after !! or "as"
 package kt2176
 
+import checkSubtype
+
 fun f1(a: String?) {
     a!!
     checkSubtype<String>(a)
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.kt
index e346432dc10..d89ee854f52 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.kt
@@ -3,6 +3,8 @@
 //KT-2176 non-nullability is not inferred after !! or "as"
 package kt2176
 
+import checkSubtype
+
 fun f1(a: String?) {
     a!!
     checkSubtype<String>(<!DEBUG_INFO_SMARTCAST!>a<!>)
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.fir.kt
index f79097f30b6..fe807690557 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.fir.kt
@@ -2,6 +2,8 @@
 
 package a
 
+import checkSubtype
+
 //KT-2234 'period!!' has type Int?
 
 class Pair<A, B>(val a: A, val b: B)
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt
index cbd456c235f..7b6df9dde68 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt
@@ -2,6 +2,8 @@
 
 package a
 
+import checkSubtype
+
 //KT-2234 'period!!' has type Int?
 
 class Pair<A, B>(val a: A, val b: B)
diff --git a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.fir.kt b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.fir.kt
index 31ef50e4c41..ed75bdb678d 100644
--- a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.fir.kt
@@ -3,6 +3,8 @@
 
 package a
 
+import checkSubtype
+
 fun <T> id(t: T): T = t
 
 fun <T> either(t1: T, t2: T): T = t1
@@ -20,4 +22,4 @@ fun test() {
     checkSubtype<Any>(d)
 
     val e: Float = id(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
index 9c46e5d5ea8..e17f289ee67 100644
--- a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
+++ b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
@@ -3,6 +3,8 @@
 
 package a
 
+import checkSubtype
+
 fun <T> id(t: T): T = t
 
 fun <T> either(t1: T, <!UNUSED_PARAMETER!>t2<!>: T): T = t1
@@ -20,4 +22,4 @@ fun test() {
     checkSubtype<Any>(d)
 
     val <!UNUSED_VARIABLE!>e<!>: Float = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>id(1)<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
index ccb9320dfbe..c6f1f114cc0 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
@@ -2,6 +2,10 @@
 // !CHECK_TYPE
 package a
 
+import checkType
+import _
+import checkSubtype
+
 fun <T> id(t: T): T = t
 
 fun <T> either(t1: T, t2: T): T = t1
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
index 4370e828990..4c6fbb91feb 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
@@ -2,6 +2,10 @@
 // !CHECK_TYPE
 package a
 
+import checkType
+import _
+import checkSubtype
+
 fun <T> id(t: T): T = t
 
 fun <T> either(t1: T, <!UNUSED_PARAMETER!>t2<!>: T): T = t1
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.fir.kt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.fir.kt
index 010fca061ef..ac17886b6d9 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.fir.kt
@@ -119,8 +119,8 @@ class C : O.B() {
     val b = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>A<!>::foo<!>
 
     // DEPRECATED: Classifiers from companions of direct superclasses
-    val e = FromCompanionA::foo
-    val f = FromCompanionB::foo
+    val e = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromCompanionA<!>::foo<!>
+    val f = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromCompanionB<!>::foo<!>
 
     // INVISIBLE: "cousin" supertypes themselves
     val g = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>Alpha<!>::foo<!>
@@ -128,9 +128,9 @@ class C : O.B() {
     val i = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>Gamma<!>::foo<!>
 
     // DEPRECATED: classifiers from "cousin" superclasses
-    val k = FromAlpha::foo
-    val l = FromBeta::foo
-    val m = FromGamma::foo
+    val k = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromAlpha<!>::foo<!>
+    val l = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromBeta<!>::foo<!>
+    val m = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromGamma<!>::foo<!>
 
     // INVISIBLE: We don't see classifiers from companions of "cousin" superclasses
     val o = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromCompanionAlpha<!>::foo<!>
@@ -138,5 +138,5 @@ class C : O.B() {
     val q = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromCompanionGamma<!>::foo<!>
 
     // DEPRECATED: Classifiers from supertypes of our own companion
-    val r = FromDelta::foo
-}
\ No newline at end of file
+    val r = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromDelta<!>::foo<!>
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.fir.kt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.fir.kt
index 5cf582c3d69..e258166f58b 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.fir.kt
@@ -119,8 +119,8 @@ class C : O.B() {
     val b = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>A<!>::foo<!>
 
     // DEPRECATED: Classifiers from companions of direct superclasses
-    val e = FromCompanionA::foo
-    val f = FromCompanionB::foo
+    val e = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromCompanionA<!>::foo<!>
+    val f = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromCompanionB<!>::foo<!>
 
     // INVISIBLE: "cousin" supertypes themselves
     val g = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>Alpha<!>::foo<!>
@@ -128,9 +128,9 @@ class C : O.B() {
     val i = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>Gamma<!>::foo<!>
 
     // DEPRECATED: classifiers from "cousin" superclasses
-    val k = FromAlpha::foo
-    val l = FromBeta::foo
-    val m = FromGamma::foo
+    val k = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromAlpha<!>::foo<!>
+    val l = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromBeta<!>::foo<!>
+    val m = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromGamma<!>::foo<!>
 
     // INVISIBLE: We don't see classifiers from companions of "cousin" superclasses
     val o = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromCompanionAlpha<!>::foo<!>
@@ -138,5 +138,5 @@ class C : O.B() {
     val q = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromCompanionGamma<!>::foo<!>
 
     // DEPRECATED: Classifiers from supertypes of our own companion
-    val r = FromDelta::foo
-}
\ No newline at end of file
+    val r = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromDelta<!>::foo<!>
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOldComplexCases.fir.kt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOldComplexCases.fir.kt
index 5902f6f0990..04396ecf509 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOldComplexCases.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOldComplexCases.fir.kt
@@ -12,7 +12,7 @@ object A {
     }
 
     class Derived : Base() {
-        val a = FromBaseCompanion::foo
+        val a = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromBaseCompanion<!>::foo<!>
     }
 }
 
@@ -30,7 +30,7 @@ object B {
     }
 
     class Derived : Base() {
-        val a = FromBaseCompanion::foo
+        val a = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromBaseCompanion<!>::foo<!>
     }
 }
 
@@ -48,7 +48,7 @@ object C {
     }
 
     class Derived : Base() {
-        val a = FromBaseCompanion::foo
+        val a = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromBaseCompanion<!>::foo<!>
     }
 }
 
@@ -64,6 +64,6 @@ object D {
     }
 
     class Derived : Base() {
-        val a = FromBaseCompanion::foo
+        val a = <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>FromBaseCompanion<!>::foo<!>
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/objects/localObjects.fir.kt b/compiler/testData/diagnostics/tests/objects/localObjects.fir.kt
index daaac36cf4b..8b825b6359c 100644
--- a/compiler/testData/diagnostics/tests/objects/localObjects.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/localObjects.fir.kt
@@ -5,11 +5,11 @@ fun foo() {
     val b = object {
         <!LOCAL_OBJECT_NOT_ALLOWED!>object c<!> {}
     }
-    b.c
+    b.<!UNRESOLVED_REFERENCE!>c<!>
     class A {
         <!LOCAL_OBJECT_NOT_ALLOWED!>object d<!> {}
     }
     val f = {
         <!LOCAL_OBJECT_NOT_ALLOWED!>object e<!> {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.fir.kt
index 571418a21e2..2df300ed26b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.fir.kt
@@ -3,7 +3,10 @@
 // !CHECK_TYPE
 package ppp
 
+import checkType
+import _
+
 fun foo(f: ft<Int, Int?>) {
     f.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
     f.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int?>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt
index 63f650fc139..1970c6ef232 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt
@@ -3,7 +3,10 @@
 // !CHECK_TYPE
 package ppp
 
+import checkType
+import _
+
 fun foo(f: ft<Int, Int?>) {
     f.checkType { _<Int>() }
     f.checkType { _<Int?>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.fir.kt
index 16310cc8fb5..e63bffd9e8d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.fir.kt
@@ -32,7 +32,7 @@ fun test() {
         foo()
     }
     with(platformN) {
-        foo()
+        <!INAPPLICABLE_CANDIDATE!>foo<!>()
     }
     with(platformJ) {
         foo()
diff --git a/compiler/testData/diagnostics/tests/regressions/kt31975.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt31975.fir.kt
index d26c5f6a750..a003b8815d1 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt31975.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt31975.fir.kt
@@ -11,7 +11,7 @@ interface TypeConstructor
 
 class Refiner {
     val memoizedFunctionLambda = createMemoizedFunction { it.foo() } // error type infered, no diagnostic, BAD, backend fails
-    val memoizedFunctionReference = <!INAPPLICABLE_CANDIDATE!>createMemoizedFunction<!>(<!UNRESOLVED_REFERENCE!>TypeConstructor::foo<!>) // EXTENSION_IN_CLASS_REFERENCE_IS_NOT_ALLOWED, fine
+    val memoizedFunctionReference = createMemoizedFunction(TypeConstructor::foo) // EXTENSION_IN_CLASS_REFERENCE_IS_NOT_ALLOWED, fine
     val memoizedFunctionTypes = createMemoizedFunction<TypeConstructor, Boolean> { it.foo() } // works fine
 
     private fun TypeConstructor.foo(): Boolean = true
diff --git a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt
index e9d9b4acc49..271c98176b8 100644
--- a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt
@@ -32,8 +32,8 @@ fun testY() {
 
 fun test(x: X) {
     val interface_as_fun = x.<!UNRESOLVED_REFERENCE!>A<!>()
-    val interface_as_val = x.A
+    val interface_as_val = x.<!UNRESOLVED_REFERENCE!>A<!>
 
     val object_as_fun = x.<!UNRESOLVED_REFERENCE!>B<!>()
-    val class_as_val = x.C
+    val class_as_val = x.<!UNRESOLVED_REFERENCE!>C<!>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.fir.kt b/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.fir.kt
index b18df6f1a3a..805c7ebac3c 100644
--- a/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.fir.kt
@@ -1,11 +1,12 @@
 // !LANGUAGE: -ForbidReferencingToUnderscoreNamedParameterOfCatchBlock
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_EXPRESSION
+// FULL_JDK
 
 fun foo() {
     try {
         TODO()
     } catch (_: Exception) {
-        `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+        `_`.stackTrace
     }
     try {
         TODO()
@@ -27,7 +28,7 @@ fun foo() {
             }
         }
     } catch (_: Exception) {
-        `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+        `_`.stackTrace
         val y1 = _
         val y2 = (`_`)
     }
@@ -37,21 +38,21 @@ fun foo() {
         try {
             TODO()
         } catch (x: Exception) {
-            `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+            `_`.stackTrace
         }
     }
     val boo1 = { `_`: Exception ->
         try {
             TODO()
         } catch (x: Exception) {
-            `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+            `_`.stackTrace
         }
     }
     val boo2 = { _: Exception ->
         try {
             TODO()
         } catch (x: Exception) {
-            `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+            `_`.stackTrace
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.kt b/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.kt
index 6d323b996dd..fffe6459de9 100644
--- a/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.kt
+++ b/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.kt
@@ -1,5 +1,6 @@
 // !LANGUAGE: -ForbidReferencingToUnderscoreNamedParameterOfCatchBlock
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_EXPRESSION
+// FULL_JDK
 
 fun foo() {
     try {
diff --git a/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.fir.kt b/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.fir.kt
index 8b52f9445b3..1bb2a00e099 100644
--- a/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.fir.kt
@@ -1,11 +1,12 @@
 // !LANGUAGE: +ForbidReferencingToUnderscoreNamedParameterOfCatchBlock
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_EXPRESSION
+// FULL_JDK
 
 fun foo() {
     try {
         TODO()
     } catch (_: Exception) {
-        `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+        `_`.stackTrace
     }
     try {
         TODO()
@@ -27,7 +28,7 @@ fun foo() {
             }
         }
     } catch (_: Exception) {
-        `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+        `_`.stackTrace
         val y1 = _
         val y2 = (`_`)
     }
@@ -37,21 +38,21 @@ fun foo() {
         try {
             TODO()
         } catch (x: Exception) {
-            `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+            `_`.stackTrace
         }
     }
     val boo1 = { `_`: Exception ->
         try {
             TODO()
         } catch (x: Exception) {
-            `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+            `_`.stackTrace
         }
     }
     val boo2 = { _: Exception ->
         try {
             TODO()
         } catch (x: Exception) {
-            `_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
+            `_`.stackTrace
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.kt b/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.kt
index 828d1a518e1..777905cdefb 100644
--- a/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.kt
+++ b/compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.kt
@@ -1,5 +1,6 @@
 // !LANGUAGE: +ForbidReferencingToUnderscoreNamedParameterOfCatchBlock
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_EXPRESSION
+// FULL_JDK
 
 fun foo() {
     try {
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.fir.kt
index 337f4764db5..27db9f77583 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.fir.kt
@@ -11,6 +11,8 @@ public abstract class AbstractModule<S> {
 package module2
 
 import module1.*
+import checkType
+import _
 
 fun <T> javaClass(): Class<T> = null!!
 
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.kt
index 83bcff10c2f..13f51aa955d 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.kt
@@ -11,6 +11,8 @@ public abstract class AbstractModule<S> {
 package module2
 
 import module1.*
+import checkType
+import _
 
 fun <T> javaClass(): Class<T> = null!!
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.fir.kt
new file mode 100644
index 00000000000..225108b566a
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.fir.kt
@@ -0,0 +1,32 @@
+fun castInTry(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } catch (e: Exception) {
+        s.<!UNRESOLVED_REFERENCE!>length<!> // shouldn't be resolved
+    } finally {
+        s.<!UNRESOLVED_REFERENCE!>length<!> // shouldn't be resolved
+    }
+    s.<!UNRESOLVED_REFERENCE!>length<!> // shouldn't be resolved
+}
+
+fun castInTryAndCatch(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } catch (e: Exception) {
+        s as String // Potential cast exception
+    } finally {
+        s.<!UNRESOLVED_REFERENCE!>length<!> // shouldn't be resolved
+    }
+    s.<!UNRESOLVED_REFERENCE!>length<!> // should be smartcast
+}
+
+fun castAtAll(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } catch (e: Exception) {
+        s as String // Potential cast exception
+    } finally {
+        s as String // Potential cast exception
+    }
+    s.length
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.kt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.kt
new file mode 100644
index 00000000000..b9741a228cb
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.kt
@@ -0,0 +1,32 @@
+fun castInTry(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } catch (e: Exception) {
+        s.<!UNRESOLVED_REFERENCE!>length<!> // shouldn't be resolved
+    } finally {
+        s.<!UNRESOLVED_REFERENCE!>length<!> // shouldn't be resolved
+    }
+    s.<!UNRESOLVED_REFERENCE!>length<!> // shouldn't be resolved
+}
+
+fun castInTryAndCatch(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } catch (e: Exception) {
+        s as String // Potential cast exception
+    } finally {
+        s.<!UNRESOLVED_REFERENCE!>length<!> // shouldn't be resolved
+    }
+    s.<!UNRESOLVED_REFERENCE!>length<!> // should be smartcast
+}
+
+fun castAtAll(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } catch (e: Exception) {
+        s as String // Potential cast exception
+    } finally {
+        s as String // Potential cast exception
+    }
+    <!DEBUG_INFO_SMARTCAST!>s<!>.length
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.txt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.txt
new file mode 100644
index 00000000000..5d6f5c5e949
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.txt
@@ -0,0 +1,5 @@
+package
+
+public fun castAtAll(/*0*/ s: kotlin.Any): kotlin.Unit
+public fun castInTry(/*0*/ s: kotlin.Any): kotlin.Unit
+public fun castInTryAndCatch(/*0*/ s: kotlin.Any): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.fir.kt
new file mode 100644
index 00000000000..01937ff9cb1
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.fir.kt
@@ -0,0 +1,17 @@
+fun castInTry(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } finally {
+        s.<!UNRESOLVED_REFERENCE!>length<!> // Shouldn't be resolved
+    }
+    s.<!UNRESOLVED_REFERENCE!>length<!> // Shouldn't be resolved
+}
+
+fun castInTryAndFinally(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } finally {
+        s as String // Potential cast exception
+    }
+    s.length // Should be smartcast
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.kt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.kt
new file mode 100644
index 00000000000..754f1bc6ab2
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.kt
@@ -0,0 +1,17 @@
+fun castInTry(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } finally {
+        s.<!UNRESOLVED_REFERENCE!>length<!> // Shouldn't be resolved
+    }
+    s.<!UNRESOLVED_REFERENCE!>length<!> // Shouldn't be resolved
+}
+
+fun castInTryAndFinally(s: Any) {
+    try {
+        s as String // Potential cast exception
+    } finally {
+        s as String // Potential cast exception
+    }
+    <!DEBUG_INFO_SMARTCAST!>s<!>.length // Should be smartcast
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.txt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.txt
new file mode 100644
index 00000000000..019ab2ae2be
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.txt
@@ -0,0 +1,4 @@
+package
+
+public fun castInTry(/*0*/ s: kotlin.Any): kotlin.Unit
+public fun castInTryAndFinally(/*0*/ s: kotlin.Any): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.fir.kt
index 5bfb285c232..a5726756c33 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.fir.kt
@@ -3,6 +3,8 @@
 
 package a
 
+import checkSubtype
+
 fun <T> id(t: T): T = t
 
 fun <T> two(u: T, v: T): T = u
@@ -58,4 +60,4 @@ fun rr(s: String?) {
 //from library
 fun <T> arrayListOf(vararg values: T): MutableList<T> = throw Exception()
 
-fun use(vararg a: Any) = a
\ No newline at end of file
+fun use(vararg a: Any) = a
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
index 8477a0bddb2..3a1268c199a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
@@ -3,6 +3,8 @@
 
 package a
 
+import checkSubtype
+
 fun <T> id(t: T): T = t
 
 fun <T> two(u: T, <!UNUSED_PARAMETER!>v<!>: T): T = u
@@ -58,4 +60,4 @@ fun rr(s: String?) {
 //from library
 fun <T> arrayListOf(vararg <!UNUSED_PARAMETER!>values<!>: T): MutableList<T> = throw Exception()
 
-fun use(vararg a: Any) = a
\ No newline at end of file
+fun use(vararg a: Any) = a
diff --git a/compiler/testData/diagnostics/tests/smartCasts/loops/whileWithAssertInConditionAndBreakAfter.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/loops/whileWithAssertInConditionAndBreakAfter.fir.kt
index 4f1e577fd70..6d6c717a1d9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/loops/whileWithAssertInConditionAndBreakAfter.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/loops/whileWithAssertInConditionAndBreakAfter.fir.kt
@@ -8,7 +8,7 @@ fun foo() {
 
     }
     // TODO: this testdata fixates undesired behavior (it should be an unsafe call)
-    x.length // 'x' is unsoundly smartcasted here
+    x.<!INAPPLICABLE_CANDIDATE!>length<!> // 'x' is unsoundly smartcasted here
 }
 
 fun bar() {
@@ -19,5 +19,5 @@ fun bar() {
 
     }
     // TODO: this testdata fixates undesired behavior (it should be an unsafe call)
-    x.size // 'x' is unsoundly smartcasted here
+    x.<!INAPPLICABLE_CANDIDATE!>size<!> // 'x' is unsoundly smartcasted here
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/smartCasts/loops/whileWithAssertInConditionAndBreakBefore.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/loops/whileWithAssertInConditionAndBreakBefore.fir.kt
index 5eca313d3e3..1af837174c9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/loops/whileWithAssertInConditionAndBreakBefore.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/loops/whileWithAssertInConditionAndBreakBefore.fir.kt
@@ -7,7 +7,7 @@ fun foo() {
         break
 
     }
-    x.length // 'x' is unsoundly smartcasted here
+    x.<!INAPPLICABLE_CANDIDATE!>length<!> // 'x' is unsoundly smartcasted here
 }
 
 fun bar() {
@@ -17,5 +17,5 @@ fun bar() {
         break
 
     }
-    x.size // 'x' is unsoundly smartcasted here
+    x.<!INAPPLICABLE_CANDIDATE!>size<!> // 'x' is unsoundly smartcasted here
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/smartCasts/openInSealed.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/openInSealed.fir.kt
index 8b0160f3ba6..5011c17372d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/openInSealed.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/openInSealed.fir.kt
@@ -2,7 +2,7 @@ sealed class My(open val x: Int?) {
     init {
         if (x != null) {
             // Should be error: property is open
-            x.hashCode()
+            x.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
         }
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/smartCasts/unstableToStable.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/unstableToStable.fir.kt
index b229ad774f3..98563e4ea6c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/unstableToStable.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/unstableToStable.fir.kt
@@ -3,15 +3,15 @@ class Foo(var x: Int?) {
         if (x != null) {
             val y = x
             // Error: x is not stable, Type(y) = Int?
-            x.hashCode()
-            y.hashCode()
+            x.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
+            y.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
             if (y == x) {
                 // Still error
-                y.hashCode()
+                y.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
             }
             if (x == null && y != x) {
                 // Still error
-                y.hashCode()
+                y.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
             }
         }
     }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/unstableToStableTypes.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/unstableToStableTypes.fir.kt
index 75893bf35b7..4702c095847 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/unstableToStableTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/unstableToStableTypes.fir.kt
@@ -7,15 +7,15 @@ class Foo(var x: Any) {
         if (x is Bar) {
             val y = x
             // Error: x is not stable, Type(y) = Any
-            x.bar()
-            y.bar()
+            x.<!UNRESOLVED_REFERENCE!>bar<!>()
+            y.<!UNRESOLVED_REFERENCE!>bar<!>()
             if (y == x) {
                 // Still error
-                y.bar()
+                y.<!UNRESOLVED_REFERENCE!>bar<!>()
             }
             if (x !is Bar && y != x) {
                 // Still error
-                y.bar()
+                y.<!UNRESOLVED_REFERENCE!>bar<!>()
             }
         }
     }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.fir.kt
index 4163683d0d1..0735df90d8d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.fir.kt
@@ -37,7 +37,7 @@ fun test3() {
     catch (e: B) {
         return
     }
-    a.hashCode() // a is nullable here
+    a.<!INAPPLICABLE_CANDIDATE!>hashCode<!>() // a is nullable here
 }
 fun test4() {
     var a: Int? = null
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/setNotNullInTry.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/setNotNullInTry.fir.kt
index e380e336ffe..b80a9706116 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/setNotNullInTry.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/setNotNullInTry.fir.kt
@@ -10,5 +10,5 @@ fun foo() {
     } catch (ex: Exception) {}
     bar(s)
     if (s != null) { }
-    s.hashCode()
+    s.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt
index 66aec7f85f4..b4b0ecc3eae 100644
--- a/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt
+++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt
@@ -4,14 +4,14 @@ abstract class A : Map<Int, String>
 
 fun foo(x: Map<Int, String>, a: A, b: java.util.HashMap<Int, String>) {
     x.getOrDefault(1, "")
-    x.<!NONE_APPLICABLE!>getOrDefault<!>("", "")
-    x.<!NONE_APPLICABLE!>getOrDefault<!>(1, 2)
-    x.<!NONE_APPLICABLE!>getOrDefault<!>("", 2)
+    x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")
+    x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
+    x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
 
     a.getOrDefault(1, "")
-    a.<!NONE_APPLICABLE!>getOrDefault<!>("", "")
-    a.<!NONE_APPLICABLE!>getOrDefault<!>(1, 2)
-    a.<!NONE_APPLICABLE!>getOrDefault<!>("", 2)
+    a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")
+    a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
+    a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
 
     b.getOrDefault(1, "")
     b.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")
diff --git a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt
index eb31c42f913..92c6786e45c 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt
@@ -5,8 +5,8 @@ typealias N<T> = Num<T>
 typealias N2<T> = N<T>
 
 val x1 = <!INAPPLICABLE_CANDIDATE!>Num<!><String>("")
-val x2 = <!UPPER_BOUND_VIOLATED!>N<String>("")<!>
-val x3 = <!UPPER_BOUND_VIOLATED!>N2<String>("")<!>
+val x2 = N<String>("")
+val x3 = N2<String>("")
 
 class TColl<T, C : Collection<T>>
 
@@ -14,5 +14,5 @@ typealias TC<T, C> = TColl<T, C>
 typealias TC2<T, C> = TC<T, C>
 
 val y1 = TColl<Any, <!UPPER_BOUND_VIOLATED!>Any<!>>()
-val y2 = <!UPPER_BOUND_VIOLATED!>TC<Any, Any>()<!>
-val y3 = <!UPPER_BOUND_VIOLATED!>TC2<Any, Any>()<!>
+val y2 = TC<Any, Any>()
+val y3 = TC2<Any, Any>()
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt
index 51986247c74..c868b92be74 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt
@@ -14,4 +14,4 @@ fun test4(x: TC2<Number, List<Any>>) {}
 val test5 = TC2<Number, Collection<Number>>()
 val test6 = TC2<Number, Collection<Int>>()
 val test7 = TC2<Number, List<Int>>()
-val test8 = <!UPPER_BOUND_VIOLATED!>TC2<Number, List<Any>>()<!>
+val test8 = TC2<Number, List<Any>>()
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt
index d8133bb37be..5b2b448a9dd 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt
@@ -16,10 +16,10 @@ fun test3(x: NL<Int>) {}
 fun test4(x: NL<Any>) {}
 
 val test5 = NA<Int>()
-val test6 = <!UPPER_BOUND_VIOLATED!>NA<Any>()<!>
+val test6 = NA<Any>()
 val test7 = NL<Int>()
 val test8 = MMMM<Int>()
-val test9dwd = <!UPPER_BOUND_VIOLATED!>NL<Any>()<!>
+val test9dwd = NL<Any>()
 
 fun test9(x: TC<Number, Collection<Number>>) {}
 fun test10(x: TC<Number, Collection<Int>>) {}
@@ -29,4 +29,4 @@ fun test12(x: TC<Number, List<Any>>) {}
 val test13 = TC<Number, Collection<Number>>()
 val test14 = TC<Number, Collection<Int>>()
 val test15 = TC<Number, List<Int>>()
-val test16 = <!UPPER_BOUND_VIOLATED!>TC<Number, List<Any>>()<!>
+val test16 = TC<Number, List<Any>>()
diff --git a/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.fir.kt b/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.fir.kt
index 1475e2951eb..bc72f271c10 100644
--- a/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.fir.kt
@@ -3,6 +3,9 @@
 // FILE: a.kt
 package a
 
+import checkType
+import _
+
 class B(x: String)
 typealias A1 = B
 private typealias A2 = B
@@ -18,6 +21,8 @@ fun bar() {
 package usage
 
 import a.B
+import checkType
+import _
 
 fun baz() {
     a.A1("") // resolved to B constructor, OK
diff --git a/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.kt b/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.kt
index 7d6ae58cb01..5f9c7f95d1e 100644
--- a/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.kt
+++ b/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.kt
@@ -3,6 +3,9 @@
 // FILE: a.kt
 package a
 
+import checkType
+import _
+
 class B(x: String)
 typealias A1 = B
 private typealias A2 = B
@@ -18,6 +21,8 @@ fun bar() {
 package usage
 
 import a.B
+import checkType
+import _
 
 fun baz() {
     a.A1("") // resolved to B constructor, OK
diff --git a/compiler/testData/diagnostics/tests/typealias/kt15734.fir.kt b/compiler/testData/diagnostics/tests/typealias/kt15734.fir.kt
index f35a9e1befc..b7a667b24da 100644
--- a/compiler/testData/diagnostics/tests/typealias/kt15734.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/kt15734.fir.kt
@@ -15,5 +15,5 @@ val test5: List<TNString?> = TODO()
 val test6: () -> List<TNString> = TODO()
 
 fun test(x: TNString) {
-    x.hashCode()
+    x.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.fir.kt
index b8ee1fd1f65..b7008cf51e6 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.fir.kt
@@ -5,7 +5,7 @@ class Num<Tn : Number>(val x: Tn)
 typealias N<T> = Num<T>
 
 val test0 = N(1)
-val test1 = <!UPPER_BOUND_VIOLATED!>N("1")<!>
+val test1 = N("1")
 
 
 class Cons<T>(val head: T, val tail: Cons<T>?)
@@ -30,4 +30,4 @@ typealias F<T> = Foo<T>
 fun testProjections1(x: Pair<in Int, out String>) = <!INAPPLICABLE_CANDIDATE!>F<!>(x)
 fun testProjections2(x: Pair<in Int, out Number>) = <!INAPPLICABLE_CANDIDATE!>F<!>(x)
 fun testProjections3(x: Pair<in Number, out Int>) = <!INAPPLICABLE_CANDIDATE!>F<!>(x)
-fun testProjections4(x: Pair<in Int, in Int>) = <!INAPPLICABLE_CANDIDATE!>F<!>(x)
\ No newline at end of file
+fun testProjections4(x: Pair<in Int, in Int>) = <!INAPPLICABLE_CANDIDATE!>F<!>(x)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.fir.kt
index ed47e4b8a16..7f8a87e86f3 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.fir.kt
@@ -5,4 +5,4 @@ class Cons<T : Number>(val head: T, val tail: Cons<T>?)
 typealias C<T> = Cons<T>
 
 val test1 = C(1, C(2, null))
-val test2 = <!UPPER_BOUND_VIOLATED!>C(1, <!UPPER_BOUND_VIOLATED!>C("", null)<!>)<!>
+val test2 = C(1, C("", null))
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.fir.kt
index bff59ebac46..71d617e6796 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.fir.kt
@@ -62,7 +62,7 @@ fun foo(
     test.ObjectAlias::func
 
     test.ObjectSample.Nested::func
-    test.ObjectAlias.Nested::func
+    <!UNRESOLVED_REFERENCE!>test.ObjectAlias.<!UNRESOLVED_REFERENCE!>Nested<!>::func<!>
 
     test.EnumSample::Nested
     test.EnumAlias::Nested
@@ -72,4 +72,4 @@ fun foo(
 
     test.EnumSample.Nested::func
     <!UNRESOLVED_REFERENCE!>test.EnumAlias.<!UNRESOLVED_REFERENCE!>Nested<!>::func<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt
index fa611a11a7c..d321469fd3b 100644
--- a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt
@@ -29,9 +29,9 @@ val test3pr = <!INAPPLICABLE_CANDIDATE!>P2<!><String, Int, Int>(1, "")
 class Num<T : Number>(val x: T)
 typealias N<T> = Num<T>
 
-val testN0 = <!UPPER_BOUND_VIOLATED!>N("")<!>
+val testN0 = N("")
 val testN1 = N<Int>(1)
-val testN1a = <!UPPER_BOUND_VIOLATED!>N<String>("")<!>
+val testN1a = N<String>("")
 val testN2 = <!INAPPLICABLE_CANDIDATE!>N<!><Int, Int>(1)
 
 class MyPair<T1 : CharSequence, T2 : Number>(val string: T1, val number: T2)
@@ -39,4 +39,4 @@ typealias MP<T1> = MyPair<String, T1>
 
 val testMP0 = MP<Int>("", 1)
 val testMP1 = <!INAPPLICABLE_CANDIDATE!>MP<!>(1, "")
-val testMP2 = <!UPPER_BOUND_VIOLATED!>MP<String>("", "")<!>
\ No newline at end of file
+val testMP2 = MP<String>("", "")
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
index 1b1b29427a3..af94f1b47ce 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
@@ -24,13 +24,13 @@ fun test_ann(s: String, arr: Array<String>) {
     foo()
     @Ann(*[""], x = 1)
     foo()
-    @Ann(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>s = [""]<!>, x = 1)
+    @Ann(s = [""], x = 1)
     foo()
-    @Ann(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>s = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_ANNOTATION!>[""]<!><!>, x = 1)
+    @Ann(s = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_ANNOTATION!>[""]<!>, x = 1)
     foo()
 
     @Ann("", x = 1)
     foo()
-    @Ann(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR, NI;TYPE_MISMATCH!>""<!><!>, x = 1)
+    @Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR, NI;TYPE_MISMATCH!>""<!>, x = 1)
     foo()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
index 092998e528c..d74bf038a54 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
@@ -24,13 +24,13 @@ fun test_ann(s: String, arr: Array<String>) {
     foo()
     @Ann(*[""], x = 1)
     foo()
-    @Ann(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>s = [""]<!>, x = 1)
+    @Ann(s = [""], x = 1)
     foo()
-    @Ann(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>s = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_ANNOTATION!>[""]<!><!>, x = 1)
+    @Ann(s = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_ANNOTATION!>[""]<!>, x = 1)
     foo()
 
     @Ann("", x = 1)
     foo()
-    @Ann(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR, NI;TYPE_MISMATCH!>""<!><!>, x = 1)
+    @Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR, NI;TYPE_MISMATCH!>""<!>, x = 1)
     foo()
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt b/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
index 4c3911d35c7..e830c54b743 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
@@ -33,7 +33,7 @@ fun jTest1() {}
 @JavaAnn(value = ["value"])
 fun jTest2() {}
 
-@JavaAnn(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>value = ["value"]<!>, path = ["path"])
+@JavaAnn(value = ["value"], path = ["path"])
 fun jTest3() {}
 
 
diff --git a/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt b/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
index 6496325002f..203747e07d8 100644
--- a/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
+++ b/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
@@ -30,7 +30,7 @@ fun jTest1() {}
 @JavaAnn(value = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>)
 fun jTest2() {}
 
-@JavaAnn(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>value = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!><!>, path = ["path"])
+@JavaAnn(value = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>, path = ["path"])
 fun jTest3() {}
 
 annotation class IntAnn(vararg val i: Int)
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt
new file mode 100644
index 00000000000..f0d500dabbd
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt
@@ -0,0 +1,7 @@
+// !LANGUAGE: +InlineClasses
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+inline class IC(val i: Int)
+
+<!CONFLICTING_JVM_DECLARATIONS!>fun foo(a: Any, ic: IC)<!> {}
+<!CONFLICTING_JVM_DECLARATIONS!>fun foo(a: Any?, ic: IC)<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt
new file mode 100644
index 00000000000..bf10ceb74b6
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt
@@ -0,0 +1,12 @@
+package
+
+public fun foo(/*0*/ a: kotlin.Any, /*1*/ ic: IC): kotlin.Unit
+public fun foo(/*0*/ a: kotlin.Any?, /*1*/ ic: IC): kotlin.Unit
+
+public final inline class IC {
+    public constructor IC(/*0*/ i: kotlin.Int)
+    public final val i: kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt
index 0ffb8a37a9f..ee2422d2d7e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt
@@ -26,5 +26,5 @@ public @interface A {
 @A fun test8() {}
 
 @A(x = Any::class, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>*arrayOf("5", "6")<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3) fun test9() {}
-@A(x = Any::class, <!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>value = ["5", "6"]<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3) fun test10() {}
-@A(x = Any::class, <!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>value = ["5", "6", "7"]<!>, y = 3) fun test11() {}
+@A(x = Any::class, value = ["5", "6"], <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"7"<!>, y = 3) fun test10() {}
+@A(x = Any::class, value = ["5", "6", "7"], y = 3) fun test11() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.kt b/compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.kt
new file mode 100644
index 00000000000..9f592fa20b0
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.kt
@@ -0,0 +1,13 @@
+// FIR_IDENTICAL
+class A {
+    fun test() {
+        val a: A
+        synchronized(this) {
+            if (bar()) throw RuntimeException()
+            a = A()
+        }
+        a.bar()
+    }
+
+    fun bar() = false
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.txt b/compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.txt
new file mode 100644
index 00000000000..01315e44ce9
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.txt
@@ -0,0 +1,10 @@
+package
+
+public final class A {
+    public constructor A()
+    public final fun bar(): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchFinally.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchFinally.fir.kt
index d7d436c9b87..80f20d5ba69 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchFinally.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchFinally.fir.kt
@@ -62,7 +62,7 @@ fun innerFinallyInitializes() {
         }
 
         // Properly initialized
-        <!UNINITIALIZED_VARIABLE!>x<!>.inc()
+        x.inc()
     } catch (e: java.lang.Exception) {
         log()
     }
@@ -87,12 +87,12 @@ fun innerFinallyInitializesOuterRethrows() {
         }
 
         // Properly initialized
-        <!UNINITIALIZED_VARIABLE!>x<!>.inc()
+        x.inc()
     } catch (e: java.lang.Exception) {
         log()
         throw e
     }
 
     // Guaranteed to be initialized because all catch-clauses are rethrowing
-    <!UNINITIALIZED_VARIABLE!>x<!>.inc()
+    x.inc()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.fir.kt
index 40b40cd4c83..a942e8d5bfb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.fir.kt
@@ -30,7 +30,7 @@ fun innerTryCatchInitializes() {
             }
         }
         // Can get here only when inlined lambda exited properly, i.e. x is initialized
-        <!UNINITIALIZED_VARIABLE!>x<!>.inc()
+        x.inc()
         outerComputation()
 
     } catch (e: java.lang.Exception) {
@@ -43,5 +43,5 @@ fun innerTryCatchInitializes() {
         x = 42
     }
     // Here x=I because outer try-catch either exited normally (x=I) or catched exception (x=I, with reassingment, though)
-    <!UNINITIALIZED_VARIABLE!>x<!>.inc()
-}
\ No newline at end of file
+    x.inc()
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.fir.kt
index 61c2f902434..3adc7cc800c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.fir.kt
@@ -26,7 +26,7 @@ fun throwIfNotCalled() {
     }
     // x *is* initialized here, because if myRun was never called -> exception
     // were thrown and control flow wouldn't be here
-    println(<!UNINITIALIZED_VARIABLE!>x<!>)
+    println(x)
 }
 
 fun catchThrowIfNotCalled() {
@@ -45,4 +45,4 @@ fun catchThrowIfNotCalled() {
 
     // x *isn't* initialized here!
     println(<!UNINITIALIZED_VARIABLE!>x<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatch.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatch.fir.kt
index 2e864fbe2f3..b0914fa713b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatch.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatch.fir.kt
@@ -43,7 +43,7 @@ fun possibleReassignmentInTryCatch() {
         }
         x.inc()
     }
-    <!UNINITIALIZED_VARIABLE!>x<!>.inc()
+    x.inc()
 }
 
 fun tryCatchOuter() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatchFinally.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatchFinally.fir.kt
index 2b1f4f23c98..c62c45b5a24 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatchFinally.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatchFinally.fir.kt
@@ -30,5 +30,5 @@ fun innerTryCatchFinally() {
         }
     }
 
-    <!UNINITIALIZED_VARIABLE!>x<!>.inc()
+    x.inc()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.fir.kt
index e63f28fb23c..b5e2d6fab7e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.fir.kt
@@ -89,4 +89,16 @@ class DefiniteInitializationInInitSection {
         myRun { x = 42 }
         unknownRun { y = 239 }
     }
-}
\ No newline at end of file
+}
+
+class DefiniteInitializationAfterThrow {
+    fun test() {
+        val a: Int
+        myRun {
+            if (bar()) throw RuntimeException()
+            a = 42
+        }
+        a.hashCode()
+    }
+    fun bar() = false
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.kt
index 74cf4cbc28d..dbad861f8f7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.kt
@@ -89,4 +89,16 @@ class DefiniteInitializationInInitSection {
         myRun { <!CAPTURED_VAL_INITIALIZATION!>x<!> = 42 }
         unknownRun { <!CAPTURED_MEMBER_VAL_INITIALIZATION!>y<!> = 239 }
     }
-}
\ No newline at end of file
+}
+
+class DefiniteInitializationAfterThrow {
+    fun test() {
+        val a: Int
+        myRun {
+            if (bar()) throw RuntimeException()
+            a = 42
+        }
+        a.hashCode()
+    }
+    fun bar() = false
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.txt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.txt
index d10107c46d7..6814b01f411 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.txt
@@ -11,6 +11,15 @@ public fun returningValue(): kotlin.Unit
 public fun shadowing(): kotlin.Unit
 public fun unknownRun(/*0*/ block: () -> kotlin.Unit): kotlin.Unit
 
+public final class DefiniteInitializationAfterThrow {
+    public constructor DefiniteInitializationAfterThrow()
+    public final fun bar(): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
 public final class DefiniteInitializationInInitSection {
     public constructor DefiniteInitializationInInitSection()
     public final val x: kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/catchExceptionSpilling.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/catchExceptionSpilling.fir.kt
index 950164c591d..f922b23dfb2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/catchExceptionSpilling.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/catchExceptionSpilling.fir.kt
@@ -17,5 +17,5 @@ fun testWithCatch(x: Any?) {
         x.length
     } catch (e: java.lang.IllegalArgumentException) { }
 
-    x.length
+    x.<!UNRESOLVED_REFERENCE!>length<!>
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.fir.kt
index deb0801d3fc..c1f71e56f15 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.fir.kt
@@ -17,7 +17,7 @@ fun CharSequence?.isNullOrEmpty(): Boolean {
 fun smartcastOnReceiver(s: String?) {
     with(s) {
         if (isNullOrEmpty()) {
-            length
+            <!INAPPLICABLE_CANDIDATE!>length<!>
         }
         else {
             length
@@ -32,7 +32,7 @@ fun mixedReceiver(s: String?) {
         }
     } else {
         with(s) {
-            length
+            <!INAPPLICABLE_CANDIDATE!>length<!>
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.fir.kt
index d0ba672130a..d82ea265323 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.fir.kt
@@ -17,7 +17,7 @@ fun CharSequence?.isNullOrEmpty(): Boolean {
 fun smartcastOnReceiver(s: String?) {
     with(s) {
         if (isNullOrEmpty()) {
-            length
+            <!INAPPLICABLE_CANDIDATE!>length<!>
         }
         else {
             length
@@ -32,7 +32,7 @@ fun mixedReceiver(s: String?) {
         }
     } else {
         with(s) {
-            length
+            <!INAPPLICABLE_CANDIDATE!>length<!>
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/throwsEffect.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/throwsEffect.fir.kt
index 1253490875b..219ab26035a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/throwsEffect.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/throwsEffect.fir.kt
@@ -45,7 +45,7 @@ fun testTryCatch(x: Any?) {
     } catch (e: kotlin.IllegalArgumentException) {
 
     }
-    x.length
+    x.<!UNRESOLVED_REFERENCE!>length<!>
 }
 
 fun testUncertainFlow(x: Any?) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt41430.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt41430.fir.kt
index b69ad21f0c9..a0cf6c2b5e9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt41430.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt41430.fir.kt
@@ -3,18 +3,18 @@
 class A
 
 fun test_1(list: List<Set<A>>) {
-    list.<!AMBIGUITY!>flatMapTo<!>(mutableSetOf()) { <!UNRESOLVED_REFERENCE!>it<!> }
+    list.flatMapTo(mutableSetOf()) { it }
 }
 
 fun test_2(list: List<Set<A>>) {
     sequence<A> {
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Ambiguity: flatMapTo, [kotlin/collections/flatMapTo, kotlin/collections/flatMapTo]")!>list.<!AMBIGUITY!>flatMapTo<!>(mutableSetOf()) { <!UNRESOLVED_REFERENCE!>it<!> }<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableSet<A>")!>list.flatMapTo(mutableSetOf()) { it }<!>
     }
 }
 
 fun test_3(list: List<Set<A>>) {
     sequence {
-        list.<!AMBIGUITY!>flatMapTo<!>(mutableSetOf()) { <!UNRESOLVED_REFERENCE!>it<!> }
+        list.flatMapTo(mutableSetOf()) { it }
         yield(A())
     }
 }
@@ -22,6 +22,6 @@ fun test_3(list: List<Set<A>>) {
 fun test_4(list: List<Set<A>>) {
     sequence {
         yield(A())
-        list.<!AMBIGUITY!>flatMapTo<!>(mutableSetOf()) { <!UNRESOLVED_REFERENCE!>it<!> }
+        list.flatMapTo(mutableSetOf()) { it }
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.fir.kt
deleted file mode 100644
index de14e25943c..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.fir.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-// !LANGUAGE: +NewInference +OverloadResolutionByLambdaReturnType
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
-// ISSUE: KT-11265
-
-// FILE: OverloadResolutionByLambdaReturnType.kt
-
-package kotlin
-
-annotation class OverloadResolutionByLambdaReturnType
-
-// FILE: main.kt
-
-import kotlin.OverloadResolutionByLambdaReturnType
-
-@kotlin.jvm.JvmName("myFlatMapIterable")
-@OverloadResolutionByLambdaReturnType
-fun <T, R> Sequence<T>.myFlatMap(transform: (T) -> Iterable<R>): Sequence<R> {
-    TODO()
-}
-
-fun <T, R> Sequence<T>.myFlatMap(transform: (T) -> Sequence<R>): Sequence<R> {
-    TODO()
-}
-
-interface A {
-    val supertypes: Collection<B>
-}
-
-interface B {
-    val descriptors: Sequence<C>?
-}
-
-interface C
-
-fun <K : Any> elvis(x: K?, y: K): K = y
-
-fun test(a: A) {
-    a.supertypes.asSequence().<!AMBIGUITY!>myFlatMap<!> {
-        <!INAPPLICABLE_CANDIDATE!>elvis<!>(<!UNRESOLVED_REFERENCE!>it<!>.<!UNRESOLVED_REFERENCE!>descriptors<!>, sequenceOf())
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt
index f7fc1603694..95e2ff88ad0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +NewInference +OverloadResolutionByLambdaReturnType
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
deleted file mode 100644
index d017efdc4ba..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-// !LANGUAGE: +NewInference +OverloadResolutionByLambdaReturnType
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
-// ISSUE: KT-11265
-
-// FILE: OverloadResolutionByLambdaReturnType.kt
-
-package kotlin
-
-annotation class OverloadResolutionByLambdaReturnType
-
-// FILE: main.kt
-
-import kotlin.OverloadResolutionByLambdaReturnType
-
-@OverloadResolutionByLambdaReturnType
-fun <R> UByteArray.fooMap(t: (UByte) -> Iterable<R>): List<R> {
-    TODO("ub.fm")
-}
-
-@OverloadResolutionByLambdaReturnType
-fun <T, R> Iterable<T>.fooMap(t: (T) -> Iterable<R>): List<R> {
-    TODO("i.fm(i)")
-}
-
-@JvmName("fooMapSeq")
-fun <T, R> Iterable<T>.fooMap(t: (T) -> Sequence<R>): List<R> {
-    TODO("i.fm(s)")
-}
-
-fun test() {
-    val list = ubyteArrayOf(0u).<!AMBIGUITY!>fooMap<!> { <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) }
-    takeUByteList(list)
-}
-
-fun takeUByteList(list: List<UByte>) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt
index 989ad9a96e5..485b9617821 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +NewInference +OverloadResolutionByLambdaReturnType
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
 // ISSUE: KT-11265
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.fir.kt
deleted file mode 100644
index 97436c8de29..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.fir.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// !LANGUAGE: +NewInference +OverloadResolutionByLambdaReturnType
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
-// ISSUE: KT-11265
-
-// FILE: OverloadResolutionByLambdaReturnType.kt
-
-package kotlin
-
-annotation class OverloadResolutionByLambdaReturnType
-
-// FILE: main.kt
-
-import kotlin.OverloadResolutionByLambdaReturnType
-
-@OverloadResolutionByLambdaReturnType
-fun <T, R : Comparable<R>> Iterable<T>.myMaxOf(selector: (T) -> R): R = TODO()
-@OverloadResolutionByLambdaReturnType
-fun <T> Iterable<T>.myMaxOf(selector: (T) -> Double): Double = TODO()
-@OverloadResolutionByLambdaReturnType
-fun <T> Iterable<T>.myMaxOf(selector: (T) -> Float): Float = TODO()
-
-fun Double.pow(v: Int): Double = this
-
-fun test() {
-    val value = listOf(1, 2, 3, 4, 5, 6).<!AMBIGUITY!>myMaxOf<!> { -2.0.pow(<!UNRESOLVED_REFERENCE!>it<!>) }
-    takeDouble(value)
-}
-
-fun takeDouble(value: Double) {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt
index c4c0ba0d0d2..9dc84763c39 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +NewInference +OverloadResolutionByLambdaReturnType
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
 // ISSUE: KT-11265
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.fir.kt
deleted file mode 100644
index c5a6b7f8778..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.fir.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-// !LANGUAGE: +NewInference +OverloadResolutionByLambdaReturnType
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
-// ISSUE: KT-11265
-
-// FILE: OverloadResolutionByLambdaReturnType.kt
-
-package kotlin
-
-annotation class OverloadResolutionByLambdaReturnType
-
-// FILE: main.kt
-
-import kotlin.OverloadResolutionByLambdaReturnType
-
-public inline fun <T, R> Iterable<T>.myFlatMap(transform: (T) -> Iterable<R>): List<R> {
-    TODO()
-}
-
-@OverloadResolutionByLambdaReturnType
-@kotlin.jvm.JvmName("myFlatMapSequence")
-public inline fun <T, R> Iterable<T>.myFlatMap(transform: (T) -> Sequence<R>): List<R> {
-    TODO()
-}
-
-interface Name
-interface DeclarationDescriptor {
-    val nextCandidates: List<DeclarationDescriptor>?
-    val nextCandidatesSeq: Sequence<DeclarationDescriptor>?
-    val name: Name
-}
-
-fun test_1(name: Name, toplevelDescriptors: List<DeclarationDescriptor>): List<DeclarationDescriptor> {
-    val candidates = toplevelDescriptors.<!AMBIGUITY!>myFlatMap<!> { container ->
-        val nextCandidates = container.<!UNRESOLVED_REFERENCE!>nextCandidates<!> ?: return@myFlatMap emptyList()
-        nextCandidates
-    }
-    return candidates
-}
-
-fun test_2(name: Name, toplevelDescriptors: List<DeclarationDescriptor>): List<DeclarationDescriptor> {
-    val candidates = toplevelDescriptors.<!AMBIGUITY!>myFlatMap<!> { container ->
-        val nextCandidates = container.<!UNRESOLVED_REFERENCE!>nextCandidatesSeq<!> ?: return@myFlatMap sequenceOf()
-        nextCandidates
-    }
-    return candidates
-}
-
-fun test_3(name: Name, toplevelDescriptors: List<DeclarationDescriptor>): List<DeclarationDescriptor> {
-    val candidates = toplevelDescriptors.<!AMBIGUITY!>myFlatMap<!> { container ->
-        val nextCandidates = container.<!UNRESOLVED_REFERENCE!>nextCandidatesSeq<!>!!
-        nextCandidates
-    }
-    return candidates
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.kt
index 71f5bdf68e8..7e25ef482b2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +NewInference +OverloadResolutionByLambdaReturnType
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
 // ISSUE: KT-11265
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
index edea75cb513..c24133ec13b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
@@ -20,17 +20,17 @@ fun takeString(s: String) {}
 fun takeInt(s: Int) {}
 
 fun test_1() {
-    val x = <!AMBIGUITY!>create<!> { "" }
+    val x = create { "" }
     takeString(x)
 }
 
 fun test_2() {
-    val x = <!AMBIGUITY!>create<!> { 1 }
+    val x = create { 1 }
     takeInt(x)
 }
 
 fun test_3() {
-    val x = <!AMBIGUITY!>create<!> { 1.0 }
+    val x = create { 1.0 }
 }
 
 @OverloadResolutionByLambdaReturnType
@@ -38,11 +38,11 @@ fun <K> create(x: K, f: (K) -> Int): Int = 1
 fun <T> create(x: T, f: (T) -> String): String = ""
 
 fun test_4() {
-    val x = <!AMBIGUITY!>create<!>("") { "" }
+    val x = create("") { "" }
     takeString(x)
 }
 
 fun test_5() {
-    val x = <!AMBIGUITY!>create<!>("") { 1 }
+    val x = create("") { 1 }
     takeInt(x)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt
index 2d2fbb7ce42..1113a848f54 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt
@@ -20,17 +20,17 @@ fun takeString(s: String) {}
 fun takeInt(s: Int) {}
 
 fun test_1() {
-    val x = <!AMBIGUITY!>create<!> { "" }
+    val x = create { "" }
     takeString(x)
 }
 
 fun test_2() {
-    val x = <!AMBIGUITY!>create<!> { 1 }
+    val x = create { 1 }
     takeInt(x)
 }
 
 fun test_3() {
-    val x = <!AMBIGUITY!>create<!> { 1.0 }
+    val x = create { 1.0 }
 }
 
 @OverloadResolutionByLambdaReturnType
@@ -38,12 +38,12 @@ fun <K> create(x: K, f: (K) -> Int): Int = 1
 fun <T> create(x: T, f: (T) -> String): String = ""
 
 fun test_4() {
-    val x = <!AMBIGUITY!>create<!>("") { "" }
+    val x = create("") { "" }
     takeString(x)
 }
 
 fun test_5() {
-    val x = <!AMBIGUITY!>create<!>("") { 1 }
+    val x = create("") { 1 }
     takeInt(x)
 }
 
@@ -56,6 +56,6 @@ fun foo(f: () -> A): Int = 1
 fun foo(f: () -> B): String = ""
 
 fun test_6(c: C) {
-    val x = <!AMBIGUITY!>foo<!> { c }
+    val x = foo { c }
     takeString(x)
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.fir.kt
deleted file mode 100644
index ea9e10330bc..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.fir.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// !LANGUAGE: -NewInference
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
-// ISSUE: KT-11265
-
-// FILE: OverloadResolutionByLambdaReturnType.kt
-
-package kotlin
-
-annotation class OverloadResolutionByLambdaReturnType
-
-// FILE: main.kt
-
-import kotlin.OverloadResolutionByLambdaReturnType
-
-@OverloadResolutionByLambdaReturnType
-fun create(f: (Int) -> Int): Int = 1
-fun create(f: (Int) -> String): String = ""
-
-fun takeString(s: String) {}
-
-fun test_1() {
-    val x = <!AMBIGUITY!>create<!> { "" }
-    takeString("")
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt
index 1da656d5b7c..8870c5ea0dd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/returnFromInlineLambda.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/returnFromInlineLambda.fir.kt
index ed92d7cd852..af86c7df384 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/returnFromInlineLambda.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/returnFromInlineLambda.fir.kt
@@ -25,10 +25,10 @@ inline fun <T, R> Array<out T>.myFlatMap(transform: (T) -> Sequence<R>): List<R>
 fun String.toList(): List<String> = null!!
 
 fun test_1(a: Array<String>, b: Boolean) {
-    a.<!AMBIGUITY!>myFlatMap<!> { <!UNRESOLVED_REFERENCE!>it<!>.toList().ifEmpty { return } }
-    a.<!AMBIGUITY!>myFlatMap<!> {
+    a.myFlatMap { it.toList().ifEmpty { return } }
+    a.myFlatMap {
         if (b) return
-        <!UNRESOLVED_REFERENCE!>it<!>.toList()
+        it.toList()
     }
 }
 
@@ -43,9 +43,9 @@ fun <T, R> Array<out T>.noInlineFlatMap(transform: (T) -> Sequence<R>): List<R>
 }
 
 fun test_2(a: Array<String>, b: Boolean) {
-    a.<!AMBIGUITY!>noInlineFlatMap<!> { <!UNRESOLVED_REFERENCE!>it<!>.toList().ifEmpty { return } }
-    a.<!AMBIGUITY!>noInlineFlatMap<!> {
+    a.noInlineFlatMap { it.toList().ifEmpty { return } }
+    a.noInlineFlatMap {
         if (b) return
-        <!UNRESOLVED_REFERENCE!>it<!>.toList()
+        it.toList()
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt
index aa2e0494e0f..421620c5f4b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt
@@ -3,6 +3,8 @@
 
 package b
 
+import checkSubtype
+
 fun bar() {
     val a1 = Array(1, {i: Int -> i})
     val a2 = Array(1, {i: Int -> "$i"})
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
index a360a7cd9d9..f42237eb05a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
@@ -3,6 +3,8 @@
 //KT-1558 Exception while analyzing
 package j
 
+import checkSubtype
+
 fun <T : Any> T?.sure() : T = this!!
 
 fun <E> List<*>.toArray(ar: Array<E>): Array<E> = ar
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt
index 2db5bd7fee7..073c85653b3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt
@@ -3,6 +3,8 @@
 //KT-1558 Exception while analyzing
 package j
 
+import checkSubtype
+
 fun <T : Any> T?.sure() : T = this!!
 
 fun <E> List<*>.toArray(ar: Array<E>): Array<E> = ar
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt
new file mode 100644
index 00000000000..22d9a361f23
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt
@@ -0,0 +1,6 @@
+// FIR_IDENTICAL
+fun get(map: Map<String, Int>, key: String?): Int? {
+    return map[key]?.let { x ->
+        return x
+    }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.txt
new file mode 100644
index 00000000000..5ddd134db2b
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.txt
@@ -0,0 +1,3 @@
+package
+
+public fun get(/*0*/ map: kotlin.collections.Map<kotlin.String, kotlin.Int>, /*1*/ key: kotlin.String?): kotlin.Int?
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/recursiveFlexibleAssertions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/recursiveFlexibleAssertions.fir.kt
index 74d1efb30f0..b47ca4ecb79 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/recursiveFlexibleAssertions.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/recursiveFlexibleAssertions.fir.kt
@@ -75,5 +75,5 @@ fun test() {
     }
     // TODO: FIR
     // {AbstractAssert<*, out Any!>! & EnumerableAssert<*, {Comparable<*> & java.io.Serializable!}>!} with unfolded flexible nullability
-    <!DEBUG_INFO_EXPRESSION_TYPE("AbstractAssert<*, out ERROR CLASS: CST(ERROR CLASS: Unexpected classifier: null, kotlin/String..ERROR CLASS: CST(ERROR CLASS: Unexpected classifier: null, kotlin/String?!> & EnumerableAssert<*, out kotlin.Comparable<kotlin.String & kotlin.Char> & java.io.Serializable..kotlin.Comparable<kotlin.String & kotlin.Char>? & java.io.Serializable?>..AbstractAssert<*, out ERROR CLASS: CST(ERROR CLASS: Unexpected classifier: null, kotlin/String..ERROR CLASS: CST(ERROR CLASS: Unexpected classifier: null, kotlin/String?!>? & EnumerableAssert<*, out kotlin.Comparable<kotlin.String & kotlin.Char> & java.io.Serializable..kotlin.Comparable<kotlin.String & kotlin.Char>? & java.io.Serializable?>?")!>assertion<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("AbstractAssert<*, out ERROR CLASS: CST(ERROR CLASS: Unexpected classifier: null, @FlexibleNullability kotlin/String..ERROR CLASS: CST(ERROR CLASS: Unexpected classifier: null, @FlexibleNullability kotlin/String?!> & EnumerableAssert<*, out kotlin.Comparable<kotlin.String & kotlin.Char> & java.io.Serializable..kotlin.Comparable<kotlin.String & kotlin.Char>? & java.io.Serializable?>..AbstractAssert<*, out ERROR CLASS: CST(ERROR CLASS: Unexpected classifier: null, @FlexibleNullability kotlin/String..ERROR CLASS: CST(ERROR CLASS: Unexpected classifier: null, @FlexibleNullability kotlin/String?!>? & EnumerableAssert<*, out kotlin.Comparable<kotlin.String & kotlin.Char> & java.io.Serializable..kotlin.Comparable<kotlin.String & kotlin.Char>? & java.io.Serializable?>?")!>assertion<!>
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
index fd2ce8d10e4..5ceddd130b9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
@@ -20,6 +20,8 @@ fun A.forEach(s: String) {}
 package a
 
 import b.*
+import checkType
+import _
 
 class A {
     fun forEach() = this
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.kt
index e593bbccd40..fd6989c1461 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.kt
@@ -20,6 +20,8 @@ fun A.forEach(s: String) {}
 package a
 
 import b.*
+import checkType
+import _
 
 class A {
     fun forEach() = this
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt
index 34a9ab25056..b24665e36d8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt
@@ -16,7 +16,7 @@ fun test1(s: String?) {
             requireNotNull(s)
         }
         t2.<!INAPPLICABLE_CANDIDATE!>not<!>()
-        s.length
+        s.<!INAPPLICABLE_CANDIDATE!>length<!>
     }
 }
 
@@ -45,7 +45,7 @@ fun test3() {
         s = null
         return
     }
-    s.<!INAPPLICABLE_CANDIDATE!>length<!>
+    s.length
 }
 
 fun test4() {
@@ -61,7 +61,7 @@ fun test4() {
     catch (e: ExcB) {
 
     }
-    s.<!INAPPLICABLE_CANDIDATE!>length<!>
+    s.length
 }
 
 fun test5(s: String?) {
@@ -74,7 +74,7 @@ fun test5(s: String?) {
     catch (e: ExcB) {
 
     }
-    s.length
+    s.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 fun test6(s: String?) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt
index ca50d78463d..48729b80495 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt
@@ -17,7 +17,7 @@ fun test1(s: String?) {
             requireNotNull(s)
         }
         t2.<!INAPPLICABLE_CANDIDATE!>not<!>()
-        s.length
+        s.<!INAPPLICABLE_CANDIDATE!>length<!>
     }
 }
 
@@ -46,7 +46,7 @@ fun test3() {
         s = null
         return
     }
-    s.<!INAPPLICABLE_CANDIDATE!>length<!>
+    s.length
 }
 
 fun test4() {
@@ -62,7 +62,7 @@ fun test4() {
     catch (e: ExcB) {
 
     }
-    s.<!INAPPLICABLE_CANDIDATE!>length<!>
+    s.length
 }
 
 fun test5(s: String?) {
@@ -75,7 +75,7 @@ fun test5(s: String?) {
     catch (e: ExcB) {
 
     }
-    s.length
+    s.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 fun test6(s: String?) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt
index 1cadd1dd25a..156ddc884e2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt
@@ -101,6 +101,6 @@ fun test6(s1: String?, s2: String?) {
         requireNotNull(s2)
     }
     s.<!INAPPLICABLE_CANDIDATE!>length<!>
-    s1.length
+    s1.<!INAPPLICABLE_CANDIDATE!>length<!>
     s2.length
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
index 2cd1a23c5ea..0e40b596a63 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
@@ -103,6 +103,6 @@ fun test6(s1: String?, s2: String?) {
         requireNotNull(s2)
     }
     s.<!INAPPLICABLE_CANDIDATE!>length<!>
-    s1.length
+    s1.<!INAPPLICABLE_CANDIDATE!>length<!>
     s2.length
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
index d6bb676ce71..d3314901a7c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
@@ -23,21 +23,21 @@ val test3: MutableList<Int> =
         }
 
 val test4: Collection<Int> =
-        listOf(1, 2, 3).<!AMBIGUITY!>flatMapTo<!>(LinkedHashSet()) {
-            <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
+        listOf(1, 2, 3).flatMapTo(LinkedHashSet()) {
+            listOf(it)
         }
 
 val test5: Collection<Int> =
-        listOf(1, 2, 3).<!AMBIGUITY!>flatMapTo<!>(LinkedHashSet()) { // TODO
-            if (true) <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) else <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
+        listOf(1, 2, 3).flatMapTo(LinkedHashSet()) { // TODO
+            if (true) listOf(it) else listOf(it)
         }
 
 val test6: Collection<Int> =
-        listOf(1, 2, 3).<!AMBIGUITY!>flatMapTo<!>(LinkedHashSet<Int>()) {
-            if (true) <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) else <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
+        listOf(1, 2, 3).flatMapTo(LinkedHashSet<Int>()) {
+            if (true) listOf(it) else listOf(it)
         }
 
 val test7: Collection<Int> =
-        listOf(1, 2, 3).<!AMBIGUITY!>flatMapTo<!>(LinkedHashSet()) {
-            <!INAPPLICABLE_CANDIDATE!>select<!>(<!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>), <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>))
+        listOf(1, 2, 3).flatMapTo(LinkedHashSet()) {
+            select(listOf(it), listOf(it))
         }
diff --git a/compiler/testData/ir/irText/classes/cloneable.fir.txt b/compiler/testData/ir/irText/classes/cloneable.fir.txt
new file mode 100644
index 00000000000..1e1f2c778b5
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/cloneable.fir.txt
@@ -0,0 +1,92 @@
+FILE fqName:<root> fileName:/cloneable.kt
+  CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Cloneable]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
+    CONSTRUCTOR visibility:public <> () returnType:<root>.A [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Cloneable]'
+    FUN FAKE_OVERRIDE name:clone visibility:protected modality:OPEN <> ($this:kotlin.Cloneable) returnType:kotlin.Any [fake_override]
+      overridden:
+        protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Cloneable
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:I modality:ABSTRACT visibility:public superTypes:[kotlin.Cloneable]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.I
+    FUN FAKE_OVERRIDE name:clone visibility:protected modality:OPEN <> ($this:kotlin.Cloneable) returnType:kotlin.Any [fake_override]
+      overridden:
+        protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Cloneable
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.I]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
+    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.I]'
+    FUN FAKE_OVERRIDE name:clone visibility:protected modality:OPEN <> ($this:kotlin.Cloneable) returnType:kotlin.Any [fake_override]
+      overridden:
+        protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Cloneable
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:OC modality:FINAL visibility:public superTypes:[<root>.I]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.OC
+    CONSTRUCTOR visibility:public <> () returnType:<root>.OC [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:OC modality:FINAL visibility:public superTypes:[<root>.I]'
+    FUN name:clone visibility:protected modality:FINAL <> ($this:<root>.OC) returnType:<root>.OC
+      overridden:
+        protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:<root>.OC
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='protected final fun clone (): <root>.OC declared in <root>.OC'
+          CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.OC' type=<root>.OC origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/cloneable.kt b/compiler/testData/ir/irText/classes/cloneable.kt
new file mode 100644
index 00000000000..2152a490e6d
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/cloneable.kt
@@ -0,0 +1,9 @@
+class A : Cloneable
+
+interface I : Cloneable
+
+class C : I
+
+class OC : I {
+    override fun clone(): OC = OC()
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/classes/cloneable.txt b/compiler/testData/ir/irText/classes/cloneable.txt
new file mode 100644
index 00000000000..e5a7fd8e16f
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/cloneable.txt
@@ -0,0 +1,92 @@
+FILE fqName:<root> fileName:/cloneable.kt
+  CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Cloneable]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
+    CONSTRUCTOR visibility:public <> () returnType:<root>.A [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Cloneable]'
+    FUN FAKE_OVERRIDE name:clone visibility:protected modality:OPEN <> ($this:kotlin.Cloneable) returnType:kotlin.Any [fake_override]
+      overridden:
+        protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Cloneable
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:I modality:ABSTRACT visibility:public superTypes:[kotlin.Cloneable]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.I
+    FUN FAKE_OVERRIDE name:clone visibility:protected modality:OPEN <> ($this:kotlin.Cloneable) returnType:kotlin.Any [fake_override]
+      overridden:
+        protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Cloneable
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.I]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
+    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.I]'
+    FUN FAKE_OVERRIDE name:clone visibility:protected modality:OPEN <> ($this:kotlin.Cloneable) returnType:kotlin.Any [fake_override]
+      overridden:
+        protected open fun clone (): kotlin.Any [fake_override] declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Cloneable
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:OC modality:FINAL visibility:public superTypes:[<root>.I]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.OC
+    CONSTRUCTOR visibility:public <> () returnType:<root>.OC [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:OC modality:FINAL visibility:public superTypes:[<root>.I]'
+    FUN name:clone visibility:protected modality:OPEN <> ($this:<root>.OC) returnType:<root>.OC
+      overridden:
+        protected open fun clone (): kotlin.Any [fake_override] declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:<root>.OC
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='protected open fun clone (): <root>.OC declared in <root>.OC'
+          CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.OC' type=<root>.OC origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.fir.txt b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.fir.txt
index 865f37c1eeb..ccdc5eb4067 100644
--- a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.fir.txt
+++ b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.fir.txt
@@ -63,35 +63,6 @@ FILE fqName:<root> fileName:/delegatedGenericImplementation.kt
             receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.foo' type=<root>.Test1<E of <root>.Test1> origin=null
           a: GET_VAR 'a: E of <root>.Test1 declared in <root>.Test1.foo' type=E of <root>.Test1 origin=null
           b: GET_VAR 'b: B of <root>.Test1.foo declared in <root>.Test1.foo' type=B of <root>.Test1.foo origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test1<E of <root>.Test1>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test1'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
-              receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.equals' type=<root>.Test1<E of <root>.Test1> origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test1.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1<E of <root>.Test1>) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
-              receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.hashCode' type=<root>.Test1<E of <root>.Test1> origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1<E of <root>.Test1>) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
-              receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.toString' type=<root>.Test1<E of <root>.Test1> origin=null
     PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
       FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <C> ($this:<root>.Test1<E of <root>.Test1>, $receiver:C of <root>.Test1.<get-id>) returnType:kotlin.collections.Map<E of <root>.Test1, C of <root>.Test1.<get-id>>?
         correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
@@ -138,6 +109,19 @@ FILE fqName:<root> fileName:/delegatedGenericImplementation.kt
             $receiver: GET_VAR '<this>: kotlin.collections.List<D of <root>.Test1.<get-x>> declared in <root>.Test1.<set-x>' type=kotlin.collections.List<D of <root>.Test1.<get-x>> origin=null
             <set-?>: GET_VAR '<set-?>: D of <root>.Test1.<set-x>? declared in <root>.Test1.<set-x>' type=D of <root>.Test1.<set-x>? origin=null
     FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[<root>.IBase<kotlin.String>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
     CONSTRUCTOR visibility:public <> (j:<root>.IBase<kotlin.String>) returnType:<root>.Test2 [primary]
@@ -181,35 +165,6 @@ FILE fqName:<root> fileName:/delegatedGenericImplementation.kt
             receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.foo' type=<root>.Test2 origin=null
           a: GET_VAR 'a: kotlin.String declared in <root>.Test2.foo' type=kotlin.String origin=null
           b: GET_VAR 'b: B of <root>.Test2.foo declared in <root>.Test2.foo' type=B of <root>.Test2.foo origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test2'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.equals' type=<root>.Test2 origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test2.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.hashCode' type=<root>.Test2 origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.toString' type=<root>.Test2 origin=null
     PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
       FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <C> ($this:<root>.Test2, $receiver:C of <root>.Test2.<get-id>) returnType:kotlin.collections.Map<kotlin.String, C of <root>.Test2.<get-id>>?
         correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
@@ -256,3 +211,16 @@ FILE fqName:<root> fileName:/delegatedGenericImplementation.kt
             $receiver: GET_VAR '<this>: kotlin.collections.List<D of <root>.Test2.<get-x>> declared in <root>.Test2.<set-x>' type=kotlin.collections.List<D of <root>.Test2.<get-x>> origin=null
             <set-?>: GET_VAR '<set-?>: D of <root>.Test2.<set-x>? declared in <root>.Test2.<set-x>' type=D of <root>.Test2.<set-x>? origin=null
     FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt
index 1f7658a66b0..cdb02665cd0 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt
@@ -234,36 +234,20 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
           $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
             receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.qux' type=<root>.Test1 origin=null
           $receiver: GET_VAR '<this>: kotlin.String declared in <root>.Test1.qux' type=kotlin.String origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test1, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test1'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.equals' type=<root>.Test1 origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test1.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[<root>.IBase; <root>.IOther]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
     CONSTRUCTOR visibility:public <> () returnType:<root>.Test2 [primary]
@@ -309,35 +293,6 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
           $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
             receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.qux' type=<root>.Test2 origin=null
           $receiver: GET_VAR '<this>: kotlin.String declared in <root>.Test2.qux' type=kotlin.String origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test2'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.equals' type=<root>.Test2 origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test2.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.hashCode' type=<root>.Test2 origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.toString' type=<root>.Test2 origin=null
     FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]
     PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [val]
       FUN DELEGATED_MEMBER name:<get-x> visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.String
@@ -412,3 +367,16 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
             $receiver: GET_VAR '<this>: kotlin.Byte declared in <root>.Test2.<set-z2>' type=kotlin.Byte origin=null
             <set-?>: GET_VAR '<set-?>: kotlin.Int declared in <root>.Test2.<set-z2>' type=kotlin.Int origin=null
     FIELD DELEGATE name:<$$delegate_1> type:<root>.IOther visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.fir.txt b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.fir.txt
index dd5d8c80a02..d415e70da09 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.fir.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.fir.txt
@@ -20,26 +20,26 @@ FILE fqName:<root> fileName:/delegatedImplementationOfJavaInterface.kt
           RETURN type=kotlin.Nothing from='private final fun <get-j> (): <root>.J declared in <root>.Test'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:j type:<root>.J visibility:private [final]' type=<root>.J origin=null
               receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.<get-j>' type=<root>.Test origin=null
-    FUN DELEGATED_MEMBER name:takeNotNull visibility:public modality:OPEN <> ($this:<root>.Test, x:kotlin.String) returnType:kotlin.Unit
+    FUN DELEGATED_MEMBER name:takeNotNull visibility:public modality:OPEN <> ($this:<root>.Test, x:@[EnhancedNullability] kotlin.String) returnType:kotlin.Unit
       overridden:
-        public abstract fun takeNotNull (x: kotlin.String): kotlin.Unit declared in <root>.J
+        public abstract fun takeNotNull (x: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in <root>.J
       $this: VALUE_PARAMETER name:<this> type:<root>.Test
-      VALUE_PARAMETER name:x index:0 type:kotlin.String
+      VALUE_PARAMETER name:x index:0 type:@[EnhancedNullability] kotlin.String
       BLOCK_BODY
-        CALL 'public abstract fun takeNotNull (x: kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+        CALL 'public abstract fun takeNotNull (x: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
           $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
             receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.takeNotNull' type=<root>.Test origin=null
-          x: GET_VAR 'x: kotlin.String declared in <root>.Test.takeNotNull' type=kotlin.String origin=null
-    FUN DELEGATED_MEMBER name:takeNullable visibility:public modality:OPEN <> ($this:<root>.Test, x:kotlin.String?) returnType:kotlin.Unit
+          x: GET_VAR 'x: @[EnhancedNullability] kotlin.String declared in <root>.Test.takeNotNull' type=@[EnhancedNullability] kotlin.String origin=null
+    FUN DELEGATED_MEMBER name:takeNullable visibility:public modality:OPEN <> ($this:<root>.Test, x:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Unit
       overridden:
-        public abstract fun takeNullable (x: kotlin.String?): kotlin.Unit declared in <root>.J
+        public abstract fun takeNullable (x: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J
       $this: VALUE_PARAMETER name:<this> type:<root>.Test
-      VALUE_PARAMETER name:x index:0 type:kotlin.String?
+      VALUE_PARAMETER name:x index:0 type:@[FlexibleNullability] kotlin.String?
       BLOCK_BODY
-        CALL 'public abstract fun takeNullable (x: kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+        CALL 'public abstract fun takeNullable (x: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
           $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
             receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.takeNullable' type=<root>.Test origin=null
-          x: GET_VAR 'x: kotlin.String? declared in <root>.Test.takeNullable' type=kotlin.String? origin=null
+          x: GET_VAR 'x: @[FlexibleNullability] kotlin.String? declared in <root>.Test.takeNullable' type=@[FlexibleNullability] kotlin.String? origin=null
     FUN DELEGATED_MEMBER name:takeFlexible visibility:public modality:OPEN <> ($this:<root>.Test, x:kotlin.String?) returnType:kotlin.Unit
       overridden:
         public abstract fun takeFlexible (x: kotlin.String?): kotlin.Unit declared in <root>.J
@@ -50,22 +50,22 @@ FILE fqName:<root> fileName:/delegatedImplementationOfJavaInterface.kt
           $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
             receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.takeFlexible' type=<root>.Test origin=null
           x: GET_VAR 'x: kotlin.String? declared in <root>.Test.takeFlexible' type=kotlin.String? origin=null
-    FUN DELEGATED_MEMBER name:returnNotNull visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.String
+    FUN DELEGATED_MEMBER name:returnNotNull visibility:public modality:OPEN <> ($this:<root>.Test) returnType:@[EnhancedNullability] kotlin.String
       overridden:
-        public abstract fun returnNotNull (): kotlin.String declared in <root>.J
+        public abstract fun returnNotNull (): @[EnhancedNullability] kotlin.String declared in <root>.J
       $this: VALUE_PARAMETER name:<this> type:<root>.Test
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun returnNotNull (): kotlin.String declared in <root>.Test'
-          CALL 'public abstract fun returnNotNull (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+        RETURN type=kotlin.Nothing from='public open fun returnNotNull (): @[EnhancedNullability] kotlin.String declared in <root>.Test'
+          CALL 'public abstract fun returnNotNull (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
               receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.returnNotNull' type=<root>.Test origin=null
-    FUN DELEGATED_MEMBER name:returnNullable visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.String?
+    FUN DELEGATED_MEMBER name:returnNullable visibility:public modality:OPEN <> ($this:<root>.Test) returnType:@[FlexibleNullability] kotlin.String?
       overridden:
-        public abstract fun returnNullable (): kotlin.String? declared in <root>.J
+        public abstract fun returnNullable (): @[FlexibleNullability] kotlin.String? declared in <root>.J
       $this: VALUE_PARAMETER name:<this> type:<root>.Test
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun returnNullable (): kotlin.String? declared in <root>.Test'
-          CALL 'public abstract fun returnNullable (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
+        RETURN type=kotlin.Nothing from='public open fun returnNullable (): @[FlexibleNullability] kotlin.String? declared in <root>.Test'
+          CALL 'public abstract fun returnNullable (): @[FlexibleNullability] kotlin.String? declared in <root>.J' type=@[FlexibleNullability] kotlin.String? origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
               receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.returnNullable' type=<root>.Test origin=null
     FUN DELEGATED_MEMBER name:returnsFlexible visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.String?
@@ -77,33 +77,17 @@ FILE fqName:<root> fileName:/delegatedImplementationOfJavaInterface.kt
           CALL 'public abstract fun returnsFlexible (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
               receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.returnsFlexible' type=<root>.Test origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
-              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.equals' type=<root>.Test origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
-              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.hashCode' type=<root>.Test origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
-              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.toString' type=<root>.Test origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt
index 3265f6c05ef..a30487d58ad 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt
@@ -69,33 +69,17 @@ FILE fqName:<root> fileName:/delegatedImplementationWithExplicitOverride.kt
         CALL 'public abstract fun foo (): kotlin.Unit declared in <root>.IFooBar' type=kotlin.Unit origin=null
           $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]' type=<root>.IFooBar origin=null
             receiver: GET_VAR '<this>: <root>.C declared in <root>.C.foo' type=<root>.C origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.C, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.C'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]' type=<root>.IFooBar origin=null
-              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.equals' type=<root>.C origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.C.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.C'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]' type=<root>.IFooBar origin=null
-              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.hashCode' type=<root>.C origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.C'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]' type=<root>.IFooBar origin=null
-              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.toString' type=<root>.C origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt
index c7858df0dce..cca274e6190 100644
--- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt
+++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt
@@ -22,9 +22,9 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.JFoo'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[<root>.JFoo]'
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:<root>.JFoo) returnType:kotlin.String [fake_override]
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:<root>.JFoo) returnType:@[FlexibleNullability] kotlin.String [fake_override]
       overridden:
-        public open fun foo (): kotlin.String declared in <root>.JFoo
+        public open fun foo (): @[FlexibleNullability] kotlin.String declared in <root>.JFoo
       $this: VALUE_PARAMETER name:<this> type:<root>.JFoo
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
@@ -45,13 +45,13 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.JFoo'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K2 modality:FINAL visibility:public superTypes:[<root>.JFoo]'
-    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.K2) returnType:kotlin.String
+    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.K2) returnType:@[FlexibleNullability] kotlin.String
       overridden:
-        public open fun foo (): kotlin.String declared in <root>.JFoo
+        public open fun foo (): @[FlexibleNullability] kotlin.String declared in <root>.JFoo
       $this: VALUE_PARAMETER name:<this> type:<root>.K2
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.K2'
-          CALL 'public open fun foo (): kotlin.String declared in <root>.JFoo' superQualifier='CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:JFoo modality:OPEN visibility:public superTypes:[kotlin.Any; <root>.IFoo]' type=kotlin.String origin=null
+        RETURN type=kotlin.Nothing from='public final fun foo (): @[FlexibleNullability] kotlin.String declared in <root>.K2'
+          CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String declared in <root>.JFoo' superQualifier='CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:JFoo modality:OPEN visibility:public superTypes:[kotlin.Any; <root>.IFoo]' type=@[FlexibleNullability] kotlin.String origin=null
             $this: GET_VAR '<this>: <root>.K2 declared in <root>.K2.foo' type=<root>.K2 origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
@@ -136,36 +136,20 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
           CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
               receiver: GET_VAR '<this>: <root>.TestJFoo declared in <root>.TestJFoo.foo' type=<root>.TestJFoo origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestJFoo, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestJFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestJFoo'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestJFoo declared in <root>.TestJFoo.equals' type=<root>.TestJFoo origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestJFoo.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestJFoo) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestJFoo
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestJFoo'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestJFoo declared in <root>.TestJFoo.hashCode' type=<root>.TestJFoo origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestJFoo) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestJFoo
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestJFoo'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestJFoo declared in <root>.TestJFoo.toString' type=<root>.TestJFoo origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:TestK1 modality:FINAL visibility:public superTypes:[<root>.IFoo]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestK1
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestK1 [primary]
@@ -184,36 +168,20 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
           CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
               receiver: GET_VAR '<this>: <root>.TestK1 declared in <root>.TestK1.foo' type=<root>.TestK1 origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestK1, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK1
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestK1'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK1 declared in <root>.TestK1.equals' type=<root>.TestK1 origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestK1.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestK1) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK1
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestK1'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK1 declared in <root>.TestK1.hashCode' type=<root>.TestK1 origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestK1) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK1
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestK1'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK1 declared in <root>.TestK1.toString' type=<root>.TestK1 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:TestK2 modality:FINAL visibility:public superTypes:[<root>.IFoo]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestK2
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestK2 [primary]
@@ -232,36 +200,20 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
           CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
               receiver: GET_VAR '<this>: <root>.TestK2 declared in <root>.TestK2.foo' type=<root>.TestK2 origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestK2, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestK2'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK2 declared in <root>.TestK2.equals' type=<root>.TestK2 origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestK2.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestK2) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK2
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestK2'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK2 declared in <root>.TestK2.hashCode' type=<root>.TestK2 origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestK2) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK2
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestK2'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK2 declared in <root>.TestK2.toString' type=<root>.TestK2 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:TestK3 modality:FINAL visibility:public superTypes:[<root>.IFoo]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestK3
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestK3 [primary]
@@ -280,36 +232,20 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
           CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
               receiver: GET_VAR '<this>: <root>.TestK3 declared in <root>.TestK3.foo' type=<root>.TestK3 origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestK3, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK3
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestK3'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK3 declared in <root>.TestK3.equals' type=<root>.TestK3 origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestK3.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestK3) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK3
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestK3'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK3 declared in <root>.TestK3.hashCode' type=<root>.TestK3 origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestK3) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK3
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestK3'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK3 declared in <root>.TestK3.toString' type=<root>.TestK3 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:TestK4 modality:FINAL visibility:public superTypes:[<root>.IFoo]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestK4
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestK4 [primary]
@@ -328,33 +264,17 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
           CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
               receiver: GET_VAR '<this>: <root>.TestK4 declared in <root>.TestK4.foo' type=<root>.TestK4 origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestK4, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK4
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestK4'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK4 declared in <root>.TestK4.equals' type=<root>.TestK4 origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestK4.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestK4) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK4
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestK4'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK4 declared in <root>.TestK4.hashCode' type=<root>.TestK4 origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestK4) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestK4
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestK4'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
-              receiver: GET_VAR '<this>: <root>.TestK4 declared in <root>.TestK4.toString' type=<root>.TestK4 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/initValInLambda.txt b/compiler/testData/ir/irText/classes/initValInLambda.txt
index 9c0dbb3f3ea..2cc06d155bd 100644
--- a/compiler/testData/ir/irText/classes/initValInLambda.txt
+++ b/compiler/testData/ir/irText/classes/initValInLambda.txt
@@ -22,7 +22,7 @@ FILE fqName:<root> fileName:/initValInLambda.kt
           $receiver: CONST Int type=kotlin.Int value=1
           block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<kotlin.Int, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:kotlin.Int) returnType:kotlin.Unit
-              $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
+              $receiver: VALUE_PARAMETER name:$this$run type:kotlin.Int
               BLOCK_BODY
                 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null
                   receiver: GET_VAR '<this>: <root>.TestInitValInLambdaCalledOnce declared in <root>.TestInitValInLambdaCalledOnce' type=<root>.TestInitValInLambdaCalledOnce origin=null
diff --git a/compiler/testData/ir/irText/classes/kt43217.fir.txt b/compiler/testData/ir/irText/classes/kt43217.fir.txt
new file mode 100644
index 00000000000..7a16b0895ec
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/kt43217.fir.txt
@@ -0,0 +1,94 @@
+FILE fqName:<root> fileName:/kt43217.kt
+  CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
+    CONSTRUCTOR visibility:public <> () returnType:<root>.A [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:b visibility:private modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:b type:<root>.A.b.<no name provided> visibility:private [final]
+        EXPRESSION_BODY
+          BLOCK type=<root>.A.b.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.DoubleExpression]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A.b.<no name provided>
+              CONSTRUCTOR visibility:private <> () returnType:<root>.A.b.<no name provided> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.DoubleExpression'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.DoubleExpression]'
+              FUN name:get visibility:public modality:FINAL <> ($this:<root>.A.b.<no name provided>) returnType:kotlin.Double [operator]
+                overridden:
+                  public abstract fun get (): @[FlexibleNullability] T of <root>.ObservableValue [operator] declared in <root>.ObservableValue
+                $this: VALUE_PARAMETER name:<this> type:<root>.A.b.<no name provided>
+                BLOCK_BODY
+                  RETURN type=kotlin.Nothing from='public final fun get (): kotlin.Double [operator] declared in <root>.A.b.<no name provided>'
+                    CONST Double type=kotlin.Double value=0.0
+              FUN FAKE_OVERRIDE name:isEqualTo visibility:public modality:OPEN <> ($this:<root>.DoubleExpression, value:kotlin.Double) returnType:@[EnhancedNullability] kotlin.Any [fake_override]
+                overridden:
+                  public open fun isEqualTo (value: kotlin.Double): @[EnhancedNullability] kotlin.Any declared in <root>.DoubleExpression
+                $this: VALUE_PARAMETER name:<this> type:<root>.DoubleExpression
+                VALUE_PARAMETER name:value index:0 type:kotlin.Double
+              FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+                overridden:
+                  public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int declared in kotlin.Any
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String declared in kotlin.Any
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.A.b.<no name provided>' type=<root>.A.b.<no name provided> origin=OBJECT_LITERAL
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:private modality:FINAL <> ($this:<root>.A) returnType:<root>.A.b.<no name provided>
+        correspondingProperty: PROPERTY name:b visibility:private modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.A
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='private final fun <get-b> (): <root>.A.b.<no name provided> declared in <root>.A'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:b type:<root>.A.b.<no name provided> visibility:private [final]' type=<root>.A.b.<no name provided> origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-b>' type=<root>.A origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.DoubleExpression]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
+    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.DoubleExpression'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.DoubleExpression]'
+    FUN name:get visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Double [operator]
+      overridden:
+        public abstract fun get (): @[FlexibleNullability] T of <root>.ObservableValue [operator] declared in <root>.ObservableValue
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun get (): kotlin.Double [operator] declared in <root>.C'
+          CONST Double type=kotlin.Double value=0.0
+    FUN FAKE_OVERRIDE name:isEqualTo visibility:public modality:OPEN <> ($this:<root>.DoubleExpression, value:kotlin.Double) returnType:@[EnhancedNullability] kotlin.Any [fake_override]
+      overridden:
+        public open fun isEqualTo (value: kotlin.Double): @[EnhancedNullability] kotlin.Any declared in <root>.DoubleExpression
+      $this: VALUE_PARAMETER name:<this> type:<root>.DoubleExpression
+      VALUE_PARAMETER name:value index:0 type:kotlin.Double
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/kt43217.kt b/compiler/testData/ir/irText/classes/kt43217.kt
new file mode 100644
index 00000000000..a62b2547b78
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/kt43217.kt
@@ -0,0 +1,46 @@
+// FILE: kt43217.kt
+class A {
+    private val b =
+        object : DoubleExpression() {
+            override fun get(): Double {
+                return 0.0
+            }
+        }
+}
+
+class C : DoubleExpression() {
+    override fun get() = 0.0
+}
+
+// FILE: DoubleExpression.java
+import org.jetbrains.annotations.NotNull;
+
+public abstract class DoubleExpression implements ObservableDouble {
+    @NotNull
+    @Override
+    public Object isEqualTo(double value) {
+        return null;
+    }
+}
+
+// FILE: ObservableValue.java
+import org.jetbrains.annotations.NotNull;
+
+public interface ObservableValue<T> {
+    @NotNull
+    T get();
+
+    @NotNull
+    default Object isEqualTo(@NotNull T value) {
+        return null;
+    }
+}
+
+// FILE: ObservableDouble.java
+import org.jetbrains.annotations.NotNull;
+
+public interface ObservableDouble extends ObservableValue<Double> {
+    @NotNull
+    Object isEqualTo(double value);
+}
+
diff --git a/compiler/testData/ir/irText/classes/kt43217.txt b/compiler/testData/ir/irText/classes/kt43217.txt
new file mode 100644
index 00000000000..4bee53c9656
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/kt43217.txt
@@ -0,0 +1,118 @@
+FILE fqName:<root> fileName:/kt43217.kt
+  CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
+    CONSTRUCTOR visibility:public <> () returnType:<root>.A [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:b visibility:private modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:b type:<root>.A.b.<no name provided> visibility:private [final]
+        EXPRESSION_BODY
+          BLOCK type=<root>.A.b.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.DoubleExpression]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A.b.<no name provided>
+              CONSTRUCTOR visibility:public <> () returnType:<root>.A.b.<no name provided> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.DoubleExpression'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.DoubleExpression]'
+              FUN name:get visibility:public modality:OPEN <> ($this:<root>.A.b.<no name provided>) returnType:kotlin.Double
+                overridden:
+                  public abstract fun get (): @[EnhancedNullability] kotlin.Double [fake_override] declared in <root>.DoubleExpression
+                $this: VALUE_PARAMETER name:<this> type:<root>.A.b.<no name provided>
+                BLOCK_BODY
+                  RETURN type=kotlin.Nothing from='public open fun get (): kotlin.Double declared in <root>.A.b.<no name provided>'
+                    CONST Double type=kotlin.Double value=0.0
+              FUN FAKE_OVERRIDE name:isEqualTo visibility:public modality:OPEN <> ($this:<root>.DoubleExpression, value:kotlin.Double) returnType:@[EnhancedNullability] kotlin.Any [fake_override]
+                annotations:
+                  NotNull(value = <null>)
+                  Override
+                overridden:
+                  public open fun isEqualTo (value: kotlin.Double): @[EnhancedNullability] kotlin.Any declared in <root>.DoubleExpression
+                $this: VALUE_PARAMETER name:<this> type:<root>.DoubleExpression
+                VALUE_PARAMETER name:value index:0 type:kotlin.Double
+              FUN FAKE_OVERRIDE name:isEqualTo visibility:public modality:OPEN <> ($this:<root>.ObservableValue<@[FlexibleNullability] kotlin.Double?>, value:@[EnhancedNullability] kotlin.Double) returnType:@[EnhancedNullability] kotlin.Any [fake_override]
+                annotations:
+                  NotNull(value = <null>)
+                overridden:
+                  public open fun isEqualTo (value: @[EnhancedNullability] kotlin.Double): @[EnhancedNullability] kotlin.Any [fake_override] declared in <root>.DoubleExpression
+                $this: VALUE_PARAMETER name:<this> type:<root>.ObservableValue<@[FlexibleNullability] kotlin.Double?>
+                VALUE_PARAMETER name:value index:0 type:@[EnhancedNullability] kotlin.Double
+                  annotations:
+                    NotNull(value = <null>)
+              FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+                overridden:
+                  public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.DoubleExpression
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.DoubleExpression
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String [fake_override] declared in <root>.DoubleExpression
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.A.b.<no name provided>' type=<root>.A.b.<no name provided> origin=OBJECT_LITERAL
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:private modality:FINAL <> ($this:<root>.A) returnType:<root>.A.b.<no name provided>
+        correspondingProperty: PROPERTY name:b visibility:private modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.A
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='private final fun <get-b> (): <root>.A.b.<no name provided> declared in <root>.A'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:b type:<root>.A.b.<no name provided> visibility:private [final]' type=<root>.A.b.<no name provided> origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-b>' type=<root>.A origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.DoubleExpression]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
+    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.DoubleExpression'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.DoubleExpression]'
+    FUN name:get visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.Double
+      overridden:
+        public abstract fun get (): @[EnhancedNullability] kotlin.Double [fake_override] declared in <root>.DoubleExpression
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun get (): kotlin.Double declared in <root>.C'
+          CONST Double type=kotlin.Double value=0.0
+    FUN FAKE_OVERRIDE name:isEqualTo visibility:public modality:OPEN <> ($this:<root>.DoubleExpression, value:kotlin.Double) returnType:@[EnhancedNullability] kotlin.Any [fake_override]
+      annotations:
+        NotNull(value = <null>)
+        Override
+      overridden:
+        public open fun isEqualTo (value: kotlin.Double): @[EnhancedNullability] kotlin.Any declared in <root>.DoubleExpression
+      $this: VALUE_PARAMETER name:<this> type:<root>.DoubleExpression
+      VALUE_PARAMETER name:value index:0 type:kotlin.Double
+    FUN FAKE_OVERRIDE name:isEqualTo visibility:public modality:OPEN <> ($this:<root>.ObservableValue<@[FlexibleNullability] kotlin.Double?>, value:@[EnhancedNullability] kotlin.Double) returnType:@[EnhancedNullability] kotlin.Any [fake_override]
+      annotations:
+        NotNull(value = <null>)
+      overridden:
+        public open fun isEqualTo (value: @[EnhancedNullability] kotlin.Double): @[EnhancedNullability] kotlin.Any [fake_override] declared in <root>.DoubleExpression
+      $this: VALUE_PARAMETER name:<this> type:<root>.ObservableValue<@[FlexibleNullability] kotlin.Double?>
+      VALUE_PARAMETER name:value index:0 type:@[EnhancedNullability] kotlin.Double
+        annotations:
+          NotNull(value = <null>)
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.DoubleExpression
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.DoubleExpression
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.DoubleExpression
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt
index 00f57f168b2..7f2f8a2d776 100644
--- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt
+++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt
@@ -6,7 +6,7 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
         EXPRESSION_BODY
           FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.A, it:kotlin.String) returnType:kotlin.Unit
-              $receiver: VALUE_PARAMETER name:<this> type:<root>.A
+              $receiver: VALUE_PARAMETER name:$this$null type:<root>.A
               VALUE_PARAMETER name:it index:0 type:kotlin.String
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.String): kotlin.Unit declared in <root>.A.<init>'
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.fir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.fir.txt
new file mode 100644
index 00000000000..230b63660fb
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.fir.txt
@@ -0,0 +1,120 @@
+FILE fqName:<root> fileName:/annotationsOnDelegatedMembers.kt
+  CLASS ANNOTATION_CLASS name:Ann modality:FINAL visibility:public superTypes:[kotlin.Annotation]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Ann
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Ann [primary]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:IFoo modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IFoo
+    PROPERTY name:testVal visibility:public modality:ABSTRACT [val]
+      annotations:
+        Ann
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVal> visibility:public modality:ABSTRACT <> ($this:<root>.IFoo) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:testVal visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+    FUN name:testFun visibility:public modality:ABSTRACT <> ($this:<root>.IFoo) returnType:kotlin.Unit
+      annotations:
+        Ann
+      $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+    PROPERTY name:testExtVal visibility:public modality:ABSTRACT [val]
+      annotations:
+        Ann
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testExtVal> visibility:public modality:ABSTRACT <> ($this:<root>.IFoo, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:testExtVal visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    FUN name:testExtFun visibility:public modality:ABSTRACT <> ($this:<root>.IFoo, $receiver:kotlin.String) returnType:kotlin.Unit
+      annotations:
+        Ann
+      $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:DFoo modality:FINAL visibility:public superTypes:[<root>.IFoo]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.DFoo
+    CONSTRUCTOR visibility:public <> (d:<root>.IFoo) returnType:<root>.DFoo [primary]
+      VALUE_PARAMETER name:d index:0 type:<root>.IFoo
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DFoo modality:FINAL visibility:public superTypes:[<root>.IFoo]'
+        SET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=kotlin.Unit origin=EQ
+          receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo' type=<root>.DFoo origin=null
+          value: GET_VAR 'd: <root>.IFoo declared in <root>.DFoo.<init>' type=<root>.IFoo origin=null
+    FUN DELEGATED_MEMBER name:testFun visibility:public modality:OPEN <> ($this:<root>.DFoo) returnType:kotlin.Unit
+      overridden:
+        public abstract fun testFun (): kotlin.Unit declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:<root>.DFoo
+      BLOCK_BODY
+        CALL 'public abstract fun testFun (): kotlin.Unit declared in <root>.IFoo' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+            receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo.testFun' type=<root>.DFoo origin=null
+    FUN DELEGATED_MEMBER name:testExtFun visibility:public modality:OPEN <> ($this:<root>.DFoo, $receiver:kotlin.String) returnType:kotlin.Unit
+      overridden:
+        public abstract fun testExtFun (): kotlin.Unit declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:<root>.DFoo
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+      BLOCK_BODY
+        CALL 'public abstract fun testExtFun (): kotlin.Unit declared in <root>.IFoo' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+            receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo.testExtFun' type=<root>.DFoo origin=null
+          $receiver: GET_VAR '<this>: kotlin.String declared in <root>.DFoo.testExtFun' type=kotlin.String origin=null
+    PROPERTY DELEGATED_MEMBER name:testVal visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-testVal> visibility:public modality:OPEN <> ($this:<root>.DFoo) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:testVal visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-testVal> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.DFoo
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-testVal> (): kotlin.String declared in <root>.DFoo'
+            CALL 'public abstract fun <get-testVal> (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+                receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo.<get-testVal>' type=<root>.DFoo origin=null
+    PROPERTY DELEGATED_MEMBER name:testExtVal visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-testExtVal> visibility:public modality:OPEN <> ($this:<root>.DFoo, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:testExtVal visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-testExtVal> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.DFoo
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-testExtVal> (): kotlin.String declared in <root>.DFoo'
+            CALL 'public abstract fun <get-testExtVal> (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+                receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo.<get-testExtVal>' type=<root>.DFoo origin=null
+              $receiver: GET_VAR '<this>: kotlin.String declared in <root>.DFoo.<get-testExtVal>' type=kotlin.String origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt
new file mode 100644
index 00000000000..807a2746c15
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt
@@ -0,0 +1,10 @@
+annotation class Ann
+
+interface IFoo {
+    @Ann val testVal: String
+    @Ann fun testFun()
+    @Ann val String.testExtVal: String
+    @Ann fun String.testExtFun()
+}
+
+class DFoo(d: IFoo) : IFoo by d
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.txt
new file mode 100644
index 00000000000..3032d5e006c
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.txt
@@ -0,0 +1,123 @@
+FILE fqName:<root> fileName:/annotationsOnDelegatedMembers.kt
+  CLASS ANNOTATION_CLASS name:Ann modality:FINAL visibility:public superTypes:[kotlin.Annotation]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Ann
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Ann [primary]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:IFoo modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IFoo
+    PROPERTY name:testVal visibility:public modality:ABSTRACT [val]
+      annotations:
+        Ann
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVal> visibility:public modality:ABSTRACT <> ($this:<root>.IFoo) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:testVal visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+    FUN name:testFun visibility:public modality:ABSTRACT <> ($this:<root>.IFoo) returnType:kotlin.Unit
+      annotations:
+        Ann
+      $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+    PROPERTY name:testExtVal visibility:public modality:ABSTRACT [val]
+      annotations:
+        Ann
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testExtVal> visibility:public modality:ABSTRACT <> ($this:<root>.IFoo, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:testExtVal visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    FUN name:testExtFun visibility:public modality:ABSTRACT <> ($this:<root>.IFoo, $receiver:kotlin.String) returnType:kotlin.Unit
+      annotations:
+        Ann
+      $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:DFoo modality:FINAL visibility:public superTypes:[<root>.IFoo]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.DFoo
+    CONSTRUCTOR visibility:public <> (d:<root>.IFoo) returnType:<root>.DFoo [primary]
+      VALUE_PARAMETER name:d index:0 type:<root>.IFoo
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DFoo modality:FINAL visibility:public superTypes:[<root>.IFoo]'
+    FIELD DELEGATE name:$$delegate_0 type:<root>.IFoo visibility:private [final]
+      EXPRESSION_BODY
+        GET_VAR 'd: <root>.IFoo declared in <root>.DFoo.<init>' type=<root>.IFoo origin=null
+    FUN DELEGATED_MEMBER name:testExtFun visibility:public modality:OPEN <> ($this:<root>.DFoo, $receiver:kotlin.String) returnType:kotlin.Unit
+      annotations:
+        Ann
+      overridden:
+        public abstract fun testExtFun (): kotlin.Unit declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:<root>.DFoo
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+      BLOCK_BODY
+        CALL 'public abstract fun testExtFun (): kotlin.Unit declared in <root>.IFoo' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.IFoo visibility:private [final]' type=<root>.IFoo origin=null
+            receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo.testExtFun' type=<root>.DFoo origin=null
+          $receiver: GET_VAR '<this>: kotlin.String declared in <root>.DFoo.testExtFun' type=kotlin.String origin=null
+    FUN DELEGATED_MEMBER name:testFun visibility:public modality:OPEN <> ($this:<root>.DFoo) returnType:kotlin.Unit
+      annotations:
+        Ann
+      overridden:
+        public abstract fun testFun (): kotlin.Unit declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:<root>.DFoo
+      BLOCK_BODY
+        CALL 'public abstract fun testFun (): kotlin.Unit declared in <root>.IFoo' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.IFoo visibility:private [final]' type=<root>.IFoo origin=null
+            receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo.testFun' type=<root>.DFoo origin=null
+    PROPERTY DELEGATED_MEMBER name:testExtVal visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-testExtVal> visibility:public modality:OPEN <> ($this:<root>.DFoo, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:testExtVal visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-testExtVal> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.DFoo
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-testExtVal> (): kotlin.String declared in <root>.DFoo'
+            CALL 'public abstract fun <get-testExtVal> (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.IFoo visibility:private [final]' type=<root>.IFoo origin=null
+                receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo.<get-testExtVal>' type=<root>.DFoo origin=null
+              $receiver: GET_VAR '<this>: kotlin.String declared in <root>.DFoo.<get-testExtVal>' type=kotlin.String origin=null
+    PROPERTY DELEGATED_MEMBER name:testVal visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-testVal> visibility:public modality:OPEN <> ($this:<root>.DFoo) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:testVal visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-testVal> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.DFoo
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-testVal> (): kotlin.String declared in <root>.DFoo'
+            CALL 'public abstract fun <get-testVal> (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.IFoo visibility:private [final]' type=<root>.IFoo origin=null
+                receiver: GET_VAR '<this>: <root>.DFoo declared in <root>.DFoo.<get-testVal>' type=<root>.DFoo origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.fir.txt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.fir.txt
new file mode 100644
index 00000000000..df51d7b9442
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.fir.txt
@@ -0,0 +1,153 @@
+FILE fqName:<root> fileName:/inheritingDeprecation.kt
+  CLASS INTERFACE name:IFoo modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IFoo
+    PROPERTY name:prop visibility:public modality:OPEN [val]
+      annotations:
+        Deprecated(message = '', replaceWith = <null>, level = <null>)
+      FUN name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.IFoo) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:prop visibility:public modality:OPEN [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-prop> (): kotlin.String declared in <root>.IFoo'
+            CONST String type=kotlin.String value=""
+    PROPERTY name:extProp visibility:public modality:OPEN [val]
+      annotations:
+        Deprecated(message = '', replaceWith = <null>, level = <null>)
+      FUN name:<get-extProp> visibility:public modality:OPEN <> ($this:<root>.IFoo, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:extProp visibility:public modality:OPEN [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo'
+            CONST String type=kotlin.String value=""
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:Delegated modality:FINAL visibility:public superTypes:[<root>.IFoo]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Delegated
+    CONSTRUCTOR visibility:public <> (foo:<root>.IFoo) returnType:<root>.Delegated [primary]
+      VALUE_PARAMETER name:foo index:0 type:<root>.IFoo
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Delegated modality:FINAL visibility:public superTypes:[<root>.IFoo]'
+        SET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=kotlin.Unit origin=EQ
+          receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated' type=<root>.Delegated origin=null
+          value: GET_VAR 'foo: <root>.IFoo declared in <root>.Delegated.<init>' type=<root>.IFoo origin=null
+    PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.Delegated) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val]
+        overridden:
+          public open fun <get-prop> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-prop> (): kotlin.String declared in <root>.Delegated'
+            CALL 'public open fun <get-prop> (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+                receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.<get-prop>' type=<root>.Delegated origin=null
+    PROPERTY DELEGATED_MEMBER name:extProp visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-extProp> visibility:public modality:OPEN <> ($this:<root>.Delegated, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:extProp visibility:public modality:OPEN [val]
+        overridden:
+          public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-extProp> (): kotlin.String declared in <root>.Delegated'
+            CALL 'public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+                receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.<get-extProp>' type=<root>.Delegated origin=null
+              $receiver: GET_VAR '<this>: kotlin.String declared in <root>.Delegated.<get-extProp>' type=kotlin.String origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:DefaultImpl modality:FINAL visibility:public superTypes:[<root>.IFoo]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.DefaultImpl
+    CONSTRUCTOR visibility:public <> () returnType:<root>.DefaultImpl [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DefaultImpl modality:FINAL visibility:public superTypes:[<root>.IFoo]'
+    PROPERTY FAKE_OVERRIDE name:prop visibility:public modality:OPEN [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.IFoo) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:prop visibility:public modality:OPEN [fake_override,val]
+        overridden:
+          public open fun <get-prop> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+    PROPERTY FAKE_OVERRIDE name:extProp visibility:public modality:OPEN [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-extProp> visibility:public modality:OPEN <> ($this:<root>.IFoo, $receiver:kotlin.String) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:extProp visibility:public modality:OPEN [fake_override,val]
+        overridden:
+          public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:ExplicitOverride modality:FINAL visibility:public superTypes:[<root>.IFoo]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ExplicitOverride
+    CONSTRUCTOR visibility:public <> () returnType:<root>.ExplicitOverride [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ExplicitOverride modality:FINAL visibility:public superTypes:[<root>.IFoo]'
+    PROPERTY name:prop visibility:public modality:FINAL [val]
+      FUN name:<get-prop> visibility:public modality:FINAL <> ($this:<root>.ExplicitOverride) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:prop visibility:public modality:FINAL [val]
+        overridden:
+          public open fun <get-prop> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.ExplicitOverride
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-prop> (): kotlin.String declared in <root>.ExplicitOverride'
+            CONST String type=kotlin.String value=""
+    PROPERTY name:extProp visibility:public modality:FINAL [val]
+      FUN name:<get-extProp> visibility:public modality:FINAL <> ($this:<root>.ExplicitOverride, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:extProp visibility:public modality:FINAL [val]
+        overridden:
+          public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.ExplicitOverride
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-extProp> (): kotlin.String declared in <root>.ExplicitOverride'
+            CONST String type=kotlin.String value=""
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt
new file mode 100644
index 00000000000..f52f5112821
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt
@@ -0,0 +1,16 @@
+interface IFoo {
+    @Deprecated("")
+    val prop: String get() = ""
+
+    @Deprecated("")
+    val String.extProp: String get() = ""
+}
+
+class Delegated(foo: IFoo) : IFoo by foo
+
+class DefaultImpl : IFoo
+
+class ExplicitOverride : IFoo {
+    override val prop: String get() = ""
+    override val String.extProp: String get() = ""
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.txt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.txt
new file mode 100644
index 00000000000..0f87c3c0954
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.txt
@@ -0,0 +1,156 @@
+FILE fqName:<root> fileName:/inheritingDeprecation.kt
+  CLASS INTERFACE name:IFoo modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IFoo
+    PROPERTY name:prop visibility:public modality:OPEN [val]
+      annotations:
+        Deprecated(message = '', replaceWith = <null>, level = <null>)
+      FUN name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.IFoo) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:prop visibility:public modality:OPEN [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-prop> (): kotlin.String declared in <root>.IFoo'
+            CONST String type=kotlin.String value=""
+    PROPERTY name:extProp visibility:public modality:OPEN [val]
+      annotations:
+        Deprecated(message = '', replaceWith = <null>, level = <null>)
+      FUN name:<get-extProp> visibility:public modality:OPEN <> ($this:<root>.IFoo, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:extProp visibility:public modality:OPEN [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo'
+            CONST String type=kotlin.String value=""
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:Delegated modality:FINAL visibility:public superTypes:[<root>.IFoo]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Delegated
+    CONSTRUCTOR visibility:public <> (foo:<root>.IFoo) returnType:<root>.Delegated [primary]
+      VALUE_PARAMETER name:foo index:0 type:<root>.IFoo
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Delegated modality:FINAL visibility:public superTypes:[<root>.IFoo]'
+    FIELD DELEGATE name:$$delegate_0 type:<root>.IFoo visibility:private [final]
+      EXPRESSION_BODY
+        GET_VAR 'foo: <root>.IFoo declared in <root>.Delegated.<init>' type=<root>.IFoo origin=null
+    PROPERTY DELEGATED_MEMBER name:extProp visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-extProp> visibility:public modality:OPEN <> ($this:<root>.Delegated, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:extProp visibility:public modality:OPEN [val]
+        overridden:
+          public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-extProp> (): kotlin.String declared in <root>.Delegated'
+            CALL 'public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.IFoo visibility:private [final]' type=<root>.IFoo origin=null
+                receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.<get-extProp>' type=<root>.Delegated origin=null
+              $receiver: GET_VAR '<this>: kotlin.String declared in <root>.Delegated.<get-extProp>' type=kotlin.String origin=null
+    PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.Delegated) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val]
+        overridden:
+          public open fun <get-prop> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-prop> (): kotlin.String declared in <root>.Delegated'
+            CALL 'public open fun <get-prop> (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.IFoo visibility:private [final]' type=<root>.IFoo origin=null
+                receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.<get-prop>' type=<root>.Delegated origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:DefaultImpl modality:FINAL visibility:public superTypes:[<root>.IFoo]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.DefaultImpl
+    CONSTRUCTOR visibility:public <> () returnType:<root>.DefaultImpl [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DefaultImpl modality:FINAL visibility:public superTypes:[<root>.IFoo]'
+    PROPERTY FAKE_OVERRIDE name:extProp visibility:public modality:OPEN [fake_override,val]
+      annotations:
+        Deprecated(message = '', replaceWith = <null>, level = <null>)
+      FUN FAKE_OVERRIDE name:<get-extProp> visibility:public modality:OPEN <> ($this:<root>.IFoo, $receiver:kotlin.String) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:extProp visibility:public modality:OPEN [fake_override,val]
+        overridden:
+          public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    PROPERTY FAKE_OVERRIDE name:prop visibility:public modality:OPEN [fake_override,val]
+      annotations:
+        Deprecated(message = '', replaceWith = <null>, level = <null>)
+      FUN FAKE_OVERRIDE name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.IFoo) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:prop visibility:public modality:OPEN [fake_override,val]
+        overridden:
+          public open fun <get-prop> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:ExplicitOverride modality:FINAL visibility:public superTypes:[<root>.IFoo]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ExplicitOverride
+    CONSTRUCTOR visibility:public <> () returnType:<root>.ExplicitOverride [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ExplicitOverride modality:FINAL visibility:public superTypes:[<root>.IFoo]'
+    PROPERTY name:prop visibility:public modality:OPEN [val]
+      FUN name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.ExplicitOverride) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:prop visibility:public modality:OPEN [val]
+        overridden:
+          public open fun <get-prop> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.ExplicitOverride
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-prop> (): kotlin.String declared in <root>.ExplicitOverride'
+            CONST String type=kotlin.String value=""
+    PROPERTY name:extProp visibility:public modality:OPEN [val]
+      FUN name:<get-extProp> visibility:public modality:OPEN <> ($this:<root>.ExplicitOverride, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:extProp visibility:public modality:OPEN [val]
+        overridden:
+          public open fun <get-extProp> (): kotlin.String declared in <root>.IFoo
+        $this: VALUE_PARAMETER name:<this> type:<root>.ExplicitOverride
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-extProp> (): kotlin.String declared in <root>.ExplicitOverride'
+            CONST String type=kotlin.String value=""
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.IFoo
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
index f9d7f95429c..47dad12b6e2 100644
--- a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
@@ -60,7 +60,8 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
     PROPERTY name:test3 visibility:public modality:FINAL [delegated,var]
       FIELD PROPERTY_DELEGATE name:test3$delegate type:kotlin.collections.MutableMap<kotlin.String, kotlin.Any> visibility:private [final]
         EXPRESSION_BODY
-          GET_VAR 'map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any> declared in <root>.C.<init>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
+          CALL 'public final fun <get-map> (): kotlin.collections.MutableMap<kotlin.String, kotlin.Any> declared in <root>.C' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=GET_PROPERTY
+            $this: GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Any
         correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [delegated,var]
         $this: VALUE_PARAMETER name:<this> type:<root>.C
diff --git a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.txt b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.txt
index 15575da2ed4..38dd5a8740c 100644
--- a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.txt
+++ b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.txt
@@ -92,7 +92,7 @@ FILE fqName:<root> fileName:/inlineCollectionOfInlineClass.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.InlineMutableSet
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-size> (): kotlin.Int declared in <root>.InlineMutableSet'
-            CALL 'public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.Set' type=kotlin.Int origin=GET_PROPERTY
+            CALL 'public abstract fun <get-size> (): kotlin.Int [fake_override] declared in kotlin.collections.MutableSet' type=kotlin.Int origin=GET_PROPERTY
               $this: CALL 'private final fun <get-ms> (): kotlin.collections.MutableSet<<root>.IT> declared in <root>.InlineMutableSet' type=kotlin.collections.MutableSet<<root>.IT> origin=GET_PROPERTY
                 $this: GET_VAR '<this>: <root>.InlineMutableSet declared in <root>.InlineMutableSet.<get-size>' type=<root>.InlineMutableSet origin=null
     FUN name:contains visibility:public modality:FINAL <> ($this:<root>.InlineMutableSet, element:<root>.IT) returnType:kotlin.Boolean [operator]
diff --git a/compiler/testData/ir/irText/declarations/kt35550.fir.txt b/compiler/testData/ir/irText/declarations/kt35550.fir.txt
index c291ac2f8ec..fca54190d10 100644
--- a/compiler/testData/ir/irText/declarations/kt35550.fir.txt
+++ b/compiler/testData/ir/irText/declarations/kt35550.fir.txt
@@ -33,35 +33,6 @@ FILE fqName:<root> fileName:/kt35550.kt
         SET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=kotlin.Unit origin=EQ
           receiver: GET_VAR '<this>: <root>.A declared in <root>.A' type=<root>.A origin=null
           value: GET_VAR 'i: <root>.I declared in <root>.A.<init>' type=<root>.I origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.A, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.A'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=<root>.I origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.equals' type=<root>.A origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.A.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=<root>.I origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=<root>.I origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
     PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
       FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <T> ($this:<root>.A, $receiver:T of <root>.A.<get-id>) returnType:T of <root>.A.<get-id>
         correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
@@ -78,3 +49,16 @@ FILE fqName:<root> fileName:/kt35550.kt
                 receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-id>' type=<root>.A origin=null
               $receiver: GET_VAR '<this>: T of <root>.A.<get-id> declared in <root>.A.<get-id>' type=T of <root>.A.<get-id> origin=null
     FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.txt
index 53cbb989a23..2e25ff1cdb9 100644
--- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.txt
@@ -62,35 +62,6 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
             receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.qux' type=<root>.Test<TT of <root>.Test> origin=null
           t: GET_VAR 't: TT of <root>.Test declared in <root>.Test.qux' type=TT of <root>.Test origin=null
           x: GET_VAR 'x: X of <root>.Test.qux declared in <root>.Test.qux' type=X of <root>.Test.qux origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
-              receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.equals' type=<root>.Test<TT of <root>.Test> origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
-              receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.hashCode' type=<root>.Test<TT of <root>.Test> origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
-              receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.toString' type=<root>.Test<TT of <root>.Test> origin=null
     PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
       FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>) returnType:kotlin.Int
         correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
@@ -103,3 +74,16 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
               $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
                 receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.<get-bar>' type=<root>.Test<TT of <root>.Test> origin=null
     FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
index c58d27fdbb1..a79f92d3c68 100644
--- a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/lambdas.kt
       EXPRESSION_BODY
         FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Int> origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:kotlin.Any, it:kotlin.Any) returnType:kotlin.Int
-            $receiver: VALUE_PARAMETER name:<this> type:kotlin.Any
+            $receiver: VALUE_PARAMETER name:$this$null type:kotlin.Any
             VALUE_PARAMETER name:it index:0 type:kotlin.Any
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Any): kotlin.Int declared in <root>.test2'
diff --git a/compiler/testData/ir/irText/expressions/badBreakContinue.fir.txt b/compiler/testData/ir/irText/expressions/badBreakContinue.fir.txt
index 6646171c5e2..4861247b5ec 100644
--- a/compiler/testData/ir/irText/expressions/badBreakContinue.fir.txt
+++ b/compiler/testData/ir/irText/expressions/badBreakContinue.fir.txt
@@ -7,14 +7,14 @@ FILE fqName:<root> fileName:/badBreakContinue.kt
     BLOCK_BODY
       WHILE label=L1 origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Nothing origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Nothing origin=null
           ERROR_EXPR 'Unbound loop: break@@@[ERROR_EXPR(Cannot bind label ERROR to a loop)] ' type=kotlin.Nothing
           ERROR_EXPR 'Unbound loop: continue@@@[ERROR_EXPR(Cannot bind label ERROR to a loop)] ' type=kotlin.Nothing
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       WHILE label=L1 origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
           VAR name:lambda type:kotlin.Function0<kotlin.Nothing> [val]
             FUN_EXPR type=kotlin.Function0<kotlin.Nothing> origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Nothing
@@ -25,7 +25,7 @@ FILE fqName:<root> fileName:/badBreakContinue.kt
     BLOCK_BODY
       WHILE label=null origin=WHILE_LOOP
         condition: ERROR_EXPR 'Unbound loop: break@@@[ERROR_EXPR(Cannot bind unlabeled jump to a loop)] ' type=kotlin.Nothing
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
       WHILE label=null origin=WHILE_LOOP
         condition: ERROR_EXPR 'Unbound loop: continue@@@[ERROR_EXPR(Cannot bind unlabeled jump to a loop)] ' type=kotlin.Nothing
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/expressions/bangbang.fir.txt b/compiler/testData/ir/irText/expressions/bangbang.fir.txt
index df073e2d155..cca5d161680 100644
--- a/compiler/testData/ir/irText/expressions/bangbang.fir.txt
+++ b/compiler/testData/ir/irText/expressions/bangbang.fir.txt
@@ -44,10 +44,11 @@ FILE fqName:<root> fileName:/bangbang.kt
         BRANCH
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String?
             GET_VAR 'a: X of <root>.test4 declared in <root>.test4' type=X of <root>.test4 origin=null
-          then: CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): T0 of kotlin.internal.ir.CHECK_NOT_NULL declared in kotlin.internal.ir' type=kotlin.String origin=EXCLEXCL
-            <T0>: kotlin.String
-            arg0: TYPE_OP type=kotlin.String? origin=IMPLICIT_CAST typeOperand=kotlin.String?
-              GET_VAR 'a: X of <root>.test4 declared in <root>.test4' type=X of <root>.test4 origin=null
+          then: TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+            CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): T0 of kotlin.internal.ir.CHECK_NOT_NULL declared in kotlin.internal.ir' type=kotlin.String origin=EXCLEXCL
+              <T0>: kotlin.String
+              arg0: TYPE_OP type=kotlin.String? origin=IMPLICIT_CAST typeOperand=kotlin.String?
+                GET_VAR 'a: X of <root>.test4 declared in <root>.test4' type=X of <root>.test4 origin=null
       WHEN type=kotlin.Unit origin=IF
         BRANCH
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String?
diff --git a/compiler/testData/ir/irText/expressions/breakContinue.fir.txt b/compiler/testData/ir/irText/expressions/breakContinue.fir.txt
index 52bbb3be4fe..dfd2a27515b 100644
--- a/compiler/testData/ir/irText/expressions/breakContinue.fir.txt
+++ b/compiler/testData/ir/irText/expressions/breakContinue.fir.txt
@@ -17,19 +17,19 @@ FILE fqName:<root> fileName:/breakContinue.kt
     BLOCK_BODY
       WHILE label=OUTER origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Nothing origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Nothing origin=null
           WHILE label=INNER origin=WHILE_LOOP
             condition: CONST Boolean type=kotlin.Boolean value=true
-            body: BLOCK type=kotlin.Nothing origin=WHILE_LOOP
+            body: BLOCK type=kotlin.Nothing origin=null
               BREAK label=INNER loop.label=INNER
               BREAK label=OUTER loop.label=OUTER
           BREAK label=OUTER loop.label=OUTER
       WHILE label=OUTER origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Nothing origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Nothing origin=null
           WHILE label=INNER origin=WHILE_LOOP
             condition: CONST Boolean type=kotlin.Boolean value=true
-            body: BLOCK type=kotlin.Nothing origin=WHILE_LOOP
+            body: BLOCK type=kotlin.Nothing origin=null
               CONTINUE label=INNER loop.label=INNER
               CONTINUE label=OUTER loop.label=OUTER
           CONTINUE label=OUTER loop.label=OUTER
@@ -37,14 +37,14 @@ FILE fqName:<root> fileName:/breakContinue.kt
     BLOCK_BODY
       WHILE label=L origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Nothing origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Nothing origin=null
           WHILE label=L origin=WHILE_LOOP
             condition: CONST Boolean type=kotlin.Boolean value=true
             body: BREAK label=L loop.label=L
           BREAK label=L loop.label=L
       WHILE label=L origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Nothing origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Nothing origin=null
           WHILE label=L origin=WHILE_LOOP
             condition: CONST Boolean type=kotlin.Boolean value=true
             body: CONTINUE label=L loop.label=L
diff --git a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
index 89f3809e6e0..60b54f615b5 100644
--- a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
+++ b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
@@ -4,7 +4,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
     BLOCK_BODY
       WHILE label=L origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
           WHILE label=L2 origin=WHILE_LOOP
             condition: BLOCK type=kotlin.Boolean origin=ELVIS
               VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Boolean? [val]
@@ -19,13 +19,13 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
                   if: CONST Boolean type=kotlin.Boolean value=true
                   then: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_CAST typeOperand=kotlin.Boolean
                     GET_VAR 'val tmp_0: kotlin.Boolean? [val] declared in <root>.test1' type=kotlin.Boolean? origin=null
-            body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+            body: BLOCK type=kotlin.Unit origin=null
   FUN name:test2 visibility:public modality:FINAL <> (c:kotlin.Boolean?) returnType:kotlin.Unit
     VALUE_PARAMETER name:c index:0 type:kotlin.Boolean?
     BLOCK_BODY
       WHILE label=L origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
           WHILE label=L2 origin=WHILE_LOOP
             condition: BLOCK type=kotlin.Boolean origin=ELVIS
               VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Boolean? [val]
@@ -40,13 +40,13 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
                   if: CONST Boolean type=kotlin.Boolean value=true
                   then: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_CAST typeOperand=kotlin.Boolean
                     GET_VAR 'val tmp_1: kotlin.Boolean? [val] declared in <root>.test2' type=kotlin.Boolean? origin=null
-            body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+            body: BLOCK type=kotlin.Unit origin=null
   FUN name:test3 visibility:public modality:FINAL <> (ss:kotlin.collections.List<kotlin.String>?) returnType:kotlin.Unit
     VALUE_PARAMETER name:ss index:0 type:kotlin.collections.List<kotlin.String>?
     BLOCK_BODY
       WHILE label=L origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
           BLOCK type=kotlin.Unit origin=FOR_LOOP
             VAR FOR_LOOP_ITERATOR name:tmp_2 type:kotlin.collections.Iterator<kotlin.String> [val]
               CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
@@ -75,7 +75,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
     BLOCK_BODY
       WHILE label=L origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
           BLOCK type=kotlin.Unit origin=FOR_LOOP
             VAR FOR_LOOP_ITERATOR name:tmp_4 type:kotlin.collections.Iterator<kotlin.String> [val]
               CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
@@ -105,7 +105,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
         CONST Int type=kotlin.Int value=0
       WHILE label=Outer origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
           SET_VAR 'var i: kotlin.Int [var] declared in <root>.test5' type=kotlin.Unit origin=EQ
             CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
               $this: GET_VAR 'var i: kotlin.Int [var] declared in <root>.test5' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.fir.txt b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.fir.txt
index f7841f19a32..48a7778edda 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.fir.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.fir.txt
@@ -2,5 +2,6 @@ FILE fqName:<root> fileName:/implicitCastOnPlatformType.kt
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test (): kotlin.String declared in <root>'
-        CALL 'public open fun getProperty (p0: kotlin.String?): kotlin.String? declared in java.lang.System' type=kotlin.String? origin=null
-          p0: CONST String type=kotlin.String value="test"
+        TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+          CALL 'public open fun getProperty (p0: kotlin.String?): kotlin.String? declared in java.lang.System' type=kotlin.String? origin=null
+            p0: CONST String type=kotlin.String value="test"
diff --git a/compiler/testData/ir/irText/expressions/kt37570.txt b/compiler/testData/ir/irText/expressions/kt37570.txt
index fc334bf80ee..153663305a6 100644
--- a/compiler/testData/ir/irText/expressions/kt37570.txt
+++ b/compiler/testData/ir/irText/expressions/kt37570.txt
@@ -26,11 +26,11 @@ FILE fqName:<root> fileName:/kt37570.kt
             $receiver: CALL 'public final fun a (): kotlin.String declared in <root>' type=kotlin.String origin=null
             block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.Unit
-                $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+                $receiver: VALUE_PARAMETER name:$this$apply type:kotlin.String
                 BLOCK_BODY
                   SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:b type:kotlin.String visibility:private [final]' type=kotlin.Unit origin=null
                     receiver: GET_VAR '<this>: <root>.A declared in <root>.A' type=<root>.A origin=null
-                    value: GET_VAR '<this>: kotlin.String declared in <root>.A.<anonymous>' type=kotlin.String origin=null
+                    value: GET_VAR '$this$apply: kotlin.String declared in <root>.A.<anonymous>' type=kotlin.String origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.fir.txt b/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.fir.txt
index bdd3226308e..e3d4542de79 100644
--- a/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.fir.txt
+++ b/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.fir.txt
@@ -45,14 +45,13 @@ FILE fqName:<root> fileName:/nullCheckOnGenericLambdaReturn.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.String declared in <root>'
         TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          CALL 'public final fun checkT <T> (fn: kotlin.Function0<T of <root>.checkT>): T of <root>.checkT declared in <root>' type=kotlin.String origin=null
-            <T>: kotlin.String
-            fn: FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
-              FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
+          CALL 'public final fun checkT <T> (fn: kotlin.Function0<T of <root>.checkT>): T of <root>.checkT declared in <root>' type=@[EnhancedNullability] kotlin.String origin=null
+            <T>: @[EnhancedNullability] kotlin.String
+            fn: FUN_EXPR type=kotlin.Function0<@[EnhancedNullability] kotlin.String> origin=LAMBDA
+              FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:@[EnhancedNullability] kotlin.String
                 BLOCK_BODY
-                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in <root>.test2'
-                    TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-                      CALL 'public open fun nnFoo (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (): @[EnhancedNullability] kotlin.String declared in <root>.test2'
+                    CALL 'public open fun nnFoo (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.String?
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.String? declared in <root>'
@@ -67,11 +66,10 @@ FILE fqName:<root> fileName:/nullCheckOnGenericLambdaReturn.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 (): kotlin.String declared in <root>'
         TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          CALL 'public final fun checkTAny <T> (fn: kotlin.Function0<T of <root>.checkTAny>): T of <root>.checkTAny declared in <root>' type=kotlin.String origin=null
-            <T>: kotlin.String
-            fn: FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
-              FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
+          CALL 'public final fun checkTAny <T> (fn: kotlin.Function0<T of <root>.checkTAny>): T of <root>.checkTAny declared in <root>' type=@[EnhancedNullability] kotlin.String origin=null
+            <T>: @[EnhancedNullability] kotlin.String
+            fn: FUN_EXPR type=kotlin.Function0<@[EnhancedNullability] kotlin.String> origin=LAMBDA
+              FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:@[EnhancedNullability] kotlin.String
                 BLOCK_BODY
-                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in <root>.test4'
-                    TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-                      CALL 'public open fun nnFoo (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (): @[EnhancedNullability] kotlin.String declared in <root>.test4'
+                    CALL 'public open fun nnFoo (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.fir.txt b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.fir.txt
index f0fffa4360e..e51da36277b 100644
--- a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.fir.txt
+++ b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.fir.txt
@@ -25,7 +25,8 @@ FILE fqName:<root> fileName:/nullCheckOnLambdaReturn.kt
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Any
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any declared in <root>.test1'
-                  CALL 'public open fun foo (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
+                  TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+                    CALL 'public open fun foo (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val]
     FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0<kotlin.Any> visibility:private [final,static]
       EXPRESSION_BODY
@@ -85,5 +86,4 @@ FILE fqName:<root> fileName:/nullCheckOnLambdaReturn.kt
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Any?
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any? declared in <root>.test6'
-                  TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-                    CALL 'public open fun nnFoo (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+                  CALL 'public open fun nnFoo (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/expressions/objectByNameInsideObject.fir.txt b/compiler/testData/ir/irText/expressions/objectByNameInsideObject.fir.txt
new file mode 100644
index 00000000000..aae5f871fee
--- /dev/null
+++ b/compiler/testData/ir/irText/expressions/objectByNameInsideObject.fir.txt
@@ -0,0 +1,72 @@
+FILE fqName:<root> fileName:/objectByNameInsideObject.kt
+  CLASS CLASS name:Base modality:OPEN visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base
+    CONSTRUCTOR visibility:public <> (f1:kotlin.Function0<kotlin.Any>) returnType:<root>.Base [primary]
+      VALUE_PARAMETER name:f1 index:0 type:kotlin.Function0<kotlin.Any>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:OPEN visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:f1 visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:f1 type:kotlin.Function0<kotlin.Any> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'f1: kotlin.Function0<kotlin.Any> declared in <root>.Base.<init>' type=kotlin.Function0<kotlin.Any> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-f1> visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.Function0<kotlin.Any>
+        correspondingProperty: PROPERTY name:f1 visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-f1> (): kotlin.Function0<kotlin.Any> declared in <root>.Base'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f1 type:kotlin.Function0<kotlin.Any> visibility:private [final]' type=kotlin.Function0<kotlin.Any> origin=null
+              receiver: GET_VAR '<this>: <root>.Base declared in <root>.Base.<get-f1>' type=<root>.Base origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS OBJECT name:Thing modality:FINAL visibility:public superTypes:[<root>.Base]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Thing
+    CONSTRUCTOR visibility:private <> () returnType:<root>.Thing [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (f1: kotlin.Function0<kotlin.Any>) [primary] declared in <root>.Base'
+          f1: FUN_EXPR type=kotlin.Function0<kotlin.Any> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Any
+              BLOCK_BODY
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any declared in <root>.Thing.<init>'
+                  GET_OBJECT 'CLASS OBJECT name:Thing modality:FINAL visibility:public superTypes:[<root>.Base]' type=<root>.Thing
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Thing modality:FINAL visibility:public superTypes:[<root>.Base]'
+    FUN name:test1 visibility:public modality:FINAL <> ($this:<root>.Thing) returnType:<root>.Thing
+      $this: VALUE_PARAMETER name:<this> type:<root>.Thing
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun test1 (): <root>.Thing declared in <root>.Thing'
+          GET_OBJECT 'CLASS OBJECT name:Thing modality:FINAL visibility:public superTypes:[<root>.Base]' type=<root>.Thing
+    FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Thing) returnType:<root>.Thing
+      $this: VALUE_PARAMETER name:<this> type:<root>.Thing
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.Thing declared in <root>.Thing'
+          GET_VAR '<this>: <root>.Thing declared in <root>.Thing.test2' type=<root>.Thing origin=null
+    PROPERTY FAKE_OVERRIDE name:f1 visibility:public modality:FINAL [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-f1> visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.Function0<kotlin.Any> [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:f1 visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-f1> (): kotlin.Function0<kotlin.Any> declared in <root>.Base
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/objectByNameInsideObject.kt b/compiler/testData/ir/irText/expressions/objectByNameInsideObject.kt
new file mode 100644
index 00000000000..945c11ceea5
--- /dev/null
+++ b/compiler/testData/ir/irText/expressions/objectByNameInsideObject.kt
@@ -0,0 +1,6 @@
+open class Base(val f1: () -> Any)
+
+object Thing : Base({ Thing }) {
+    fun test1() = Thing
+    fun test2() = this
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/expressions/objectByNameInsideObject.txt b/compiler/testData/ir/irText/expressions/objectByNameInsideObject.txt
new file mode 100644
index 00000000000..87b401c2bcd
--- /dev/null
+++ b/compiler/testData/ir/irText/expressions/objectByNameInsideObject.txt
@@ -0,0 +1,72 @@
+FILE fqName:<root> fileName:/objectByNameInsideObject.kt
+  CLASS CLASS name:Base modality:OPEN visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base
+    CONSTRUCTOR visibility:public <> (f1:kotlin.Function0<kotlin.Any>) returnType:<root>.Base [primary]
+      VALUE_PARAMETER name:f1 index:0 type:kotlin.Function0<kotlin.Any>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:OPEN visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:f1 visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:f1 type:kotlin.Function0<kotlin.Any> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'f1: kotlin.Function0<kotlin.Any> declared in <root>.Base.<init>' type=kotlin.Function0<kotlin.Any> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-f1> visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.Function0<kotlin.Any>
+        correspondingProperty: PROPERTY name:f1 visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-f1> (): kotlin.Function0<kotlin.Any> declared in <root>.Base'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f1 type:kotlin.Function0<kotlin.Any> visibility:private [final]' type=kotlin.Function0<kotlin.Any> origin=null
+              receiver: GET_VAR '<this>: <root>.Base declared in <root>.Base.<get-f1>' type=<root>.Base origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS OBJECT name:Thing modality:FINAL visibility:public superTypes:[<root>.Base]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Thing
+    CONSTRUCTOR visibility:private <> () returnType:<root>.Thing [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (f1: kotlin.Function0<kotlin.Any>) [primary] declared in <root>.Base'
+          f1: FUN_EXPR type=kotlin.Function0<kotlin.Any> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Any
+              BLOCK_BODY
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any declared in <root>.Thing.<init>'
+                  GET_OBJECT 'CLASS OBJECT name:Thing modality:FINAL visibility:public superTypes:[<root>.Base]' type=<root>.Thing
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Thing modality:FINAL visibility:public superTypes:[<root>.Base]'
+    FUN name:test1 visibility:public modality:FINAL <> ($this:<root>.Thing) returnType:<root>.Thing
+      $this: VALUE_PARAMETER name:<this> type:<root>.Thing
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun test1 (): <root>.Thing declared in <root>.Thing'
+          GET_OBJECT 'CLASS OBJECT name:Thing modality:FINAL visibility:public superTypes:[<root>.Base]' type=<root>.Thing
+    FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Thing) returnType:<root>.Thing
+      $this: VALUE_PARAMETER name:<this> type:<root>.Thing
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.Thing declared in <root>.Thing'
+          GET_VAR '<this>: <root>.Thing declared in <root>.Thing.test2' type=<root>.Thing origin=null
+    PROPERTY FAKE_OVERRIDE name:f1 visibility:public modality:FINAL [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-f1> visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.Function0<kotlin.Any> [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:f1 visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-f1> (): kotlin.Function0<kotlin.Any> declared in <root>.Base
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt b/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
index ab06764a079..03377753661 100644
--- a/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
+++ b/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
@@ -278,20 +278,20 @@ FILE fqName:<root> fileName:/propertyReferences.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test_J_nonConst> (): kotlin.reflect.KMutableProperty0<kotlin.Int> declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:kotlin.reflect.KMutableProperty0<kotlin.Int> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=null
   PROPERTY name:test_varWithPrivateSet visibility:public modality:FINAL [val]
-    FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> visibility:private [final,static]
+    FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.reflect.KProperty1<<root>.C, kotlin.Int> visibility:private [final,static]
       EXPRESSION_BODY
-        PROPERTY_REFERENCE 'public final varWithPrivateSet: kotlin.Int [var]' field=null getter='public final fun <get-varWithPrivateSet> (): kotlin.Int declared in <root>.C' setter='private final fun <set-varWithPrivateSet> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.C' type=kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithPrivateSet> visibility:public modality:FINAL <> () returnType:kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int>
+        PROPERTY_REFERENCE 'public final varWithPrivateSet: kotlin.Int [var]' field=null getter='public final fun <get-varWithPrivateSet> (): kotlin.Int declared in <root>.C' setter=null type=kotlin.reflect.KProperty1<<root>.C, kotlin.Int> origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithPrivateSet> visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty1<<root>.C, kotlin.Int>
       correspondingProperty: PROPERTY name:test_varWithPrivateSet visibility:public modality:FINAL [val]
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test_varWithPrivateSet> (): kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test_varWithPrivateSet> (): kotlin.reflect.KProperty1<<root>.C, kotlin.Int> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.reflect.KProperty1<<root>.C, kotlin.Int> visibility:private [final,static]' type=kotlin.reflect.KProperty1<<root>.C, kotlin.Int> origin=null
   PROPERTY name:test_varWithProtectedSet visibility:public modality:FINAL [val]
-    FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> visibility:private [final,static]
+    FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.reflect.KProperty1<<root>.C, kotlin.Int> visibility:private [final,static]
       EXPRESSION_BODY
-        PROPERTY_REFERENCE 'public final varWithProtectedSet: kotlin.Int [var]' field=null getter='public final fun <get-varWithProtectedSet> (): kotlin.Int declared in <root>.C' setter='protected final fun <set-varWithProtectedSet> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.C' type=kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithProtectedSet> visibility:public modality:FINAL <> () returnType:kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int>
+        PROPERTY_REFERENCE 'public final varWithProtectedSet: kotlin.Int [var]' field=null getter='public final fun <get-varWithProtectedSet> (): kotlin.Int declared in <root>.C' setter=null type=kotlin.reflect.KProperty1<<root>.C, kotlin.Int> origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithProtectedSet> visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty1<<root>.C, kotlin.Int>
       correspondingProperty: PROPERTY name:test_varWithProtectedSet visibility:public modality:FINAL [val]
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test_varWithProtectedSet> (): kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty1<<root>.C, kotlin.Int> origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test_varWithProtectedSet> (): kotlin.reflect.KProperty1<<root>.C, kotlin.Int> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.reflect.KProperty1<<root>.C, kotlin.Int> visibility:private [final,static]' type=kotlin.reflect.KProperty1<<root>.C, kotlin.Int> origin=null
diff --git a/compiler/testData/ir/irText/expressions/sam/genericSamSmartcast.fir.txt b/compiler/testData/ir/irText/expressions/sam/genericSamSmartcast.fir.txt
index d25cef9cccb..7eefb793044 100644
--- a/compiler/testData/ir/irText/expressions/sam/genericSamSmartcast.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/genericSamSmartcast.fir.txt
@@ -7,15 +7,16 @@ FILE fqName:<root> fileName:/genericSamSmartcast.kt
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.A<*>
             GET_VAR 'x: kotlin.Any declared in <root>.f' type=kotlin.Any origin=null
           then: RETURN type=kotlin.Nothing from='public final fun f (x: kotlin.Any): kotlin.String declared in <root>'
-            CALL 'public open fun call (block: <root>.A.I<T of <root>.A?>?): kotlin.String? declared in <root>.A' type=kotlin.String? origin=null
-              $this: TYPE_OP type=<root>.A<*> origin=IMPLICIT_CAST typeOperand=<root>.A<*>
-                GET_VAR 'x: kotlin.Any declared in <root>.f' type=kotlin.Any origin=null
-              block: TYPE_OP type=<root>.A.I<kotlin.Any?>? origin=SAM_CONVERSION typeOperand=<root>.A.I<kotlin.Any?>?
-                FUN_EXPR type=kotlin.Function1<kotlin.Any?, kotlin.String?> origin=LAMBDA
-                  FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (y:kotlin.Any?) returnType:kotlin.String?
-                    VALUE_PARAMETER name:y index:0 type:kotlin.Any?
-                    BLOCK_BODY
-                      RETURN type=kotlin.Nothing from='local final fun <anonymous> (y: kotlin.Any?): kotlin.String? declared in <root>.f'
-                        CONST String type=kotlin.String value="OK"
+            TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+              CALL 'public open fun call (block: <root>.A.I<T of <root>.A?>?): kotlin.String? declared in <root>.A' type=kotlin.String? origin=null
+                $this: TYPE_OP type=<root>.A<*> origin=IMPLICIT_CAST typeOperand=<root>.A<*>
+                  GET_VAR 'x: kotlin.Any declared in <root>.f' type=kotlin.Any origin=null
+                block: TYPE_OP type=<root>.A.I<kotlin.Any?>? origin=SAM_CONVERSION typeOperand=<root>.A.I<kotlin.Any?>?
+                  FUN_EXPR type=kotlin.Function1<kotlin.Any?, kotlin.String?> origin=LAMBDA
+                    FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (y:kotlin.Any?) returnType:kotlin.String?
+                      VALUE_PARAMETER name:y index:0 type:kotlin.Any?
+                      BLOCK_BODY
+                        RETURN type=kotlin.Nothing from='local final fun <anonymous> (y: kotlin.Any?): kotlin.String? declared in <root>.f'
+                          CONST String type=kotlin.String value="OK"
       RETURN type=kotlin.Nothing from='public final fun f (x: kotlin.Any): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="Fail"
diff --git a/compiler/testData/ir/irText/expressions/sam/samByProjectedType.fir.txt b/compiler/testData/ir/irText/expressions/sam/samByProjectedType.fir.txt
index b60ea9db1a7..c6a4b9d1f5d 100644
--- a/compiler/testData/ir/irText/expressions/sam/samByProjectedType.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samByProjectedType.fir.txt
@@ -1,10 +1,11 @@
 FILE fqName:<root> fileName:/samByProjectedType.kt
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /H.bar>#' type=kotlin.Unit
-        FUN_EXPR type=kotlin.Function1<kotlin.Any, kotlin.Any?> origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any?
-            VALUE_PARAMETER name:x index:0 type:kotlin.Any
-            BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.Any): kotlin.Any? declared in <root>.test1'
-                GET_VAR 'x: kotlin.Any declared in <root>.test1.<anonymous>' type=kotlin.Any origin=null
+      CALL 'public open fun bar (j: <root>.J<*>?): kotlin.Unit declared in <root>.H' type=kotlin.Unit origin=null
+        j: TYPE_OP type=<root>.J<*>? origin=SAM_CONVERSION typeOperand=<root>.J<*>?
+          FUN_EXPR type=kotlin.Function1<kotlin.Any, kotlin.Any?> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any?
+              VALUE_PARAMETER name:x index:0 type:kotlin.Any
+              BLOCK_BODY
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.Any): kotlin.Any? declared in <root>.test1'
+                  GET_VAR 'x: kotlin.Any declared in <root>.test1.<anonymous>' type=kotlin.Any origin=null
diff --git a/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.txt
index 76d3d8cba80..bb21c34f27d 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.txt
@@ -33,4 +33,5 @@ FILE fqName:<root> fileName:/samConstructors.kt
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (a: kotlin.Int?, b: kotlin.Int?): kotlin.Int declared in <root>.test4'
                   CALL 'public final fun minus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=MINUS
                     $this: GET_VAR 'a: kotlin.Int? declared in <root>.test4.<anonymous>' type=kotlin.Int? origin=null
-                    other: GET_VAR 'b: kotlin.Int? declared in <root>.test4.<anonymous>' type=kotlin.Int? origin=null
+                    other: TYPE_OP type=kotlin.Int origin=IMPLICIT_NOTNULL typeOperand=kotlin.Int
+                      GET_VAR 'b: kotlin.Int? declared in <root>.test4.<anonymous>' type=kotlin.Int? origin=null
diff --git a/compiler/testData/ir/irText/expressions/whenCoercedToUnit.fir.txt b/compiler/testData/ir/irText/expressions/whenCoercedToUnit.fir.txt
deleted file mode 100644
index 32ab6eefa35..00000000000
--- a/compiler/testData/ir/irText/expressions/whenCoercedToUnit.fir.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-FILE fqName:<root> fileName:/whenCoercedToUnit.kt
-  FUN name:foo visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.Unit
-    VALUE_PARAMETER name:x index:0 type:kotlin.Int
-    BLOCK_BODY
-      BLOCK type=kotlin.Unit origin=WHEN
-        VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val]
-          GET_VAR 'x: kotlin.Int declared in <root>.foo' type=kotlin.Int origin=null
-        WHEN type=kotlin.Unit origin=WHEN
-          BRANCH
-            if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-              arg0: GET_VAR 'val tmp_0: kotlin.Int [val] declared in <root>.foo' type=kotlin.Int origin=null
-              arg1: CONST Int type=kotlin.Int value=0
-            then: CONST Int type=kotlin.Int value=0
diff --git a/compiler/testData/ir/irText/expressions/whenCoercedToUnit.kt b/compiler/testData/ir/irText/expressions/whenCoercedToUnit.kt
index cfbd1828b35..e556187c081 100644
--- a/compiler/testData/ir/irText/expressions/whenCoercedToUnit.kt
+++ b/compiler/testData/ir/irText/expressions/whenCoercedToUnit.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // WITH_RUNTIME
 
 fun foo(x: Int) {
diff --git a/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt b/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt
index acda0e88efe..982bbd9e1ea 100644
--- a/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt
+++ b/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt
@@ -7,7 +7,7 @@ FILE fqName:<root> fileName:/whileDoWhile.kt
         condition: CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
           arg0: GET_VAR 'var x: kotlin.Int [var] declared in <root>.test' type=kotlin.Int origin=null
           arg1: CONST Int type=kotlin.Int value=0
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
       WHILE label=null origin=WHILE_LOOP
         condition: CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
           arg0: GET_VAR 'var x: kotlin.Int [var] declared in <root>.test' type=kotlin.Int origin=null
@@ -23,7 +23,7 @@ FILE fqName:<root> fileName:/whileDoWhile.kt
         condition: CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
           arg0: GET_VAR 'var x: kotlin.Int [var] declared in <root>.test' type=kotlin.Int origin=null
           arg1: CONST Int type=kotlin.Int value=10
-        body: BLOCK type=kotlin.Int origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Int origin=null
           VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Int [val]
             GET_VAR 'var x: kotlin.Int [var] declared in <root>.test' type=kotlin.Int origin=null
           SET_VAR 'var x: kotlin.Int [var] declared in <root>.test' type=kotlin.Unit origin=EQ
@@ -69,7 +69,7 @@ FILE fqName:<root> fileName:/whileDoWhile.kt
             WHILE label=null origin=WHILE_LOOP
               condition: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_CAST typeOperand=kotlin.Boolean
                 GET_VAR 'val a: kotlin.Any? [val] declared in <root>.testSmartcastInCondition' type=kotlin.Any? origin=null
-              body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+              body: BLOCK type=kotlin.Unit origin=null
             DO_WHILE label=null origin=DO_WHILE_LOOP
               body: COMPOSITE type=kotlin.Unit origin=DO_WHILE_LOOP
               condition: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_CAST typeOperand=kotlin.Boolean
diff --git a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.txt b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.txt
index 7eb7c1bd1f3..88468b10bc9 100644
--- a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.txt
+++ b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.txt
@@ -80,12 +80,12 @@ FILE fqName:<root> fileName:/AbstractMutableMap.kt
         public abstract fun get (key: K of kotlin.collections.Map): V of kotlin.collections.Map? [operator] declared in kotlin.collections.Map
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
       VALUE_PARAMETER name:key index:0 type:K of <root>.MyMap
-    FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:java.util.Map<K of java.util.Map, V of java.util.Map>, p0:K of <root>.MyMap?, p1:V of <root>.MyMap?) returnType:V of <root>.MyMap? [fake_override]
+    FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>, key:K of <root>.MyMap, defaultValue:V of <root>.MyMap) returnType:V of <root>.MyMap [fake_override]
       overridden:
-        public open fun getOrDefault (p0: K of java.util.Map?, p1: V of java.util.Map?): V of java.util.Map? declared in java.util.Map
-      $this: VALUE_PARAMETER name:<this> type:java.util.Map<K of java.util.Map, V of java.util.Map>
-      VALUE_PARAMETER name:p0 index:0 type:K of <root>.MyMap?
-      VALUE_PARAMETER name:p1 index:1 type:V of <root>.MyMap?
+        public open fun getOrDefault (key: K of kotlin.collections.Map, defaultValue: V of kotlin.collections.Map): V of kotlin.collections.Map declared in kotlin.collections.Map
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
+      VALUE_PARAMETER name:key index:0 type:K of <root>.MyMap
+      VALUE_PARAMETER name:defaultValue index:1 type:V of <root>.MyMap
     FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>) returnType:kotlin.Boolean [fake_override]
       overridden:
         public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Map
@@ -104,7 +104,7 @@ FILE fqName:<root> fileName:/AbstractMutableMap.kt
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-        public open fun equals (p0: kotlin.Any?): kotlin.Boolean [operator] declared in java.util.AbstractMap
+        public open fun equals (p0: @[FlexibleNullability] kotlin.Any?): kotlin.Boolean [operator] declared in java.util.AbstractMap
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
@@ -115,7 +115,7 @@ FILE fqName:<root> fileName:/AbstractMutableMap.kt
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-        public open fun toString (): kotlin.String declared in java.util.AbstractMap
+        public open fun toString (): @[FlexibleNullability] kotlin.String declared in java.util.AbstractMap
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:keySet visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:kotlin.collections.Set<K of <root>.MyMap?>? [fake_override]
       overridden:
diff --git a/compiler/testData/ir/irText/firProblems/AllCandidates.txt b/compiler/testData/ir/irText/firProblems/AllCandidates.txt
index def1c01880a..591878e17f6 100644
--- a/compiler/testData/ir/irText/firProblems/AllCandidates.txt
+++ b/compiler/testData/ir/irText/firProblems/AllCandidates.txt
@@ -61,12 +61,12 @@ FILE fqName:<root> fileName:/AllCandidates.kt
             <R>: @[FlexibleNullability] A of <root>.allCandidatesResult?
           block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<@[FlexibleNullability] <root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>?, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:@[FlexibleNullability] <root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>?) returnType:kotlin.Unit
-              $receiver: VALUE_PARAMETER name:<this> type:@[FlexibleNullability] <root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>?
+              $receiver: VALUE_PARAMETER name:$this$apply type:@[FlexibleNullability] <root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>?
               BLOCK_BODY
                 CALL 'public open fun setAllCandidates (allCandidates: @[FlexibleNullability] kotlin.collections.MutableCollection<@[FlexibleNullability] <root>.ResolvedCall<@[FlexibleNullability] D of <root>.OverloadResolutionResultsImpl?>?>?): kotlin.Unit declared in <root>.OverloadResolutionResultsImpl' type=kotlin.Unit origin=EQ
                   <1>: @[FlexibleNullability] A of <root>.allCandidatesResult?
                   $this: TYPE_OP type=<root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?> origin=IMPLICIT_NOTNULL typeOperand=<root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>
-                    GET_VAR '<this>: @[FlexibleNullability] <root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>? declared in <root>.allCandidatesResult.<anonymous>' type=@[FlexibleNullability] <root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>? origin=null
+                    GET_VAR '$this$apply: @[FlexibleNullability] <root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>? declared in <root>.allCandidatesResult.<anonymous>' type=@[FlexibleNullability] <root>.OverloadResolutionResultsImpl<@[FlexibleNullability] A of <root>.allCandidatesResult?>? origin=null
                   allCandidates: CALL 'public final fun map <T, R> (transform: kotlin.Function1<T of kotlin.collections.map, R of kotlin.collections.map>): kotlin.collections.List<R of kotlin.collections.map> [inline] declared in kotlin.collections' type=kotlin.collections.List<<root>.ResolvedCall<A of <root>.allCandidatesResult>> origin=null
                     <T>: <root>.MyCandidate
                     <R>: <root>.ResolvedCall<A of <root>.allCandidatesResult>
diff --git a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.fir.txt b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.fir.txt
index 25a0cb0dd7c..f774624f25c 100644
--- a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.fir.txt
+++ b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.fir.txt
@@ -152,7 +152,7 @@ FILE fqName:<root> fileName:/ClashResolutionDescriptor.kt
               BLOCK type=kotlin.collections.Collection<<root>.ComponentDescriptor> origin=ELVIS
                 VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.collections.Collection<<root>.ComponentDescriptor>? [val]
                   TYPE_OP type=kotlin.collections.Collection<<root>.ComponentDescriptor>? origin=SAFE_CAST typeOperand=kotlin.collections.Collection<<root>.ComponentDescriptor>
-                    CALL 'public open fun get (p0: K of java.util.HashMap?): V of java.util.HashMap? [operator] declared in java.util.HashMap' type=kotlin.Any? origin=null
+                    CALL 'public open fun get (p0: K of java.util.HashMap?): @[FlexibleNullability] V of java.util.HashMap? [operator] declared in java.util.HashMap' type=kotlin.Any? origin=null
                       $this: CALL 'private final fun <get-registrationMap> (): java.util.HashMap<java.lang.reflect.Type, kotlin.Any> declared in <root>' type=java.util.HashMap<java.lang.reflect.Type, kotlin.Any> origin=GET_PROPERTY
                       p0: CALL 'public final fun <get-applicableTo> (): java.lang.Class<E of <root>.PlatformExtensionsClashResolver> declared in <root>.PlatformExtensionsClashResolver' type=java.lang.Class<out <root>.PlatformSpecificExtension<out <root>.PlatformSpecificExtension<out <root>.PlatformSpecificExtension<out <root>.PlatformSpecificExtension<out <root>.PlatformSpecificExtension<out kotlin.Any?>>>>>> origin=GET_PROPERTY
                         $this: GET_VAR 'val resolver: <root>.PlatformExtensionsClashResolver<*> [val] declared in <root>.resolveClashesIfAny' type=<root>.PlatformExtensionsClashResolver<*> origin=null
diff --git a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.txt b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.txt
new file mode 100644
index 00000000000..d72caa18324
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.txt
@@ -0,0 +1,143 @@
+FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
+  CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.Foo.A; <root>.Foo.B]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Impl
+    CONSTRUCTOR visibility:public <> (b:<root>.Foo.B) returnType:<root>.Impl [primary]
+      VALUE_PARAMETER name:b index:0 type:<root>.Foo.B
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.Foo.A; <root>.Foo.B]'
+        SET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=kotlin.Unit origin=EQ
+          receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl' type=<root>.Impl origin=null
+          value: GET_VAR 'b: <root>.Foo.B declared in <root>.Impl.<init>' type=<root>.Foo.B origin=null
+    FUN DELEGATED_MEMBER name:add visibility:public modality:OPEN <> ($this:<root>.Impl, element:kotlin.String?) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun add (element: E of kotlin.collections.MutableSet): kotlin.Boolean declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:element index:0 type:kotlin.String?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun add (element: kotlin.String?): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun add (element: kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.add' type=<root>.Impl origin=null
+            element: GET_VAR 'element: kotlin.String? declared in <root>.Impl.add' type=kotlin.String? origin=null
+    FUN DELEGATED_MEMBER name:addAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<kotlin.String?>) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun addAll (elements: kotlin.collections.Collection<E of kotlin.collections.MutableSet>): kotlin.Boolean declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.String?>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun addAll (elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun addAll (elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.addAll' type=<root>.Impl origin=null
+            elements: GET_VAR 'elements: kotlin.collections.Collection<kotlin.String?> declared in <root>.Impl.addAll' type=kotlin.collections.Collection<kotlin.String?> origin=null
+    FUN DELEGATED_MEMBER name:clear visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.Unit
+      overridden:
+        public abstract fun clear (): kotlin.Unit declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      BLOCK_BODY
+        CALL 'public abstract fun clear (): kotlin.Unit declared in kotlin.collections.MutableSet' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+            receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.clear' type=<root>.Impl origin=null
+    FUN DELEGATED_MEMBER name:iterator visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.collections.MutableIterator<kotlin.String?> [operator]
+      overridden:
+        public abstract fun iterator (): kotlin.collections.MutableIterator<E of kotlin.collections.MutableSet> [operator] declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun iterator (): kotlin.collections.MutableIterator<kotlin.String?> [operator] declared in <root>.Impl'
+          CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<kotlin.String?> [fake_override,operator] declared in <root>.Foo.B' type=kotlin.collections.MutableIterator<kotlin.String?> origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.iterator' type=<root>.Impl origin=null
+    FUN DELEGATED_MEMBER name:remove visibility:public modality:OPEN <> ($this:<root>.Impl, element:kotlin.String?) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun remove (element: E of kotlin.collections.MutableSet): kotlin.Boolean declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:element index:0 type:kotlin.String?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun remove (element: kotlin.String?): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun remove (element: kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.remove' type=<root>.Impl origin=null
+            element: GET_VAR 'element: kotlin.String? declared in <root>.Impl.remove' type=kotlin.String? origin=null
+    FUN DELEGATED_MEMBER name:removeAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<kotlin.String?>) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun removeAll (elements: kotlin.collections.Collection<E of kotlin.collections.MutableSet>): kotlin.Boolean declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.String?>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun removeAll (elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun removeAll (elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.removeAll' type=<root>.Impl origin=null
+            elements: GET_VAR 'elements: kotlin.collections.Collection<kotlin.String?> declared in <root>.Impl.removeAll' type=kotlin.collections.Collection<kotlin.String?> origin=null
+    FUN DELEGATED_MEMBER name:retainAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<kotlin.String?>) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun retainAll (elements: kotlin.collections.Collection<E of kotlin.collections.MutableSet>): kotlin.Boolean declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.String?>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun retainAll (elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun retainAll (elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.retainAll' type=<root>.Impl origin=null
+            elements: GET_VAR 'elements: kotlin.collections.Collection<kotlin.String?> declared in <root>.Impl.retainAll' type=kotlin.collections.Collection<kotlin.String?> origin=null
+    FUN DELEGATED_MEMBER name:contains visibility:public modality:OPEN <> ($this:<root>.Impl, element:kotlin.String?) returnType:kotlin.Boolean [operator]
+      overridden:
+        public abstract fun contains (element: E of kotlin.collections.Set): kotlin.Boolean [operator] declared in kotlin.collections.Set
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:element index:0 type:kotlin.String?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun contains (element: kotlin.String?): kotlin.Boolean [operator] declared in <root>.Impl'
+          CALL 'public abstract fun contains (element: kotlin.String?): kotlin.Boolean [fake_override,operator] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.contains' type=<root>.Impl origin=null
+            element: GET_VAR 'element: kotlin.String? declared in <root>.Impl.contains' type=kotlin.String? origin=null
+    FUN DELEGATED_MEMBER name:containsAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<kotlin.String?>) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun containsAll (elements: kotlin.collections.Collection<E of kotlin.collections.MutableSet>): kotlin.Boolean [fake_override] declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.String?>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun containsAll (elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun containsAll (elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.containsAll' type=<root>.Impl origin=null
+            elements: GET_VAR 'elements: kotlin.collections.Collection<kotlin.String?> declared in <root>.Impl.containsAll' type=kotlin.collections.Collection<kotlin.String?> origin=null
+    FUN DELEGATED_MEMBER name:isEmpty visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Set
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun isEmpty (): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in kotlin.collections.MutableSet' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.isEmpty' type=<root>.Impl origin=null
+    PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-size> visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.Int
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.Set
+        $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-size> (): kotlin.Int declared in <root>.Impl'
+            CALL 'public abstract fun <get-size> (): kotlin.Int [fake_override] declared in kotlin.collections.MutableSet' type=kotlin.Int origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
+                receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.<get-size>' type=<root>.Impl origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in kotlin.collections.MutableSet
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CONST String type=kotlin.String value="OK"
diff --git a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt
new file mode 100644
index 00000000000..a7fb7c1c24f
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt
@@ -0,0 +1,18 @@
+// FILE: Foo.java
+
+import java.util.Set;
+
+public class Foo {
+    public interface A extends Set<String> {}
+
+    public interface B extends Set<String> {}
+}
+
+// FILE: DelegationAndInheritanceFromJava.kt
+
+import Foo.*
+import java.util.HashSet
+
+class Impl(b: B): A, B by b
+
+fun box() = "OK"
diff --git a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.txt b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.txt
new file mode 100644
index 00000000000..fd4b1eee2d3
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.txt
@@ -0,0 +1,156 @@
+FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
+  CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.Foo.A; <root>.Foo.B]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Impl
+    CONSTRUCTOR visibility:public <> (b:<root>.Foo.B) returnType:<root>.Impl [primary]
+      VALUE_PARAMETER name:b index:0 type:<root>.Foo.B
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.Foo.A; <root>.Foo.B]'
+    FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]
+      EXPRESSION_BODY
+        GET_VAR 'b: <root>.Foo.B declared in <root>.Impl.<init>' type=<root>.Foo.B origin=null
+    FUN DELEGATED_MEMBER name:add visibility:public modality:OPEN <> ($this:<root>.Impl, element:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun add (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun add (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:element index:0 type:@[FlexibleNullability] kotlin.String?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun add (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun add (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.add' type=<root>.Impl origin=null
+            element: GET_VAR 'element: @[FlexibleNullability] kotlin.String? declared in <root>.Impl.add' type=@[FlexibleNullability] kotlin.String? origin=null
+    FUN DELEGATED_MEMBER name:addAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun addAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun addAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun addAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun addAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.addAll' type=<root>.Impl origin=null
+            elements: GET_VAR 'elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> declared in <root>.Impl.addAll' type=kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> origin=null
+    FUN DELEGATED_MEMBER name:clear visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.Unit
+      overridden:
+        public abstract fun clear (): kotlin.Unit [fake_override] declared in <root>.Foo.A
+        public abstract fun clear (): kotlin.Unit [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      BLOCK_BODY
+        CALL 'public abstract fun clear (): kotlin.Unit [fake_override] declared in <root>.Foo.B' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+            receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.clear' type=<root>.Impl origin=null
+    FUN DELEGATED_MEMBER name:contains visibility:public modality:OPEN <> ($this:<root>.Impl, element:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Boolean [operator]
+      overridden:
+        public abstract fun contains (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override,operator] declared in <root>.Foo.A
+        public abstract fun contains (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override,operator] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:element index:0 type:@[FlexibleNullability] kotlin.String?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun contains (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [operator] declared in <root>.Impl'
+          CALL 'public abstract fun contains (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override,operator] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.contains' type=<root>.Impl origin=null
+            element: GET_VAR 'element: @[FlexibleNullability] kotlin.String? declared in <root>.Impl.contains' type=@[FlexibleNullability] kotlin.String? origin=null
+    FUN DELEGATED_MEMBER name:containsAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun containsAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun containsAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun containsAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun containsAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.containsAll' type=<root>.Impl origin=null
+            elements: GET_VAR 'elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> declared in <root>.Impl.containsAll' type=kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> origin=null
+    FUN DELEGATED_MEMBER name:isEmpty visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun isEmpty (): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.isEmpty' type=<root>.Impl origin=null
+    FUN DELEGATED_MEMBER name:iterator visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [operator]
+      overridden:
+        public abstract fun iterator (): kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [fake_override,operator] declared in <root>.Foo.A
+        public abstract fun iterator (): kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [fake_override,operator] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun iterator (): kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [operator] declared in <root>.Impl'
+          CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [fake_override,operator] declared in <root>.Foo.B' type=kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.iterator' type=<root>.Impl origin=null
+    FUN DELEGATED_MEMBER name:remove visibility:public modality:OPEN <> ($this:<root>.Impl, element:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun remove (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun remove (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:element index:0 type:@[FlexibleNullability] kotlin.String?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun remove (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun remove (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.remove' type=<root>.Impl origin=null
+            element: GET_VAR 'element: @[FlexibleNullability] kotlin.String? declared in <root>.Impl.remove' type=@[FlexibleNullability] kotlin.String? origin=null
+    FUN DELEGATED_MEMBER name:removeAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun removeAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun removeAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun removeAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun removeAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.removeAll' type=<root>.Impl origin=null
+            elements: GET_VAR 'elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> declared in <root>.Impl.removeAll' type=kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> origin=null
+    FUN DELEGATED_MEMBER name:retainAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.Boolean
+      overridden:
+        public abstract fun retainAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun retainAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun retainAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean declared in <root>.Impl'
+          CALL 'public abstract fun retainAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+              receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.retainAll' type=<root>.Impl origin=null
+            elements: GET_VAR 'elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> declared in <root>.Impl.retainAll' type=kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> origin=null
+    PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-size> visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.Int
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-size> (): kotlin.Int [fake_override] declared in <root>.Foo.A
+          public abstract fun <get-size> (): kotlin.Int [fake_override] declared in <root>.Foo.B
+        $this: VALUE_PARAMETER name:<this> type:<root>.Impl
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-size> (): kotlin.Int declared in <root>.Impl'
+            CALL 'public abstract fun <get-size> (): kotlin.Int [fake_override] declared in <root>.Foo.B' type=kotlin.Int origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Foo.B visibility:private [final]' type=<root>.Foo.B origin=null
+                receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.<get-size>' type=<root>.Impl origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Foo.A
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Foo.A
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.Foo.A
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.Foo.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CONST String type=kotlin.String value="OK"
diff --git a/compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.fir.txt b/compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.fir.txt
index b0bf9cce90a..c6218892a32 100644
--- a/compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.fir.txt
+++ b/compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.fir.txt
@@ -48,10 +48,11 @@ FILE fqName:<root> fileName:/InnerClassInAnonymous.kt
                       other: CALL 'public final fun <get-end> (): kotlin.String declared in <root>.box.<no name provided>' type=kotlin.String origin=GET_PROPERTY
                         $this: GET_VAR '<this>: <root>.box.<no name provided> declared in <root>.box.<no name provided>' type=<root>.box.<no name provided> origin=null
               PROPERTY FAKE_OVERRIDE name:s visibility:public modality:FINAL [fake_override,val]
-                FUN FAKE_OVERRIDE name:<get-s> visibility:public modality:FINAL <> () returnType:kotlin.String [fake_override]
+                FUN FAKE_OVERRIDE name:<get-s> visibility:public modality:FINAL <> ($this:<root>.box.<no name provided>.Base) returnType:kotlin.String [fake_override]
                   correspondingProperty: PROPERTY FAKE_OVERRIDE name:s visibility:public modality:FINAL [fake_override,val]
                   overridden:
                     public final fun <get-s> (): kotlin.String declared in <root>.box.<no name provided>.Base
+                  $this: VALUE_PARAMETER name:<this> type:<root>.box.<no name provided>.Base
               FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
                 overridden:
                   public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/firProblems/MultiList.fir.txt b/compiler/testData/ir/irText/firProblems/MultiList.fir.txt
new file mode 100644
index 00000000000..7dcc48ba3f5
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/MultiList.fir.txt
@@ -0,0 +1,579 @@
+FILE fqName:<root> fileName:/MultiList.kt
+  CLASS CLASS name:Some modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Some<T of <root>.Some>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+    CONSTRUCTOR visibility:public <> (value:T of <root>.Some) returnType:<root>.Some<T of <root>.Some> [primary]
+      VALUE_PARAMETER name:value index:0 type:T of <root>.Some
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Some modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+    PROPERTY name:value visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'value: T of <root>.Some declared in <root>.Some.<init>' type=T of <root>.Some origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.Some<T of <root>.Some>) returnType:T of <root>.Some
+        correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-value> (): T of <root>.Some declared in <root>.Some'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+              receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.<get-value>' type=<root>.Some<T of <root>.Some> origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Some<T of <root>.Some>) returnType:T of <root>.Some
+      $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): T of <root>.Some declared in <root>.Some'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+            receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.component1' type=<root>.Some<T of <root>.Some> origin=null
+    FUN name:copy visibility:public modality:FINAL <> ($this:<root>.Some<T of <root>.Some>, value:T of <root>.Some) returnType:<root>.Some<T of <root>.Some>
+      $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+      VALUE_PARAMETER name:value index:0 type:T of <root>.Some
+        EXPRESSION_BODY
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+            receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.copy' type=<root>.Some<T of <root>.Some> origin=null
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun copy (value: T of <root>.Some): <root>.Some<T of <root>.Some> declared in <root>.Some'
+          CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Some) [primary] declared in <root>.Some' type=<root>.Some<T of <root>.Some> origin=null
+            <class: T>: kotlin.Any
+            value: GET_VAR 'value: T of <root>.Some declared in <root>.Some.copy' type=T of <root>.Some origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Some<T of <root>.Some>, other:kotlin.Any?) returnType:kotlin.Boolean
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER GENERATED_DATA_CLASS_MEMBER name:<this> type:<root>.Some<T of <root>.Some>
+      VALUE_PARAMETER GENERATED_DATA_CLASS_MEMBER name:other index:0 type:kotlin.Any?
+      BLOCK_BODY
+        WHEN type=kotlin.Unit origin=null
+          BRANCH
+            if: CALL 'public final fun EQEQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQEQ
+              arg0: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.equals' type=<root>.Some<T of <root>.Some> origin=null
+              arg1: GET_VAR 'other: kotlin.Any? declared in <root>.Some.equals' type=kotlin.Any? origin=null
+            then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Some'
+              CONST Boolean type=kotlin.Boolean value=true
+        WHEN type=kotlin.Unit origin=null
+          BRANCH
+            if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=<root>.Some<T of <root>.Some>
+              GET_VAR 'other: kotlin.Any? declared in <root>.Some.equals' type=kotlin.Any? origin=null
+            then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Some'
+              CONST Boolean type=kotlin.Boolean value=false
+        VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:<root>.Some<T of <root>.Some> [val]
+          TYPE_OP type=<root>.Some<T of <root>.Some> origin=CAST typeOperand=<root>.Some<T of <root>.Some>
+            GET_VAR 'other: kotlin.Any? declared in <root>.Some.equals' type=kotlin.Any? origin=null
+        WHEN type=kotlin.Unit origin=null
+          BRANCH
+            if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
+              $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+                  receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.equals' type=<root>.Some<T of <root>.Some> origin=null
+                arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+                  receiver: GET_VAR 'val tmp_0: <root>.Some<T of <root>.Some> [val] declared in <root>.Some.equals' type=<root>.Some<T of <root>.Some> origin=null
+            then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Some'
+              CONST Boolean type=kotlin.Boolean value=false
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Some'
+          CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Some<T of <root>.Some>) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER GENERATED_DATA_CLASS_MEMBER name:<this> type:<root>.Some<T of <root>.Some>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Some'
+          WHEN type=kotlin.Int origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+                  receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.hashCode' type=<root>.Some<T of <root>.Some> origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Int type=kotlin.Int value=0
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+                  receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.hashCode' type=<root>.Some<T of <root>.Some> origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Some<T of <root>.Some>) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER GENERATED_DATA_CLASS_MEMBER name:<this> type:<root>.Some<T of <root>.Some>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Some'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Some("
+            CONST String type=kotlin.String value="value="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+              receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.toString' type=<root>.Some<T of <root>.Some> origin=null
+            CONST String type=kotlin.String value=")"
+  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[kotlin.collections.List<<root>.Some<T of <root>.MyList>>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList<T of <root>.MyList>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.MyList>) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public abstract fun contains (element: E of kotlin.collections.List): kotlin.Boolean [operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.MyList>
+    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>, elements:kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun containsAll (elements: kotlin.collections.Collection<E of kotlin.collections.List>): kotlin.Boolean declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:get visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>, index:kotlin.Int) returnType:<root>.Some<T of <root>.MyList> [fake_override,operator]
+      overridden:
+        public abstract fun get (index: kotlin.Int): E of kotlin.collections.List [operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.MyList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun indexOf (element: E of kotlin.collections.List): kotlin.Int declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.MyList>
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+    FUN FAKE_OVERRIDE name:iterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.collections.Iterator<<root>.Some<T of <root>.MyList>> [fake_override,operator]
+      overridden:
+        public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.MyList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun lastIndexOf (element: E of kotlin.collections.List): kotlin.Int declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.MyList>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override]
+      overridden:
+        public abstract fun listIterator (): kotlin.collections.ListIterator<E of kotlin.collections.List> declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>, index:kotlin.Int) returnType:kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override]
+      overridden:
+        public abstract fun listIterator (index: kotlin.Int): kotlin.collections.ListIterator<E of kotlin.collections.List> declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:subList visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>, fromIndex:kotlin.Int, toIndex:kotlin.Int) returnType:kotlin.collections.List<<root>.Some<T of <root>.MyList>> [fake_override]
+      overridden:
+        public abstract fun subList (fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.collections.List<E of kotlin.collections.List> declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:fromIndex index:0 type:kotlin.Int
+      VALUE_PARAMETER name:toIndex index:1 type:kotlin.Int
+    PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.List
+        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:SomeList modality:OPEN visibility:public superTypes:[<root>.MyList<T of <root>.SomeList>; java.util.ArrayList<<root>.Some<T of <root>.SomeList>>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.SomeList<T of <root>.SomeList>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+    CONSTRUCTOR visibility:public <> () returnType:<root>.SomeList<T of <root>.SomeList> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in java.util.ArrayList'
+          <E>: <root>.Some<T of <root>.SomeList>
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:SomeList modality:OPEN visibility:public superTypes:[<root>.MyList<T of <root>.SomeList>; java.util.ArrayList<<root>.Some<T of <root>.SomeList>>]'
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public abstract fun contains (element: <root>.Some<T of <root>.MyList>): kotlin.Boolean [fake_override,operator] declared in <root>.MyList
+        public open fun contains (p0: E of java.util.ArrayList?): kotlin.Boolean [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, elements:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun containsAll (elements: kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>): kotlin.Boolean [fake_override] declared in <root>.MyList
+        public open fun containsAll (p0: kotlin.collections.Collection<E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, index:kotlin.Int) returnType:<root>.Some<T of <root>.SomeList> [fake_override,operator]
+      overridden:
+        public abstract fun get (index: kotlin.Int): <root>.Some<T of <root>.MyList> [fake_override,operator] declared in <root>.MyList
+        public open fun get (p0: kotlin.Int): E of java.util.ArrayList? [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun indexOf (element: <root>.Some<T of <root>.MyList>): kotlin.Int [fake_override] declared in <root>.MyList
+        public open fun indexOf (p0: E of java.util.ArrayList?): kotlin.Int declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.List
+        public open fun isEmpty (): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+    FUN FAKE_OVERRIDE name:iterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[FlexibleNullability] kotlin.collections.MutableIterator<<root>.Some<T of <root>.SomeList>?> [fake_override,operator]
+      overridden:
+        public abstract fun iterator (): kotlin.collections.Iterator<<root>.Some<T of <root>.MyList>> [fake_override,operator] declared in <root>.MyList
+        public open fun iterator (): @[FlexibleNullability] kotlin.collections.MutableIterator<E of java.util.ArrayList?> [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun lastIndexOf (element: <root>.Some<T of <root>.MyList>): kotlin.Int [fake_override] declared in <root>.MyList
+        public open fun lastIndexOf (p0: E of java.util.ArrayList?): kotlin.Int declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[FlexibleNullability] kotlin.collections.MutableListIterator<<root>.Some<T of <root>.SomeList>?> [fake_override]
+      overridden:
+        public abstract fun listIterator (): kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
+        public open fun listIterator (): @[FlexibleNullability] kotlin.collections.MutableListIterator<E of java.util.ArrayList?> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:@[FlexibleNullability] kotlin.collections.MutableListIterator<<root>.Some<T of <root>.SomeList>?> [fake_override]
+      overridden:
+        public abstract fun listIterator (index: kotlin.Int): kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
+        public open fun listIterator (p0: kotlin.Int): @[FlexibleNullability] kotlin.collections.MutableListIterator<E of java.util.ArrayList?> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:subList visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:kotlin.Int) returnType:@[FlexibleNullability] kotlin.collections.MutableList<<root>.Some<T of <root>.SomeList>?> [fake_override]
+      overridden:
+        public abstract fun subList (fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.collections.List<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
+        public open fun subList (p0: kotlin.Int, p1: kotlin.Int): @[FlexibleNullability] kotlin.collections.MutableList<E of java.util.ArrayList?> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:size visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun size (): kotlin.Int declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.List
+          public abstract fun <get-size> (): kotlin.Int declared in java.util.ArrayList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+        public open fun equals (p0: @[FlexibleNullability] kotlin.Any?): kotlin.Boolean [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        public open fun hashCode (): kotlin.Int declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+        public open fun toString (): @[FlexibleNullability] kotlin.String declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:elementData visibility:public/*package*/ modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:<root>.Some<T of <root>.SomeList>? [fake_override]
+      overridden:
+        public/*package*/ open fun elementData (p0: kotlin.Int): E of java.util.ArrayList? declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:trimToSize visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun trimToSize (): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:ensureCapacity visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun ensureCapacity (p0: kotlin.Int): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:clone visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[FlexibleNullability] kotlin.Any [fake_override]
+      overridden:
+        public open fun clone (): @[FlexibleNullability] kotlin.Any declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:toArray visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Array<out kotlin.Any?>? [fake_override]
+      overridden:
+        public open fun toArray (): kotlin.Array<out kotlin.Any?>? declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:toArray visibility:public modality:OPEN <T> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Array<out T of <root>.SomeList.toArray?>?) returnType:kotlin.Array<out T of <root>.SomeList.toArray?>? [fake_override]
+      overridden:
+        public open fun toArray <T> (p0: kotlin.Array<out T of java.util.ArrayList.toArray?>?): kotlin.Array<out T of java.util.ArrayList.toArray?>? declared in java.util.ArrayList
+      TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Array<out T of <root>.SomeList.toArray?>?
+    FUN FAKE_OVERRIDE name:set visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:<root>.Some<T of <root>.SomeList>?) returnType:<root>.Some<T of <root>.SomeList>? [fake_override,operator]
+      overridden:
+        public open fun set (p0: kotlin.Int, p1: E of java.util.ArrayList?): E of java.util.ArrayList? [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:<root>.Some<T of <root>.SomeList>?
+    FUN FAKE_OVERRIDE name:add visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:<root>.Some<T of <root>.SomeList>?) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun add (p0: E of java.util.ArrayList?): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:<root>.Some<T of <root>.SomeList>?
+    FUN FAKE_OVERRIDE name:add visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:<root>.Some<T of <root>.SomeList>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun add (p0: kotlin.Int, p1: E of java.util.ArrayList?): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:<root>.Some<T of <root>.SomeList>?
+    FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:<root>.Some<T of <root>.SomeList>? [fake_override]
+      overridden:
+        public open fun remove (p0: kotlin.Int): E of java.util.ArrayList? declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:<root>.Some<T of <root>.SomeList>?) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun remove (p0: E of java.util.ArrayList?): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:<root>.Some<T of <root>.SomeList>?
+    FUN FAKE_OVERRIDE name:clear visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun clear (): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] kotlin.collections.Collection<out <root>.Some<T of <root>.SomeList>?>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun addAll (p0: @[FlexibleNullability] kotlin.collections.Collection<out E of java.util.ArrayList?>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] kotlin.collections.Collection<out <root>.Some<T of <root>.SomeList>?>
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:@[FlexibleNullability] kotlin.collections.Collection<out <root>.Some<T of <root>.SomeList>?>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun addAll (p0: kotlin.Int, p1: @[FlexibleNullability] kotlin.collections.Collection<out E of java.util.ArrayList?>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:@[FlexibleNullability] kotlin.collections.Collection<out <root>.Some<T of <root>.SomeList>?>
+    FUN FAKE_OVERRIDE name:removeRange visibility:protected/*protected and package*/ modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:kotlin.Int) returnType:kotlin.Unit [fake_override]
+      overridden:
+        protected/*protected and package*/ open fun removeRange (p0: kotlin.Int, p1: kotlin.Int): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:removeAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun removeAll (p0: kotlin.collections.Collection<E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:retainAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun retainAll (p0: kotlin.collections.Collection<E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:java.lang.Iterable<T of java.lang.Iterable>, p0:java.util.function.Consumer<in <root>.Some<T of <root>.SomeList>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun forEach (p0: java.util.function.Consumer<in <root>.Some<T of <root>.MyList>?>?): kotlin.Unit declared in <root>.MyList
+        public open fun forEach (p0: java.util.function.Consumer<in E of java.util.ArrayList?>?): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.lang.Iterable<T of java.lang.Iterable>
+      VALUE_PARAMETER name:p0 index:0 type:java.util.function.Consumer<in <root>.Some<T of <root>.SomeList>?>?
+    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:java.util.Collection<E of java.util.Collection>) returnType:@[FlexibleNullability] java.util.Spliterator<<root>.Some<T of <root>.SomeList>?> [fake_override]
+      overridden:
+        public open fun spliterator (): @[FlexibleNullability] java.util.Spliterator<<root>.Some<T of <root>.MyList>?> declared in <root>.MyList
+        public open fun spliterator (): @[FlexibleNullability] java.util.Spliterator<E of java.util.ArrayList?> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.Collection<E of java.util.Collection>
+    FUN FAKE_OVERRIDE name:removeIf visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:java.util.function.Predicate<in <root>.Some<T of <root>.SomeList>?>?) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun removeIf (p0: java.util.function.Predicate<in E of java.util.ArrayList?>?): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:java.util.function.Predicate<in <root>.Some<T of <root>.SomeList>?>?
+    FUN FAKE_OVERRIDE name:replaceAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] java.util.function.UnaryOperator<<root>.Some<T of <root>.SomeList>?>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun replaceAll (p0: @[FlexibleNullability] java.util.function.UnaryOperator<E of java.util.ArrayList?>): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.UnaryOperator<<root>.Some<T of <root>.SomeList>?>
+    FUN FAKE_OVERRIDE name:sort visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:java.util.Comparator<in <root>.Some<T of <root>.SomeList>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun sort (p0: java.util.Comparator<in E of java.util.ArrayList?>?): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:java.util.Comparator<in <root>.Some<T of <root>.SomeList>?>?
+    FUN FAKE_OVERRIDE name:removeAt visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList<E of kotlin.collections.MutableList>, index:kotlin.Int) returnType:<root>.Some<T of <root>.SomeList>? [fake_override]
+      overridden:
+        public abstract fun removeAt (index: kotlin.Int): E of kotlin.collections.MutableList declared in kotlin.collections.MutableList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList<E of kotlin.collections.MutableList>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+  CLASS CLASS name:FinalList modality:FINAL visibility:public superTypes:[<root>.SomeList<kotlin.String>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FinalList
+    CONSTRUCTOR visibility:public <> () returnType:<root>.FinalList [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.SomeList'
+          <T>: kotlin.String
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FinalList modality:FINAL visibility:public superTypes:[<root>.SomeList<kotlin.String>]'
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<kotlin.String>) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public abstract fun contains (element: E of kotlin.collections.List): kotlin.Boolean [operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, elements:kotlin.collections.Collection<<root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun containsAll (elements: kotlin.collections.Collection<E of kotlin.collections.List>): kotlin.Boolean declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, index:kotlin.Int) returnType:<root>.Some<kotlin.String> [fake_override,operator]
+      overridden:
+        public abstract fun get (index: kotlin.Int): E of kotlin.collections.List [operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<kotlin.String>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun indexOf (element: E of kotlin.collections.List): kotlin.Int declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.List
+        public open fun isEmpty (): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+    FUN FAKE_OVERRIDE name:iterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[FlexibleNullability] kotlin.collections.MutableIterator<<root>.Some<kotlin.String>?> [fake_override,operator]
+      overridden:
+        public open fun iterator (): @[FlexibleNullability] kotlin.collections.MutableIterator<E of java.util.ArrayList?> [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<kotlin.String>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun lastIndexOf (element: E of kotlin.collections.List): kotlin.Int declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[FlexibleNullability] kotlin.collections.MutableListIterator<<root>.Some<kotlin.String>?> [fake_override]
+      overridden:
+        public open fun listIterator (): @[FlexibleNullability] kotlin.collections.MutableListIterator<E of java.util.ArrayList?> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:@[FlexibleNullability] kotlin.collections.MutableListIterator<<root>.Some<kotlin.String>?> [fake_override]
+      overridden:
+        public open fun listIterator (p0: kotlin.Int): @[FlexibleNullability] kotlin.collections.MutableListIterator<E of java.util.ArrayList?> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:subList visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:kotlin.Int) returnType:@[FlexibleNullability] kotlin.collections.MutableList<<root>.Some<kotlin.String>?> [fake_override]
+      overridden:
+        public open fun subList (p0: kotlin.Int, p1: kotlin.Int): @[FlexibleNullability] kotlin.collections.MutableList<E of java.util.ArrayList?> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:size visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun size (): kotlin.Int declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.List
+          public abstract fun <get-size> (): kotlin.Int declared in java.util.ArrayList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+        public open fun equals (p0: @[FlexibleNullability] kotlin.Any?): kotlin.Boolean [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        public open fun hashCode (): kotlin.Int declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+        public open fun toString (): @[FlexibleNullability] kotlin.String declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:elementData visibility:public/*package*/ modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:<root>.Some<kotlin.String>? [fake_override]
+      overridden:
+        public/*package*/ open fun elementData (p0: kotlin.Int): E of java.util.ArrayList? declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:trimToSize visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun trimToSize (): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:ensureCapacity visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun ensureCapacity (p0: kotlin.Int): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:clone visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[FlexibleNullability] kotlin.Any [fake_override]
+      overridden:
+        public open fun clone (): @[FlexibleNullability] kotlin.Any declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:toArray visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Array<out kotlin.Any?>? [fake_override]
+      overridden:
+        public open fun toArray (): kotlin.Array<out kotlin.Any?>? declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:toArray visibility:public modality:OPEN <T> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Array<out T of <root>.FinalList.toArray?>?) returnType:kotlin.Array<out T of <root>.FinalList.toArray?>? [fake_override]
+      overridden:
+        public open fun toArray <T> (p0: kotlin.Array<out T of java.util.ArrayList.toArray?>?): kotlin.Array<out T of java.util.ArrayList.toArray?>? declared in java.util.ArrayList
+      TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Array<out T of <root>.FinalList.toArray?>?
+    FUN FAKE_OVERRIDE name:set visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:<root>.Some<kotlin.String>?) returnType:<root>.Some<kotlin.String>? [fake_override,operator]
+      overridden:
+        public open fun set (p0: kotlin.Int, p1: E of java.util.ArrayList?): E of java.util.ArrayList? [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:<root>.Some<kotlin.String>?
+    FUN FAKE_OVERRIDE name:add visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:<root>.Some<kotlin.String>?) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun add (p0: E of java.util.ArrayList?): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:<root>.Some<kotlin.String>?
+    FUN FAKE_OVERRIDE name:add visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:<root>.Some<kotlin.String>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun add (p0: kotlin.Int, p1: E of java.util.ArrayList?): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:<root>.Some<kotlin.String>?
+    FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:<root>.Some<kotlin.String>? [fake_override]
+      overridden:
+        public open fun remove (p0: kotlin.Int): E of java.util.ArrayList? declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:<root>.Some<kotlin.String>?) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun remove (p0: E of java.util.ArrayList?): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:<root>.Some<kotlin.String>?
+    FUN FAKE_OVERRIDE name:clear visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun clear (): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] kotlin.collections.Collection<out <root>.Some<kotlin.String>?>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun addAll (p0: @[FlexibleNullability] kotlin.collections.Collection<out E of java.util.ArrayList?>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] kotlin.collections.Collection<out <root>.Some<kotlin.String>?>
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:@[FlexibleNullability] kotlin.collections.Collection<out <root>.Some<kotlin.String>?>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun addAll (p0: kotlin.Int, p1: @[FlexibleNullability] kotlin.collections.Collection<out E of java.util.ArrayList?>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:@[FlexibleNullability] kotlin.collections.Collection<out <root>.Some<kotlin.String>?>
+    FUN FAKE_OVERRIDE name:removeRange visibility:protected/*protected and package*/ modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:kotlin.Int) returnType:kotlin.Unit [fake_override]
+      overridden:
+        protected/*protected and package*/ open fun removeRange (p0: kotlin.Int, p1: kotlin.Int): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:removeAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.collections.Collection<<root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun removeAll (p0: kotlin.collections.Collection<E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.collections.Collection<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:retainAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.collections.Collection<<root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun retainAll (p0: kotlin.collections.Collection<E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.collections.Collection<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:java.lang.Iterable<T of java.lang.Iterable>, p0:java.util.function.Consumer<in <root>.Some<kotlin.String>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun forEach (p0: java.util.function.Consumer<in T of java.lang.Iterable?>?): kotlin.Unit declared in java.lang.Iterable
+      $this: VALUE_PARAMETER name:<this> type:java.lang.Iterable<T of java.lang.Iterable>
+      VALUE_PARAMETER name:p0 index:0 type:java.util.function.Consumer<in <root>.Some<kotlin.String>?>?
+    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:java.util.Collection<E of java.util.Collection>) returnType:@[FlexibleNullability] java.util.Spliterator<<root>.Some<kotlin.String>?> [fake_override]
+      overridden:
+        public open fun spliterator (): @[FlexibleNullability] java.util.Spliterator<E of java.util.Collection?> declared in java.util.Collection
+      $this: VALUE_PARAMETER name:<this> type:java.util.Collection<E of java.util.Collection>
+    FUN FAKE_OVERRIDE name:removeIf visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:java.util.function.Predicate<in <root>.Some<kotlin.String>?>?) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun removeIf (p0: java.util.function.Predicate<in E of java.util.ArrayList?>?): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:java.util.function.Predicate<in <root>.Some<kotlin.String>?>?
+    FUN FAKE_OVERRIDE name:replaceAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] java.util.function.UnaryOperator<<root>.Some<kotlin.String>?>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun replaceAll (p0: @[FlexibleNullability] java.util.function.UnaryOperator<E of java.util.ArrayList?>): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.UnaryOperator<<root>.Some<kotlin.String>?>
+    FUN FAKE_OVERRIDE name:sort visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:java.util.Comparator<in <root>.Some<kotlin.String>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun sort (p0: java.util.Comparator<in E of java.util.ArrayList?>?): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
+      VALUE_PARAMETER name:p0 index:0 type:java.util.Comparator<in <root>.Some<kotlin.String>?>?
+    FUN FAKE_OVERRIDE name:removeAt visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList<E of kotlin.collections.MutableList>, index:kotlin.Int) returnType:<root>.Some<kotlin.String>? [fake_override]
+      overridden:
+        public abstract fun removeAt (index: kotlin.Int): E of kotlin.collections.MutableList declared in kotlin.collections.MutableList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList<E of kotlin.collections.MutableList>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
diff --git a/compiler/testData/ir/irText/firProblems/MultiList.kt b/compiler/testData/ir/irText/firProblems/MultiList.kt
new file mode 100644
index 00000000000..fb3a141f113
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/MultiList.kt
@@ -0,0 +1,11 @@
+// FULL_JDK
+
+import java.util.ArrayList
+
+data class Some<T>(val value: T)
+
+interface MyList<T> : List<Some<T>>
+
+open class SomeList<T> : MyList<T>, ArrayList<Some<T>>()
+
+class FinalList : SomeList<String>()
diff --git a/compiler/testData/ir/irText/firProblems/MultiList.txt b/compiler/testData/ir/irText/firProblems/MultiList.txt
new file mode 100644
index 00000000000..c5eec0e61d2
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/MultiList.txt
@@ -0,0 +1,583 @@
+FILE fqName:<root> fileName:/MultiList.kt
+  CLASS CLASS name:Some modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Some<T of <root>.Some>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+    CONSTRUCTOR visibility:public <> (value:T of <root>.Some) returnType:<root>.Some<T of <root>.Some> [primary]
+      VALUE_PARAMETER name:value index:0 type:T of <root>.Some
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Some modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+    PROPERTY name:value visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'value: T of <root>.Some declared in <root>.Some.<init>' type=T of <root>.Some origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.Some<T of <root>.Some>) returnType:T of <root>.Some
+        correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-value> (): T of <root>.Some declared in <root>.Some'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+              receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.<get-value>' type=<root>.Some<T of <root>.Some> origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Some<T of <root>.Some>) returnType:T of <root>.Some [operator]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): T of <root>.Some [operator] declared in <root>.Some'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+            receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.component1' type=<root>.Some<T of <root>.Some> origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:<root>.Some<T of <root>.Some>, value:T of <root>.Some) returnType:<root>.Some<T of <root>.Some>
+      $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+      VALUE_PARAMETER name:value index:0 type:T of <root>.Some
+        EXPRESSION_BODY
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+            receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.copy' type=<root>.Some<T of <root>.Some> origin=null
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun copy (value: T of <root>.Some): <root>.Some<T of <root>.Some> declared in <root>.Some'
+          CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Some) [primary] declared in <root>.Some' type=<root>.Some<T of <root>.Some> origin=null
+            <class: T>: T of <root>.Some
+            value: GET_VAR 'value: T of <root>.Some declared in <root>.Some.copy' type=T of <root>.Some origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Some<T of <root>.Some>) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Some'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Some("
+            CONST String type=kotlin.String value="value="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+              receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.toString' type=<root>.Some<T of <root>.Some> origin=null
+            CONST String type=kotlin.String value=")"
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Some<T of <root>.Some>) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Some'
+          WHEN type=kotlin.Int origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+                  receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.hashCode' type=<root>.Some<T of <root>.Some> origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Int type=kotlin.Int value=0
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+                  receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.hashCode' type=<root>.Some<T of <root>.Some> origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Some<T of <root>.Some>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Some<T of <root>.Some>
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      BLOCK_BODY
+        WHEN type=kotlin.Unit origin=null
+          BRANCH
+            if: CALL 'public final fun EQEQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQEQ
+              arg0: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.equals' type=<root>.Some<T of <root>.Some> origin=null
+              arg1: GET_VAR 'other: kotlin.Any? declared in <root>.Some.equals' type=kotlin.Any? origin=null
+            then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Some'
+              CONST Boolean type=kotlin.Boolean value=true
+        WHEN type=kotlin.Unit origin=null
+          BRANCH
+            if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=<root>.Some<T of <root>.Some>
+              GET_VAR 'other: kotlin.Any? declared in <root>.Some.equals' type=kotlin.Any? origin=null
+            then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Some'
+              CONST Boolean type=kotlin.Boolean value=false
+        VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:<root>.Some<T of <root>.Some> [val]
+          TYPE_OP type=<root>.Some<T of <root>.Some> origin=CAST typeOperand=<root>.Some<T of <root>.Some>
+            GET_VAR 'other: kotlin.Any? declared in <root>.Some.equals' type=kotlin.Any? origin=null
+        WHEN type=kotlin.Unit origin=null
+          BRANCH
+            if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
+              $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+                  receiver: GET_VAR '<this>: <root>.Some<T of <root>.Some> declared in <root>.Some.equals' type=<root>.Some<T of <root>.Some> origin=null
+                arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Some visibility:private [final]' type=T of <root>.Some origin=null
+                  receiver: GET_VAR 'val tmp_0: <root>.Some<T of <root>.Some> [val] declared in <root>.Some.equals' type=<root>.Some<T of <root>.Some> origin=null
+            then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Some'
+              CONST Boolean type=kotlin.Boolean value=false
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Some'
+          CONST Boolean type=kotlin.Boolean value=true
+  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[kotlin.collections.List<<root>.Some<T of <root>.MyList>>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList<T of <root>.MyList>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>, element:<root>.Some<T of <root>.MyList>) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public abstract fun contains (element: E of kotlin.collections.List): kotlin.Boolean [operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.MyList>
+    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>, elements:kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun containsAll (elements: kotlin.collections.Collection<E of kotlin.collections.List>): kotlin.Boolean declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:get visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>, index:kotlin.Int) returnType:<root>.Some<T of <root>.MyList> [fake_override,operator]
+      overridden:
+        public abstract fun get (index: kotlin.Int): E of kotlin.collections.List [operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>, element:<root>.Some<T of <root>.MyList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun indexOf (element: E of kotlin.collections.List): kotlin.Int declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.MyList>
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:iterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>) returnType:kotlin.collections.Iterator<<root>.Some<T of <root>.MyList>> [fake_override,operator]
+      overridden:
+        public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>, element:<root>.Some<T of <root>.MyList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun lastIndexOf (element: E of kotlin.collections.List): kotlin.Int declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.MyList>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>) returnType:kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override]
+      overridden:
+        public abstract fun listIterator (): kotlin.collections.ListIterator<E of kotlin.collections.List> declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>, index:kotlin.Int) returnType:kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override]
+      overridden:
+        public abstract fun listIterator (index: kotlin.Int): kotlin.collections.ListIterator<E of kotlin.collections.List> declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:subList visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>, fromIndex:kotlin.Int, toIndex:kotlin.Int) returnType:kotlin.collections.List<<root>.Some<T of <root>.MyList>> [fake_override]
+      overridden:
+        public abstract fun subList (fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.collections.List<E of kotlin.collections.List> declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+      VALUE_PARAMETER name:fromIndex index:0 type:kotlin.Int
+      VALUE_PARAMETER name:toIndex index:1 type:kotlin.Int
+    PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.List
+        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<<root>.Some<T of <root>.MyList>>, p0:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.MyList>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] E of kotlin.collections.List?>?): kotlin.Unit [fake_override] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Iterable<<root>.Some<T of <root>.MyList>>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.MyList>?>?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<T of <root>.MyList>> [fake_override]
+      overridden:
+        public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] E of kotlin.collections.List> [fake_override] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.MyList>>) returnType:@[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<T of <root>.MyList>?> [fake_override]
+      overridden:
+        public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] E of kotlin.collections.List?> declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<T of <root>.MyList>> [fake_override]
+      overridden:
+        public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] E of kotlin.collections.List> [fake_override] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in kotlin.collections.List
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:SomeList modality:OPEN visibility:public superTypes:[<root>.MyList<T of <root>.SomeList>; java.util.ArrayList<<root>.Some<T of <root>.SomeList>>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.SomeList<T of <root>.SomeList>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+    CONSTRUCTOR visibility:public <> () returnType:<root>.SomeList<T of <root>.SomeList> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in java.util.ArrayList'
+          <E>: @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:SomeList modality:OPEN visibility:public superTypes:[<root>.MyList<T of <root>.SomeList>; java.util.ArrayList<<root>.Some<T of <root>.SomeList>>]'
+    PROPERTY FAKE_OVERRIDE name:modCount visibility:protected/*protected and package*/ modality:FINAL [fake_override,var]
+    FUN FAKE_OVERRIDE name:removeRange visibility:protected/*protected and package*/ modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, p0:kotlin.Int, p1:kotlin.Int) returnType:kotlin.Unit [fake_override]
+      overridden:
+        protected/*protected and package*/ open fun removeRange (p0: kotlin.Int, p1: kotlin.Int): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:sort visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, p0:@[FlexibleNullability] java.util.Comparator<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun sort (p0: @[FlexibleNullability] java.util.Comparator<in @[FlexibleNullability] E of java.util.ArrayList?>?): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.Comparator<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?
+    FUN FAKE_OVERRIDE name:toArray visibility:public modality:OPEN <T> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, p0:@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of <root>.SomeList.toArray?>?) returnType:@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of <root>.SomeList.toArray?>? [fake_override]
+      overridden:
+        public open fun toArray <T> (p0: @[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of java.util.ArrayList.toArray?>?): @[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of java.util.ArrayList.toArray?>? declared in java.util.ArrayList
+      TYPE_PARAMETER name:T index:0 variance: superTypes:[@[FlexibleNullability] kotlin.Any?]
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of <root>.SomeList.toArray?>?
+    FUN FAKE_OVERRIDE name:add visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, element:@[EnhancedNullability] <root>.Some<T of <root>.SomeList>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun add (element: @[EnhancedNullability] E of java.util.ArrayList): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:element index:0 type:@[EnhancedNullability] <root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:add visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, index:kotlin.Int, element:@[EnhancedNullability] <root>.Some<T of <root>.SomeList>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun add (index: kotlin.Int, element: @[EnhancedNullability] E of java.util.ArrayList): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+      VALUE_PARAMETER name:element index:1 type:@[EnhancedNullability] <root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, elements:@[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun addAll (elements: @[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:elements index:0 type:@[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, index:kotlin.Int, elements:@[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun addAll (index: kotlin.Int, elements: @[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+      VALUE_PARAMETER name:elements index:1 type:@[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:clear visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun clear (): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:clone visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>) returnType:@[EnhancedNullability] kotlin.Any [fake_override]
+      overridden:
+        public open fun clone (): @[EnhancedNullability] kotlin.Any declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:ensureCapacity visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, p0:kotlin.Int) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun ensureCapacity (p0: kotlin.Int): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, element:@[EnhancedNullability] <root>.Some<T of <root>.SomeList>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun remove (element: @[EnhancedNullability] E of java.util.ArrayList): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:element index:0 type:@[EnhancedNullability] <root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:removeAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, elements:kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun removeAll (elements: kotlin.collections.Collection<@[EnhancedNullability] E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:removeAt visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, p0:kotlin.Int) returnType:@[EnhancedNullability] <root>.Some<T of <root>.SomeList> [fake_override]
+      overridden:
+        public open fun removeAt (p0: kotlin.Int): @[EnhancedNullability] E of java.util.ArrayList declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:removeIf visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, p0:@[EnhancedNullability] java.util.function.Predicate<in @[EnhancedNullability] <root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun removeIf (p0: @[EnhancedNullability] java.util.function.Predicate<in @[EnhancedNullability] E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] java.util.function.Predicate<in @[EnhancedNullability] <root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:replaceAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, p0:@[EnhancedNullability] java.util.function.UnaryOperator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun replaceAll (p0: @[EnhancedNullability] java.util.function.UnaryOperator<@[EnhancedNullability] E of java.util.ArrayList>): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] java.util.function.UnaryOperator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:retainAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, elements:kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun retainAll (elements: kotlin.collections.Collection<@[EnhancedNullability] E of java.util.ArrayList>): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:set visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, index:kotlin.Int, element:@[EnhancedNullability] <root>.Some<T of <root>.SomeList>) returnType:@[EnhancedNullability] <root>.Some<T of <root>.SomeList> [fake_override,operator]
+      overridden:
+        public open fun set (index: kotlin.Int, element: @[EnhancedNullability] E of java.util.ArrayList): @[EnhancedNullability] E of java.util.ArrayList [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+      VALUE_PARAMETER name:element index:1 type:@[EnhancedNullability] <root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:toArray visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>) returnType:@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] kotlin.Any?>? [fake_override]
+      overridden:
+        public open fun toArray (): @[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] kotlin.Any?>? declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:trimToSize visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun trimToSize (): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public abstract fun contains (element: <root>.Some<T of <root>.MyList>): kotlin.Boolean [fake_override,operator] declared in <root>.MyList
+        public open fun contains (element: @[EnhancedNullability] E of java.util.ArrayList): kotlin.Boolean [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>, elements:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun containsAll (elements: kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>): kotlin.Boolean [fake_override] declared in <root>.MyList
+        public open fun containsAll (elements: kotlin.collections.Collection<@[EnhancedNullability] E of java.util.ArrayList>): kotlin.Boolean [fake_override] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.MyList
+        public open fun equals (other: @[EnhancedNullability] kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<<root>.Some<T of <root>.SomeList>>, p0:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.MyList>?>?): kotlin.Unit [fake_override] declared in <root>.MyList
+        public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] E of java.util.ArrayList?>?): kotlin.Unit declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Iterable<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?
+    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>, index:kotlin.Int) returnType:<root>.Some<T of <root>.SomeList> [fake_override,operator]
+      overridden:
+        public abstract fun get (index: kotlin.Int): <root>.Some<T of <root>.MyList> [fake_override,operator] declared in <root>.MyList
+        public open fun get (index: kotlin.Int): @[EnhancedNullability] E of java.util.ArrayList [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.MyList
+        public open fun hashCode (): kotlin.Int [fake_override] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun indexOf (element: <root>.Some<T of <root>.MyList>): kotlin.Int [fake_override] declared in <root>.MyList
+        public open fun indexOf (element: @[EnhancedNullability] E of java.util.ArrayList): kotlin.Int declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in <root>.MyList
+        public open fun isEmpty (): kotlin.Boolean declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:iterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>) returnType:@[EnhancedNullability] kotlin.collections.MutableIterator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override,operator]
+      overridden:
+        public abstract fun iterator (): kotlin.collections.Iterator<<root>.Some<T of <root>.MyList>> [fake_override,operator] declared in <root>.MyList
+        public open fun iterator (): @[EnhancedNullability] kotlin.collections.MutableIterator<@[EnhancedNullability] E of java.util.ArrayList> [operator] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public abstract fun lastIndexOf (element: <root>.Some<T of <root>.MyList>): kotlin.Int [fake_override] declared in <root>.MyList
+        public open fun lastIndexOf (element: @[EnhancedNullability] E of java.util.ArrayList): kotlin.Int declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>) returnType:@[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override]
+      overridden:
+        public abstract fun listIterator (): kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
+        public open fun listIterator (): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] E of java.util.ArrayList> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, index:kotlin.Int) returnType:@[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override]
+      overridden:
+        public abstract fun listIterator (index: kotlin.Int): kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
+        public open fun listIterator (index: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] E of java.util.ArrayList> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override]
+      overridden:
+        public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
+        public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] E of java.util.ArrayList> [fake_override] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>) returnType:@[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override]
+      overridden:
+        public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<T of <root>.MyList>?> [fake_override] declared in <root>.MyList
+        public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override]
+      overridden:
+        public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
+        public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] E of java.util.ArrayList> [fake_override] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>
+    FUN FAKE_OVERRIDE name:subList visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>, fromIndex:kotlin.Int, toIndex:kotlin.Int) returnType:@[EnhancedNullability] kotlin.collections.MutableList<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override]
+      overridden:
+        public abstract fun subList (fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.collections.List<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
+        public open fun subList (fromIndex: kotlin.Int, toIndex: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableList<@[EnhancedNullability] E of java.util.ArrayList> declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<T of <root>.SomeList>>
+      VALUE_PARAMETER name:fromIndex index:0 type:kotlin.Int
+      VALUE_PARAMETER name:toIndex index:1 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.MyList
+        public open fun toString (): @[EnhancedNullability] kotlin.String [fake_override] declared in java.util.ArrayList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
+        overridden:
+          public abstract fun <get-size> (): kotlin.Int [fake_override] declared in <root>.MyList
+          public open fun <get-size> (): kotlin.Int declared in java.util.ArrayList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<T of <root>.SomeList>>
+  CLASS CLASS name:FinalList modality:FINAL visibility:public superTypes:[<root>.SomeList<kotlin.String>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FinalList
+    CONSTRUCTOR visibility:public <> () returnType:<root>.FinalList [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.SomeList'
+          <T>: kotlin.String
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FinalList modality:FINAL visibility:public superTypes:[<root>.SomeList<kotlin.String>]'
+    PROPERTY FAKE_OVERRIDE name:modCount visibility:protected/*protected and package*/ modality:FINAL [fake_override,var]
+    FUN FAKE_OVERRIDE name:removeRange visibility:protected/*protected and package*/ modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, p0:kotlin.Int, p1:kotlin.Int) returnType:kotlin.Unit [fake_override]
+      overridden:
+        protected/*protected and package*/ open fun removeRange (p0: kotlin.Int, p1: kotlin.Int): kotlin.Unit [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p1 index:1 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:sort visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, p0:@[FlexibleNullability] java.util.Comparator<in @[FlexibleNullability] <root>.Some<kotlin.String>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun sort (p0: @[FlexibleNullability] java.util.Comparator<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?): kotlin.Unit [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.Comparator<in @[FlexibleNullability] <root>.Some<kotlin.String>?>?
+    FUN FAKE_OVERRIDE name:toArray visibility:public modality:OPEN <T> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, p0:@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of <root>.FinalList.toArray?>?) returnType:@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of <root>.FinalList.toArray?>? [fake_override]
+      overridden:
+        public open fun toArray <T> (p0: @[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of <root>.SomeList.toArray?>?): @[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of <root>.SomeList.toArray?>? [fake_override] declared in <root>.SomeList
+      TYPE_PARAMETER name:T index:0 variance: superTypes:[@[FlexibleNullability] kotlin.Any?]
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] T of <root>.FinalList.toArray?>?
+    FUN FAKE_OVERRIDE name:add visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, element:@[EnhancedNullability] <root>.Some<kotlin.String>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun add (element: @[EnhancedNullability] <root>.Some<T of <root>.SomeList>): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:element index:0 type:@[EnhancedNullability] <root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:add visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, index:kotlin.Int, element:@[EnhancedNullability] <root>.Some<kotlin.String>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun add (index: kotlin.Int, element: @[EnhancedNullability] <root>.Some<T of <root>.SomeList>): kotlin.Unit [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+      VALUE_PARAMETER name:element index:1 type:@[EnhancedNullability] <root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, elements:@[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun addAll (elements: @[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:elements index:0 type:@[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, index:kotlin.Int, elements:@[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun addAll (index: kotlin.Int, elements: @[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+      VALUE_PARAMETER name:elements index:1 type:@[EnhancedNullability] kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:clear visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun clear (): kotlin.Unit [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:clone visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>) returnType:@[EnhancedNullability] kotlin.Any [fake_override]
+      overridden:
+        public open fun clone (): @[EnhancedNullability] kotlin.Any [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<kotlin.String>>, element:<root>.Some<kotlin.String>) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun contains (element: <root>.Some<T of <root>.SomeList>): kotlin.Boolean [fake_override,operator] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<kotlin.String>>, elements:kotlin.collections.Collection<<root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun containsAll (elements: kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:ensureCapacity visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, p0:kotlin.Int) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun ensureCapacity (p0: kotlin.Int): kotlin.Unit [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<<root>.Some<kotlin.String>>, p0:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<kotlin.String>?>?) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?): kotlin.Unit [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Iterable<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<kotlin.String>?>?
+    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<kotlin.String>>, index:kotlin.Int) returnType:<root>.Some<kotlin.String> [fake_override,operator]
+      overridden:
+        public open fun get (index: kotlin.Int): <root>.Some<T of <root>.SomeList> [fake_override,operator] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<kotlin.String>>, element:<root>.Some<kotlin.String>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun indexOf (element: <root>.Some<T of <root>.SomeList>): kotlin.Int [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun isEmpty (): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:iterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>) returnType:@[EnhancedNullability] kotlin.collections.MutableIterator<@[EnhancedNullability] <root>.Some<kotlin.String>> [fake_override,operator]
+      overridden:
+        public open fun iterator (): @[EnhancedNullability] kotlin.collections.MutableIterator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override,operator] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<kotlin.String>>, element:<root>.Some<kotlin.String>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun lastIndexOf (element: <root>.Some<T of <root>.SomeList>): kotlin.Int [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>) returnType:@[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] <root>.Some<kotlin.String>> [fake_override]
+      overridden:
+        public open fun listIterator (): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, index:kotlin.Int) returnType:@[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] <root>.Some<kotlin.String>> [fake_override]
+      overridden:
+        public open fun listIterator (index: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<<root>.Some<kotlin.String>>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<kotlin.String>> [fake_override]
+      overridden:
+        public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, element:@[EnhancedNullability] <root>.Some<kotlin.String>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun remove (element: @[EnhancedNullability] <root>.Some<T of <root>.SomeList>): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:element index:0 type:@[EnhancedNullability] <root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:removeAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, elements:kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun removeAll (elements: kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:removeAt visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, p0:kotlin.Int) returnType:@[EnhancedNullability] <root>.Some<kotlin.String> [fake_override]
+      overridden:
+        public open fun removeAt (p0: kotlin.Int): @[EnhancedNullability] <root>.Some<T of <root>.SomeList> [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:removeIf visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, p0:@[EnhancedNullability] java.util.function.Predicate<in @[EnhancedNullability] <root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun removeIf (p0: @[EnhancedNullability] java.util.function.Predicate<in @[EnhancedNullability] <root>.Some<T of <root>.SomeList>>): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] java.util.function.Predicate<in @[EnhancedNullability] <root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:replaceAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, p0:@[EnhancedNullability] java.util.function.UnaryOperator<@[EnhancedNullability] <root>.Some<kotlin.String>>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun replaceAll (p0: @[EnhancedNullability] java.util.function.UnaryOperator<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>): kotlin.Unit [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] java.util.function.UnaryOperator<@[EnhancedNullability] <root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:retainAll visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, elements:kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
+      overridden:
+        public open fun retainAll (elements: kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>>): kotlin.Boolean [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[EnhancedNullability] <root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:set visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, index:kotlin.Int, element:@[EnhancedNullability] <root>.Some<kotlin.String>) returnType:@[EnhancedNullability] <root>.Some<kotlin.String> [fake_override,operator]
+      overridden:
+        public open fun set (index: kotlin.Int, element: @[EnhancedNullability] <root>.Some<T of <root>.SomeList>): @[EnhancedNullability] <root>.Some<T of <root>.SomeList> [fake_override,operator] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+      VALUE_PARAMETER name:element index:1 type:@[EnhancedNullability] <root>.Some<kotlin.String>
+    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<kotlin.String>>) returnType:@[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<kotlin.String>?> [fake_override]
+      overridden:
+        public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<<root>.Some<kotlin.String>>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<kotlin.String>> [fake_override]
+      overridden:
+        public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:subList visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>, fromIndex:kotlin.Int, toIndex:kotlin.Int) returnType:@[EnhancedNullability] kotlin.collections.MutableList<@[EnhancedNullability] <root>.Some<kotlin.String>> [fake_override]
+      overridden:
+        public open fun subList (fromIndex: kotlin.Int, toIndex: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableList<@[EnhancedNullability] <root>.Some<T of <root>.SomeList>> [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+      VALUE_PARAMETER name:fromIndex index:0 type:kotlin.Int
+      VALUE_PARAMETER name:toIndex index:1 type:kotlin.Int
+    FUN FAKE_OVERRIDE name:toArray visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>) returnType:@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] kotlin.Any?>? [fake_override]
+      overridden:
+        public open fun toArray (): @[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] kotlin.Any?>? [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:trimToSize visibility:public modality:OPEN <> ($this:java.util.ArrayList<<root>.Some<kotlin.String>>) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public open fun trimToSize (): kotlin.Unit [fake_override] declared in <root>.SomeList
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<<root>.Some<kotlin.String>>
+    PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:kotlin.collections.List<<root>.Some<kotlin.String>>) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
+        overridden:
+          public open fun <get-size> (): kotlin.Int [fake_override] declared in <root>.SomeList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<<root>.Some<kotlin.String>>
diff --git a/compiler/testData/ir/irText/firProblems/VarInInit.kt b/compiler/testData/ir/irText/firProblems/VarInInit.kt
new file mode 100644
index 00000000000..95736ea6392
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/VarInInit.kt
@@ -0,0 +1,8 @@
+// FIR_IDENTICAL
+class Some(var foo: Int) {
+    init {
+        if (foo < 0) {
+            foo = 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/firProblems/VarInInit.txt b/compiler/testData/ir/irText/firProblems/VarInInit.txt
new file mode 100644
index 00000000000..da4d2165685
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/VarInInit.txt
@@ -0,0 +1,52 @@
+FILE fqName:<root> fileName:/VarInInit.kt
+  CLASS CLASS name:Some modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Some
+    CONSTRUCTOR visibility:public <> (foo:kotlin.Int) returnType:<root>.Some [primary]
+      VALUE_PARAMETER name:foo index:0 type:kotlin.Int
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Some modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:foo visibility:public modality:FINAL [var]
+      FIELD PROPERTY_BACKING_FIELD name:foo type:kotlin.Int visibility:private
+        EXPRESSION_BODY
+          GET_VAR 'foo: kotlin.Int declared in <root>.Some.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-foo> visibility:public modality:FINAL <> ($this:<root>.Some) returnType:kotlin.Int
+        correspondingProperty: PROPERTY name:foo visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Some
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-foo> (): kotlin.Int declared in <root>.Some'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:foo type:kotlin.Int visibility:private' type=kotlin.Int origin=null
+              receiver: GET_VAR '<this>: <root>.Some declared in <root>.Some.<get-foo>' type=<root>.Some origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-foo> visibility:public modality:FINAL <> ($this:<root>.Some, <set-?>:kotlin.Int) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:foo visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Some
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
+        BLOCK_BODY
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:foo type:kotlin.Int visibility:private' type=kotlin.Unit origin=null
+            receiver: GET_VAR '<this>: <root>.Some declared in <root>.Some.<set-foo>' type=<root>.Some origin=null
+            value: GET_VAR '<set-?>: kotlin.Int declared in <root>.Some.<set-foo>' type=kotlin.Int origin=null
+    ANONYMOUS_INITIALIZER isStatic=false
+      BLOCK_BODY
+        WHEN type=kotlin.Unit origin=IF
+          BRANCH
+            if: CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
+              arg0: CALL 'public final fun <get-foo> (): kotlin.Int declared in <root>.Some' type=kotlin.Int origin=GET_PROPERTY
+                $this: GET_VAR '<this>: <root>.Some declared in <root>.Some' type=<root>.Some origin=null
+              arg1: CONST Int type=kotlin.Int value=0
+            then: BLOCK type=kotlin.Unit origin=null
+              CALL 'public final fun <set-foo> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.Some' type=kotlin.Unit origin=EQ
+                $this: GET_VAR '<this>: <root>.Some declared in <root>.Some' type=<root>.Some origin=null
+                <set-?>: CONST Int type=kotlin.Int value=0
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.fir.txt b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.fir.txt
new file mode 100644
index 00000000000..a5d704ba546
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.fir.txt
@@ -0,0 +1,102 @@
+FILE fqName:<root> fileName:/coercionToUnitForNestedWhen.kt
+  PROPERTY name:BACKSLASH visibility:private modality:FINAL [const,val]
+    FIELD PROPERTY_BACKING_FIELD name:BACKSLASH type:kotlin.Char visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Char type=kotlin.Char value='\\'
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-BACKSLASH> visibility:private modality:FINAL <> () returnType:kotlin.Char
+      correspondingProperty: PROPERTY name:BACKSLASH visibility:private modality:FINAL [const,val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='private final fun <get-BACKSLASH> (): kotlin.Char declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:BACKSLASH type:kotlin.Char visibility:private [final,static]' type=kotlin.Char origin=null
+  FUN name:nextChar visibility:private modality:FINAL <> ($receiver:java.io.Reader) returnType:kotlin.Char?
+    $receiver: VALUE_PARAMETER name:<this> type:java.io.Reader
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='private final fun nextChar (): kotlin.Char? declared in <root>'
+        BLOCK type=kotlin.Char? origin=SAFE_CALL
+          VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int? [val]
+            CALL 'public final fun takeUnless <T> (predicate: kotlin.Function1<T of kotlin.takeUnless, kotlin.Boolean>): T of kotlin.takeUnless? [inline] declared in kotlin' type=kotlin.Int? origin=null
+              <T>: kotlin.Int
+              $receiver: CALL 'public open fun read (): kotlin.Int declared in java.io.Reader' type=kotlin.Int origin=null
+                $this: GET_VAR '<this>: java.io.Reader declared in <root>.nextChar' type=java.io.Reader origin=null
+              predicate: FUN_EXPR type=kotlin.Function1<kotlin.Int, kotlin.Boolean> origin=LAMBDA
+                FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Boolean
+                  VALUE_PARAMETER name:it index:0 type:kotlin.Int
+                  BLOCK_BODY
+                    RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Int): kotlin.Boolean declared in <root>.nextChar'
+                      CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                        arg0: GET_VAR 'it: kotlin.Int declared in <root>.nextChar.<anonymous>' type=kotlin.Int origin=null
+                        arg1: CONST Int type=kotlin.Int value=-1
+          WHEN type=kotlin.Char? origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_VAR 'val tmp_0: kotlin.Int? [val] declared in <root>.nextChar' type=kotlin.Int? origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Null type=kotlin.Nothing? value=null
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public open fun toChar (): kotlin.Char declared in kotlin.Int' type=kotlin.Char origin=null
+                $this: GET_VAR 'val tmp_0: kotlin.Int? [val] declared in <root>.nextChar' type=kotlin.Int? origin=null
+  FUN name:consumeRestOfQuotedSequence visibility:public modality:FINAL <> ($receiver:java.io.Reader, sb:java.lang.StringBuilder, quote:kotlin.Char) returnType:kotlin.Unit
+    $receiver: VALUE_PARAMETER name:<this> type:java.io.Reader
+    VALUE_PARAMETER name:sb index:0 type:java.lang.StringBuilder
+    VALUE_PARAMETER name:quote index:1 type:kotlin.Char
+    BLOCK_BODY
+      VAR name:ch type:kotlin.Char? [var]
+        CALL 'private final fun nextChar (): kotlin.Char? declared in <root>' type=kotlin.Char? origin=null
+          $receiver: GET_VAR '<this>: java.io.Reader declared in <root>.consumeRestOfQuotedSequence' type=java.io.Reader origin=null
+      WHILE label=null origin=WHILE_LOOP
+        condition: WHEN type=kotlin.Boolean origin=ANDAND
+          BRANCH
+            if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
+              $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
+                arg0: GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+            then: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
+              $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
+                arg0: TYPE_OP type=kotlin.Char origin=IMPLICIT_CAST typeOperand=kotlin.Char
+                  GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                arg1: GET_VAR 'quote: kotlin.Char declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char origin=null
+          BRANCH
+            if: CONST Boolean type=kotlin.Boolean value=true
+            then: CONST Boolean type=kotlin.Boolean value=false
+        body: BLOCK type=kotlin.Unit origin=null
+          TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+            WHEN type=@[FlexibleNullability] java.lang.StringBuilder? origin=IF
+              BRANCH
+                if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                  arg0: TYPE_OP type=kotlin.Char origin=IMPLICIT_CAST typeOperand=kotlin.Char
+                    GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                  arg1: CALL 'private final fun <get-BACKSLASH> (): kotlin.Char declared in <root>' type=kotlin.Char origin=GET_PROPERTY
+                then: BLOCK type=java.lang.StringBuilder? origin=SAFE_CALL
+                  VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Char? [val]
+                    CALL 'private final fun nextChar (): kotlin.Char? declared in <root>' type=kotlin.Char? origin=null
+                      $receiver: GET_VAR '<this>: java.io.Reader declared in <root>.consumeRestOfQuotedSequence' type=java.io.Reader origin=null
+                  WHEN type=java.lang.StringBuilder? origin=null
+                    BRANCH
+                      if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                        arg0: GET_VAR 'val tmp_1: kotlin.Char? [val] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                        arg1: CONST Null type=kotlin.Nothing? value=null
+                      then: CONST Null type=kotlin.Nothing? value=null
+                    BRANCH
+                      if: CONST Boolean type=kotlin.Boolean value=true
+                      then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.let, R of kotlin.let>): R of kotlin.let [inline] declared in kotlin' type=java.lang.StringBuilder? origin=null
+                        <T>: kotlin.Char
+                        <R>: java.lang.StringBuilder?
+                        $receiver: GET_VAR 'val tmp_1: kotlin.Char? [val] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                        block: FUN_EXPR type=kotlin.Function1<kotlin.Char, java.lang.StringBuilder?> origin=LAMBDA
+                          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.Char) returnType:java.lang.StringBuilder?
+                            VALUE_PARAMETER name:it index:0 type:kotlin.Char
+                            BLOCK_BODY
+                              RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Char): java.lang.StringBuilder? declared in <root>.consumeRestOfQuotedSequence'
+                                CALL 'public open fun append (p0: kotlin.Char): java.lang.StringBuilder? declared in java.lang.StringBuilder' type=java.lang.StringBuilder? origin=null
+                                  $this: GET_VAR 'sb: java.lang.StringBuilder declared in <root>.consumeRestOfQuotedSequence' type=java.lang.StringBuilder origin=null
+                                  p0: GET_VAR 'it: kotlin.Char declared in <root>.consumeRestOfQuotedSequence.<anonymous>' type=kotlin.Char origin=null
+              BRANCH
+                if: CONST Boolean type=kotlin.Boolean value=true
+                then: CALL 'public open fun append (p0: kotlin.Char): java.lang.StringBuilder? declared in java.lang.StringBuilder' type=java.lang.StringBuilder? origin=null
+                  $this: GET_VAR 'sb: java.lang.StringBuilder declared in <root>.consumeRestOfQuotedSequence' type=java.lang.StringBuilder origin=null
+                  p0: TYPE_OP type=kotlin.Char origin=IMPLICIT_CAST typeOperand=kotlin.Char
+                    GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+          SET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Unit origin=EQ
+            CALL 'private final fun nextChar (): kotlin.Char? declared in <root>' type=kotlin.Char? origin=null
+              $receiver: GET_VAR '<this>: java.io.Reader declared in <root>.consumeRestOfQuotedSequence' type=java.io.Reader origin=null
diff --git a/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt
new file mode 100644
index 00000000000..e6e377e2cde
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt
@@ -0,0 +1,17 @@
+// WITH_RUNTIME
+// FULL_JDK
+import java.io.Reader
+import java.io.StringReader
+
+private const val BACKSLASH = '\\'
+
+private fun Reader.nextChar(): Char? =
+    read().takeUnless { it == -1 }?.toChar()
+
+fun Reader.consumeRestOfQuotedSequence(sb: StringBuilder, quote: Char) {
+    var ch = nextChar()
+    while (ch != null && ch != quote) {
+        if (ch == BACKSLASH) nextChar()?.let { sb.append(it) } else sb.append(ch)
+        ch = nextChar()
+    }
+}
diff --git a/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.txt b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.txt
new file mode 100644
index 00000000000..0696ec0655c
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.txt
@@ -0,0 +1,100 @@
+FILE fqName:<root> fileName:/coercionToUnitForNestedWhen.kt
+  PROPERTY name:BACKSLASH visibility:private modality:FINAL [const,val]
+    FIELD PROPERTY_BACKING_FIELD name:BACKSLASH type:kotlin.Char visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Char type=kotlin.Char value='\\'
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-BACKSLASH> visibility:private modality:FINAL <> () returnType:kotlin.Char
+      correspondingProperty: PROPERTY name:BACKSLASH visibility:private modality:FINAL [const,val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='private final fun <get-BACKSLASH> (): kotlin.Char declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:BACKSLASH type:kotlin.Char visibility:private [final,static]' type=kotlin.Char origin=null
+  FUN name:nextChar visibility:private modality:FINAL <> ($receiver:java.io.Reader) returnType:kotlin.Char?
+    $receiver: VALUE_PARAMETER name:<this> type:java.io.Reader
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='private final fun nextChar (): kotlin.Char? declared in <root>'
+        BLOCK type=kotlin.Char? origin=SAFE_CALL
+          VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int? [val]
+            CALL 'public final fun takeUnless <T> (predicate: kotlin.Function1<T of kotlin.takeUnless, kotlin.Boolean>): T of kotlin.takeUnless? [inline] declared in kotlin' type=kotlin.Int? origin=null
+              <T>: kotlin.Int
+              $receiver: CALL 'public open fun read (): kotlin.Int declared in java.io.Reader' type=kotlin.Int origin=null
+                $this: GET_VAR '<this>: java.io.Reader declared in <root>.nextChar' type=java.io.Reader origin=null
+              predicate: FUN_EXPR type=kotlin.Function1<kotlin.Int, kotlin.Boolean> origin=LAMBDA
+                FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Boolean
+                  VALUE_PARAMETER name:it index:0 type:kotlin.Int
+                  BLOCK_BODY
+                    RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Int): kotlin.Boolean declared in <root>.nextChar'
+                      CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                        arg0: GET_VAR 'it: kotlin.Int declared in <root>.nextChar.<anonymous>' type=kotlin.Int origin=null
+                        arg1: CONST Int type=kotlin.Int value=-1
+          WHEN type=kotlin.Char? origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_VAR 'val tmp_0: kotlin.Int? [val] declared in <root>.nextChar' type=kotlin.Int? origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Null type=kotlin.Nothing? value=null
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public open fun toChar (): kotlin.Char declared in kotlin.Int' type=kotlin.Char origin=null
+                $this: GET_VAR 'val tmp_0: kotlin.Int? [val] declared in <root>.nextChar' type=kotlin.Int? origin=null
+  FUN name:consumeRestOfQuotedSequence visibility:public modality:FINAL <> ($receiver:java.io.Reader, sb:java.lang.StringBuilder{ kotlin.text.StringBuilder }, quote:kotlin.Char) returnType:kotlin.Unit
+    $receiver: VALUE_PARAMETER name:<this> type:java.io.Reader
+    VALUE_PARAMETER name:sb index:0 type:java.lang.StringBuilder{ kotlin.text.StringBuilder }
+    VALUE_PARAMETER name:quote index:1 type:kotlin.Char
+    BLOCK_BODY
+      VAR name:ch type:kotlin.Char? [var]
+        CALL 'private final fun nextChar (): kotlin.Char? declared in <root>' type=kotlin.Char? origin=null
+          $receiver: GET_VAR '<this>: java.io.Reader declared in <root>.consumeRestOfQuotedSequence' type=java.io.Reader origin=null
+      WHILE label=null origin=WHILE_LOOP
+        condition: WHEN type=kotlin.Boolean origin=ANDAND
+          BRANCH
+            if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
+              $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
+                arg0: GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+            then: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
+              $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
+                arg0: GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                arg1: GET_VAR 'quote: kotlin.Char declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char origin=null
+          BRANCH
+            if: CONST Boolean type=kotlin.Boolean value=true
+            then: CONST Boolean type=kotlin.Boolean value=false
+        body: BLOCK type=kotlin.Unit origin=null
+          WHEN type=kotlin.Unit origin=IF
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                arg1: CALL 'private final fun <get-BACKSLASH> (): kotlin.Char declared in <root>' type=kotlin.Char origin=GET_PROPERTY
+              then: TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+                BLOCK type=@[FlexibleNullability] java.lang.StringBuilder? origin=SAFE_CALL
+                  VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Char? [val]
+                    CALL 'private final fun nextChar (): kotlin.Char? declared in <root>' type=kotlin.Char? origin=null
+                      $receiver: GET_VAR '<this>: java.io.Reader declared in <root>.consumeRestOfQuotedSequence' type=java.io.Reader origin=null
+                  WHEN type=@[FlexibleNullability] java.lang.StringBuilder? origin=null
+                    BRANCH
+                      if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                        arg0: GET_VAR 'val tmp_1: kotlin.Char? [val] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                        arg1: CONST Null type=kotlin.Nothing? value=null
+                      then: CONST Null type=kotlin.Nothing? value=null
+                    BRANCH
+                      if: CONST Boolean type=kotlin.Boolean value=true
+                      then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.let, R of kotlin.let>): R of kotlin.let [inline] declared in kotlin' type=@[FlexibleNullability] java.lang.StringBuilder? origin=null
+                        <T>: kotlin.Char
+                        <R>: @[FlexibleNullability] java.lang.StringBuilder?
+                        $receiver: GET_VAR 'val tmp_1: kotlin.Char? [val] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+                        block: FUN_EXPR type=kotlin.Function1<kotlin.Char, @[FlexibleNullability] java.lang.StringBuilder?> origin=LAMBDA
+                          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.Char) returnType:@[FlexibleNullability] java.lang.StringBuilder?
+                            VALUE_PARAMETER name:it index:0 type:kotlin.Char
+                            BLOCK_BODY
+                              RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in <root>.consumeRestOfQuotedSequence'
+                                CALL 'public open fun append (p0: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in java.lang.StringBuilder' type=@[FlexibleNullability] java.lang.StringBuilder? origin=null
+                                  $this: GET_VAR 'sb: java.lang.StringBuilder{ kotlin.text.StringBuilder } declared in <root>.consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.StringBuilder } origin=null
+                                  p0: GET_VAR 'it: kotlin.Char declared in <root>.consumeRestOfQuotedSequence.<anonymous>' type=kotlin.Char origin=null
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+                CALL 'public open fun append (p0: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in java.lang.StringBuilder' type=@[FlexibleNullability] java.lang.StringBuilder? origin=null
+                  $this: GET_VAR 'sb: java.lang.StringBuilder{ kotlin.text.StringBuilder } declared in <root>.consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.StringBuilder } origin=null
+                  p0: GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
+          SET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Unit origin=EQ
+            CALL 'private final fun nextChar (): kotlin.Char? declared in <root>' type=kotlin.Char? origin=null
+              $receiver: GET_VAR '<this>: java.io.Reader declared in <root>.consumeRestOfQuotedSequence' type=java.io.Reader origin=null
diff --git a/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.fir.txt b/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.fir.txt
new file mode 100644
index 00000000000..23c851dd3b6
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.fir.txt
@@ -0,0 +1,68 @@
+FILE fqName:<root> fileName:/recursiveCapturedTypeInPropertyReference.kt
+  CLASS INTERFACE name:Something modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Something
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:Recursive modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Recursive<R of <root>.Recursive>
+    TYPE_PARAMETER name:R index:0 variance: superTypes:[<root>.Recursive<R of <root>.Recursive>; <root>.Something]
+    PROPERTY name:symbol visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-symbol> visibility:public modality:ABSTRACT <> ($this:<root>.Recursive<R of <root>.Recursive>) returnType:<root>.AbstractSymbol<R of <root>.Recursive>
+        correspondingProperty: PROPERTY name:symbol visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Recursive<R of <root>.Recursive>
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:AbstractSymbol modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.AbstractSymbol<E of <root>.AbstractSymbol>
+    TYPE_PARAMETER name:E index:0 variance: superTypes:[<root>.Recursive<E of <root>.AbstractSymbol>; <root>.Something]
+    CONSTRUCTOR visibility:public <> () returnType:<root>.AbstractSymbol<E of <root>.AbstractSymbol> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:AbstractSymbol modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
+    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.AbstractSymbol<E of <root>.AbstractSymbol>, list:kotlin.collections.List<kotlin.Any>) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.AbstractSymbol<E of <root>.AbstractSymbol>
+      VALUE_PARAMETER name:list index:0 type:kotlin.collections.List<kotlin.Any>
+      BLOCK_BODY
+        VAR name:result type:kotlin.collections.List<<root>.AbstractSymbol<out <root>.Recursive<*>>> [val]
+          CALL 'public final fun map <T, R> (transform: kotlin.Function1<T of kotlin.collections.map, R of kotlin.collections.map>): kotlin.collections.List<R of kotlin.collections.map> [inline] declared in kotlin.collections' type=kotlin.collections.List<<root>.AbstractSymbol<out <root>.Recursive<*>>> origin=null
+            <T>: <root>.Recursive<*>
+            <R>: <root>.AbstractSymbol<out <root>.Recursive<*>>
+            $receiver: CALL 'public final fun filterIsInstance <R> (): kotlin.collections.List<R of kotlin.collections.filterIsInstance> [inline] declared in kotlin.collections' type=kotlin.collections.List<<root>.Recursive<*>> origin=null
+              <R>: <root>.Recursive<*>
+              $receiver: GET_VAR 'list: kotlin.collections.List<kotlin.Any> declared in <root>.AbstractSymbol.foo' type=kotlin.collections.List<kotlin.Any> origin=null
+            transform: PROPERTY_REFERENCE 'public abstract symbol: <root>.AbstractSymbol<R of <root>.Recursive> [val]' field=null getter='public abstract fun <get-symbol> (): <root>.AbstractSymbol<R of <root>.Recursive> declared in <root>.Recursive' setter=null type=kotlin.reflect.KProperty1<<root>.Recursive<*>, <root>.AbstractSymbol<<root>.Recursive<*>>> origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.kt b/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.kt
new file mode 100644
index 00000000000..7b7dd6d6098
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.kt
@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+// FULL_JDK
+
+interface Something
+
+interface Recursive<R> where R : Recursive<R>, R : Something {
+    val symbol: AbstractSymbol<R>
+}
+
+abstract class AbstractSymbol<E> where E : Recursive<E>, E : Something {
+    fun foo(list: List<Any>) {
+        val result = list.filterIsInstance<Recursive<*>>().map(Recursive<*>::symbol)
+    }
+}
diff --git a/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.txt b/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.txt
new file mode 100644
index 00000000000..ebfe0eed446
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.txt
@@ -0,0 +1,68 @@
+FILE fqName:<root> fileName:/recursiveCapturedTypeInPropertyReference.kt
+  CLASS INTERFACE name:Something modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Something
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:Recursive modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Recursive<R of <root>.Recursive>
+    TYPE_PARAMETER name:R index:0 variance: superTypes:[<root>.Recursive<R of <root>.Recursive>; <root>.Something]
+    PROPERTY name:symbol visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-symbol> visibility:public modality:ABSTRACT <> ($this:<root>.Recursive<R of <root>.Recursive>) returnType:<root>.AbstractSymbol<R of <root>.Recursive>
+        correspondingProperty: PROPERTY name:symbol visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Recursive<R of <root>.Recursive>
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:AbstractSymbol modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.AbstractSymbol<E of <root>.AbstractSymbol>
+    TYPE_PARAMETER name:E index:0 variance: superTypes:[<root>.Recursive<E of <root>.AbstractSymbol>; <root>.Something]
+    CONSTRUCTOR visibility:public <> () returnType:<root>.AbstractSymbol<E of <root>.AbstractSymbol> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:AbstractSymbol modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
+    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.AbstractSymbol<E of <root>.AbstractSymbol>, list:kotlin.collections.List<kotlin.Any>) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.AbstractSymbol<E of <root>.AbstractSymbol>
+      VALUE_PARAMETER name:list index:0 type:kotlin.collections.List<kotlin.Any>
+      BLOCK_BODY
+        VAR name:result type:kotlin.collections.List<<root>.AbstractSymbol<out <root>.Recursive<*>>> [val]
+          CALL 'public final fun map <T, R> (transform: kotlin.Function1<T of kotlin.collections.map, R of kotlin.collections.map>): kotlin.collections.List<R of kotlin.collections.map> [inline] declared in kotlin.collections' type=kotlin.collections.List<<root>.AbstractSymbol<out <root>.Recursive<*>>> origin=null
+            <T>: <root>.Recursive<*>
+            <R>: <root>.AbstractSymbol<out <root>.Recursive<*>>
+            $receiver: CALL 'public final fun filterIsInstance <R> (): kotlin.collections.List<@[NoInfer] R of kotlin.collections.filterIsInstance> [inline] declared in kotlin.collections' type=kotlin.collections.List<@[NoInfer] <root>.Recursive<*>> origin=null
+              <R>: <root>.Recursive<*>
+              $receiver: GET_VAR 'list: kotlin.collections.List<kotlin.Any> declared in <root>.AbstractSymbol.foo' type=kotlin.collections.List<kotlin.Any> origin=null
+            transform: PROPERTY_REFERENCE 'public abstract symbol: <root>.AbstractSymbol<R of <root>.Recursive> [val]' field=null getter='public abstract fun <get-symbol> (): <root>.AbstractSymbol<R of <root>.Recursive> declared in <root>.Recursive' setter=null type=kotlin.reflect.KProperty1<<root>.Recursive<*>, <root>.AbstractSymbol<out <root>.Recursive<*>>> origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/firProblems/throwableStackTrace.fir.txt b/compiler/testData/ir/irText/firProblems/throwableStackTrace.fir.txt
new file mode 100644
index 00000000000..23028c6f810
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/throwableStackTrace.fir.txt
@@ -0,0 +1,8 @@
+FILE fqName:<root> fileName:/throwableStackTrace.kt
+  FUN name:foo visibility:public modality:FINAL <> (t:kotlin.Throwable) returnType:kotlin.Unit
+    VALUE_PARAMETER name:t index:0 type:kotlin.Throwable
+    BLOCK_BODY
+      CALL 'public open fun setStackTrace (p0: kotlin.Array<out java.lang.StackTraceElement?>?): kotlin.Unit declared in java.lang.Throwable' type=kotlin.Unit origin=EQ
+        $this: GET_VAR 't: kotlin.Throwable declared in <root>.foo' type=kotlin.Throwable origin=null
+        p0: CALL 'public open fun getStackTrace (): kotlin.Array<out java.lang.StackTraceElement?>? declared in java.lang.Throwable' type=kotlin.Array<out java.lang.StackTraceElement?>? origin=GET_PROPERTY
+          $this: GET_VAR 't: kotlin.Throwable declared in <root>.foo' type=kotlin.Throwable origin=null
diff --git a/compiler/testData/ir/irText/firProblems/throwableStackTrace.kt b/compiler/testData/ir/irText/firProblems/throwableStackTrace.kt
new file mode 100644
index 00000000000..b4a2c47ed77
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/throwableStackTrace.kt
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+// FULL_JDK
+
+fun foo(t: Throwable) {
+    t.stackTrace = t.stackTrace
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/firProblems/throwableStackTrace.txt b/compiler/testData/ir/irText/firProblems/throwableStackTrace.txt
new file mode 100644
index 00000000000..4c4da60f969
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/throwableStackTrace.txt
@@ -0,0 +1,8 @@
+FILE fqName:<root> fileName:/throwableStackTrace.kt
+  FUN name:foo visibility:public modality:FINAL <> (t:kotlin.Throwable) returnType:kotlin.Unit
+    VALUE_PARAMETER name:t index:0 type:kotlin.Throwable
+    BLOCK_BODY
+      CALL 'public open fun setStackTrace (p0: @[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] java.lang.StackTraceElement?>?): kotlin.Unit declared in kotlin.Throwable' type=kotlin.Unit origin=EQ
+        $this: GET_VAR 't: kotlin.Throwable declared in <root>.foo' type=kotlin.Throwable origin=null
+        p0: CALL 'public open fun getStackTrace (): @[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] java.lang.StackTraceElement?>? declared in kotlin.Throwable' type=@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] java.lang.StackTraceElement?>? origin=GET_PROPERTY
+          $this: GET_VAR 't: kotlin.Throwable declared in <root>.foo' type=kotlin.Throwable origin=null
diff --git a/compiler/testData/ir/irText/lambdas/extensionLambda.txt b/compiler/testData/ir/irText/lambdas/extensionLambda.txt
index f6736edec91..037908ce0e8 100644
--- a/compiler/testData/ir/irText/lambdas/extensionLambda.txt
+++ b/compiler/testData/ir/irText/lambdas/extensionLambda.txt
@@ -8,8 +8,8 @@ FILE fqName:<root> fileName:/extensionLambda.kt
           $receiver: CONST String type=kotlin.String value="42"
           block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Int> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.Int
-              $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+              $receiver: VALUE_PARAMETER name:$this$run type:kotlin.String
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.test1'
                   CALL 'public open fun <get-length> (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=GET_PROPERTY
-                    $this: GET_VAR '<this>: kotlin.String declared in <root>.test1.<anonymous>' type=kotlin.String origin=null
+                    $this: GET_VAR '$this$run: kotlin.String declared in <root>.test1.<anonymous>' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
index 688dbeafe2c..4caa81755a8 100644
--- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
+++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
@@ -92,7 +92,7 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
           receiver: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.A
           block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<<root>.A, kotlin.Int> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.A) returnType:kotlin.Int
-              $receiver: VALUE_PARAMETER name:<this> type:<root>.A
+              $receiver: VALUE_PARAMETER name:$this$with type:<root>.A
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.test'
                   CALL 'public final fun with <T, R> (receiver: T of kotlin.with, block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.with, R of kotlin.with>): R of kotlin.with [inline] declared in kotlin' type=kotlin.Int origin=null
@@ -101,7 +101,7 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
                     receiver: GET_VAR 'fooImpl: <root>.IFoo declared in <root>.test' type=<root>.IFoo origin=null
                     block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<<root>.IFoo, kotlin.Int> origin=LAMBDA
                       FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.IFoo) returnType:kotlin.Int
-                        $receiver: VALUE_PARAMETER name:<this> type:<root>.IFoo
+                        $receiver: VALUE_PARAMETER name:$this$with type:<root>.IFoo
                         BLOCK_BODY
                           RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.test.<anonymous>'
                             CALL 'public final fun with <T, R> (receiver: T of kotlin.with, block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.with, R of kotlin.with>): R of kotlin.with [inline] declared in kotlin' type=kotlin.Int origin=null
@@ -110,11 +110,11 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
                               receiver: GET_VAR 'invokeImpl: <root>.IInvoke declared in <root>.test' type=<root>.IInvoke origin=null
                               block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<<root>.IInvoke, kotlin.Int> origin=LAMBDA
                                 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.IInvoke) returnType:kotlin.Int
-                                  $receiver: VALUE_PARAMETER name:<this> type:<root>.IInvoke
+                                  $receiver: VALUE_PARAMETER name:$this$with type:<root>.IInvoke
                                   BLOCK_BODY
                                     RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.test.<anonymous>.<anonymous>'
                                       CALL 'public open fun invoke (): kotlin.Int [operator] declared in <root>.IInvoke' type=kotlin.Int origin=INVOKE
-                                        $this: GET_VAR '<this>: <root>.IInvoke declared in <root>.test.<anonymous>.<anonymous>.<anonymous>' type=<root>.IInvoke origin=null
+                                        $this: GET_VAR '$this$with: <root>.IInvoke declared in <root>.test.<anonymous>.<anonymous>.<anonymous>' type=<root>.IInvoke origin=null
                                         $receiver: CALL 'public open fun <get-foo> (): <root>.B declared in <root>.IFoo' type=<root>.B origin=GET_PROPERTY
-                                          $this: GET_VAR '<this>: <root>.IFoo declared in <root>.test.<anonymous>.<anonymous>' type=<root>.IFoo origin=null
-                                          $receiver: GET_VAR '<this>: <root>.A declared in <root>.test.<anonymous>' type=<root>.A origin=null
+                                          $this: GET_VAR '$this$with: <root>.IFoo declared in <root>.test.<anonymous>.<anonymous>' type=<root>.IFoo origin=null
+                                          $receiver: GET_VAR '$this$with: <root>.A declared in <root>.test.<anonymous>' type=<root>.A origin=null
diff --git a/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt b/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt
index c1bc6307f3d..fecdbd66787 100644
--- a/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt
+++ b/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt
@@ -12,7 +12,7 @@ FILE fqName:<root> fileName:/coercionInLoop.kt
       WHILE label=null origin=WHILE_LOOP
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
           $this: GET_VAR 'val x: kotlin.collections.DoubleIterator [val] declared in <root>.box' type=kotlin.collections.DoubleIterator origin=null
-        body: BLOCK type=kotlin.Int origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Int origin=null
           WHEN type=kotlin.Unit origin=IF
             BRANCH
               if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
diff --git a/compiler/testData/ir/irText/regressions/typeParametersInImplicitCast.fir.txt b/compiler/testData/ir/irText/regressions/typeParametersInImplicitCast.fir.txt
index 70025eb96c8..a21eafe3e68 100644
--- a/compiler/testData/ir/irText/regressions/typeParametersInImplicitCast.fir.txt
+++ b/compiler/testData/ir/irText/regressions/typeParametersInImplicitCast.fir.txt
@@ -4,12 +4,16 @@ FILE fqName:<root> fileName:/typeParametersInImplicitCast.kt
     VALUE_PARAMETER name:lss index:0 type:kotlin.collections.List<kotlin.collections.List<T of <root>.problematic>>
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun problematic <T> (lss: kotlin.collections.List<kotlin.collections.List<T of <root>.problematic>>): kotlin.collections.List<T of <root>.problematic> declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: flatMap, [kotlin/collections/flatMap, kotlin/collections/flatMap]>#' type=IrErrorType
-          FUN_EXPR type=kotlin.Function0<kotlin.collections.List<kotlin.Any?>> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.collections.List<kotlin.Any?>
+        CALL 'public final fun flatMap <T, R> (transform: kotlin.Function1<T of kotlin.collections.flatMap, kotlin.collections.Iterable<R of kotlin.collections.flatMap>>): kotlin.collections.List<R of kotlin.collections.flatMap> [inline] declared in kotlin.collections' type=kotlin.collections.List<T of <root>.problematic> origin=null
+          <T>: kotlin.collections.List<T of <root>.problematic>
+          <R>: T of <root>.problematic
+          $receiver: GET_VAR 'lss: kotlin.collections.List<kotlin.collections.List<T of <root>.problematic>> declared in <root>.problematic' type=kotlin.collections.List<kotlin.collections.List<T of <root>.problematic>> origin=null
+          transform: FUN_EXPR type=kotlin.Function1<kotlin.collections.List<T of <root>.problematic>, kotlin.collections.Iterable<T of <root>.problematic>> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.collections.List<T of <root>.problematic>) returnType:kotlin.collections.Iterable<T of <root>.problematic>
+              VALUE_PARAMETER name:it index:0 type:kotlin.collections.List<T of <root>.problematic>
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.collections.List<kotlin.Any?> declared in <root>.problematic'
-                  TYPE_OP type=kotlin.collections.List<kotlin.Any?> origin=IMPLICIT_NOTNULL typeOperand=kotlin.collections.List<kotlin.Any?>
-                    CALL 'public/*package*/ open fun id <T> (v: kotlin.collections.List<T of <root>.ListId.id?>?): kotlin.collections.List<T of <root>.ListId.id?> declared in <root>.ListId' type=kotlin.collections.List<kotlin.Any?> origin=null
-                      <T>: kotlin.Any?
-                      v: ERROR_CALL 'Unresolved reference: <Unresolved name: it>#' type=IrErrorType
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.collections.List<T of <root>.problematic>): kotlin.collections.Iterable<T of <root>.problematic> declared in <root>.problematic'
+                  TYPE_OP type=kotlin.collections.List<T of <root>.problematic?> origin=IMPLICIT_NOTNULL typeOperand=kotlin.collections.List<T of <root>.problematic?>
+                    CALL 'public/*package*/ open fun id <T> (v: kotlin.collections.List<T of <root>.ListId.id?>?): @[EnhancedNullability] kotlin.collections.List<T of <root>.ListId.id?> declared in <root>.ListId' type=@[EnhancedNullability] kotlin.collections.List<T of <root>.problematic?> origin=null
+                      <T>: T of <root>.problematic?
+                      v: GET_VAR 'it: kotlin.collections.List<T of <root>.problematic> declared in <root>.problematic.<anonymous>' type=kotlin.collections.List<T of <root>.problematic> origin=null
diff --git a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
index 3b7d9ff78e6..0216d629a41 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
@@ -27,9 +27,10 @@ FILE fqName:<root> fileName:/builtinMap.kt
                   $receiver: VALUE_PARAMETER name:<this> type:java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?>
                   BLOCK_BODY
                     RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.plus'
-                      CALL 'public open fun put (p0: K of java.util.LinkedHashMap?, p1: V of java.util.LinkedHashMap?): V of java.util.LinkedHashMap? declared in java.util.LinkedHashMap' type=V1 of <root>.plus? origin=null
-                        $this: GET_VAR '<this>: java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?> declared in <root>.plus.<anonymous>' type=java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?> origin=null
-                        p0: CALL 'public final fun <get-first> (): A of kotlin.Pair declared in kotlin.Pair' type=K1 of <root>.plus origin=GET_PROPERTY
-                          $this: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
-                        p1: CALL 'public final fun <get-second> (): B of kotlin.Pair declared in kotlin.Pair' type=V1 of <root>.plus origin=GET_PROPERTY
-                          $this: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
+                      TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+                        CALL 'public open fun put (p0: @[FlexibleNullability] K of java.util.LinkedHashMap?, p1: @[FlexibleNullability] V of java.util.LinkedHashMap?): @[FlexibleNullability] V of java.util.LinkedHashMap? declared in java.util.LinkedHashMap' type=V1 of <root>.plus? origin=null
+                          $this: GET_VAR '<this>: java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?> declared in <root>.plus.<anonymous>' type=java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?> origin=null
+                          p0: CALL 'public final fun <get-first> (): A of kotlin.Pair declared in kotlin.Pair' type=K1 of <root>.plus origin=GET_PROPERTY
+                            $this: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
+                          p1: CALL 'public final fun <get-second> (): B of kotlin.Pair declared in kotlin.Pair' type=V1 of <root>.plus origin=GET_PROPERTY
+                            $this: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
diff --git a/compiler/testData/ir/irText/stubs/builtinMap.txt b/compiler/testData/ir/irText/stubs/builtinMap.txt
index d96be88acc2..7698edb6c28 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap.txt
@@ -24,11 +24,11 @@ FILE fqName:<root> fileName:/builtinMap.kt
                 p0: GET_VAR '<this>: kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> origin=null
               block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<java.util.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?> }, kotlin.Unit> origin=LAMBDA
                 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:java.util.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?> }) returnType:kotlin.Unit
-                  $receiver: VALUE_PARAMETER name:<this> type:java.util.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?> }
+                  $receiver: VALUE_PARAMETER name:$this$apply type:java.util.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?> }
                   BLOCK_BODY
                     TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
                       CALL 'public open fun put (key: @[EnhancedNullability] K of java.util.LinkedHashMap, value: @[EnhancedNullability] V of java.util.LinkedHashMap): @[EnhancedNullability] V of java.util.LinkedHashMap? [fake_override] declared in java.util.LinkedHashMap' type=@[EnhancedNullability] V1 of <root>.plus? origin=null
-                        $this: GET_VAR '<this>: java.util.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?> } declared in <root>.plus.<anonymous>' type=java.util.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?> } origin=null
+                        $this: GET_VAR '$this$apply: java.util.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?> } declared in <root>.plus.<anonymous>' type=java.util.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of <root>.plus?, @[FlexibleNullability] V1 of <root>.plus?> } origin=null
                         key: CALL 'public final fun <get-first> (): A of kotlin.Pair declared in kotlin.Pair' type=K1 of <root>.plus origin=GET_PROPERTY
                           $this: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
                         value: CALL 'public final fun <get-second> (): B of kotlin.Pair declared in kotlin.Pair' type=V1 of <root>.plus origin=GET_PROPERTY
diff --git a/compiler/testData/ir/irText/stubs/javaEnum.fir.txt b/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
index 2d2b83d27cb..7463a993c3c 100644
--- a/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
+++ b/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
@@ -1,10 +1,10 @@
 FILE fqName:<root> fileName:/javaEnum.kt
   PROPERTY name:test visibility:public modality:FINAL [val]
-    FIELD PROPERTY_BACKING_FIELD name:test type:<root>.JEnum visibility:private [final,static]
+    FIELD PROPERTY_BACKING_FIELD name:test type:@[FlexibleNullability] <root>.JEnum visibility:private [final,static]
       EXPRESSION_BODY
-        GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_JAVA_DECLARATION_STUB name:ONE' type=<root>.JEnum
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:<root>.JEnum
+        GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_JAVA_DECLARATION_STUB name:ONE' type=@[FlexibleNullability] <root>.JEnum
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:@[FlexibleNullability] <root>.JEnum
       correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test> (): <root>.JEnum declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:<root>.JEnum visibility:private [final,static]' type=<root>.JEnum origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test> (): @[FlexibleNullability] <root>.JEnum declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:@[FlexibleNullability] <root>.JEnum visibility:private [final,static]' type=@[FlexibleNullability] <root>.JEnum origin=null
diff --git a/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt b/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt
index 97aeb566a43..1b9feb3cc04 100644
--- a/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt
+++ b/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt
@@ -14,11 +14,11 @@ FILE fqName:<root> fileName:/asOnPlatformType.kt
           <T>: kotlin.String?
           $receiver: GET_VAR 'val nonnullStr: kotlin.String? [val] declared in <root>.test' type=kotlin.String? origin=null
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-        CALL 'public final fun fooN <T> (): T of <root>.fooN? [inline] declared in <root>' type=kotlin.String? origin=null
+        CALL 'public final fun fooN <T> (): T of <root>.fooN? [inline] declared in <root>' type=@[FlexibleNullability] kotlin.String? origin=null
           <T>: kotlin.String?
           $receiver: GET_VAR 'val nullStr: kotlin.String? [val] declared in <root>.test' type=kotlin.String? origin=null
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-        CALL 'public final fun fooN <T> (): T of <root>.fooN? [inline] declared in <root>' type=kotlin.String? origin=null
+        CALL 'public final fun fooN <T> (): T of <root>.fooN? [inline] declared in <root>' type=@[FlexibleNullability] kotlin.String? origin=null
           <T>: kotlin.String?
           $receiver: GET_VAR 'val nonnullStr: kotlin.String? [val] declared in <root>.test' type=kotlin.String? origin=null
   FUN name:foo visibility:public modality:FINAL <T> ($receiver:T of <root>.foo) returnType:T of <root>.foo [inline]
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.txt
index 785ad3c66fb..0b261fec251 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.txt
@@ -12,19 +12,19 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
           <T>: R of <root>.scopedFlow
           block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<R of <root>.scopedFlow>, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.FlowCollector<R of <root>.scopedFlow>) returnType:kotlin.Unit [suspend]
-              $receiver: VALUE_PARAMETER name:<this> type:<root>.FlowCollector<R of <root>.scopedFlow>
+              $receiver: VALUE_PARAMETER name:$this$flow type:<root>.FlowCollector<R of <root>.scopedFlow>
               BLOCK_BODY
                 VAR name:collector type:<root>.FlowCollector<R of <root>.scopedFlow> [val]
-                  GET_VAR '<this>: <root>.FlowCollector<R of <root>.scopedFlow> declared in <root>.scopedFlow.<anonymous>' type=<root>.FlowCollector<R of <root>.scopedFlow> origin=null
+                  GET_VAR '$this$flow: <root>.FlowCollector<R of <root>.scopedFlow> declared in <root>.scopedFlow.<anonymous>' type=<root>.FlowCollector<R of <root>.scopedFlow> origin=null
                 CALL 'public final fun flowScope <R> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.CoroutineScope, R of <root>.flowScope>): R of <root>.flowScope [suspend] declared in <root>' type=kotlin.Unit origin=null
                   <R>: kotlin.Unit
                   block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.CoroutineScope, kotlin.Unit> origin=LAMBDA
                     FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.CoroutineScope) returnType:kotlin.Unit [suspend]
-                      $receiver: VALUE_PARAMETER name:<this> type:<root>.CoroutineScope
+                      $receiver: VALUE_PARAMETER name:$this$flowScope type:<root>.CoroutineScope
                       BLOCK_BODY
                         CALL 'public abstract fun invoke (p1: P1 of kotlin.coroutines.SuspendFunction2, p2: P2 of kotlin.coroutines.SuspendFunction2): R of kotlin.coroutines.SuspendFunction2 [suspend,operator] declared in kotlin.coroutines.SuspendFunction2' type=kotlin.Unit origin=INVOKE
                           $this: GET_VAR 'block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.CoroutineScope, <root>.FlowCollector<R of <root>.scopedFlow>, kotlin.Unit> declared in <root>.scopedFlow' type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.CoroutineScope, <root>.FlowCollector<R of <root>.scopedFlow>, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
-                          p1: GET_VAR '<this>: <root>.CoroutineScope declared in <root>.scopedFlow.<anonymous>.<anonymous>' type=<root>.CoroutineScope origin=null
+                          p1: GET_VAR '$this$flowScope: <root>.CoroutineScope declared in <root>.scopedFlow.<anonymous>.<anonymous>' type=<root>.CoroutineScope origin=null
                           p2: GET_VAR 'val collector: <root>.FlowCollector<R of <root>.scopedFlow> [val] declared in <root>.scopedFlow.<anonymous>' type=<root>.FlowCollector<R of <root>.scopedFlow> origin=null
   FUN name:onCompletion visibility:public modality:FINAL <T> ($receiver:<root>.Flow<T of <root>.onCompletion>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.FlowCollector<T of <root>.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>) returnType:<root>.Flow<T of <root>.onCompletion>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
@@ -36,12 +36,12 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
           <T>: T of <root>.onCompletion
           block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.onCompletion>, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.FlowCollector<T of <root>.onCompletion>) returnType:kotlin.Unit [suspend]
-              $receiver: VALUE_PARAMETER name:<this> type:<root>.FlowCollector<T of <root>.onCompletion>
+              $receiver: VALUE_PARAMETER name:$this$unsafeFlow type:<root>.FlowCollector<T of <root>.onCompletion>
               BLOCK_BODY
                 VAR name:safeCollector type:<root>.SafeCollector<T of <root>.onCompletion> [val]
                   CONSTRUCTOR_CALL 'public constructor <init> (collector: <root>.FlowCollector<T of <root>.SafeCollector>) [primary] declared in <root>.SafeCollector' type=<root>.SafeCollector<T of <root>.onCompletion> origin=null
                     <class: T>: T of <root>.onCompletion
-                    collector: GET_VAR '<this>: <root>.FlowCollector<T of <root>.onCompletion> declared in <root>.onCompletion.<anonymous>' type=<root>.FlowCollector<T of <root>.onCompletion> origin=null
+                    collector: GET_VAR '$this$unsafeFlow: <root>.FlowCollector<T of <root>.onCompletion> declared in <root>.onCompletion.<anonymous>' type=<root>.FlowCollector<T of <root>.onCompletion> origin=null
                 CALL 'public final fun invokeSafely <T> (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.FlowCollector<T of <root>.invokeSafely>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): kotlin.Unit [suspend] declared in <root>' type=kotlin.Unit origin=null
                   <T>: T of <root>.onCompletion
                   $receiver: GET_VAR 'val safeCollector: <root>.SafeCollector<T of <root>.onCompletion> [val] declared in <root>.onCompletion.<anonymous>' type=<root>.SafeCollector<T of <root>.onCompletion> origin=null
@@ -73,7 +73,7 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
           $receiver: GET_VAR '<this>: <root>.Flow<T of <root>.onCompletion> declared in <root>.onCompletion' type=<root>.Flow<T of <root>.onCompletion> origin=null
           action: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.FlowCollector<T of <root>.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.FlowCollector<T of <root>.onCompletion>, it:kotlin.Throwable?) returnType:kotlin.Unit [suspend]
-              $receiver: VALUE_PARAMETER name:<this> type:<root>.FlowCollector<T of <root>.onCompletion>
+              $receiver: VALUE_PARAMETER name:$this$onCompletion type:<root>.FlowCollector<T of <root>.onCompletion>
               VALUE_PARAMETER name:it index:0 type:kotlin.Throwable?
               BLOCK_BODY
                 CALL 'public abstract fun invoke (p1: P1 of kotlin.coroutines.SuspendFunction1): R of kotlin.coroutines.SuspendFunction1 [suspend,operator] declared in kotlin.coroutines.SuspendFunction1' type=kotlin.Unit origin=INVOKE
@@ -89,12 +89,12 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
           $receiver: GET_VAR '<this>: <root>.CoroutineScope declared in <root>.asFairChannel' type=<root>.CoroutineScope origin=null
           block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.ProducerScope<kotlin.Any>, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.ProducerScope<kotlin.Any>) returnType:kotlin.Unit [suspend]
-              $receiver: VALUE_PARAMETER name:<this> type:<root>.ProducerScope<kotlin.Any>
+              $receiver: VALUE_PARAMETER name:$this$produce type:<root>.ProducerScope<kotlin.Any>
               BLOCK_BODY
                 VAR name:channel type:<root>.ChannelCoroutine<kotlin.Any> [val]
                   TYPE_OP type=<root>.ChannelCoroutine<kotlin.Any> origin=CAST typeOperand=<root>.ChannelCoroutine<kotlin.Any>
                     CALL 'public abstract fun <get-channel> (): <root>.SendChannel<E of <root>.ProducerScope> declared in <root>.ProducerScope' type=<root>.SendChannel<kotlin.Any> origin=GET_PROPERTY
-                      $this: GET_VAR '<this>: <root>.ProducerScope<kotlin.Any> declared in <root>.asFairChannel.<anonymous>' type=<root>.ProducerScope<kotlin.Any> origin=null
+                      $this: GET_VAR '$this$produce: <root>.ProducerScope<kotlin.Any> declared in <root>.asFairChannel.<anonymous>' type=<root>.ProducerScope<kotlin.Any> origin=null
                 CALL 'public final fun collect <T> (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of <root>.collect, kotlin.Unit>): kotlin.Unit [inline,suspend] declared in <root>' type=kotlin.Unit origin=null
                   <T>: kotlin.Any?
                   $receiver: GET_VAR 'flow: <root>.Flow<*> declared in <root>.asFairChannel' type=<root>.Flow<*> origin=null
@@ -127,7 +127,7 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
           $receiver: GET_VAR '<this>: <root>.CoroutineScope declared in <root>.asChannel' type=<root>.CoroutineScope origin=null
           block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.ProducerScope<kotlin.Any>, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.ProducerScope<kotlin.Any>) returnType:kotlin.Unit [suspend]
-              $receiver: VALUE_PARAMETER name:<this> type:<root>.ProducerScope<kotlin.Any>
+              $receiver: VALUE_PARAMETER name:$this$produce type:<root>.ProducerScope<kotlin.Any>
               BLOCK_BODY
                 CALL 'public final fun collect <T> (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of <root>.collect, kotlin.Unit>): kotlin.Unit [inline,suspend] declared in <root>' type=kotlin.Unit origin=null
                   <T>: kotlin.Any?
@@ -139,7 +139,7 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
                         RETURN type=kotlin.Nothing from='local final fun <anonymous> (value: kotlin.Any?): kotlin.Unit [suspend] declared in <root>.asChannel.<anonymous>'
                           CALL 'public abstract fun send (e: E of <root>.SendChannel): kotlin.Unit [suspend] declared in <root>.SendChannel' type=kotlin.Unit origin=null
                             $this: CALL 'public abstract fun <get-channel> (): <root>.SendChannel<E of <root>.ProducerScope> declared in <root>.ProducerScope' type=<root>.SendChannel<kotlin.Any> origin=GET_PROPERTY
-                              $this: GET_VAR '<this>: <root>.ProducerScope<kotlin.Any> declared in <root>.asChannel.<anonymous>' type=<root>.ProducerScope<kotlin.Any> origin=null
+                              $this: GET_VAR '$this$produce: <root>.ProducerScope<kotlin.Any> declared in <root>.asChannel.<anonymous>' type=<root>.ProducerScope<kotlin.Any> origin=null
                             e: BLOCK type=kotlin.Any origin=ELVIS
                               VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Any? [val]
                                 GET_VAR 'value: kotlin.Any? declared in <root>.asChannel.<anonymous>.<anonymous>' type=kotlin.Any? origin=null
diff --git a/compiler/testData/ir/irText/types/javaWildcardType.fir.txt b/compiler/testData/ir/irText/types/javaWildcardType.fir.txt
index 5dc5a48b9b0..256454833dd 100644
--- a/compiler/testData/ir/irText/types/javaWildcardType.fir.txt
+++ b/compiler/testData/ir/irText/types/javaWildcardType.fir.txt
@@ -76,35 +76,6 @@ FILE fqName:<root> fileName:/javaWildcardType.kt
           $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
             receiver: GET_VAR '<this>: <root>.C declared in <root>.C.jg2' type=<root>.C origin=null
           c: GET_VAR 'c: kotlin.collections.Collection<kotlin.CharSequence?>? declared in <root>.C.jg2' type=kotlin.collections.Collection<kotlin.CharSequence?>? origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.C, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.C'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
-              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.equals' type=<root>.C origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.C.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.C'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
-              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.hashCode' type=<root>.C origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.C'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
-              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.toString' type=<root>.C origin=null
     FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]
     FUN DELEGATED_MEMBER name:kf1 visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.collections.Collection<out kotlin.CharSequence>
       overridden:
@@ -145,3 +116,16 @@ FILE fqName:<root> fileName:/javaWildcardType.kt
             receiver: GET_VAR '<this>: <root>.C declared in <root>.C.kg2' type=<root>.C origin=null
           c: GET_VAR 'c: kotlin.collections.Collection<kotlin.CharSequence> declared in <root>.C.kg2' type=kotlin.collections.Collection<kotlin.CharSequence> origin=null
     FIELD DELEGATE name:<$$delegate_1> type:<root>.K visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.fir.txt
index 47f8abe6f03..be18c790bcc 100644
--- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.fir.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.fir.txt
@@ -6,22 +6,22 @@ FILE fqName:<root> fileName:/enhancedNullability.kt
     BLOCK_BODY
       CALL 'public final fun use (s: kotlin.String): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
         s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+          CALL 'public open fun notNullString (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
   FUN name:testLocalVal visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       VAR name:local type:kotlin.String [val]
         TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+          CALL 'public open fun notNullString (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
   FUN name:testReturnValue visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testReturnValue (): kotlin.String declared in <root>'
         TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+          CALL 'public open fun notNullString (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
   PROPERTY name:testGlobalVal visibility:public modality:FINAL [val]
     FIELD PROPERTY_BACKING_FIELD name:testGlobalVal type:kotlin.String visibility:private [final,static]
       EXPRESSION_BODY
         TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+          CALL 'public open fun notNullString (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testGlobalVal> visibility:public modality:FINAL <> () returnType:kotlin.String
       correspondingProperty: PROPERTY name:testGlobalVal visibility:public modality:FINAL [val]
       BLOCK_BODY
@@ -33,23 +33,21 @@ FILE fqName:<root> fileName:/enhancedNullability.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-testGlobalValGetter> (): kotlin.String declared in <root>'
           TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-            CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+            CALL 'public open fun notNullString (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
   FUN name:testJUse visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      CALL 'public open fun use (s: kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+      CALL 'public open fun use (s: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
         s: CALL 'public open fun nullString (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
-      CALL 'public open fun use (s: kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
-        s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+      CALL 'public open fun use (s: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+        s: CALL 'public open fun notNullString (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
   FUN name:testLocalVarUse visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       VAR name:ns type:kotlin.String? [val]
         CALL 'public open fun nullString (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
-      CALL 'public open fun use (s: kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+      CALL 'public open fun use (s: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
         s: GET_VAR 'val ns: kotlin.String? [val] declared in <root>.testLocalVarUse' type=kotlin.String? origin=null
       VAR name:nns type:kotlin.String [val]
         TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
-      CALL 'public open fun use (s: kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
-        s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-          GET_VAR 'val nns: kotlin.String [val] declared in <root>.testLocalVarUse' type=kotlin.String origin=null
+          CALL 'public open fun notNullString (): @[EnhancedNullability] kotlin.String declared in <root>.J' type=@[EnhancedNullability] kotlin.String origin=null
+      CALL 'public open fun use (s: @[EnhancedNullability] kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+        s: GET_VAR 'val nns: kotlin.String [val] declared in <root>.testLocalVarUse' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt
index dfa77283efe..2fb5458168d 100644
--- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt
@@ -119,7 +119,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInDestructuringAssignment.kt
     BLOCK_BODY
       VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:<root>.P [val]
         TYPE_OP type=<root>.P origin=IMPLICIT_NOTNULL typeOperand=<root>.P
-          CALL 'public open fun notNullP (): <root>.P declared in <root>.J' type=<root>.P origin=null
+          CALL 'public open fun notNullP (): @[EnhancedNullability] <root>.P declared in <root>.J' type=@[EnhancedNullability] <root>.P origin=null
       VAR name:x type:kotlin.Int [val]
         CALL 'public final fun component1 (): kotlin.Int [operator] declared in <root>.P' type=kotlin.Int origin=null
           $this: GET_VAR 'val tmp_0: <root>.P [val] declared in <root>.test1' type=<root>.P origin=null
@@ -131,43 +131,47 @@ FILE fqName:<root> fileName:/enhancedNullabilityInDestructuringAssignment.kt
         y: GET_VAR 'val y: kotlin.Int [val] declared in <root>.test1' type=kotlin.Int origin=null
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:<root>.Q<kotlin.String, kotlin.String?>? [val]
-        CALL 'public open fun notNullComponents (): <root>.Q<kotlin.String, kotlin.String?>? declared in <root>.J' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
-      VAR name:x type:kotlin.String [val]
-        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String origin=null
-          $this: GET_VAR 'val tmp_1: <root>.Q<kotlin.String, kotlin.String?>? [val] declared in <root>.test2' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
+      VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? [val]
+        CALL 'public open fun notNullComponents (): <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? declared in <root>.J' type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? origin=null
+      VAR name:x type:@[FlexibleNullability] kotlin.String [val]
+        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=@[FlexibleNullability] kotlin.String origin=null
+          $this: GET_VAR 'val tmp_1: <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? [val] declared in <root>.test2' type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? origin=null
       VAR name:y type:kotlin.String? [val]
         CALL 'public final fun component2 (): T2 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String? origin=null
-          $this: GET_VAR 'val tmp_1: <root>.Q<kotlin.String, kotlin.String?>? [val] declared in <root>.test2' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
+          $this: GET_VAR 'val tmp_1: <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? [val] declared in <root>.test2' type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? origin=null
       CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        x: GET_VAR 'val x: kotlin.String [val] declared in <root>.test2' type=kotlin.String origin=null
-        y: GET_VAR 'val y: kotlin.String? [val] declared in <root>.test2' type=kotlin.String? origin=null
+        x: GET_VAR 'val x: @[FlexibleNullability] kotlin.String [val] declared in <root>.test2' type=@[FlexibleNullability] kotlin.String origin=null
+        y: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+          GET_VAR 'val y: kotlin.String? [val] declared in <root>.test2' type=kotlin.String? origin=null
   FUN name:test2Desugared visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      VAR name:tmp type:<root>.Q<kotlin.String, kotlin.String?>? [val]
-        CALL 'public open fun notNullComponents (): <root>.Q<kotlin.String, kotlin.String?>? declared in <root>.J' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
-      VAR name:x type:kotlin.String [val]
-        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String origin=null
-          $this: GET_VAR 'val tmp: <root>.Q<kotlin.String, kotlin.String?>? [val] declared in <root>.test2Desugared' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
+      VAR name:tmp type:<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? [val]
+        CALL 'public open fun notNullComponents (): <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? declared in <root>.J' type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? origin=null
+      VAR name:x type:@[FlexibleNullability] kotlin.String [val]
+        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=@[FlexibleNullability] kotlin.String origin=null
+          $this: GET_VAR 'val tmp: <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? [val] declared in <root>.test2Desugared' type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? origin=null
       VAR name:y type:kotlin.String? [val]
         CALL 'public final fun component2 (): T2 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String? origin=null
-          $this: GET_VAR 'val tmp: <root>.Q<kotlin.String, kotlin.String?>? [val] declared in <root>.test2Desugared' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
+          $this: GET_VAR 'val tmp: <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? [val] declared in <root>.test2Desugared' type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>? origin=null
       CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        x: GET_VAR 'val x: kotlin.String [val] declared in <root>.test2Desugared' type=kotlin.String origin=null
-        y: GET_VAR 'val y: kotlin.String? [val] declared in <root>.test2Desugared' type=kotlin.String? origin=null
+        x: GET_VAR 'val x: @[FlexibleNullability] kotlin.String [val] declared in <root>.test2Desugared' type=@[FlexibleNullability] kotlin.String origin=null
+        y: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+          GET_VAR 'val y: kotlin.String? [val] declared in <root>.test2Desugared' type=kotlin.String? origin=null
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:<root>.Q<kotlin.String, kotlin.String?> [val]
-        CALL 'public open fun notNullQAndComponents (): <root>.Q<kotlin.String, kotlin.String?> declared in <root>.J' type=<root>.Q<kotlin.String, kotlin.String?> origin=null
-      VAR name:x type:kotlin.String [val]
-        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String origin=null
-          $this: GET_VAR 'val tmp_2: <root>.Q<kotlin.String, kotlin.String?> [val] declared in <root>.test3' type=<root>.Q<kotlin.String, kotlin.String?> origin=null
+      VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?> [val]
+        TYPE_OP type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?> origin=IMPLICIT_NOTNULL typeOperand=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?>
+          CALL 'public open fun notNullQAndComponents (): @[EnhancedNullability] <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?> declared in <root>.J' type=@[EnhancedNullability] <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?> origin=null
+      VAR name:x type:@[FlexibleNullability] kotlin.String [val]
+        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=@[FlexibleNullability] kotlin.String origin=null
+          $this: GET_VAR 'val tmp_2: <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?> [val] declared in <root>.test3' type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?> origin=null
       VAR name:y type:kotlin.String? [val]
         CALL 'public final fun component2 (): T2 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String? origin=null
-          $this: GET_VAR 'val tmp_2: <root>.Q<kotlin.String, kotlin.String?> [val] declared in <root>.test3' type=<root>.Q<kotlin.String, kotlin.String?> origin=null
+          $this: GET_VAR 'val tmp_2: <root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?> [val] declared in <root>.test3' type=<root>.Q<@[FlexibleNullability] kotlin.String, kotlin.String?> origin=null
       CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        x: GET_VAR 'val x: kotlin.String [val] declared in <root>.test3' type=kotlin.String origin=null
-        y: GET_VAR 'val y: kotlin.String? [val] declared in <root>.test3' type=kotlin.String? origin=null
+        x: GET_VAR 'val x: @[FlexibleNullability] kotlin.String [val] declared in <root>.test3' type=@[FlexibleNullability] kotlin.String origin=null
+        y: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+          GET_VAR 'val y: kotlin.String? [val] declared in <root>.test3' type=kotlin.String? origin=null
   FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.collections.IndexedValue<<root>.P?> [val]
@@ -184,4 +188,5 @@ FILE fqName:<root> fileName:/enhancedNullabilityInDestructuringAssignment.kt
           $this: GET_VAR 'val tmp_3: kotlin.collections.IndexedValue<<root>.P?> [val] declared in <root>.test4' type=kotlin.collections.IndexedValue<<root>.P?> origin=null
       CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
         x: GET_VAR 'val x: kotlin.Int [val] declared in <root>.test4' type=kotlin.Int origin=null
-        y: GET_VAR 'val y: <root>.P? [val] declared in <root>.test4' type=<root>.P? origin=null
+        y: TYPE_OP type=<root>.P origin=IMPLICIT_NOTNULL typeOperand=<root>.P
+          GET_VAR 'val y: <root>.P? [val] declared in <root>.test4' type=<root>.P? origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt
index a8bcb54b0c8..9cf32cd3d9e 100644
--- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt
@@ -42,7 +42,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
       WHILE label=null origin=WHILE_LOOP
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
           $this: GET_VAR 'val iterator: kotlin.collections.MutableIterator<<root>.P?> [val] declared in <root>.testDesugaredForInList' type=kotlin.collections.MutableIterator<<root>.P?> origin=null
-        body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
+        body: BLOCK type=kotlin.Unit origin=null
           VAR name:x type:<root>.P? [val]
             CALL 'public abstract fun next (): T of kotlin.collections.MutableIterator [fake_override,operator] declared in kotlin.collections.MutableIterator' type=<root>.P? origin=null
               $this: GET_VAR 'val iterator: kotlin.collections.MutableIterator<<root>.P?> [val] declared in <root>.testDesugaredForInList' type=kotlin.collections.MutableIterator<<root>.P?> origin=null
@@ -75,8 +75,9 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
               CALL 'public abstract fun next (): T of kotlin.collections.MutableIterator [fake_override,operator] declared in kotlin.collections.MutableIterator' type=<root>.P? origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'val tmp_3: kotlin.collections.MutableIterator<<root>.P?> [val] declared in <root>.testForInListUse' type=kotlin.collections.MutableIterator<<root>.P?> origin=null
             CALL 'public final fun use (s: <root>.P): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-              s: GET_VAR 'val x: <root>.P? [val] declared in <root>.testForInListUse' type=<root>.P? origin=null
-            CALL 'public open fun use (s: <root>.P): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+              s: TYPE_OP type=<root>.P origin=IMPLICIT_NOTNULL typeOperand=<root>.P
+                GET_VAR 'val x: <root>.P? [val] declared in <root>.testForInListUse' type=<root>.P? origin=null
+            CALL 'public open fun use (s: @[EnhancedNullability] <root>.P): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
               s: GET_VAR 'val x: <root>.P? [val] declared in <root>.testForInListUse' type=<root>.P? origin=null
   FUN name:testForInArrayUse visibility:public modality:FINAL <> (j:<root>.J) returnType:kotlin.Unit
     VALUE_PARAMETER name:j index:0 type:<root>.J
@@ -94,8 +95,9 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
               CALL 'public abstract fun next (): T of kotlin.collections.Iterator [operator] declared in kotlin.collections.Iterator' type=<root>.P? origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'val tmp_4: kotlin.collections.Iterator<<root>.P?> [val] declared in <root>.testForInArrayUse' type=kotlin.collections.Iterator<<root>.P?> origin=null
             CALL 'public final fun use (s: <root>.P): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-              s: GET_VAR 'val x: <root>.P? [val] declared in <root>.testForInArrayUse' type=<root>.P? origin=null
-            CALL 'public open fun use (s: <root>.P): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+              s: TYPE_OP type=<root>.P origin=IMPLICIT_NOTNULL typeOperand=<root>.P
+                GET_VAR 'val x: <root>.P? [val] declared in <root>.testForInArrayUse' type=<root>.P? origin=null
+            CALL 'public open fun use (s: @[EnhancedNullability] <root>.P): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
               s: GET_VAR 'val x: <root>.P? [val] declared in <root>.testForInArrayUse' type=<root>.P? origin=null
   CLASS INTERFACE name:K modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K
diff --git a/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.fir.txt b/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.fir.txt
index 2e3c14c17b6..63b46434e8f 100644
--- a/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.fir.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.fir.txt
@@ -31,8 +31,9 @@ FILE fqName:<root> fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv
         CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int [operator] declared in kotlin.Double' type=kotlin.Int origin=null
           $this: CALL 'public open fun null0 (): kotlin.Double? declared in <root>.JavaClass' type=kotlin.Double? origin=null
             $this: GET_VAR '<this>: <root>.JavaClass declared in <root>.testPlatformCompareToPlatform' type=<root>.JavaClass origin=null
-          other: CALL 'public open fun null0 (): kotlin.Double? declared in <root>.JavaClass' type=kotlin.Double? origin=null
-            $this: GET_VAR '<this>: <root>.JavaClass declared in <root>.testPlatformCompareToPlatform' type=<root>.JavaClass origin=null
+          other: TYPE_OP type=kotlin.Double origin=IMPLICIT_NOTNULL typeOperand=kotlin.Double
+            CALL 'public open fun null0 (): kotlin.Double? declared in <root>.JavaClass' type=kotlin.Double? origin=null
+              $this: GET_VAR '<this>: <root>.JavaClass declared in <root>.testPlatformCompareToPlatform' type=<root>.JavaClass origin=null
   FUN name:testPlatformCompareToKotlin visibility:public modality:FINAL <> ($receiver:<root>.JavaClass) returnType:kotlin.Int
     $receiver: VALUE_PARAMETER name:<this> type:<root>.JavaClass
     BLOCK_BODY
@@ -47,5 +48,6 @@ FILE fqName:<root> fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv
       RETURN type=kotlin.Nothing from='public final fun testKotlinCompareToPlatform (): kotlin.Int declared in <root>'
         CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int [operator] declared in kotlin.Double' type=kotlin.Int origin=null
           $this: CONST Double type=kotlin.Double value=0.0
-          other: CALL 'public open fun null0 (): kotlin.Double? declared in <root>.JavaClass' type=kotlin.Double? origin=null
-            $this: GET_VAR '<this>: <root>.JavaClass declared in <root>.testKotlinCompareToPlatform' type=<root>.JavaClass origin=null
+          other: TYPE_OP type=kotlin.Double origin=IMPLICIT_NOTNULL typeOperand=kotlin.Double
+            CALL 'public open fun null0 (): kotlin.Double? declared in <root>.JavaClass' type=kotlin.Double? origin=null
+              $this: GET_VAR '<this>: <root>.JavaClass declared in <root>.testKotlinCompareToPlatform' type=<root>.JavaClass origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt
index 887af12416c..48b734647ea 100644
--- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt
@@ -63,16 +63,19 @@ FILE fqName:<root> fileName:/implicitNotNullOnPlatformType.kt
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       CALL 'public final fun f (s: kotlin.String): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        s: CALL 'public open fun s (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
+        s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+          CALL 'public open fun s (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
       CALL 'public final fun f (s: kotlin.String): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        s: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:kotlin.String? visibility:public [static]' type=kotlin.String? origin=GET_PROPERTY
+        s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+          GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:kotlin.String? visibility:public [static]' type=kotlin.String? origin=GET_PROPERTY
   FUN name:testContains visibility:public modality:FINAL <> (m:<root>.MySet) returnType:kotlin.Unit
     VALUE_PARAMETER name:m index:0 type:<root>.MySet
     BLOCK_BODY
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         CALL 'public final fun contains (element: kotlin.String): kotlin.Boolean [operator] declared in <root>.MySet' type=kotlin.Boolean origin=null
           $this: GET_VAR 'm: <root>.MySet declared in <root>.testContains' type=<root>.MySet origin=null
-          element: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:kotlin.String? visibility:public [static]' type=kotlin.String? origin=GET_PROPERTY
+          element: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+            GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:kotlin.String? visibility:public [static]' type=kotlin.String? origin=GET_PROPERTY
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         CALL 'public final fun contains (element: kotlin.String): kotlin.Boolean [operator] declared in <root>.MySet' type=kotlin.Boolean origin=null
           $this: GET_VAR 'm: <root>.MySet declared in <root>.testContains' type=<root>.MySet origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.fir.txt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.fir.txt
deleted file mode 100644
index 27e2274e6af..00000000000
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.fir.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-FILE fqName:<root> fileName:/nnStringVsT.kt
-  FUN name:useT visibility:public modality:FINAL <T> (fn:kotlin.Function0<T of <root>.useT>) returnType:T of <root>.useT
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
-    VALUE_PARAMETER name:fn index:0 type:kotlin.Function0<T of <root>.useT>
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun useT <T> (fn: kotlin.Function0<T of <root>.useT>): T of <root>.useT declared in <root>'
-        CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=T of <root>.useT origin=INVOKE
-          $this: GET_VAR 'fn: kotlin.Function0<T of <root>.useT> declared in <root>.useT' type=kotlin.Function0<T of <root>.useT> origin=VARIABLE_AS_FUNCTION
-  FUN name:testNoNullCheck visibility:public modality:FINAL <> () returnType:kotlin.Unit
-    BLOCK_BODY
-      TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-        CALL 'public final fun useT <T> (fn: kotlin.Function0<T of <root>.useT>): T of <root>.useT declared in <root>' type=kotlin.String origin=null
-          <T>: kotlin.String
-          fn: FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in <root>.testNoNullCheck'
-                  TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-                    CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.kt
index 1ef154d4831..80d46a0c9fb 100644
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.kt
+++ b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: nnStringVsT.kt
 fun <T> useT(fn: () -> T) = fn()
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.fir.txt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.fir.txt
deleted file mode 100644
index f3b5c206b9b..00000000000
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.fir.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-FILE fqName:<root> fileName:/nnStringVsTAny.kt
-  FUN name:useTAny visibility:public modality:FINAL <T> (fn:kotlin.Function0<T of <root>.useTAny>) returnType:T of <root>.useTAny
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any]
-    VALUE_PARAMETER name:fn index:0 type:kotlin.Function0<T of <root>.useTAny>
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun useTAny <T> (fn: kotlin.Function0<T of <root>.useTAny>): T of <root>.useTAny declared in <root>'
-        CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=T of <root>.useTAny origin=INVOKE
-          $this: GET_VAR 'fn: kotlin.Function0<T of <root>.useTAny> declared in <root>.useTAny' type=kotlin.Function0<T of <root>.useTAny> origin=VARIABLE_AS_FUNCTION
-  FUN name:testNoNullCheck visibility:public modality:FINAL <> () returnType:kotlin.Unit
-    BLOCK_BODY
-      TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-        CALL 'public final fun useTAny <T> (fn: kotlin.Function0<T of <root>.useTAny>): T of <root>.useTAny declared in <root>' type=kotlin.String origin=null
-          <T>: kotlin.String
-          fn: FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in <root>.testNoNullCheck'
-                  TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-                    CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.kt
index 6e63d7863f3..7b050e5553f 100644
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.kt
+++ b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: nnStringVsTAny.kt
 fun <T : Any> useTAny(fn: () -> T) = fn()
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.fir.txt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.fir.txt
deleted file mode 100644
index 85c41a3b06b..00000000000
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.fir.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-FILE fqName:<root> fileName:/nnStringVsTConstrained.kt
-  FUN name:useTConstrained visibility:public modality:FINAL <T> (xs:kotlin.Array<T of <root>.useTConstrained>, fn:kotlin.Function0<T of <root>.useTConstrained>) returnType:T of <root>.useTConstrained
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
-    VALUE_PARAMETER name:xs index:0 type:kotlin.Array<T of <root>.useTConstrained>
-    VALUE_PARAMETER name:fn index:1 type:kotlin.Function0<T of <root>.useTConstrained>
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun useTConstrained <T> (xs: kotlin.Array<T of <root>.useTConstrained>, fn: kotlin.Function0<T of <root>.useTConstrained>): T of <root>.useTConstrained declared in <root>'
-        CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=T of <root>.useTConstrained origin=INVOKE
-          $this: GET_VAR 'fn: kotlin.Function0<T of <root>.useTConstrained> declared in <root>.useTConstrained' type=kotlin.Function0<T of <root>.useTConstrained> origin=VARIABLE_AS_FUNCTION
-  FUN name:testWithNullCheck visibility:public modality:FINAL <> (xs:kotlin.Array<kotlin.String>) returnType:kotlin.Unit
-    VALUE_PARAMETER name:xs index:0 type:kotlin.Array<kotlin.String>
-    BLOCK_BODY
-      TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-        CALL 'public final fun useTConstrained <T> (xs: kotlin.Array<T of <root>.useTConstrained>, fn: kotlin.Function0<T of <root>.useTConstrained>): T of <root>.useTConstrained declared in <root>' type=kotlin.String origin=null
-          <T>: kotlin.String
-          xs: GET_VAR 'xs: kotlin.Array<kotlin.String> declared in <root>.testWithNullCheck' type=kotlin.Array<kotlin.String> origin=null
-          fn: FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in <root>.testWithNullCheck'
-                  TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-                    CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.kt
index 3a57193e5b8..67135c9a3a3 100644
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.kt
+++ b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: nnStringVsTConstrained.kt
 fun <T> useTConstrained(xs: Array<T>, fn: () -> T) = fn()
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.fir.txt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.fir.txt
deleted file mode 100644
index 51a43cd122d..00000000000
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.fir.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-FILE fqName:<root> fileName:/nnStringVsTXArray.kt
-  FUN name:useTX visibility:public modality:FINAL <T> (x:T of <root>.useTX, fn:kotlin.Function0<T of <root>.useTX>) returnType:T of <root>.useTX
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
-    VALUE_PARAMETER name:x index:0 type:T of <root>.useTX
-    VALUE_PARAMETER name:fn index:1 type:kotlin.Function0<T of <root>.useTX>
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun useTX <T> (x: T of <root>.useTX, fn: kotlin.Function0<T of <root>.useTX>): T of <root>.useTX declared in <root>'
-        CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=T of <root>.useTX origin=INVOKE
-          $this: GET_VAR 'fn: kotlin.Function0<T of <root>.useTX> declared in <root>.useTX' type=kotlin.Function0<T of <root>.useTX> origin=VARIABLE_AS_FUNCTION
-  FUN name:testWithNullCheck visibility:public modality:FINAL <> (xs:kotlin.Array<kotlin.String>) returnType:kotlin.Unit
-    VALUE_PARAMETER name:xs index:0 type:kotlin.Array<kotlin.String>
-    BLOCK_BODY
-      TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-        CALL 'public final fun useTX <T> (x: T of <root>.useTX, fn: kotlin.Function0<T of <root>.useTX>): T of <root>.useTX declared in <root>' type=java.io.Serializable origin=null
-          <T>: java.io.Serializable
-          x: GET_VAR 'xs: kotlin.Array<kotlin.String> declared in <root>.testWithNullCheck' type=kotlin.Array<kotlin.String> origin=null
-          fn: FUN_EXPR type=kotlin.Function0<java.io.Serializable> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:java.io.Serializable
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): java.io.Serializable declared in <root>.testWithNullCheck'
-                  TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-                    CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.kt
index 43bcbfe5210..b7422ecf6bb 100644
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.kt
+++ b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: nnStringVsTXArray.kt
 fun <T> useTX(x: T, fn: () -> T) = fn()
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.fir.txt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.fir.txt
deleted file mode 100644
index cf8a95857f9..00000000000
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.fir.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-FILE fqName:<root> fileName:/nnStringVsTXString.kt
-  FUN name:useTX visibility:public modality:FINAL <T> (x:T of <root>.useTX, fn:kotlin.Function0<T of <root>.useTX>) returnType:T of <root>.useTX
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
-    VALUE_PARAMETER name:x index:0 type:T of <root>.useTX
-    VALUE_PARAMETER name:fn index:1 type:kotlin.Function0<T of <root>.useTX>
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun useTX <T> (x: T of <root>.useTX, fn: kotlin.Function0<T of <root>.useTX>): T of <root>.useTX declared in <root>'
-        CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=T of <root>.useTX origin=INVOKE
-          $this: GET_VAR 'fn: kotlin.Function0<T of <root>.useTX> declared in <root>.useTX' type=kotlin.Function0<T of <root>.useTX> origin=VARIABLE_AS_FUNCTION
-  FUN name:testWithNullCheck visibility:public modality:FINAL <> () returnType:kotlin.Unit
-    BLOCK_BODY
-      TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-        CALL 'public final fun useTX <T> (x: T of <root>.useTX, fn: kotlin.Function0<T of <root>.useTX>): T of <root>.useTX declared in <root>' type=kotlin.String origin=null
-          <T>: kotlin.String
-          x: CONST String type=kotlin.String value=""
-          fn: FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in <root>.testWithNullCheck'
-                  TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
-                    CALL 'public open fun notNullString (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.kt
index c1879f227ba..12dee7899cf 100644
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.kt
+++ b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: nnStringVsTXString.kt
 fun <T> useTX(x: T, fn: () -> T) = fn()
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTConstrained.fir.txt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTConstrained.fir.txt
index 9072f71313c..d06da6b5448 100644
--- a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTConstrained.fir.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTConstrained.fir.txt
@@ -18,4 +18,5 @@ FILE fqName:<root> fileName:/stringVsTConstrained.kt
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in <root>.testWithNullCheck'
-                  CALL 'public open fun string (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
+                  TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+                    CALL 'public open fun string (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
diff --git a/compiler/testData/ir/irText/types/rawTypeInSignature.fir.txt b/compiler/testData/ir/irText/types/rawTypeInSignature.fir.txt
index b01fe5a3155..30b0c189dc0 100644
--- a/compiler/testData/ir/irText/types/rawTypeInSignature.fir.txt
+++ b/compiler/testData/ir/irText/types/rawTypeInSignature.fir.txt
@@ -163,33 +163,17 @@ FILE fqName:<root> fileName:/rawTypeInSignature.kt
           CALL 'public abstract fun returnsRawGenericOut (): <root>.GenericOut<*>? declared in <root>.JRaw' type=<root>.GenericOut<*>? origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
               receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.returnsRawGenericOut' type=<root>.KRaw origin=null
-    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.KRaw, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.KRaw'
-          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
-              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.equals' type=<root>.KRaw origin=null
-            other: GET_VAR 'other: kotlin.Any? declared in <root>.KRaw.equals' type=kotlin.Any? origin=null
-    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.KRaw) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.KRaw'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
-              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.hashCode' type=<root>.KRaw origin=null
-    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.KRaw) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.KRaw'
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
-              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.toString' type=<root>.KRaw origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.txt b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.txt
index 62ae2c87c1d..8c9701788ee 100644
--- a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.txt
+++ b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.txt
@@ -9,7 +9,7 @@ FILE fqName:<root> fileName:/smartCastOnFieldReceiverOfGenericType.kt
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         TYPE_OP type=kotlin.String origin=CAST typeOperand=kotlin.String
           GET_VAR 'b: kotlin.Any declared in <root>.testSetField' type=kotlin.Any origin=null
-      SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.Unit origin=EQ
+      SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:T of <root>.JCell? visibility:public' type=kotlin.Unit origin=EQ
         receiver: TYPE_OP type=<root>.JCell<kotlin.String> origin=IMPLICIT_CAST typeOperand=<root>.JCell<kotlin.String>
           GET_VAR 'a: kotlin.Any declared in <root>.testSetField' type=kotlin.Any origin=null
         value: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String
@@ -21,6 +21,7 @@ FILE fqName:<root> fileName:/smartCastOnFieldReceiverOfGenericType.kt
         TYPE_OP type=<root>.JCell<kotlin.String> origin=CAST typeOperand=<root>.JCell<kotlin.String>
           GET_VAR 'a: kotlin.Any declared in <root>.testGetField' type=kotlin.Any origin=null
       RETURN type=kotlin.Nothing from='public final fun testGetField (a: kotlin.Any): kotlin.String declared in <root>'
-        GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.String? origin=GET_PROPERTY
-          receiver: TYPE_OP type=<root>.JCell<kotlin.String> origin=IMPLICIT_CAST typeOperand=<root>.JCell<kotlin.String>
-            GET_VAR 'a: kotlin.Any declared in <root>.testGetField' type=kotlin.Any origin=null
+        TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+          GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:T of <root>.JCell? visibility:public' type=kotlin.String? origin=GET_PROPERTY
+            receiver: TYPE_OP type=<root>.JCell<kotlin.String> origin=IMPLICIT_CAST typeOperand=<root>.JCell<kotlin.String>
+              GET_VAR 'a: kotlin.Any declared in <root>.testGetField' type=kotlin.Any origin=null
diff --git a/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
index cd7c38e68a5..5ad1da0e20c 100644
--- a/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
@@ -1,9 +1,9 @@
 public open class ArrayInGenericArguments : R|kotlin/Any| {
-    public final static field X: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!>, ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!>?>!|
+    public final static field X: R|ft<@FlexibleNullability ArrayInGenericArguments.DataKey<ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, ArrayInGenericArguments.DataKey<ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|
 
-    public final static field Y: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>!>, ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>!>?>!|
+    public final static field Y: R|ft<@FlexibleNullability ArrayInGenericArguments.DataKey<ft<@FlexibleNullability kotlin/IntArray, kotlin/IntArray?>!>, ArrayInGenericArguments.DataKey<ft<@FlexibleNullability kotlin/IntArray, kotlin/IntArray?>!>?>!|
 
-    public final static field Z: R|ft<ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!>, ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!>?>!|
+    public final static field Z: R|ft<@FlexibleNullability ArrayInGenericArguments.DataKey<out ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!>, ArrayInGenericArguments.DataKey<out ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!>?>!|
 
     public constructor(): R|ArrayInGenericArguments|
 
diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
index 7aaf6f43345..389ccc232f5 100644
--- a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
@@ -1,5 +1,5 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
-    public final fun toArray(p0: R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>?>!|): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>?>!|
+    public final fun toArray(p0: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>?>!|): R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>?>!|
 
     public constructor(): R|test/ArrayTypeVariance|
 
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
index 8ae833f484d..cebda2aeb12 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
@@ -1,4 +1,4 @@
-public abstract class ClassWithTypePExtendsIterableP<P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<P, P?>!>| {
+public abstract class ClassWithTypePExtendsIterableP<P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<@FlexibleNullability P, P?>!>| {
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/ClassWithTypePExtendsIterableP<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
index a273382fd72..402b7b4ee7e 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypePP<P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<P, P?>!|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<P, P?>!|>(): R|test/ClassWithTypePP<P, Q>|
+public final class ClassWithTypePP<P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<@FlexibleNullability P, P?>!|> : R|kotlin/Any| {
+    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<@FlexibleNullability P, P?>!|>(): R|test/ClassWithTypePP<P, Q>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
index 305d940481d..62a0efb6202 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
@@ -1,4 +1,4 @@
-public open class ClassWithTypePRefNext<R : R|ft<kotlin/collections/MutableIterable<ft<P, P?>!>, kotlin/collections/Iterable<ft<P, P?>!>?>!|, P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public constructor<R : R|ft<kotlin/collections/MutableIterable<ft<P, P?>!>, kotlin/collections/Iterable<ft<P, P?>!>?>!|, P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/ClassWithTypePRefNext<R, P>|
+public open class ClassWithTypePRefNext<R : R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability P, P?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability P, P?>!>?>!|, P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
+    public constructor<R : R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability P, P?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability P, P?>!>?>!|, P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/ClassWithTypePRefNext<R, P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
index a39791bd955..6935b2c07da 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelf<P : R|ft<kotlin/Enum<ft<P, P?>!>, kotlin/Enum<ft<P, P?>!>?>!|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Enum<ft<P, P?>!>, kotlin/Enum<ft<P, P?>!>?>!|>(): R|test/ClassWithTypePRefSelf<P>|
+public final class ClassWithTypePRefSelf<P : R|ft<@FlexibleNullability kotlin/Enum<ft<@FlexibleNullability P, P?>!>, kotlin/Enum<ft<@FlexibleNullability P, P?>!>?>!|> : R|kotlin/Any| {
+    public constructor<P : R|ft<@FlexibleNullability kotlin/Enum<ft<@FlexibleNullability P, P?>!>, kotlin/Enum<ft<@FlexibleNullability P, P?>!>?>!|>(): R|test/ClassWithTypePRefSelf<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
index b0cbb2e56a2..12cf27aeb79 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelfAndClass<P : R|ft<test/ClassWithTypePRefSelfAndClass<ft<P, P?>!>, test/ClassWithTypePRefSelfAndClass<ft<P, P?>!>?>!|> : R|kotlin/Any| {
-    public constructor<P : R|ft<test/ClassWithTypePRefSelfAndClass<ft<P, P?>!>, test/ClassWithTypePRefSelfAndClass<ft<P, P?>!>?>!|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
+public final class ClassWithTypePRefSelfAndClass<P : R|ft<@FlexibleNullability test/ClassWithTypePRefSelfAndClass<ft<@FlexibleNullability P, P?>!>, test/ClassWithTypePRefSelfAndClass<ft<@FlexibleNullability P, P?>!>?>!|> : R|kotlin/Any| {
+    public constructor<P : R|ft<@FlexibleNullability test/ClassWithTypePRefSelfAndClass<ft<@FlexibleNullability P, P?>!>, test/ClassWithTypePRefSelfAndClass<ft<@FlexibleNullability P, P?>!>?>!|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
index 9099f9e09d0..acbf867d40d 100644
--- a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
@@ -1,5 +1,5 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
-    public open field files: R|ft<kotlin/Array<ft<java/io/File, java/io/File?>!>, kotlin/Array<out ft<java/io/File, java/io/File?>!>?>!|
+    public open field files: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability java/io/File, java/io/File?>!>, kotlin/Array<out ft<@FlexibleNullability java/io/File, java/io/File?>!>?>!|
 
     public constructor(): R|test/FieldOfArrayType|
 
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
index b293bd0aaa1..dd3edda3592 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
@@ -1,5 +1,5 @@
 public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
-    public open fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>!, ft<kotlin/Char, kotlin/Char?>!, ft<kotlin/Boolean, kotlin/Boolean?>!>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>!, ft<kotlin/Char, kotlin/Char?>!, ft<kotlin/Boolean, kotlin/Boolean?>!>?>!|
+    public open fun staticType(): R|ft<@FlexibleNullability test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<@FlexibleNullability kotlin/Byte, kotlin/Byte?>!, ft<@FlexibleNullability kotlin/Char, kotlin/Char?>!, ft<@FlexibleNullability kotlin/Boolean, kotlin/Boolean?>!>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<@FlexibleNullability kotlin/Byte, kotlin/Byte?>!, ft<@FlexibleNullability kotlin/Char, kotlin/Char?>!, ft<@FlexibleNullability kotlin/Boolean, kotlin/Boolean?>!>?>!|
 
     public constructor(): R|test/InnerClassTypeMultipleGeneric|
 
diff --git a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt
index aa254173084..0f1a4a066bf 100644
--- a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt
@@ -1,12 +1,12 @@
 public abstract interface IntrinsicCompanionObject : R|kotlin/Any| {
-    public abstract fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testInt(i: R|ft<@FlexibleNullability kotlin/Int.Companion, kotlin/Int.Companion?>!|): R|kotlin/Unit|
 
-    public abstract fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testChar(c: R|ft<@FlexibleNullability kotlin/Char.Companion, kotlin/Char.Companion?>!|): R|kotlin/Unit|
 
-    public abstract fun testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testString(s: R|ft<@FlexibleNullability kotlin/String.Companion, kotlin/String.Companion?>!|): R|kotlin/Unit|
 
-    public abstract fun testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testBoolean(b: R|ft<@FlexibleNullability kotlin/Boolean.Companion, kotlin/Boolean.Companion?>!|): R|kotlin/Unit|
 
-    public abstract fun testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testEnum(e: R|ft<@FlexibleNullability kotlin/Enum.Companion, kotlin/Enum.Companion?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
index 7172f1d7804..def0cea1bb0 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>!|> bar(): R|kotlin/Unit|
+    public open fun <T : R|ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!|> bar(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePOneUpperBound|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
index bc1714d64ba..6e5a9521de4 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>!|, R|ft<java/lang/Runnable, java/lang/Runnable?>!|> foo(): R|kotlin/Unit|
+    public open fun <T : R|ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!|, R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePTwoUpperBounds|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
index bf6866d07bc..9b9059e04d7 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
@@ -1,5 +1,5 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
-    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<P, P?>!|> f(): R|kotlin/Unit|
+    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<@FlexibleNullability P, P?>!|> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypePP|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
index 2472e98c2d2..88ab7b83570 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithTypePRefClassP<P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public final fun <Q : R|ft<P, P?>!|> f(): R|kotlin/Unit|
+    public final fun <Q : R|ft<@FlexibleNullability P, P?>!|> f(): R|kotlin/Unit|
 
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/MethodWithTypePRefClassP<P>|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
index 2ccb6cc4d3b..08fae4a412c 100644
--- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
@@ -1,5 +1,5 @@
 public final class MethosWithPRefTP : R|kotlin/Any| {
-    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>!|> f(p: R|ft<P, P?>!|): R|kotlin/Unit|
+    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>!|> f(p: R|ft<@FlexibleNullability P, P?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethosWithPRefTP|
 
diff --git a/compiler/testData/loadJava/compiledJava/MyException.fir.txt b/compiler/testData/loadJava/compiledJava/MyException.fir.txt
index d0b5ce80202..55a5f954c56 100644
--- a/compiler/testData/loadJava/compiledJava/MyException.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MyException.fir.txt
@@ -1,4 +1,4 @@
 public open class MyException : R|kotlin/Any| {
-    public constructor(message: R|ft<kotlin/String, kotlin/String?>!|, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>!|): R|test/MyException|
+    public constructor(message: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, cause: R|ft<@FlexibleNullability kotlin/Throwable, kotlin/Throwable?>!|): R|test/MyException|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
index 54e2eb9adfe..ca7ba99a04a 100644
--- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
@@ -1,11 +1,11 @@
 public open class Frame : R|kotlin/Any| {
-    public/*package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>!|
+    public/*package*/ open field accessibleContext: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|awt/Frame|
 
 }
 public open class JFrame : R|awt/Frame| {
-    protected/*protected and package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>!|
+    protected/*protected and package*/ open field accessibleContext: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/JFrame|
 
diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt
index 286e71ec700..3c864540e8a 100644
--- a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| {
-    public abstract fun f(collection: R|ft<kotlin/collections/MutableCollection<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/Collection<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
+    public abstract fun f(collection: R|ft<@FlexibleNullability kotlin/collections/MutableCollection<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/Collection<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
 
-    public abstract fun f(comparator: R|ft<kotlin/Comparable<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Comparable<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
+    public abstract fun f(comparator: R|ft<@FlexibleNullability kotlin/Comparable<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Comparable<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
index a0bbe00d88e..bb807cf56b3 100644
--- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
@@ -1,5 +1,5 @@
 public open class TopLevel$Class : R|kotlin/Any| {
-    public open fun foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>!|): R|kotlin/Unit|
+    public open fun foo(other: R|ft<@FlexibleNullability test/TopLevel$Class, test/TopLevel$Class?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/TopLevel$Class|
 
diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
index 2007a47d6de..c73f1d7f8aa 100644
--- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
@@ -1,7 +1,7 @@
 public final class UnboundWildcard : R|kotlin/Any| {
-    public final fun foo(): R|ft<test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>!|
+    public final fun foo(): R|ft<@FlexibleNullability test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>!|
 
-    public final fun collection(): R|ft<kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>!|
+    public final fun collection(): R|ft<@FlexibleNullability kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>!|
 
     public constructor(): R|test/UnboundWildcard|
 
diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
index 2dd00af5101..f82c9171814 100644
--- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
@@ -1,5 +1,5 @@
 public open class WildcardBounds : R|kotlin/Any| {
-    public/*package*/ open fun foo(x: R|ft<test/WildcardBounds.A<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>, test/WildcardBounds.A<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, y: R|ft<test/WildcardBounds.A<in ft<kotlin/String, kotlin/String?>!>, test/WildcardBounds.A<in ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public/*package*/ open fun foo(x: R|ft<@FlexibleNullability test/WildcardBounds.A<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, test/WildcardBounds.A<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, y: R|ft<@FlexibleNullability test/WildcardBounds.A<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, test/WildcardBounds.A<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/WildcardBounds|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
index d8ec5fbc8df..cbd13f04d73 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
@@ -1,7 +1,7 @@
-public final enum class AnnotatedEnumEntry : R|kotlin/Enum<ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>!>| {
-    @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static enum entry E1: R|test/AnnotatedEnumEntry|
-    @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static enum entry E2: R|test/AnnotatedEnumEntry|
-    public final static enum entry E3: R|test/AnnotatedEnumEntry|
+public final enum class AnnotatedEnumEntry : R|kotlin/Enum<ft<@FlexibleNullability test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>!>| {
+    @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static enum entry E1: R|@FlexibleNullability test/AnnotatedEnumEntry|
+    @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static enum entry E2: R|@FlexibleNullability test/AnnotatedEnumEntry|
+    public final static enum entry E3: R|@FlexibleNullability test/AnnotatedEnumEntry|
     public final static fun values(): R|kotlin/Array<test/AnnotatedEnumEntry>| {
     }
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
index 7302d1a8925..49927052b8f 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
@@ -1,5 +1,5 @@
 public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
-    public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>!|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|test/AnnotatedTypeInFun|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
index a5daeeac779..d9c5c9d06a0 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
@@ -1,5 +1,5 @@
 public open class AnnotatedValueParameter : R|kotlin/Any| {
-    public open fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public open fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/AnnotatedValueParameter|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
index 7c9938b9448..3d0ea98b0a4 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
@@ -1,6 +1,6 @@
-public final enum class EnumConstructorParameter : R|kotlin/Enum<ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>!>| {
-    public final static enum entry INSTANCE: R|test/EnumConstructorParameter|
-    private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>!|): R|test/EnumConstructorParameter|
+public final enum class EnumConstructorParameter : R|kotlin/Enum<ft<@FlexibleNullability test/EnumConstructorParameter, test/EnumConstructorParameter?>!>| {
+    public final static enum entry INSTANCE: R|@FlexibleNullability test/EnumConstructorParameter|
+    private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|test/EnumConstructorParameter|
 
     private constructor(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
index 9d77acf371f..06e0c7eca84 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
@@ -1,5 +1,5 @@
 public open class JavaDocDeprecated : R|kotlin/Any| {
-    public open fun getFoo(text: R|ft<kotlin/String, kotlin/String?>!|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun getFoo(text: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/JavaDocDeprecated|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
index 582e76ca52c..c7690d6416c 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface StringConstantInParam : R|kotlin/Any| {
-    public final static field HEL: R|ft<kotlin/String, kotlin/String?>!| = String(hel)
+    public final static field HEL: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(hel)
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt
index acc451ca9f7..b4f95dbad8e 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericDeep : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(cl: R|ft<java/lang/Class<ft<P, P?>!>, java/lang/Class<ft<P, P?>!>?>!|): R|test/ConstructorGenericDeep|
+    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(cl: R|ft<@FlexibleNullability java/lang/Class<ft<@FlexibleNullability P, P?>!>, java/lang/Class<ft<@FlexibleNullability P, P?>!>?>!|): R|test/ConstructorGenericDeep|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt
index 1062303dde0..3d647b85564 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericSimple : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(p: R|ft<P, P?>!|): R|test/ConstructorGenericSimple|
+    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(p: R|ft<@FlexibleNullability P, P?>!|): R|test/ConstructorGenericSimple|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
index c1a21961491..334c34e4dde 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
-    public constructor<P : R|ft<java/util/RandomAccess, java/util/RandomAccess?>!|>(p: R|ft<P, P?>!|): R|test/ConstructorGenericUpperBound|
+    public constructor<P : R|ft<@FlexibleNullability java/util/RandomAccess, java/util/RandomAccess?>!|>(p: R|ft<@FlexibleNullability P, P?>!|): R|test/ConstructorGenericUpperBound|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt
index a07ec085ca8..dbb44753cb9 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt
@@ -1,6 +1,6 @@
-public final enum class EnumMembers : R|kotlin/Enum<ft<test/EnumMembers, test/EnumMembers?>!>| {
-    public final static enum entry FIRST: R|test/EnumMembers|
-    public final static enum entry SECOND: R|test/EnumMembers|
+public final enum class EnumMembers : R|kotlin/Enum<ft<@FlexibleNullability test/EnumMembers, test/EnumMembers?>!>| {
+    public final static enum entry FIRST: R|@FlexibleNullability test/EnumMembers|
+    public final static enum entry SECOND: R|@FlexibleNullability test/EnumMembers|
     public final field isFirst: R|kotlin/Boolean|
 
     public open fun first(): R|kotlin/Boolean|
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
index 39db0096dde..50251c11ddc 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
@@ -1,6 +1,6 @@
-public open enum class EnumWithSpecializedEntry : R|kotlin/Enum<ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>!>| {
-    public final static enum entry E1: R|test/EnumWithSpecializedEntry|
-    public final static enum entry E2: R|test/EnumWithSpecializedEntry|
+public open enum class EnumWithSpecializedEntry : R|kotlin/Enum<ft<@FlexibleNullability test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>!>| {
+    public final static enum entry E1: R|@FlexibleNullability test/EnumWithSpecializedEntry|
+    public final static enum entry E2: R|@FlexibleNullability test/EnumWithSpecializedEntry|
     public final static fun values(): R|kotlin/Array<test/EnumWithSpecializedEntry>| {
     }
 
diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
index e955da73274..9b44b018a6e 100644
--- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
@@ -1,6 +1,6 @@
-public final enum class JavaEnum : R|kotlin/Enum<ft<test/JavaEnum, test/JavaEnum?>!>| {
-    public final static enum entry ENTRY: R|test/JavaEnum|
-    public final static enum entry ANOTHER: R|test/JavaEnum|
+public final enum class JavaEnum : R|kotlin/Enum<ft<@FlexibleNullability test/JavaEnum, test/JavaEnum?>!>| {
+    public final static enum entry ENTRY: R|@FlexibleNullability test/JavaEnum|
+    public final static enum entry ANOTHER: R|@FlexibleNullability test/JavaEnum|
     public final static fun values(): R|kotlin/Array<test/JavaEnum>| {
     }
 
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
index c8e0cf1a9db..37d05490aba 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
@@ -1,5 +1,5 @@
 public open class DifferentGetterAndSetter : R|kotlin/Any| {
-    public open fun setSomething(color: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun setSomething(color: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public open fun getSomething(): R|kotlin/Int|
 
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
index 699f7f70a7e..e24c3bfb30b 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
@@ -1,5 +1,5 @@
 public open class JavaBeanVal : R|kotlin/Any| {
-    public open fun getColor(): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun getColor(): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/JavaBeanVal|
 
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
index 5ccda953b37..de3686dff4d 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
@@ -1,7 +1,7 @@
 public open class JavaBeanVar : R|kotlin/Any| {
-    public open fun getColor(): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun getColor(): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    public open fun setColor(string: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun setColor(string: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/JavaBeanVar|
 
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
index 09ed70585c6..7306dca2f4e 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
@@ -1,7 +1,7 @@
 public open class JavaBeanVarOfGenericType<P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open fun getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>!>, java/util/ArrayList<ft<P, P?>!>?>!|
+    public open fun getCharacters(): R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability P, P?>!>, java/util/ArrayList<ft<@FlexibleNullability P, P?>!>?>!|
 
-    public open fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>!>, java/util/ArrayList<ft<P, P?>!>?>!|): R|kotlin/Unit|
+    public open fun setCharacters(characters: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability P, P?>!>, java/util/ArrayList<ft<@FlexibleNullability P, P?>!>?>!|): R|kotlin/Unit|
 
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/JavaBeanVarOfGenericType<P>|
 
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
index 63b1f2b7d4d..2487502afe3 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
@@ -1,5 +1,5 @@
 public open class TwoSetters : R|kotlin/Any| {
-    public open fun setSize(size: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun setSize(size: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public open fun setSize(size: R|kotlin/Int|): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
index 631151624b6..1d0d376fb11 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
@@ -1,5 +1,5 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
-    public open fun <T : R|ft<java/io/Serializable, java/io/Serializable?>!|> foo(): R|kotlin/Unit|
+    public open fun <T : R|ft<@FlexibleNullability java/io/Serializable, java/io/Serializable?>!|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/AllBoundsInWhen|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
index 11722833a1f..776ed49affc 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
@@ -1,5 +1,5 @@
 public open class ArrayType : R|kotlin/Any| {
-    public open fun foo(): R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|
+    public open fun foo(): R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
 
     public constructor(): R|test/ArrayType|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
index 0ef2f13d500..8363f8f871b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorWithNewTypeParams<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|, U : R|ft<kotlin/Any, kotlin/Any?>!|>(first: R|ft<U, U?>!|): R|test/ConstructorWithNewTypeParams<T>|
+    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|, U : R|ft<kotlin/Any, kotlin/Any?>!|>(first: R|ft<@FlexibleNullability U, U?>!|): R|test/ConstructorWithNewTypeParams<T>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
index d06169dbbb9..7cb69ff11b8 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorWithParentTypeParams<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(first: R|ft<T, T?>!|): R|test/ConstructorWithParentTypeParams<T>|
+    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(first: R|ft<@FlexibleNullability T, T?>!|): R|test/ConstructorWithParentTypeParams<T>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt
index db7f7621e44..ad470292904 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorWithSeveralParams : R|kotlin/Any| {
-    public constructor(integer: R|ft<kotlin/Int, kotlin/Int?>!|, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>?>!|): R|test/ConstructorWithSeveralParams|
+    public constructor(integer: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|, intBasic: R|kotlin/Int|, collection: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|test/ConstructorWithSeveralParams|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
index 0111e55d7a1..dfa76faaf36 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
@@ -1,5 +1,5 @@
 public open class CustomProjectionKind : R|kotlin/Any| {
-    public open fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>!>?>!|
+    public open fun foo(): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|
 
     public constructor(): R|test/CustomProjectionKind|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
index 847b28570af..c670a85da59 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
-    public open fun foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/Function1<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!|): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>!>, kotlin/Function0<ft<kotlin/String, kotlin/String?>!>?>!|
+    public open fun foo(f: R|ft<@FlexibleNullability kotlin/Function1<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Function1<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|ft<@FlexibleNullability kotlin/Function0<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Function0<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
 
     public constructor(): R|test/MethodWithFunctionTypes|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
index 7aec26e74cd..372baf50a9e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun foo(a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/MethodWithGenerics|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
index cd191791590..344a4c38b2a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
@@ -1,7 +1,7 @@
 public open class MethodWithMappedClasses : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> copy(dest: R|ft<kotlin/collections/MutableList<in ft<T, T?>!>, kotlin/collections/List<*>?>!|, src: R|ft<kotlin/collections/MutableList<ft<T, T?>!>, kotlin/collections/List<ft<T, T?>!>?>!|): R|kotlin/Unit|
+    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> copy(dest: R|ft<@FlexibleNullability kotlin/collections/MutableList<in ft<@FlexibleNullability T, T?>!>, kotlin/collections/List<*>?>!|, src: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability T, T?>!>, kotlin/collections/List<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
 
-    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, in ft<T, T?>!>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>!, *>?>!|, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, ft<T, T?>!>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>!, ft<T, T?>!>?>!|): R|kotlin/Unit|
+    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> copyMap(dest: R|ft<@FlexibleNullability kotlin/collections/MutableMap<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, in ft<@FlexibleNullability T, T?>!>, kotlin/collections/Map<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, *>?>!|, src: R|ft<@FlexibleNullability kotlin/collections/MutableMap<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability T, T?>!>, kotlin/collections/Map<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithMappedClasses|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
index bd4975c1c2f..aae0d6d367d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
-    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>!|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out ft<B, B?>!>, kotlin/collections/List<out ft<B, B?>!>?>!|, list: R|ft<kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<*>?>!|): R|kotlin/Unit|
+    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|, R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<@FlexibleNullability A, A?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<out ft<@FlexibleNullability B, B?>!>, kotlin/collections/List<out ft<@FlexibleNullability B, B?>!>?>!|, list: R|ft<@FlexibleNullability kotlin/collections/MutableList<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/List<*>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeParameters|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
index 65663efc015..5b0a470aa2f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithVararg : R|kotlin/Any| {
-    public open fun foo(vararg s: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public open fun foo(vararg s: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithVararg|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
index ef8d624fe81..538e98336d3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
@@ -1,9 +1,9 @@
 public open class PropertyArrayTypes<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open field arrayOfArrays: R|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/Array<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!>?>!|
+    public open field arrayOfArrays: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|
 
-    public open field array: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|
+    public open field array: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
 
-    public open field genericArray: R|ft<kotlin/Array<ft<T, T?>!>, kotlin/Array<out ft<T, T?>!>?>!|
+    public open field genericArray: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability T, T?>!>, kotlin/Array<out ft<@FlexibleNullability T, T?>!>?>!|
 
     public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/PropertyArrayTypes<T>|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
index 2ed4dd1f94a..3cf4f358bba 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
@@ -1,11 +1,11 @@
 public open class PropertyComplexTypes<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open field genericType: R|ft<T, T?>!|
+    public open field genericType: R|ft<@FlexibleNullability T, T?>!|
 
-    public open field listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>?>!|
+    public open field listDefinedGeneric: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
 
-    public open field listGeneric: R|ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!|
+    public open field listGeneric: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability T, T?>!>, java/util/ArrayList<ft<@FlexibleNullability T, T?>!>?>!|
 
-    public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!>?>!|
+    public open field listOfGenericList: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability T, T?>!>, java/util/ArrayList<ft<@FlexibleNullability T, T?>!>?>!>, java/util/ArrayList<ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability T, T?>!>, java/util/ArrayList<ft<@FlexibleNullability T, T?>!>?>!>?>!|
 
     public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/PropertyComplexTypes<T>|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
index db53eb1586a..428cb780aa1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
@@ -1,7 +1,7 @@
 public open class PropertySimpleType : R|kotlin/Any| {
-    public open field fieldOne: R|ft<kotlin/String, kotlin/String?>!|
+    public open field fieldOne: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>!|
+    public open field fieldTwo: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/PropertySimpleType|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
index efb97842d04..909ae4bc3aa 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
@@ -1,5 +1,5 @@
 public final class StarProjection : R|kotlin/Any| {
-    public final fun foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>!|
+    public final fun foo(): R|ft<@FlexibleNullability test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>!|
 
     public constructor(): R|test/StarProjection|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
index 66c8a8f42fc..cd2e0b52d54 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
-    public open fun copy(from: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>!>?>!|, to: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>!>?>!|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>!>?>!|
+    public open fun copy(from: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|, to: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|
 
     public constructor(): R|test/WrongProjectionKind|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
index f1ffdab8340..36f6d603bec 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun foo(a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/WrongReturnTypeStructure|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
index 2f8e39f04a3..4b50d0d6d4e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>!|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out ft<B, B?>!>, kotlin/collections/List<out ft<B, B?>!>?>!|): R|kotlin/Unit|
+    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|, R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<@FlexibleNullability A, A?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<out ft<@FlexibleNullability B, B?>!>, kotlin/collections/List<out ft<@FlexibleNullability B, B?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure1|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
index 528219f1f73..3d2386e4733 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
+    public open fun foo(a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/WrongValueParameterStructure1|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
index f92c05708cd..1cc1f7c342a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface SubclassOfCollection<E : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/collections/MutableCollection<ft<E, E?>!>| {
-    public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<ft<E, E?>!>|
+public abstract interface SubclassOfCollection<E : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/collections/MutableCollection<ft<@FlexibleNullability E, E?>!>| {
+    public abstract operator fun iterator(): R|@FlexibleNullability kotlin/collections/MutableIterator<ft<@FlexibleNullability E, E?>!>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
index 68511488c6f..84070000ea8 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface SubclassOfMapEntry<K : R|ft<kotlin/Any, kotlin/Any?>!|, V : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/collections/MutableMap.MutableEntry<ft<K, K?>!, ft<V, V?>!>| {
-    public abstract operator fun setValue(value: R|ft<V, V?>!|): R|ft<V, V?>!|
+public abstract interface SubclassOfMapEntry<K : R|ft<kotlin/Any, kotlin/Any?>!|, V : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability K, K?>!, ft<@FlexibleNullability V, V?>!>| {
+    public abstract operator fun setValue(value: R|ft<@FlexibleNullability V, V?>!|): R|ft<@FlexibleNullability V, V?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
index 9ddc69fb0f1..edb7e2c503b 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
+    public abstract fun getIterable(): R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|
 
-    public abstract fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setIterable(Iterable: R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
index ecfdd58c5f9..497c2884204 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface LoadIterator<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public abstract fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T, T?>!>, kotlin/collections/Iterator<ft<T, T?>!>?>!|
+    public abstract fun getIterator(): R|ft<@FlexibleNullability kotlin/collections/MutableIterator<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterator<ft<@FlexibleNullability T, T?>!>?>!|
 
-    public abstract fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>!>, kotlin/collections/Iterator<ft<T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setIterator(iterator: R|ft<@FlexibleNullability kotlin/collections/MutableIterator<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterator<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
index 399c1d08a4f..8dbd4195715 100644
--- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
@@ -1,5 +1,5 @@
 public open class Max : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|, R|ft<kotlin/Comparable<in ft<T, T?>!>, kotlin/Comparable<in ft<T, T?>!>?>!|> max(coll: R|ft<kotlin/collections/MutableCollection<out ft<T, T?>!>, kotlin/collections/Collection<out ft<T, T?>!>?>!|): R|ft<T, T?>!|
+    public open fun <T : R|ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!|, R|ft<@FlexibleNullability kotlin/Comparable<in ft<@FlexibleNullability T, T?>!>, kotlin/Comparable<in ft<@FlexibleNullability T, T?>!>?>!|> max(coll: R|ft<@FlexibleNullability kotlin/collections/MutableCollection<out ft<@FlexibleNullability T, T?>!>, kotlin/collections/Collection<out ft<@FlexibleNullability T, T?>!>?>!|): R|ft<@FlexibleNullability T, T?>!|
 
     public constructor(): R|test/Max|
 
diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
index 80cdabb2880..a3f0016c51b 100644
--- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
@@ -1,4 +1,4 @@
-public open class ModalityOfFakeOverrides : R|java/util/AbstractList<ft<kotlin/String, kotlin/String?>!>| {
+public open class ModalityOfFakeOverrides : R|java/util/AbstractList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>| {
     @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator fun get(index: R|kotlin/Int|): R|@EnhancedNullability kotlin/String|
 
     @R|java/lang/Override|() public open fun size(): R|kotlin/Int|
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
index 78a4930211e..df58b9b0773 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/MutableIterable<ft<T, T?>!>?>!|
+    @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>?>!|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/MutableIterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
 
-    @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
+    @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<@FlexibleNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|
 
-    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<@FlexibleNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
index aff107cedea..9c8e8239420 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface LoadIterableWithConflict<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
+    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
index a5adf624ba8..afffa9d149a 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface LoadIterableWithNullability<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable<ft<T, T?>!>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable<ft<T, T?>!>|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>|): R|kotlin/Unit|
 
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|kotlin/collections/Iterable<ft<T, T?>!>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>|
 
-    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/Iterable<ft<T, T?>!>|): R|kotlin/Unit|
+    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt
index bb96f9b059e..3c700bc0a11 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface ReadOnlyExtendsWildcard : R|kotlin/Any| {
     public abstract fun bar(): R|kotlin/Unit|
 
-    public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<kotlin/collections/List<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/List<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable<in ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
+    public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<@FlexibleNullability kotlin/collections/List<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/List<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
index 3a260301db7..4c0c4dfbf50 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
@@ -1,5 +1,5 @@
 public open class NotNullObjectArray : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft<@EnhancedNullability kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>>|
+    @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft<@EnhancedNullability kotlin/Array<ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>, @EnhancedNullability kotlin/Array<out ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>>|
 
     public constructor(): R|test/NotNullObjectArray|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
index f80ce812a9b..dc472d735a9 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface Comparator<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public abstract fun compare(o1: R|ft<T, T?>!|, o2: R|ft<T, T?>!|): R|kotlin/Int|
+    public abstract fun compare(o1: R|ft<@FlexibleNullability T, T?>!|, o2: R|ft<@FlexibleNullability T, T?>!|): R|kotlin/Int|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
index f5438fd128c..a852ff7c26b 100644
--- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface FilenameFilter : R|kotlin/Any| {
-    public abstract fun accept(dir: R|ft<java/io/File, java/io/File?>!|, name: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Boolean|
+    public abstract fun accept(dir: R|ft<@FlexibleNullability java/io/File, java/io/File?>!|, name: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Boolean|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
index 16cbfb10b49..60a6e5e3dc0 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParameterWithSelfBound<T : R|ft<test/GenericInterfaceParameterWithSelfBound<ft<T, T?>!>, test/GenericInterfaceParameterWithSelfBound<ft<T, T?>!>?>!|> : R|kotlin/Any| {
-    public abstract fun method(t: R|ft<T, T?>!|): R|ft<T, T?>!|
+public abstract interface GenericInterfaceParameterWithSelfBound<T : R|ft<@FlexibleNullability test/GenericInterfaceParameterWithSelfBound<ft<@FlexibleNullability T, T?>!>, test/GenericInterfaceParameterWithSelfBound<ft<@FlexibleNullability T, T?>!>?>!|> : R|kotlin/Any| {
+    public abstract fun method(t: R|ft<@FlexibleNullability T, T?>!|): R|ft<@FlexibleNullability T, T?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
index 4671d98a5e1..38ece403cef 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<kotlin/Comparable<ft<A, A?>!>, kotlin/Comparable<ft<A, A?>!>?>!|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>!|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>!>, kotlin/collections/List<ft<A, A?>!>?>!|> : R|kotlin/Any| {
-    public abstract fun method(a: R|ft<kotlin/Array<ft<A, A?>!>, kotlin/Array<out ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
+public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<@FlexibleNullability kotlin/Comparable<ft<@FlexibleNullability A, A?>!>, kotlin/Comparable<ft<@FlexibleNullability A, A?>!>?>!|, R|ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!|, B : R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability A, A?>!>, kotlin/collections/List<ft<@FlexibleNullability A, A?>!>?>!|> : R|kotlin/Any| {
+    public abstract fun method(a: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability A, A?>!>, kotlin/Array<out ft<@FlexibleNullability A, A?>!>?>!|, b: R|ft<@FlexibleNullability B, B?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
index 118e9a19adb..3094e8aaf70 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface GenericMethodParameters : R|kotlin/Any| {
-    public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>!>, kotlin/collections/List<ft<A, A?>!>?>!|> method(a: R|ft<kotlin/Array<ft<A, A?>!>, kotlin/Array<out ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
+    public abstract fun <A : R|ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability A, A?>!>, kotlin/collections/List<ft<@FlexibleNullability A, A?>!>?>!|> method(a: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability A, A?>!>, kotlin/Array<out ft<@FlexibleNullability A, A?>!>?>!|, b: R|ft<@FlexibleNullability B, B?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt
index 9ad3856f86f..0af72149fe1 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt
@@ -1,2 +1,2 @@
-public abstract interface SubstitutedSamInterface : R|java/util/Comparator<ft<kotlin/String, kotlin/String?>!>| {
+public abstract interface SubstitutedSamInterface : R|java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt
index 8d760bb4261..ce115f8ba45 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt
@@ -1,2 +1,2 @@
-public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable<ft<test/SubstitutedSamInterfaceSubclassOfBuiltin, test/SubstitutedSamInterfaceSubclassOfBuiltin?>!>| {
+public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable<ft<@FlexibleNullability test/SubstitutedSamInterfaceSubclassOfBuiltin, test/SubstitutedSamInterfaceSubclassOfBuiltin?>!>| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
index 798d49e7413..7e40c4ddebe 100644
--- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface VarargParameter : R|kotlin/Any| {
-    public abstract fun f(vararg strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public abstract fun f(vararg strings: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
index 4abcef59143..789dc5d13d1 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
@@ -1,7 +1,7 @@
 public open class AmbiguousAdapters : R|kotlin/Any| {
-    public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
+    public open fun foo(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
 
-    public open fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>!|): R|kotlin/Unit|
+    public open fun foo(c: R|ft<@FlexibleNullability java/io/Closeable, java/io/Closeable?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/AmbiguousAdapters|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
index 853920ef860..36eca5e9e2b 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
@@ -1,7 +1,7 @@
 public open class Basic : R|kotlin/Any| {
-    public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
+    public open fun foo(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
 
-    public open static fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
+    public open static fun bar(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/Basic|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt
index 0f0c72f6b81..53c365cc0a3 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt
@@ -1,4 +1,4 @@
 public open class Constructor : R|kotlin/Any| {
-    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|test/Constructor|
+    public constructor(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|test/Constructor|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt
index 04537918725..bc08bb138c9 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorWithAnnotations : R|kotlin/Any| {
-    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
+    public constructor(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
index 7fc2e592f23..4330efa689b 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
@@ -1,11 +1,11 @@
 public open class NonTrivialFunctionType : R|kotlin/Any| {
-    public open fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>!|): R|kotlin/Unit|
+    public open fun foo(filenameFilter: R|ft<@FlexibleNullability java/io/FilenameFilter, java/io/FilenameFilter?>!|): R|kotlin/Unit|
 
-    public open fun foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public open fun foo(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
-    public open fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>!|): R|kotlin/Unit|
+    public open fun wildcardUnbound(comparator: R|ft<@FlexibleNullability java/util/Comparator<*>, java/util/Comparator<*>?>!|): R|kotlin/Unit|
 
-    public open fun wildcardBound(comparator: R|ft<java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>, java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
+    public open fun wildcardBound(comparator: R|ft<@FlexibleNullability java/util/Comparator<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, java/util/Comparator<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/NonTrivialFunctionType|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
index 3cbb73d130e..8a6822ad29d 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
@@ -1,5 +1,5 @@
 public open class PrivateSamAdapter : R|kotlin/Any| {
-    private open fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>!|): R|kotlin/Unit|
+    private open fun samAdapter(r: R|ft<@FlexibleNullability test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/PrivateSamAdapter|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt
index 82a757164e4..797a91ff978 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface SelfAsParameter : R|kotlin/Any| {
-    public abstract fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>!|): R|kotlin/Unit|
+    public abstract fun foo(p: R|ft<@FlexibleNullability test/SelfAsParameter, test/SelfAsParameter?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
index 23c87c839df..ffd0996a777 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
@@ -1,5 +1,5 @@
 public open class SeveralSamParameters : R|kotlin/Any| {
-    public open static fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<kotlin/String, kotlin/String?>!>?>!|, a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/String, kotlin/String?>!|, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|ft<kotlin/String, kotlin/String?>!|
+    public open static fun findMaxAndInvokeCallback(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|, a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, afterRunnable: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/SeveralSamParameters|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
index d640c1cbe35..7ed0614a0d6 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
@@ -1,5 +1,5 @@
 public open class TypeParameterOfClass<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|): R|kotlin/Unit|
+    public open fun foo(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
 
     public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/TypeParameterOfClass<T>|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
index 78e2598231a..730e38b2223 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
@@ -1,9 +1,9 @@
 public open class TypeParameterOfMethod : R|kotlin/Any| {
-    public open static fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> max(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
+    public open static fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> max(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|, value1: R|ft<@FlexibleNullability T, T?>!|, value2: R|ft<@FlexibleNullability T, T?>!|): R|ft<@FlexibleNullability T, T?>!|
 
-    public open static fun <T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|> max2(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
+    public open static fun <T : R|ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!|> max2(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|, value1: R|ft<@FlexibleNullability T, T?>!|, value2: R|ft<@FlexibleNullability T, T?>!|): R|ft<@FlexibleNullability T, T?>!|
 
-    public open static fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>!>, kotlin/collections/List<ft<A, A?>!>?>!|> method(a: R|ft<java/util/Comparator<ft<A, A?>!>, java/util/Comparator<ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
+    public open static fun <A : R|ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability A, A?>!>, kotlin/collections/List<ft<@FlexibleNullability A, A?>!>?>!|> method(a: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability A, A?>!>, java/util/Comparator<ft<@FlexibleNullability A, A?>!>?>!|, b: R|ft<@FlexibleNullability B, B?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/TypeParameterOfMethod|
 
diff --git a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
index eab3b224253..404a5540346 100644
--- a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
@@ -1,5 +1,5 @@
 public open class StableName : R|kotlin/Any| {
-    public open fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/StableName|
 
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
index e063f7e7921..91356b8ac00 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
@@ -1,5 +1,5 @@
 public abstract interface TwoSuperclassesInconsistentGenericTypes : R|kotlin/Any| {
-    public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!|
+    public abstract fun foo(): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
 
     public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
index 81184201694..3dd243e3fcb 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
@@ -1,7 +1,7 @@
-public final enum class Enum : R|kotlin/Enum<ft<test/Enum, test/Enum?>!>| {
-    public final static enum entry A: R|test/Enum|
-    public final static enum entry B: R|test/Enum|
-    public final static enum entry C: R|test/Enum|
+public final enum class Enum : R|kotlin/Enum<ft<@FlexibleNullability test/Enum, test/Enum?>!>| {
+    public final static enum entry A: R|@FlexibleNullability test/Enum|
+    public final static enum entry B: R|@FlexibleNullability test/Enum|
+    public final static enum entry C: R|@FlexibleNullability test/Enum|
     public final static fun values(): R|kotlin/Array<test/Enum>| {
     }
 
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
index 2f10d610e16..63082462763 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
@@ -1,15 +1,15 @@
 public open class StaticFinal : R|kotlin/Any| {
-    public final static field publicNonNull: R|ft<kotlin/String, kotlin/String?>!| = String(aaa)
+    public final static field publicNonNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(aaa)
 
-    public final static field publicNull: R|ft<kotlin/String, kotlin/String?>!|
+    public final static field publicNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    public/*package*/ final static field packageNonNull: R|ft<kotlin/String, kotlin/String?>!| = String(bbb)
+    public/*package*/ final static field packageNonNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(bbb)
 
-    public/*package*/ final static field packageNull: R|ft<kotlin/String, kotlin/String?>!|
+    public/*package*/ final static field packageNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
-    private final static field privateNonNull: R|ft<kotlin/String, kotlin/String?>!| = String(bbb)
+    private final static field privateNonNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(bbb)
 
-    private final static field privateNull: R|ft<kotlin/String, kotlin/String?>!|
+    private final static field privateNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/StaticFinal|
 
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
index fe4c8213187..f99c13f4c71 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
@@ -1,8 +1,8 @@
-public final enum class StaticMembersInEnum : R|kotlin/Enum<ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>!>| {
-    public final static enum entry ENTRY: R|test/StaticMembersInEnum|
+public final enum class StaticMembersInEnum : R|kotlin/Enum<ft<@FlexibleNullability test/StaticMembersInEnum, test/StaticMembersInEnum?>!>| {
+    public final static enum entry ENTRY: R|@FlexibleNullability test/StaticMembersInEnum|
     public open static field STATIC_FIELD: R|kotlin/Int|
 
-    public final static field CONSTANT: R|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>!|
+    public final static field CONSTANT: R|ft<@FlexibleNullability test/StaticMembersInEnum, test/StaticMembersInEnum?>!|
 
     public open static fun foo(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
index 22229732a63..5555c047952 100644
--- a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
@@ -1,5 +1,5 @@
 public open class VarargInt : R|kotlin/Any| {
-    public open fun vararg(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>!|): R|kotlin/Unit|
+    public open fun vararg(vararg p: R|ft<@FlexibleNullability kotlin/IntArray, kotlin/IntArray?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargInt|
 
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
index 02bd3f033d4..14710ede074 100644
--- a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
@@ -1,5 +1,5 @@
 public open class VarargString : R|kotlin/Any| {
-    public open fun vararg(vararg strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public open fun vararg(vararg strings: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargString|
 
diff --git a/compiler/testData/versionRequirement/inlineClassesAndRelevantDeclarations.kt b/compiler/testData/versionRequirement/inlineClassesAndRelevantDeclarations13.kt
similarity index 100%
rename from compiler/testData/versionRequirement/inlineClassesAndRelevantDeclarations.kt
rename to compiler/testData/versionRequirement/inlineClassesAndRelevantDeclarations13.kt
diff --git a/compiler/testData/versionRequirement/inlineClassesAndRelevantDeclarations1430.kt b/compiler/testData/versionRequirement/inlineClassesAndRelevantDeclarations1430.kt
new file mode 100644
index 00000000000..fe276694fa0
--- /dev/null
+++ b/compiler/testData/versionRequirement/inlineClassesAndRelevantDeclarations1430.kt
@@ -0,0 +1,17 @@
+package test
+
+inline class IC(val x: String)
+
+typealias ICAlias = IC
+
+class Ctor(ic: IC)
+
+fun simpleFun(f: IC) {}
+fun aliasedFun(f: ICAlias) {}
+
+val simpleProp: IC = IC("")
+
+fun result(r: List<Result<Any>?>) {}
+
+abstract class Foo : List<IC>
+interface Bar<T : IC>
diff --git a/compiler/testData/writeFlags/class/accessFlags/syntheticFile.kt b/compiler/testData/writeFlags/class/accessFlags/syntheticFile.kt
new file mode 100644
index 00000000000..c364b9c4be3
--- /dev/null
+++ b/compiler/testData/writeFlags/class/accessFlags/syntheticFile.kt
@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+// FILE: test.kt
+@file:Suppress("WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET")
+@file:JvmSynthetic
+
+private val keepme = 1
+
+// TESTED_OBJECT_KIND: class
+// TESTED_OBJECTS: TestKt
+// FLAGS: ACC_FINAL, ACC_PUBLIC, ACC_SUPER, ACC_SYNTHETIC
diff --git a/compiler/testData/writeSignature/inlineClasses/genericMethodInsideClass.kt b/compiler/testData/writeSignature/inlineClasses/genericMethodInsideClass.kt
index 452dabd40c8..46c7ccd1b5e 100644
--- a/compiler/testData/writeSignature/inlineClasses/genericMethodInsideClass.kt
+++ b/compiler/testData/writeSignature/inlineClasses/genericMethodInsideClass.kt
@@ -22,6 +22,6 @@ inline class SomeClass(val v: Int) {
 // jvm signature: (ILjava/lang/Object;)Ljava/lang/Object;
 // generic signature: <K:Ljava/lang/Object;>(ITK;)TK;
 
-// method: SomeClass$Companion::comp-Uh6wWds
+// method: SomeClass$Companion::comp-hRy0JnA
 // jvm signature: (ILjava/lang/Object;)Ljava/lang/Object;
 // generic signature: <T:Ljava/lang/Object;>(ITT;)TT;
\ No newline at end of file
diff --git a/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsPrimitive.kt b/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsPrimitive.kt
index 66b6444e9a4..9523bc3c1ba 100644
--- a/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsPrimitive.kt
+++ b/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsPrimitive.kt
@@ -21,6 +21,6 @@ object Test {
 // jvm signature: (I)V
 // generic signature: null
 
-// method: Test::asAll--J2ODwA
+// method: Test::asAll-rPNOez0
 // jvm signature: (ILjava/lang/Object;II)I
 // generic signature: null
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index be269bb09f0..8ce16983e30 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 dependencies {
+    testCompile(kotlinStdlib("jdk8"))
     testCompile(project(":kotlin-scripting-compiler"))
     testCompile(project(":core:descriptors"))
     testCompile(project(":core:descriptors.jvm"))
@@ -92,13 +93,8 @@ dependencies {
         isTransitive = false
     }
 
-    Platform[192].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
-    }
-
-    Platform[193].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-ide-util-io") }
-    }
+    testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
+    testCompile(intellijDep()) { includeJars("platform-ide-util-io") }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
diff --git a/compiler/tests-common/build.gradle.kts.as42 b/compiler/tests-common/build.gradle.kts.as42
deleted file mode 100644
index 60a08cbdcda..00000000000
--- a/compiler/tests-common/build.gradle.kts.as42
+++ /dev/null
@@ -1,109 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    testCompile(project(":kotlin-scripting-compiler"))
-    testCompile(project(":core:descriptors"))
-    testCompile(project(":core:descriptors.jvm"))
-    testCompile(project(":core:deserialization"))
-    testCompile(project(":compiler:util"))
-    testCompile(project(":compiler:tests-mutes"))
-    testCompile(project(":compiler:backend"))
-    testCompile(project(":compiler:ir.tree.impl"))
-    testCompile(project(":compiler:fir:tree"))
-    testCompile(project(":compiler:fir:raw-fir:psi2fir"))
-    testCompile(project(":compiler:fir:raw-fir:light-tree2fir"))
-    testCompile(project(":compiler:fir:fir2ir"))
-    testCompile(project(":compiler:fir:jvm"))
-    testCompile(project(":compiler:fir:fir2ir:jvm-backend"))
-    testCompile(project(":compiler:fir:fir-serialization"))
-    testCompile(project(":compiler:fir:fir-deserialization"))
-    testCompile(project(":compiler:fir:cones"))
-    testCompile(project(":compiler:fir:resolve"))
-    testCompile(project(":compiler:fir:checkers"))
-    testCompile(project(":compiler:fir:java"))
-    testCompile(project(":compiler:fir:entrypoint"))
-    testCompile(project(":compiler:ir.ir2cfg"))
-    testCompile(project(":compiler:frontend"))
-    testCompile(project(":compiler:frontend.java"))
-    testCompile(project(":compiler:util"))
-    testCompile(project(":compiler:cli-common"))
-    testCompile(project(":compiler:cli"))
-    testCompile(project(":compiler:cli-js"))
-    testCompile(project(":compiler:light-classes"))
-    testCompile(project(":compiler:serialization"))
-    testCompile(project(":kotlin-preloader"))
-    testCompile(project(":compiler:cli-common"))
-    testCompile(project(":daemon-common"))
-    testCompile(project(":daemon-common-new"))
-    testCompile(project(":js:js.serializer"))
-    testCompile(project(":js:js.frontend"))
-    testCompile(project(":js:js.translator"))
-    testCompile(project(":native:frontend.native"))
-    testCompileOnly(project(":plugins:android-extensions-compiler"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(projectTests(":compiler:tests-common-jvm6"))
-    testCompile(project(":kotlin-scripting-compiler-impl"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(androidDxJar()) { isTransitive = false }
-    testCompile(commonDep("com.android.tools:r8"))
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testCompileOnly(toolsJar())
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    Platform[193].orLower {
-        testCompile(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) }
-    }
-    Platform[201].orHigher {
-        testCompile(intellijDep()) {
-            includeJars(
-                "testFramework",
-                "testFramework.core",
-                rootProject = rootProject
-            )
-        }
-    }
-    testCompile(intellijDep()) {
-        includeJars(
-            "jps-model",
-            "extensions",
-            "util",
-            "platform-api",
-            "platform-impl",
-            "idea",
-            "idea_rt",
-            "guava",
-            "trove4j",
-            "asm-all",
-            "log4j",
-            "jdom",
-            "streamex",
-            "bootstrap",
-            rootProject = rootProject
-        )
-        isTransitive = false
-    }
-
-    Platform[192].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
-    }
-
-    Platform[193].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-ide-util-io") }
-    }
-    if (Platform.P202.orHigher()) {
-        testCompile(intellijDep()) {
-            includeJars("intellij-deps-fastutil-8.3.1-1")
-            isTransitive = false
-        }
-    }
-}
-
-sourceSets {
-    "main" { }
-    "test" { projectDefault() }
-}
-
-testsJar {}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt
index cf3b9411d7f..c60d1ab96a6 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt
@@ -36,12 +36,12 @@ abstract class AbstractCompilerLightClassTest : KotlinMultiFileTestWithJava<Kotl
         val expectedFile = KotlinTestUtils.replaceExtension(wholeFile, "java")
         val allowFrontendExceptions = InTextDirectivesUtils.isDirectiveDefined(wholeFile.readText(), "// ALLOW_FRONTEND_EXCEPTION")
 
-        LightClassTestCommon.testLightClass(
-            expectedFile,
+        val actual = LightClassTestCommon.getActualLightClassText(
             wholeFile,
             { fqname -> findLightClass(allowFrontendExceptions, environment, fqname) },
             LightClassTestCommon::removeEmptyDefaultImpls
         )
+        KotlinTestUtils.assertEqualsToFile(expectedFile, actual)
     }
 
     override fun createTestModule(
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
index c8b6202b956..793a18d2fc5 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.asJava
 
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiClass
-import com.intellij.psi.impl.compiled.ClsElementImpl
 import junit.framework.TestCase
 import org.jetbrains.kotlin.asJava.PsiClassRenderer.renderClass
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
@@ -19,12 +18,11 @@ object LightClassTestCommon {
     private val SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE)
     private const val NOT_GENERATED_DIRECTIVE = "// NOT_GENERATED"
 
-    fun testLightClass(
-        expectedFile: File,
+    fun getActualLightClassText(
         testDataFile: File,
         findLightClass: (String) -> PsiClass?,
         normalizeText: (String) -> String,
-    ) {
+    ): String {
         val text = FileUtil.loadFile(testDataFile, true)
         val matcher = SUBJECT_FQ_NAME_PATTERN.matcher(text)
         TestCase.assertTrue("No FqName specified. First line of the form '// f.q.Name' expected", matcher.find())
@@ -32,8 +30,7 @@ object LightClassTestCommon {
 
         val lightClass = findLightClass(fqName)
 
-        val actual = actualText(fqName, lightClass, normalizeText)
-        KotlinTestUtils.assertEqualsToFile(expectedFile, actual)
+        return actualText(fqName, lightClass, normalizeText)
     }
 
     private fun actualText(fqName: String?, lightClass: PsiClass?, normalizeText: (String) -> String): String {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
index b59e7fd2ec0..77f25e674ed 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.checkers
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiElementFinder
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.rt.execution.junit.FileComparisonFailure
 import junit.framework.AssertionFailedError
@@ -15,6 +16,7 @@ import junit.framework.TestCase
 import org.jetbrains.kotlin.TestsCompilerError
 import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory
+import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
@@ -292,6 +294,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
         }
         if (testDataFile.readText().contains("// FIR_IDENTICAL")) {
             try {
+                PsiElementFinder.EP.getPoint(environment.project).unregisterExtension(JavaElementFinder::class.java)
                 testRunner.analyzeAndCheckUnhandled(testDataFile, files)
             } catch (e: FileComparisonFailure) {
                 println("Old FE & FIR produces different diagnostics for this file. Please remove FIR_IDENTICAL line manually")
@@ -622,6 +625,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
                         getTopLevelPackagesFromFileList(getKtFiles(testFiles, false))
                 ).toSet()
 
+        val checkTypeEnabled = testFiles.any { it.declareCheckType }
         val stepIntoFilter = Predicate<DeclarationDescriptor> { descriptor ->
             val module = DescriptorUtils.getContainingModuleOrNull(descriptor)
             if (module !in modules) return@Predicate false
@@ -631,6 +635,8 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
                 return@Predicate fqName.isRoot || fqName.pathSegments().first() in packagesNames
             }
 
+            if (checkTypeEnabled && descriptor.name in NAMES_OF_CHECK_TYPE_HELPER) return@Predicate false
+
             true
         }
 
@@ -765,5 +771,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
         private val HASH_SANITIZER = fun(s: String): String = s.replace("@(\\d)+".toRegex(), "")
 
         private val MODULE_FILES = ModuleCapability<List<KtFile>>("")
+
+        private val NAMES_OF_CHECK_TYPE_HELPER = listOf("checkSubtype", "CheckTypeInv", "_", "checkType").map { Name.identifier(it) }
     }
 }
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt
index 1bf06ef8af5..6f7bde486f1 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.test.MockLibraryUtil
 import java.io.File
 import java.util.*
 import java.util.regex.Pattern
+import kotlin.io.path.*
 
 const val JSPECIFY_NULLNESS_MISMATCH_MARK = "jspecify_nullness_mismatch"
 
@@ -30,6 +31,7 @@ abstract class AbstractJspecifyAnnotationsTest : AbstractDiagnosticsTest() {
         )
     }
 
+    @OptIn(ExperimentalPathApi::class)
     override fun doTest(filePath: String) {
         val ktSourceCode = File(filePath).readText()
         val javaSourcesFilename = javaSourcesPathRegex.matcher(ktSourceCode).also { it.find() }.group(1)
@@ -51,7 +53,7 @@ abstract class AbstractJspecifyAnnotationsTest : AbstractDiagnosticsTest() {
             appendLine("// FILE: main.kt\n$ktSourceCode")
         }
 
-        super.doTest(createTempFile().apply { writeText(mergedSourceCode) }.path)
+        super.doTest(createTempFile().apply { writeText(mergedSourceCode) }.toString())
     }
 
     private fun makeJavaClassesPublicAndSeparatedByFiles(javaCode: String): String {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
index 22c35a3c478..c6935bb88c3 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
@@ -190,9 +190,6 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
         private val imports: String
             get() = buildString {
                 // Line separator is "\n" intentionally here (see DocumentImpl.assertValidSeparators)
-                if (declareCheckType) {
-                    append(CHECK_TYPE_IMPORT + "\n")
-                }
                 if (declareFlexibleType) {
                     append(EXPLICIT_FLEXIBLE_TYPES_IMPORT + "\n")
                 }
@@ -403,8 +400,6 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
         )
 
         val CHECK_TYPE_DIRECTIVE = "CHECK_TYPE"
-        val CHECK_TYPE_PACKAGE = "tests._checkType"
-        val CHECK_TYPE_IMPORT = "import $CHECK_TYPE_PACKAGE.*"
 
         val EXPLICIT_FLEXIBLE_TYPES_DIRECTIVE = "EXPLICIT_FLEXIBLE_TYPES"
         val EXPLICIT_FLEXIBLE_PACKAGE = InternalFlexibleTypeTransformer.FLEXIBLE_TYPE_CLASSIFIER.packageFqName.asString()
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
index 43a4b5a3264..43f98edda4c 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import kotlin.Pair;
 import kotlin.collections.CollectionsKt;
 import kotlin.io.FilesKt;
+import kotlin.io.path.PathsKt;
 import kotlin.text.Charsets;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.checkers.AbstractForeignAnnotationsTestKt;
@@ -37,12 +38,17 @@ import org.jetbrains.kotlin.test.CompilerTestUtil;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestCaseWithTmpdir;
+import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 import org.jetbrains.kotlin.utils.JsMetadataVersion;
 import org.jetbrains.kotlin.utils.PathUtil;
 import org.jetbrains.kotlin.utils.StringsKt;
 import org.junit.Assert;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -232,15 +238,20 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
             @NotNull String tempDir
     ) {
         String filePath = kotlin.text.StringsKt.substringAfter(argument, argumentPrefix, argument);
-        File file = new File(filePath);
-        if (!file.exists()) return argument;
+        Path file = Paths.get(filePath);
+        if (!Files.exists(file)) return argument;
 
-        File result = FilesKt.createTempFile(file.getAbsolutePath(), tempFileSuffix, new File(tempDir));
-        String oldContent = FilesKt.readText(file, Charsets.UTF_8);
-        String newContent = replaceTestPaths(oldContent, testDataDir, tempDir);
-        FilesKt.writeText(result, newContent, Charsets.UTF_8);
+        try {
+            Path result = Files.createTempFile(Paths.get(tempDir), file.getFileName().toString(), tempFileSuffix);
+            String oldContent = PathsKt.readText(file, Charsets.UTF_8);
+            String newContent = replaceTestPaths(oldContent, testDataDir, tempDir);
+            PathsKt.writeText(result, newContent, Charsets.UTF_8);
 
-        return argumentPrefix + result.getAbsolutePath();
+            return argumentPrefix + result.toAbsolutePath();
+        }
+        catch (IOException e) {
+            throw ExceptionUtilsKt.rethrow(e);
+        }
     }
 
     private static String replaceTestPaths(@NotNull String str, @NotNull String testDataDir, @NotNull String tempDir) {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
index b45162d67e1..e7805127728 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
@@ -18,12 +18,17 @@ package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
 import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.JvmTarget
 import java.io.File
 
 abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenTest() {
     override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) {
         javaClassesOutputDirectory = writeJavaFiles(files)!!.let { directory ->
-            CodegenTestUtil.compileJava(CodegenTestUtil.findJavaSourcesInDirectory(directory), emptyList(), extractJavacOptions(files))
+            val jvmTargets = files.mapNotNullTo(mutableSetOf()) { it.directives["JVM_TARGET"]?.let((JvmTarget)::fromString) }
+            check(jvmTargets.size <= 1) { "Having different JVM_TARGETs for different files is not supported in this test." }
+            CodegenTestUtil.compileJava(
+                CodegenTestUtil.findJavaSourcesInDirectory(directory), emptyList(), extractJavacOptions(files, jvmTargets.firstOrNull())
+            )
         }
 
         super.doMultiFileTest(wholeFile, files.map { file ->
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
index 5e1fddd142e..9debd333195 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
@@ -63,9 +63,7 @@ import static org.jetbrains.kotlin.cli.common.output.OutputUtilsKt.writeAllTo;
 import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*;
 import static org.jetbrains.kotlin.codegen.TestUtilsKt.extractUrls;
 import static org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar;
-import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.getBoxMethodOrNull;
-import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.getGeneratedClass;
-import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.runBoxMethod;
+import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.*;
 
 public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.TestFile> {
     private static final String DEFAULT_TEST_FILE_NAME = "a_test";
@@ -487,7 +485,6 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
                 it -> InTextDirectivesUtils.isDirectiveDefined(it.content, "ANDROID_ANNOTATIONS")
         );
 
-        List<String> javacOptions = extractJavacOptions(files);
         List<File> classpath = new ArrayList<>();
         classpath.add(getAnnotationsJar());
 
@@ -531,6 +528,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
             updateJavaClasspath(javaClasspath);
 
             javaClassesOutputDirectory = getJavaClassesOutputDirectory();
+            List<String> javacOptions = extractJavacOptions(files, configuration.get(JVMConfigurationKeys.JVM_TARGET));
             compileJava(findJavaSourcesInDirectory(javaSourceDir), javaClasspath, javacOptions, javaClassesOutputDirectory);
         }
     }
@@ -538,22 +536,33 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
     protected void updateJavaClasspath(@NotNull List<String> javaClasspath) {}
 
     @NotNull
-    protected static List<String> extractJavacOptions(@NotNull List<TestFile> files) {
+    protected static List<String> extractJavacOptions(@NotNull List<TestFile> files, @Nullable JvmTarget kotlinTarget) {
         List<String> javacOptions = new ArrayList<>(0);
         for (TestFile file : files) {
             javacOptions.addAll(InTextDirectivesUtils.findListWithPrefixes(file.content, "// JAVAC_OPTIONS:"));
         }
-        updateJavacOptions(javacOptions);
+        String javaTarget = computeJavaTarget(javacOptions, kotlinTarget);
+        if (javaTarget != null) {
+            javacOptions.add("-source");
+            javacOptions.add(javaTarget);
+            javacOptions.add("-target");
+            javacOptions.add(javaTarget);
+        }
         return javacOptions;
     }
 
-    private static void updateJavacOptions(@NotNull List<String> javacOptions) {
-        if (JAVA_COMPILATION_TARGET != null && !javacOptions.contains("-target")) {
-            javacOptions.add("-source");
-            javacOptions.add(JAVA_COMPILATION_TARGET);
-            javacOptions.add("-target");
-            javacOptions.add(JAVA_COMPILATION_TARGET);
-        }
+    private static final boolean IS_SOURCE_6_STILL_SUPPORTED =
+            // JDKs up to 11 do support -source/target 1.6, but later -- don't.
+            Arrays.asList("1.6", "1.7", "1.8", "9", "10", "11").contains(System.getProperty("java.specification.version"));
+
+    private static String computeJavaTarget(@NotNull List<String> javacOptions, @Nullable JvmTarget kotlinTarget) {
+        if (JAVA_COMPILATION_TARGET != null && !javacOptions.contains("-target"))
+            return JAVA_COMPILATION_TARGET;
+        if (kotlinTarget != null && kotlinTarget.compareTo(JvmTarget.JVM_1_6) > 0)
+            return kotlinTarget.getDescription();
+        if (IS_SOURCE_6_STILL_SUPPORTED)
+            return "1.6";
+        return null;
     }
 
     @NotNull
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractLocalVariableTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractLocalVariableTest.kt
index c3aec9a7e32..fb8c3cc4fb2 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractLocalVariableTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractLocalVariableTest.kt
@@ -118,7 +118,9 @@ abstract class AbstractLocalVariableTest : AbstractDebugTest() {
             }
         }
 
+        @Suppress("UNCHECKED_CAST")
         val compressedLog = compressRunsWithoutLinenumber(loggedItems as List<LVTStep>, LVTStep::location)
+
         val actualLocalVariables = compressedLog.joinToString("\n") {
             "// ${it.location.formatAsExpectation()}: ${it.visibleVars.joinToString(", ")}".trim()
         }
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractSteppingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractSteppingTest.kt
index a04fdbfe55c..a140b5d4458 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractSteppingTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractSteppingTest.kt
@@ -56,6 +56,7 @@ abstract class AbstractSteppingTest : AbstractDebugTest() {
         val lines = wholeFile.readLines()
         val forceStepInto = lines.any { it.startsWith(FORCE_STEP_INTO_MARKER) }
 
+        @Suppress("UNCHECKED_CAST")
         val actualLineNumbers = compressRunsWithoutLinenumber(loggedItems as List<LocatableEvent>, LocatableEvent::location)
             .filter {
                 val location = it.location()
@@ -98,4 +99,3 @@ abstract class AbstractSteppingTest : AbstractDebugTest() {
         assertEqualsToFile(wholeFile, actual.joinToString("\n"))
     }
 }
-
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java
index a980ec434ba..9c5e0d0d6c9 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java
@@ -21,12 +21,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.kotlin.codegen.CodegenTestCase;
+import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 import org.jetbrains.org.objectweb.asm.*;
 
 import java.io.File;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.reflect.Modifier;
+import java.util.*;
 
 import static org.jetbrains.kotlin.test.InTextDirectivesUtils.findListWithPrefixes;
 import static org.jetbrains.kotlin.test.InTextDirectivesUtils.findStringWithPrefixes;
@@ -91,8 +92,14 @@ public abstract class AbstractWriteFlagsTest extends CodegenTestCase {
             assertEquals("Wrong object existence state: " + testedObject, isObjectExists, classVisitor.isExists());
 
             if (isObjectExists) {
-                assertEquals("Wrong access flag for " + testedObject + " \n" + outputFile.asText(),
-                             getExpectedFlags(testedObject.textData), classVisitor.getAccess());
+                int expected = getExpectedFlags(testedObject.textData);
+                int actual = classVisitor.getAccess();
+                if (expected != actual) {
+                    assertEquals(
+                            "Wrong access flag for " + testedObject + " \n" + outputFile.asText(),
+                            flagsToText(expected), flagsToText(actual)
+                    );
+                }
             }
         }
     }
@@ -180,14 +187,25 @@ public abstract class AbstractWriteFlagsTest extends CodegenTestCase {
         }
     }
 
+    private static String flagsToText(int flags) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(flags).append(" = ").append(String.format("0x%04x", flags)).append("\n");
+        for (int flag = 1; flag > 0; flag <<= 1) {
+            if ((flags & flag) != 0) {
+                String string = FLAG_TO_STRING.get(flag);
+                sb.append(string == null ? "unknown (" + flag + ")" : string).append("\n");
+            }
+        }
+        return sb.toString();
+    }
+
     private static int getExpectedFlags(String text) {
         int expectedAccess = 0;
-        Class<?> klass = Opcodes.class;
         List<String> flags = findListWithPrefixes(text, "// FLAGS: ");
         for (String flag : flags) {
             try {
-                Field field = klass.getDeclaredField(flag);
-                expectedAccess |= field.getInt(klass);
+                Field field = Opcodes.class.getDeclaredField(flag);
+                expectedAccess |= field.getInt(null);
             }
             catch (NoSuchFieldException | IllegalAccessException e) {
                 throw new IllegalArgumentException("Cannot find " + flag + " field in Opcodes class", e);
@@ -196,6 +214,25 @@ public abstract class AbstractWriteFlagsTest extends CodegenTestCase {
         return expectedAccess;
     }
 
+    private static final Map<Integer, String> FLAG_TO_STRING;
+
+    static {
+        Map<Integer, String> flagToString = new HashMap<>();
+        try {
+            for (Field field : Opcodes.class.getDeclaredFields()) {
+                String name = field.getName();
+                if (Modifier.isStatic(field.getModifiers()) && name.startsWith("ACC_")) {
+                    int value = field.getInt(null);
+                    String previous = flagToString.get(value);
+                    flagToString.put(value, previous == null ? name : previous + "/" + name);
+                }
+            }
+        } catch (IllegalAccessException e) {
+            throw ExceptionUtilsKt.rethrow(e);
+        }
+        FLAG_TO_STRING = Collections.unmodifiableMap(flagToString);
+    }
+
     private static class ClassFlagsVisitor extends TestClassVisitor {
         private int access = 0;
 
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrScriptCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrScriptCodegenTest.kt
new file mode 100644
index 00000000000..0d6e149b5b0
--- /dev/null
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrScriptCodegenTest.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.codegen.ir
+
+import org.jetbrains.kotlin.codegen.AbstractScriptCodegenTest
+import org.jetbrains.kotlin.test.TargetBackend
+
+abstract class AbstractIrScriptCodegenTest : AbstractScriptCodegenTest() {
+    override val backend = TargetBackend.JVM_IR
+}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
index 3abe496c47d..df4ee22d134 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
@@ -69,7 +69,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
 
         val modules = createModules(groupedByModule)
 
-        val sessionProvider = FirProjectSessionProvider(project)
+        val sessionProvider = FirProjectSessionProvider()
 
         //For BuiltIns, registered in sessionProvider automatically
         val allProjectScope = GlobalSearchScope.allScope(project)
@@ -84,7 +84,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
             val scope = TopDownAnalyzerFacadeForJVM.newModuleSearchScope(
                 project,
                 moduleFiles.mapNotNull { it.ktFile })
-            FirSessionFactory.createJavaModuleBasedSession(info, sessionProvider, scope) {
+            FirSessionFactory.createJavaModuleBasedSession(info, sessionProvider, scope, project) {
                 configureSession()
                 getFirExtensions()?.let {
                     registerExtensions(it)
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt
index 7f8b2710fb9..790eb388187 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt
@@ -18,9 +18,9 @@ import org.jetbrains.kotlin.fir.lightTree.LightTree2Fir
 import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
 import org.jetbrains.kotlin.fir.resolve.firProvider
 import org.jetbrains.kotlin.fir.resolve.providers.impl.FirProviderImpl
+import org.jetbrains.kotlin.fir.resolve.transformers.FirGlobalResolveProcessor
 import org.jetbrains.kotlin.fir.resolve.transformers.FirResolveProcessor
 import org.jetbrains.kotlin.fir.resolve.transformers.FirTransformerBasedResolveProcessor
-import org.jetbrains.kotlin.fir.resolve.transformers.FirGlobalResolveProcessor
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.visitors.FirDefaultVisitorVoid
 import org.jetbrains.kotlin.psi.KtFile
@@ -307,8 +307,6 @@ class FirResolveBench(val withProgress: Boolean) {
                         visitTypeRef(implicitTypeRef)
                     }
 
-                    override fun visitComposedSuperTypeRef(composedSuperTypeRef: FirComposedSuperTypeRef) {}
-
                     override fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef) {
                         resolvedTypes++
                         val type = resolvedTypeRef.type
@@ -471,4 +469,4 @@ fun RTableContext.RTableRowContext.linePerSecondCell(lines: Int, time: Long, tim
 }
 
 
-class FirRuntimeException(override val message: String, override val cause: Throwable) : RuntimeException(message, cause)
\ No newline at end of file
+class FirRuntimeException(override val message: String, override val cause: Throwable) : RuntimeException(message, cause)
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
index 8a120515180..ad0a96f00d1 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
@@ -28,8 +28,8 @@ fun createSession(
     packagePartProvider: (GlobalSearchScope) -> PackagePartProvider
 ): FirSession {
     val moduleInfo = FirTestModuleInfo(name = Name.identifier(moduleName))
-    val provider = FirProjectSessionProvider(project)
-    return FirSessionFactory.createJavaModuleBasedSession(moduleInfo, provider, sourceScope).also {
+    val provider = FirProjectSessionProvider()
+    return FirSessionFactory.createJavaModuleBasedSession(moduleInfo, provider, sourceScope, project).also {
         createSessionForDependencies(project, provider, moduleInfo, librariesScope, packagePartProvider)
     }
 }
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/VMCounters.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/VMCounters.kt
index 98e622e390e..8dfdbaeb2fd 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/VMCounters.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/VMCounters.kt
@@ -3,13 +3,13 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 @file:Suppress("JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE")
+
 package org.jetbrains.kotlin.fir
 
 import org.jetbrains.kotlin.daemon.common.threadCpuTime
 import org.jetbrains.kotlin.daemon.common.threadUserTime
 import sun.management.ManagementFactoryHelper
 
-
 data class GCInfo(val name: String, val gcTime: Long, val collections: Long) {
     operator fun minus(other: GCInfo): GCInfo {
         return this.copy(
@@ -36,6 +36,7 @@ data class VMCounters(val userTime: Long, val cpuTime: Long, val gcInfo: Map<Str
 private fun <K, V> merge(first: Map<K, V>, second: Map<K, V>, valueOp: (V, V) -> V): Map<K, V> {
     val result = first.toMutableMap()
     for ((k, v) in second) {
+        @Suppress("NULLABLE_TYPE_PARAMETER_AGAINST_NOT_NULL_TYPE_PARAMETER") // KT-43225
         result.merge(k, v, valueOp)
     }
     return result
@@ -55,4 +56,4 @@ fun vmStateSnapshot(): VMCounters {
         threadMXBean.threadUserTime(), threadMXBean.threadCpuTime(),
         ManagementFactoryHelper.getGarbageCollectorMXBeans().associate { it.name to GCInfo(it.name, it.collectionTime, it.collectionCount) }
     )
-}
\ No newline at end of file
+}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
index a6e3182172a..bdaaf0c659a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.codegen.GenerationUtils
+import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager
@@ -90,6 +91,7 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
         aptMode: Boolean
     ): Boolean {
         val environment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable)
+        updateConfiguration(environment.configuration)
         environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
         environment.configuration.put(JVMConfigurationKeys.COMPILE_JAVA, true)
         val ktFiles = kotlinFiles.map { kotlinFile: File ->
@@ -115,6 +117,8 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
         return JavacWrapper.getInstance(environment.project).use { it.compile(outDir) }
     }
 
+    open fun updateConfiguration(configuration: CompilerConfiguration) {}
+
     companion object {
         // Do not render parameter names because there are test cases where classes inherit from JDK collections,
         // and some versions of JDK have debug information in the class files (including parameter names), and some don't
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/ir/AbstractIrCompileKotlinAgainstJavaTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/ir/AbstractIrCompileKotlinAgainstJavaTest.kt
new file mode 100644
index 00000000000..2ce4f8e4cda
--- /dev/null
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/ir/AbstractIrCompileKotlinAgainstJavaTest.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.jvm.compiler.ir
+
+import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
+import org.jetbrains.kotlin.jvm.compiler.AbstractCompileKotlinAgainstJavaTest
+
+abstract class AbstractIrCompileKotlinAgainstJavaTest : AbstractCompileKotlinAgainstJavaTest() {
+    override fun updateConfiguration(configuration: CompilerConfiguration) = configuration.put(JVMConfigurationKeys.IR, true)
+}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java.193 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java.193
deleted file mode 100644
index 29670c6a324..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java.193
+++ /dev/null
@@ -1,976 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.test.testFramework;
-
-import com.intellij.diagnostic.PerformanceWatcher;
-import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.Application;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.PathManager;
-import com.intellij.openapi.application.impl.ApplicationInfoImpl;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.JDOMUtil;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.*;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.rt.execution.junit.FileComparisonFailure;
-import com.intellij.testFramework.*;
-import com.intellij.testFramework.exceptionCases.AbstractExceptionCase;
-import com.intellij.util.Consumer;
-import com.intellij.util.ReflectionUtil;
-import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.containers.hash.HashMap;
-import com.intellij.util.lang.CompoundRuntimeException;
-import com.intellij.util.ui.UIUtil;
-import gnu.trove.Equality;
-import gnu.trove.THashSet;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-import org.jdom.Element;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.test.IdeaSystemPropertiesForParallelRunConfigurator;
-import org.jetbrains.kotlin.testFramework.MockComponentManagerCreationTracer;
-import org.jetbrains.kotlin.types.AbstractTypeChecker;
-import org.jetbrains.kotlin.types.FlexibleTypeImpl;
-import org.junit.Assert;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
-
-@SuppressWarnings("UseOfSystemOutOrSystemErr")
-public abstract class KtUsefulTestCase extends TestCase {
-    public static final boolean IS_UNDER_TEAMCITY = System.getenv("TEAMCITY_VERSION") != null;
-    private static final String TEMP_DIR_MARKER = "unitTest_";
-    public static final boolean OVERWRITE_TESTDATA = Boolean.getBoolean("idea.tests.overwrite.data");
-
-    private static final String ORIGINAL_TEMP_DIR = FileUtil.getTempDirectory();
-
-    private static final Map<String, Long> TOTAL_SETUP_COST_MILLIS = new HashMap<>();
-    private static final Map<String, Long> TOTAL_TEARDOWN_COST_MILLIS = new HashMap<>();
-
-    private Application application;
-
-    static {
-        IdeaSystemPropertiesForParallelRunConfigurator.setProperties();
-        //TODO: investigate and enable
-        //IdeaForkJoinWorkerThreadFactory.setupPoisonFactory();
-        Logger.setFactory(TestLoggerFactory.class);
-    }
-
-    @NotNull
-    protected final Disposable myTestRootDisposable = new TestDisposable();
-
-    private static final String ourPathToKeep = null;
-    private final List<String> myPathsToKeep = new ArrayList<>();
-
-    private File myTempDir;
-
-    static {
-        // Radar #5755208: Command line Java applications need a way to launch without a Dock icon.
-        System.setProperty("apple.awt.UIElement", "true");
-
-        // -- KOTLIN ADDITIONAL START --
-
-        FlexibleTypeImpl.RUN_SLOW_ASSERTIONS = true;
-        AbstractTypeChecker.RUN_SLOW_ASSERTIONS = true;
-
-        // -- KOTLIN ADDITIONAL END --
-    }
-
-    protected boolean shouldContainTempFiles() {
-        return true;
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // -- KOTLIN ADDITIONAL START --
-        application = ApplicationManager.getApplication();
-
-        if (application != null && application.isDisposed()) {
-            MockComponentManagerCreationTracer.diagnoseDisposedButNotClearedApplication(application);
-        }
-        // -- KOTLIN ADDITIONAL END --
-
-        super.setUp();
-
-        if (shouldContainTempFiles()) {
-            String testName =  FileUtil.sanitizeFileName(getTestName(true));
-            if (StringUtil.isEmptyOrSpaces(testName)) testName = "";
-            testName = new File(testName).getName(); // in case the test name contains file separators
-            myTempDir = FileUtil.createTempDirectory(TEMP_DIR_MARKER, testName, false);
-            FileUtil.resetCanonicalTempPathCache(myTempDir.getPath());
-        }
-
-        boolean isStressTest = isStressTest();
-        ApplicationInfoImpl.setInStressTest(isStressTest);
-        if (isPerformanceTest()) {
-            Timings.getStatistics();
-        }
-
-        // turn off Disposer debugging for performance tests
-        Disposer.setDebugMode(!isStressTest);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        try {
-            // don't use method references here to make stack trace reading easier
-            //noinspection Convert2MethodRef
-            new RunAll(
-                    () -> disposeRootDisposable(),
-                    () -> cleanupSwingDataStructures(),
-                    () -> cleanupDeleteOnExitHookList(),
-                    () -> Disposer.setDebugMode(true),
-                    () -> {
-                        if (shouldContainTempFiles()) {
-                            FileUtil.resetCanonicalTempPathCache(ORIGINAL_TEMP_DIR);
-                            if (hasTmpFilesToKeep()) {
-                                File[] files = myTempDir.listFiles();
-                                if (files != null) {
-                                    for (File file : files) {
-                                        if (!shouldKeepTmpFile(file)) {
-                                            FileUtil.delete(file);
-                                        }
-                                    }
-                                }
-                            }
-                            else {
-                                FileUtil.delete(myTempDir);
-                            }
-                        }
-                    },
-                    () -> UIUtil.removeLeakingAppleListeners()
-            ).run();
-        }
-        finally {
-            super.tearDown();
-            // -- KOTLIN ADDITIONAL START --
-            TestApplicationUtilKt.resetApplicationToNull(application);
-            application = null;
-            // -- KOTLIN ADDITIONAL END --
-        }
-    }
-
-    protected final void disposeRootDisposable() {
-        Disposer.dispose(getTestRootDisposable());
-    }
-
-    protected void addTmpFileToKeep(@NotNull File file) {
-        myPathsToKeep.add(file.getPath());
-    }
-
-    private boolean hasTmpFilesToKeep() {
-        return ourPathToKeep != null && FileUtil.isAncestor(myTempDir.getPath(), ourPathToKeep, false) || !myPathsToKeep.isEmpty();
-    }
-
-    private boolean shouldKeepTmpFile(@NotNull File file) {
-        String path = file.getPath();
-        if (FileUtil.pathsEqual(path, ourPathToKeep)) return true;
-        for (String pathToKeep : myPathsToKeep) {
-            if (FileUtil.pathsEqual(path, pathToKeep)) return true;
-        }
-        return false;
-    }
-
-    private static final Set<String> DELETE_ON_EXIT_HOOK_DOT_FILES;
-    private static final Class DELETE_ON_EXIT_HOOK_CLASS;
-    static {
-        Class<?> aClass;
-        try {
-            aClass = Class.forName("java.io.DeleteOnExitHook");
-        }
-        catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        @SuppressWarnings("unchecked") Set<String> files = ReflectionUtil.getStaticFieldValue(aClass, Set.class, "files");
-        DELETE_ON_EXIT_HOOK_CLASS = aClass;
-        DELETE_ON_EXIT_HOOK_DOT_FILES = files;
-    }
-
-    @SuppressWarnings("SynchronizeOnThis")
-    private static void cleanupDeleteOnExitHookList() {
-        // try to reduce file set retained by java.io.DeleteOnExitHook
-        List<String> list;
-        synchronized (DELETE_ON_EXIT_HOOK_CLASS) {
-            if (DELETE_ON_EXIT_HOOK_DOT_FILES.isEmpty()) return;
-            list = new ArrayList<>(DELETE_ON_EXIT_HOOK_DOT_FILES);
-        }
-        for (int i = list.size() - 1; i >= 0; i--) {
-            String path = list.get(i);
-            File file = new File(path);
-            if (file.delete() || !file.exists()) {
-                synchronized (DELETE_ON_EXIT_HOOK_CLASS) {
-                    DELETE_ON_EXIT_HOOK_DOT_FILES.remove(path);
-                }
-            }
-        }
-    }
-
-    @SuppressWarnings("ConstantConditions")
-    private static void cleanupSwingDataStructures() throws Exception {
-        Object manager = ReflectionUtil.getDeclaredMethod(Class.forName("javax.swing.KeyboardManager"), "getCurrentManager").invoke(null);
-        Map componentKeyStrokeMap = ReflectionUtil.getField(manager.getClass(), manager, Hashtable.class, "componentKeyStrokeMap");
-        componentKeyStrokeMap.clear();
-        Map containerMap = ReflectionUtil.getField(manager.getClass(), manager, Hashtable.class, "containerMap");
-        containerMap.clear();
-    }
-
-    @NotNull
-    public Disposable getTestRootDisposable() {
-        return myTestRootDisposable;
-    }
-
-    @Override
-    protected void runTest() throws Throwable {
-        final Throwable[] throwables = new Throwable[1];
-
-        AtomicBoolean completed = new AtomicBoolean(false);
-        Runnable runnable = () -> {
-            try {
-                //TestLoggerFactory.onTestStarted();
-                super.runTest();
-                TestLoggerFactory.onTestFinished(true);
-                completed.set(true);
-            }
-            catch (InvocationTargetException e) {
-                TestLoggerFactory.onTestFinished(false);
-                e.fillInStackTrace();
-                throwables[0] = e.getTargetException();
-            }
-            catch (IllegalAccessException e) {
-                TestLoggerFactory.onTestFinished(false);
-                e.fillInStackTrace();
-                throwables[0] = e;
-            }
-            catch (Throwable e) {
-                TestLoggerFactory.onTestFinished(false);
-                throwables[0] = e;
-            }
-        };
-
-        invokeTestRunnable(runnable);
-
-        if (throwables[0] != null) {
-            throw throwables[0];
-        }
-        if (!completed.get()) {
-            throw new IllegalStateException("test didn't start");
-        }
-    }
-
-    protected boolean shouldRunTest() {
-        return TestFrameworkUtil.canRunTest(getClass());
-    }
-
-    protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception {
-        //IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current();
-        //if (policy != null && !policy.runInDispatchThread()) {
-        //    runnable.run();
-        //}
-        //else {
-            EdtTestUtilKt.runInEdtAndWait(() -> {
-                runnable.run();
-                return null;
-            });
-        //}
-    }
-
-    private void defaultRunBare() throws Throwable {
-        Throwable exception = null;
-        try {
-            long setupStart = System.nanoTime();
-            setUp();
-            long setupCost = (System.nanoTime() - setupStart) / 1000000;
-            logPerClassCost(setupCost, TOTAL_SETUP_COST_MILLIS);
-
-            runTest();
-        }
-        catch (Throwable running) {
-            exception = running;
-        }
-        finally {
-            try {
-                long teardownStart = System.nanoTime();
-                tearDown();
-                long teardownCost = (System.nanoTime() - teardownStart) / 1000000;
-                logPerClassCost(teardownCost, TOTAL_TEARDOWN_COST_MILLIS);
-            }
-            catch (Throwable tearingDown) {
-                if (exception == null) exception = tearingDown;
-                else exception = new CompoundRuntimeException(Arrays.asList(exception, tearingDown));
-            }
-        }
-        if (exception != null) throw exception;
-    }
-
-    /**
-     * Logs the setup cost grouped by test fixture class (superclass of the current test class).
-     *
-     * @param cost setup cost in milliseconds
-     */
-    private void logPerClassCost(long cost, @NotNull Map<String, Long> costMap) {
-        Class<?> superclass = getClass().getSuperclass();
-        Long oldCost = costMap.get(superclass.getName());
-        long newCost = oldCost == null ? cost : oldCost + cost;
-        costMap.put(superclass.getName(), newCost);
-    }
-
-    @SuppressWarnings("UseOfSystemOutOrSystemErr")
-    static void logSetupTeardownCosts() {
-        System.out.println("Setup costs");
-        long totalSetup = 0;
-        for (Map.Entry<String, Long> entry : TOTAL_SETUP_COST_MILLIS.entrySet()) {
-            System.out.println(String.format("  %s: %d ms", entry.getKey(), entry.getValue()));
-            totalSetup += entry.getValue();
-        }
-        System.out.println("Teardown costs");
-        long totalTeardown = 0;
-        for (Map.Entry<String, Long> entry : TOTAL_TEARDOWN_COST_MILLIS.entrySet()) {
-            System.out.println(String.format("  %s: %d ms", entry.getKey(), entry.getValue()));
-            totalTeardown += entry.getValue();
-        }
-        System.out.println(String.format("Total overhead: setup %d ms, teardown %d ms", totalSetup, totalTeardown));
-        System.out.println(String.format("##teamcity[buildStatisticValue key='ideaTests.totalSetupMs' value='%d']", totalSetup));
-        System.out.println(String.format("##teamcity[buildStatisticValue key='ideaTests.totalTeardownMs' value='%d']", totalTeardown));
-    }
-
-    @Override
-    public void runBare() throws Throwable {
-        if (!shouldRunTest()) return;
-
-        if (runInDispatchThread()) {
-            TestRunnerUtil.replaceIdeEventQueueSafely();
-            com.intellij.testFramework.EdtTestUtil.runInEdtAndWait(this::defaultRunBare);
-        }
-        else {
-            defaultRunBare();
-        }
-    }
-
-    protected boolean runInDispatchThread() {
-        //IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current();
-        //if (policy != null) {
-        //    return policy.runInDispatchThread();
-        //}
-        return true;
-    }
-
-    @NotNull
-    public static String toString(@NotNull Iterable<?> collection) {
-        if (!collection.iterator().hasNext()) {
-            return "<empty>";
-        }
-
-        final StringBuilder builder = new StringBuilder();
-        for (final Object o : collection) {
-            if (o instanceof THashSet) {
-                builder.append(new TreeSet<>((THashSet<?>)o));
-            }
-            else {
-                builder.append(o);
-            }
-            builder.append('\n');
-        }
-        return builder.toString();
-    }
-
-    @SafeVarargs
-    public static <T> void assertOrderedEquals(@NotNull T[] actual, @NotNull T... expected) {
-        assertOrderedEquals(Arrays.asList(actual), expected);
-    }
-
-    @SafeVarargs
-    public static <T> void assertOrderedEquals(@NotNull Iterable<? extends T> actual, @NotNull T... expected) {
-        assertOrderedEquals("", actual, expected);
-    }
-
-    public static void assertOrderedEquals(@NotNull byte[] actual, @NotNull byte[] expected) {
-        assertEquals(expected.length, actual.length);
-        for (int i = 0; i < actual.length; i++) {
-            byte a = actual[i];
-            byte e = expected[i];
-            assertEquals("not equals at index: "+i, e, a);
-        }
-    }
-
-    public static void assertOrderedEquals(@NotNull int[] actual, @NotNull int[] expected) {
-        if (actual.length != expected.length) {
-            fail("Expected size: "+expected.length+"; actual: "+actual.length+"\nexpected: "+Arrays.toString(expected)+"\nactual  : "+Arrays.toString(actual));
-        }
-        for (int i = 0; i < actual.length; i++) {
-            int a = actual[i];
-            int e = expected[i];
-            assertEquals("not equals at index: "+i, e, a);
-        }
-    }
-
-    @SafeVarargs
-    public static <T> void assertOrderedEquals(@NotNull String errorMsg, @NotNull Iterable<? extends T> actual, @NotNull T... expected) {
-        assertOrderedEquals(errorMsg, actual, Arrays.asList(expected));
-    }
-
-    public static <T> void assertOrderedEquals(@NotNull Iterable<? extends T> actual, @NotNull Iterable<? extends T> expected) {
-        assertOrderedEquals("", actual, expected);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> void assertOrderedEquals(@NotNull String errorMsg,
-            @NotNull Iterable<? extends T> actual,
-            @NotNull Iterable<? extends T> expected) {
-        assertOrderedEquals(errorMsg, actual, expected, Equality.CANONICAL);
-    }
-
-    public static <T> void assertOrderedEquals(@NotNull String errorMsg,
-            @NotNull Iterable<? extends T> actual,
-            @NotNull Iterable<? extends T> expected,
-            @NotNull Equality<? super T> comparator) {
-        if (!equals(actual, expected, comparator)) {
-            String expectedString = toString(expected);
-            String actualString = toString(actual);
-            Assert.assertEquals(errorMsg, expectedString, actualString);
-            Assert.fail("Warning! 'toString' does not reflect the difference.\nExpected: " + expectedString + "\nActual: " + actualString);
-        }
-    }
-
-    private static <T> boolean equals(@NotNull Iterable<? extends T> a1,
-            @NotNull Iterable<? extends T> a2,
-            @NotNull Equality<? super T> comparator) {
-        Iterator<? extends T> it1 = a1.iterator();
-        Iterator<? extends T> it2 = a2.iterator();
-        while (it1.hasNext() || it2.hasNext()) {
-            if (!it1.hasNext() || !it2.hasNext()) return false;
-            if (!comparator.equals(it1.next(), it2.next())) return false;
-        }
-        return true;
-    }
-
-    @SafeVarargs
-    public static <T> void assertOrderedCollection(@NotNull T[] collection, @NotNull Consumer<T>... checkers) {
-        assertOrderedCollection(Arrays.asList(collection), checkers);
-    }
-
-    /**
-     * Checks {@code actual} contains same elements (in {@link #equals(Object)} meaning) as {@code expected} irrespective of their order
-     */
-    @SafeVarargs
-    public static <T> void assertSameElements(@NotNull T[] actual, @NotNull T... expected) {
-        assertSameElements(Arrays.asList(actual), expected);
-    }
-
-    /**
-     * Checks {@code actual} contains same elements (in {@link #equals(Object)} meaning) as {@code expected} irrespective of their order
-     */
-    @SafeVarargs
-    public static <T> void assertSameElements(@NotNull Collection<? extends T> actual, @NotNull T... expected) {
-        assertSameElements(actual, Arrays.asList(expected));
-    }
-
-    /**
-     * Checks {@code actual} contains same elements (in {@link #equals(Object)} meaning) as {@code expected} irrespective of their order
-     */
-    public static <T> void assertSameElements(@NotNull Collection<? extends T> actual, @NotNull Collection<? extends T> expected) {
-        assertSameElements("", actual, expected);
-    }
-
-    /**
-     * Checks {@code actual} contains same elements (in {@link #equals(Object)} meaning) as {@code expected} irrespective of their order
-     */
-    public static <T> void assertSameElements(@NotNull String message, @NotNull Collection<? extends T> actual, @NotNull Collection<? extends T> expected) {
-        if (actual.size() != expected.size() || !new HashSet<>(expected).equals(new HashSet<T>(actual))) {
-            Assert.assertEquals(message, new HashSet<>(expected), new HashSet<T>(actual));
-        }
-    }
-
-    @SafeVarargs
-    public static <T> void assertContainsOrdered(@NotNull Collection<? extends T> collection, @NotNull T... expected) {
-        assertContainsOrdered(collection, Arrays.asList(expected));
-    }
-
-    public static <T> void assertContainsOrdered(@NotNull Collection<? extends T> collection, @NotNull Collection<? extends T> expected) {
-        ArrayList<T> copy = new ArrayList<>(collection);
-        copy.retainAll(expected);
-        assertOrderedEquals(toString(collection), copy, expected);
-    }
-
-    @SafeVarargs
-    public static <T> void assertContainsElements(@NotNull Collection<? extends T> collection, @NotNull T... expected) {
-        assertContainsElements(collection, Arrays.asList(expected));
-    }
-
-    public static <T> void assertContainsElements(@NotNull Collection<? extends T> collection, @NotNull Collection<? extends T> expected) {
-        ArrayList<T> copy = new ArrayList<>(collection);
-        copy.retainAll(expected);
-        assertSameElements(toString(collection), copy, expected);
-    }
-
-    @NotNull
-    public static String toString(@NotNull Object[] collection, @NotNull String separator) {
-        return toString(Arrays.asList(collection), separator);
-    }
-
-    @SafeVarargs
-    public static <T> void assertDoesntContain(@NotNull Collection<? extends T> collection, @NotNull T... notExpected) {
-        assertDoesntContain(collection, Arrays.asList(notExpected));
-    }
-
-    public static <T> void assertDoesntContain(@NotNull Collection<? extends T> collection, @NotNull Collection<? extends T> notExpected) {
-        ArrayList<T> expected = new ArrayList<>(collection);
-        expected.removeAll(notExpected);
-        assertSameElements(collection, expected);
-    }
-
-    @NotNull
-    public static String toString(@NotNull Collection<?> collection, @NotNull String separator) {
-        List<String> list = ContainerUtil.map2List(collection, String::valueOf);
-        Collections.sort(list);
-        StringBuilder builder = new StringBuilder();
-        boolean flag = false;
-        for (final String o : list) {
-            if (flag) {
-                builder.append(separator);
-            }
-            builder.append(o);
-            flag = true;
-        }
-        return builder.toString();
-    }
-
-    @SafeVarargs
-    public static <T> void assertOrderedCollection(@NotNull Collection<? extends T> collection, @NotNull Consumer<T>... checkers) {
-        if (collection.size() != checkers.length) {
-            Assert.fail(toString(collection));
-        }
-        int i = 0;
-        for (final T actual : collection) {
-            try {
-                checkers[i].consume(actual);
-            }
-            catch (AssertionFailedError e) {
-                //noinspection UseOfSystemOutOrSystemErr
-                System.out.println(i + ": " + actual);
-                throw e;
-            }
-            i++;
-        }
-    }
-
-    @SafeVarargs
-    public static <T> void assertUnorderedCollection(@NotNull T[] collection, @NotNull Consumer<T>... checkers) {
-        assertUnorderedCollection(Arrays.asList(collection), checkers);
-    }
-
-    @SafeVarargs
-    public static <T> void assertUnorderedCollection(@NotNull Collection<? extends T> collection, @NotNull Consumer<T>... checkers) {
-        if (collection.size() != checkers.length) {
-            Assert.fail(toString(collection));
-        }
-        Set<Consumer<T>> checkerSet = new HashSet<>(Arrays.asList(checkers));
-        int i = 0;
-        Throwable lastError = null;
-        for (final T actual : collection) {
-            boolean flag = true;
-            for (final Consumer<T> condition : checkerSet) {
-                Throwable error = accepts(condition, actual);
-                if (error == null) {
-                    checkerSet.remove(condition);
-                    flag = false;
-                    break;
-                }
-                else {
-                    lastError = error;
-                }
-            }
-            if (flag) {
-                //noinspection ConstantConditions,CallToPrintStackTrace
-                lastError.printStackTrace();
-                Assert.fail("Incorrect element(" + i + "): " + actual);
-            }
-            i++;
-        }
-    }
-
-    private static <T> Throwable accepts(@NotNull Consumer<? super T> condition, final T actual) {
-        try {
-            condition.consume(actual);
-            return null;
-        }
-        catch (Throwable e) {
-            return e;
-        }
-    }
-
-    @Contract("null, _ -> fail")
-    @NotNull
-    public static <T> T assertInstanceOf(Object o, @NotNull Class<T> aClass) {
-        Assert.assertNotNull("Expected instance of: " + aClass.getName() + " actual: " + null, o);
-        Assert.assertTrue("Expected instance of: " + aClass.getName() + " actual: " + o.getClass().getName(), aClass.isInstance(o));
-        @SuppressWarnings("unchecked") T t = (T)o;
-        return t;
-    }
-
-    public static <T> T assertOneElement(@NotNull Collection<? extends T> collection) {
-        Iterator<? extends T> iterator = collection.iterator();
-        String toString = toString(collection);
-        Assert.assertTrue(toString, iterator.hasNext());
-        T t = iterator.next();
-        Assert.assertFalse(toString, iterator.hasNext());
-        return t;
-    }
-
-    public static <T> T assertOneElement(@NotNull T[] ts) {
-        Assert.assertEquals(Arrays.asList(ts).toString(), 1, ts.length);
-        return ts[0];
-    }
-
-    @SafeVarargs
-    public static <T> void assertOneOf(T value, @NotNull T... values) {
-        for (T v : values) {
-            if (Objects.equals(value, v)) {
-                return;
-            }
-        }
-        Assert.fail(value + " should be equal to one of " + Arrays.toString(values));
-    }
-
-    public static void printThreadDump() {
-        PerformanceWatcher.dumpThreadsToConsole("Thread dump:");
-    }
-
-    public static void assertEmpty(@NotNull Object[] array) {
-        assertOrderedEquals(array);
-    }
-
-    public static void assertNotEmpty(final Collection<?> collection) {
-        assertNotNull(collection);
-        assertFalse(collection.isEmpty());
-    }
-
-    public static void assertEmpty(@NotNull Collection<?> collection) {
-        assertEmpty(collection.toString(), collection);
-    }
-
-    public static void assertNullOrEmpty(@Nullable Collection<?> collection) {
-        if (collection == null) return;
-        assertEmpty("", collection);
-    }
-
-    public static void assertEmpty(final String s) {
-        assertTrue(s, StringUtil.isEmpty(s));
-    }
-
-    public static <T> void assertEmpty(@NotNull String errorMsg, @NotNull Collection<? extends T> collection) {
-        assertOrderedEquals(errorMsg, collection, Collections.emptyList());
-    }
-
-    public static void assertSize(int expectedSize, @NotNull Object[] array) {
-        if (array.length != expectedSize) {
-            assertEquals(toString(Arrays.asList(array)), expectedSize, array.length);
-        }
-    }
-
-    public static void assertSize(int expectedSize, @NotNull Collection<?> c) {
-        if (c.size() != expectedSize) {
-            assertEquals(toString(c), expectedSize, c.size());
-        }
-    }
-
-    @NotNull
-    protected <T extends Disposable> T disposeOnTearDown(@NotNull T disposable) {
-        Disposer.register(getTestRootDisposable(), disposable);
-        return disposable;
-    }
-
-    public static void assertSameLines(@NotNull String expected, @NotNull String actual) {
-        assertSameLines(null, expected, actual);
-    }
-
-    public static void assertSameLines(@Nullable String message, @NotNull String expected, @NotNull String actual) {
-        String expectedText = StringUtil.convertLineSeparators(expected.trim());
-        String actualText = StringUtil.convertLineSeparators(actual.trim());
-        Assert.assertEquals(message, expectedText, actualText);
-    }
-
-    public static void assertExists(@NotNull File file){
-        assertTrue("File should exist " + file, file.exists());
-    }
-
-    public static void assertDoesntExist(@NotNull File file){
-        assertFalse("File should not exist " + file, file.exists());
-    }
-
-    @NotNull
-    protected String getTestName(boolean lowercaseFirstLetter) {
-        return getTestName(getName(), lowercaseFirstLetter);
-    }
-
-    @NotNull
-    public static String getTestName(@Nullable String name, boolean lowercaseFirstLetter) {
-        return name == null ? "" : PlatformTestUtil.getTestName(name, lowercaseFirstLetter);
-    }
-
-    @NotNull
-    protected String getTestDirectoryName() {
-        final String testName = getTestName(true);
-        return testName.replaceAll("_.*", "");
-    }
-
-    public static void assertSameLinesWithFile(@NotNull String filePath, @NotNull String actualText) {
-        assertSameLinesWithFile(filePath, actualText, true);
-    }
-
-    public static void assertSameLinesWithFile(@NotNull String filePath,
-            @NotNull String actualText,
-            @NotNull Supplier<String> messageProducer) {
-        assertSameLinesWithFile(filePath, actualText, true, messageProducer);
-    }
-
-    public static void assertSameLinesWithFile(@NotNull String filePath, @NotNull String actualText, boolean trimBeforeComparing) {
-        assertSameLinesWithFile(filePath, actualText, trimBeforeComparing, null);
-    }
-
-    public static void assertSameLinesWithFile(@NotNull String filePath,
-            @NotNull String actualText,
-            boolean trimBeforeComparing,
-            @Nullable Supplier<String> messageProducer) {
-        String fileText;
-        try {
-            if (OVERWRITE_TESTDATA) {
-                VfsTestUtil.overwriteTestData(filePath, actualText);
-                //noinspection UseOfSystemOutOrSystemErr
-                System.out.println("File " + filePath + " created.");
-            }
-            fileText = FileUtil.loadFile(new File(filePath), CharsetToolkit.UTF8_CHARSET);
-        }
-        catch (FileNotFoundException e) {
-            VfsTestUtil.overwriteTestData(filePath, actualText);
-            throw new AssertionFailedError("No output text found. File " + filePath + " created.");
-        }
-        catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        String expected = StringUtil.convertLineSeparators(trimBeforeComparing ? fileText.trim() : fileText);
-        String actual = StringUtil.convertLineSeparators(trimBeforeComparing ? actualText.trim() : actualText);
-        if (!Comparing.equal(expected, actual)) {
-            throw new FileComparisonFailure(messageProducer == null ? null : messageProducer.get(), expected, actual, filePath);
-        }
-    }
-
-    protected static void clearFields(@NotNull Object test) throws IllegalAccessException {
-        Class aClass = test.getClass();
-        while (aClass != null) {
-            clearDeclaredFields(test, aClass);
-            aClass = aClass.getSuperclass();
-        }
-    }
-
-    public static void clearDeclaredFields(@NotNull Object test, @NotNull Class aClass) throws IllegalAccessException {
-        for (final Field field : aClass.getDeclaredFields()) {
-            final String name = field.getDeclaringClass().getName();
-            if (!name.startsWith("junit.framework.") && !name.startsWith("com.intellij.testFramework.")) {
-                final int modifiers = field.getModifiers();
-                if ((modifiers & Modifier.FINAL) == 0 && (modifiers & Modifier.STATIC) == 0 && !field.getType().isPrimitive()) {
-                    field.setAccessible(true);
-                    field.set(test, null);
-                }
-            }
-        }
-    }
-
-    private static void checkCodeStyleSettingsEqual(@NotNull CodeStyleSettings expected, @NotNull CodeStyleSettings settings) {
-        if (!expected.equals(settings)) {
-            Element oldS = new Element("temp");
-            expected.writeExternal(oldS);
-            Element newS = new Element("temp");
-            settings.writeExternal(newS);
-
-            String newString = JDOMUtil.writeElement(newS);
-            String oldString = JDOMUtil.writeElement(oldS);
-            Assert.assertEquals("Code style settings damaged", oldString, newString);
-        }
-    }
-
-    public boolean isPerformanceTest() {
-        String testName = getName();
-        String className = getClass().getSimpleName();
-        return TestFrameworkUtil.isPerformanceTest(testName, className);
-    }
-
-    /**
-     * @return true for a test which performs A LOT of computations.
-     * Such test should typically avoid performing expensive checks, e.g. data structure consistency complex validations.
-     * If you want your test to be treated as "Stress", please mention one of these words in its name: "Stress", "Slow".
-     * For example: {@code public void testStressPSIFromDifferentThreads()}
-     */
-    public boolean isStressTest() {
-        return isStressTest(getName(), getClass().getName());
-    }
-
-    private static boolean isStressTest(String testName, String className) {
-        return TestFrameworkUtil.isPerformanceTest(testName, className) ||
-               containsStressWords(testName) ||
-               containsStressWords(className);
-    }
-
-    private static boolean containsStressWords(@Nullable String name) {
-        return name != null && (name.contains("Stress") || name.contains("Slow"));
-    }
-
-
-    /**
-     * Checks that code block throw corresponding exception with expected error msg.
-     * If expected error message is null it will not be checked.
-     *
-     * @param exceptionCase    Block annotated with some exception type
-     * @param expectedErrorMsg expected error message
-     */
-    @SuppressWarnings("unchecked")
-    protected void assertException(@NotNull AbstractExceptionCase exceptionCase, @Nullable String expectedErrorMsg) {
-        assertExceptionOccurred(true, exceptionCase, expectedErrorMsg);
-    }
-
-    /**
-     * Checks that code block doesn't throw corresponding exception.
-     *
-     * @param exceptionCase Block annotated with some exception type
-     */
-    protected <T extends Throwable> void assertNoException(@NotNull AbstractExceptionCase<T> exceptionCase) throws T {
-        assertExceptionOccurred(false, exceptionCase, null);
-    }
-
-    protected void assertNoThrowable(@NotNull Runnable closure) {
-        String throwableName = null;
-        try {
-            closure.run();
-        }
-        catch (Throwable thr) {
-            throwableName = thr.getClass().getName();
-        }
-        assertNull(throwableName);
-    }
-
-    private static <T extends Throwable> void assertExceptionOccurred(boolean shouldOccur,
-            @NotNull AbstractExceptionCase<T> exceptionCase,
-            String expectedErrorMsg) throws T {
-        boolean wasThrown = false;
-        try {
-            exceptionCase.tryClosure();
-        }
-        catch (Throwable e) {
-            if (shouldOccur) {
-                wasThrown = true;
-                final String errorMessage = exceptionCase.getAssertionErrorMessage();
-                assertEquals(errorMessage, exceptionCase.getExpectedExceptionClass(), e.getClass());
-                if (expectedErrorMsg != null) {
-                    assertEquals("Compare error messages", expectedErrorMsg, e.getMessage());
-                }
-            }
-            else if (exceptionCase.getExpectedExceptionClass().equals(e.getClass())) {
-                wasThrown = true;
-
-                //noinspection UseOfSystemOutOrSystemErr
-                System.out.println();
-                //noinspection UseOfSystemOutOrSystemErr
-                e.printStackTrace(System.out);
-
-                fail("Exception isn't expected here. Exception message: " + e.getMessage());
-            }
-            else {
-                throw e;
-            }
-        }
-        finally {
-            if (shouldOccur && !wasThrown) {
-                fail(exceptionCase.getAssertionErrorMessage());
-            }
-        }
-    }
-
-    protected boolean annotatedWith(@NotNull Class<? extends Annotation> annotationClass) {
-        Class<?> aClass = getClass();
-        String methodName = "test" + getTestName(false);
-        boolean methodChecked = false;
-        while (aClass != null && aClass != Object.class) {
-            if (aClass.getAnnotation(annotationClass) != null) return true;
-            if (!methodChecked) {
-                Method method = ReflectionUtil.getDeclaredMethod(aClass, methodName);
-                if (method != null) {
-                    if (method.getAnnotation(annotationClass) != null) return true;
-                    methodChecked = true;
-                }
-            }
-            aClass = aClass.getSuperclass();
-        }
-        return false;
-    }
-
-    @NotNull
-    protected String getHomePath() {
-        return PathManager.getHomePath().replace(File.separatorChar, '/');
-    }
-
-    public static void refreshRecursively(@NotNull VirtualFile file) {
-        VfsUtilCore.visitChildrenRecursively(file, new VirtualFileVisitor() {
-            @Override
-            public boolean visitFile(@NotNull VirtualFile file) {
-                file.getChildren();
-                return true;
-            }
-        });
-        file.refresh(false, true);
-    }
-
-    @Nullable
-    public static VirtualFile refreshAndFindFile(@NotNull final File file) {
-        return UIUtil.invokeAndWaitIfNeeded(() -> LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file));
-    }
-
-    protected class TestDisposable implements Disposable {
-        private volatile boolean myDisposed;
-
-        public TestDisposable() {
-        }
-
-        @Override
-        public void dispose() {
-            myDisposed = true;
-        }
-
-        public boolean isDisposed() {
-            return myDisposed;
-        }
-
-        @Override
-        public String toString() {
-            String testName = getTestName(false);
-            return KtUsefulTestCase.this.getClass() + (StringUtil.isEmpty(testName) ? "" : ".test" + testName);
-        }
-    };
-}
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index 3228d2747db..a6246fcb905 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -13,9 +13,7 @@ dependencies {
     testRuntime(project(":kotlin-reflect"))
     testRuntimeOnly(toolsJar())
     testRuntime(intellijDep())
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    testRuntimeOnly(intellijPluginDep("java"))
     if (System.getProperty("idea.active") != null) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
 }
 
diff --git a/compiler/tests-mutes/build.gradle.kts b/compiler/tests-mutes/build.gradle.kts
index 034c72c9479..69a4f6bbdca 100644
--- a/compiler/tests-mutes/build.gradle.kts
+++ b/compiler/tests-mutes/build.gradle.kts
@@ -17,9 +17,12 @@ sourceSets {
     "test" {}
 }
 
+val compileKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks
+compileKotlin.kotlinOptions.freeCompilerArgs += "-Xskip-runtime-version-check"
+
 val mutesPackageName = "org.jetbrains.kotlin.test.mutes"
 
 application {
     mainClassName = "$mutesPackageName.MutedTestsSyncKt"
     applicationDefaultJvmArgs = rootProject.properties.filterKeys { it.startsWith(mutesPackageName) }.map { (k, v) -> "-D$k=$v" }
-}
\ No newline at end of file
+}
diff --git a/compiler/tests-mutes/src/org/jetbrains/kotlin/test/mutes/TeamCityInteraction.kt b/compiler/tests-mutes/src/org/jetbrains/kotlin/test/mutes/TeamCityInteraction.kt
index bc298e46c90..871db830617 100644
--- a/compiler/tests-mutes/src/org/jetbrains/kotlin/test/mutes/TeamCityInteraction.kt
+++ b/compiler/tests-mutes/src/org/jetbrains/kotlin/test/mutes/TeamCityInteraction.kt
@@ -23,7 +23,7 @@ internal fun getMutedTestsOnTeamcityForRootProject(rootScopeId: String): List<Mu
     val jsonResponses = traverseAll(requestHref, requestParams)
 
     val alreadyMutedTestsOnTeamCity = jsonResponses.flatMap {
-        it.get("mute").filter { jn -> jn.get("assignment").get("text").textValue().startsWith(TAG) }
+        it.get("mute").filter { jn -> jn.get("assignment").get("text")?.textValue().toString().startsWith(TAG) }
     }
 
     return alreadyMutedTestsOnTeamCity.mapNotNull { jsonObjectMapper.treeToValue<MuteTestJson>(it) }
diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts
index 46e0a2c4dd0..f56f635f789 100644
--- a/compiler/tests-spec/build.gradle.kts
+++ b/compiler/tests-spec/build.gradle.kts
@@ -5,16 +5,14 @@ plugins {
 
 dependencies {
     testCompile(projectTests(":compiler"))
-    Platform[192].orHigher {
-        testCompileOnly(intellijDep()) {
-            includeJars("groovy-all", rootProject = rootProject)
-        }
-        testCompile(intellijDep()) {
-            includeJars("gson", rootProject = rootProject)
-        }
-        testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-        testRuntimeOnly(intellijPluginDep("java"))
+    testCompileOnly(intellijDep()) {
+        includeJars("groovy-all", rootProject = rootProject)
     }
+    testCompile(intellijDep()) {
+        includeJars("gson", rootProject = rootProject)
+    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijPluginDep("java"))
     compile("org.jsoup:jsoup:1.10.3")
     if (System.getProperty("idea.active") != null) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
     testRuntime(project(":kotlin-reflect"))
diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/call-with-an-explicit-type-receiver/p-3/pos/2.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/call-with-an-explicit-type-receiver/p-3/pos/2.1.fir.kt
index 9c653287c28..42722c95a72 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/call-with-an-explicit-type-receiver/p-3/pos/2.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/call-with-an-explicit-type-receiver/p-3/pos/2.1.fir.kt
@@ -9,7 +9,7 @@
  * ISSUES: KT-39129
  */
 fun case1() {
-    C1.<!INAPPLICABLE_CANDIDATE!>V<!>()
+    C1.<!UNRESOLVED_REFERENCE!>V<!>()
 
     C1.Companion.<!DEBUG_INFO_CALL("fqName: C1.Companion.V.V; typeCall: function")!>V()<!>
 
diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.fir.kt
index fbf2e9f05b8..55a95cd8b2b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.fir.kt
@@ -9,17 +9,17 @@ package testPackCase1
 
 fun case1(a: A, c: C) {
 
-    <!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved"), INAPPLICABLE_CANDIDATE!>a?.b += c<!>
-    a?.b .<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!><!INAPPLICABLE_CANDIDATE!>plusAssign<!>(c)<!>
+    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += c<!>
+    a?.b .<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
 
     val x = {
-        <!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved"), INAPPLICABLE_CANDIDATE!>a?.b += c<!>
-        a?.b.<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!><!INAPPLICABLE_CANDIDATE!>plusAssign<!>(c)<!>
+        <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += c<!>
+        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
     }()
 
-    <!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved"), INAPPLICABLE_CANDIDATE!>a?.b += { c }()<!>
+    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += { c }()<!>
 
-    a?.b.<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!><!INAPPLICABLE_CANDIDATE!>plusAssign<!>({ c }())<!>
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign({ c }())<!>
 }
 
 class A(val b: B)
diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/3.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/3.1.fir.kt
deleted file mode 100644
index 5a7bddd848c..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/3.1.fir.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-// !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
-// SKIP_TXT
-
-// FILE: TestCase.kt
-// TESTCASE NUMBER: 1
-package testsCase1
-
-open class A {
-    operator fun invoke() = print("invoke")
-}
-
-enum class Super_2 {
-    V1, V2;
-
-    companion object values : A() {}
-
-    private fun case() {
-        <!DEBUG_INFO_CALL("fqName: testsCase1.A.invoke; typeCall: variable&invoke")!>values()<!>
-    }
-
-    enum class NestedWithCompanion {
-        V1;
-
-        companion object values : A() {}
-
-        private fun case() {
-            <!DEBUG_INFO_CALL("fqName: testsCase1.A.invoke; typeCall: variable&invoke")!>values()<!>
-        }
-    }
-
-    enum class Nested {
-        V1;
-
-        private fun case() {
-            <!DEBUG_INFO_CALL("fqName: testsCase1.Super_2.Nested.values; typeCall: function")!>values()<!>
-        }
-    }
-}
-
-// FILE: TestCase.kt
-// TESTCASE NUMBER: 2
-package testsCase2
-
-open class A {
-    operator fun invoke(value: String) = print("invoke $value")
-}
-
-enum class Super_2 {
-    V1, V2;
-
-    companion object valueOf : A() {}
-
-    private fun case() {
-        <!DEBUG_INFO_CALL("fqName: testsCase2.A.invoke; typeCall: variable&invoke")!>valueOf("")<!>
-    }
-
-    enum class NestedWithCompanion {
-        V1;
-
-        companion object valueOf : A() {}
-
-        private fun case() {
-            <!DEBUG_INFO_CALL("fqName: testsCase2.A.invoke; typeCall: variable&invoke")!>valueOf("")<!>
-        }
-    }
-
-    enum class Nested {
-        V1;
-
-        private fun case() {
-            <!DEBUG_INFO_CALL("fqName: testsCase2.Super_2.Nested.valueOf; typeCall: function")!>valueOf("")<!>
-        }
-    }
-}
-
-
-// FILE: TestCase.kt
-// TESTCASE NUMBER: 3
-package testsCase3
-
-open class A {
-    operator fun invoke() = print("invoke")
-}
-
-enum class Super_2 {
-    V1, V2;
-
-    object values : A() {}
-
-    private fun case() {
-        <!DEBUG_INFO_CALL("fqName: testsCase3.A.invoke; typeCall: variable&invoke")!>values()<!>
-    }
-
-    enum class NestedWithCompanion {
-        V1;
-
-        object values : A() {}
-
-        private fun case() {
-            <!DEBUG_INFO_CALL("fqName: testsCase3.A.invoke; typeCall: variable&invoke")!>values()<!>
-        }
-    }
-
-    enum class Nested {
-        V1;
-
-        private fun case() {
-            <!DEBUG_INFO_CALL("fqName: testsCase3.Super_2.Nested.values; typeCall: function")!>values()<!>
-        }
-    }
-}
-
-// FILE: TestCase.kt
-// TESTCASE NUMBER: 4
-package testsCase4
-
-open class A {
-    operator fun invoke(value: String) = print("invoke $value")
-}
-open class B {
-    operator fun invoke(value: String) = print("invoke $value")
-}
-
-enum class Super_2 {
-    V1, V2;
-
-    object valueOf : A() {}
-
-    private fun case() {
-        <!DEBUG_INFO_CALL("fqName: testsCase4.A.invoke; typeCall: variable&invoke")!>valueOf("")<!>
-    }
-
-    enum class NestedWithCompanion {
-        V1;
-
-        object valueOf : B() {}
-
-        private fun case() {
-            <!DEBUG_INFO_CALL("fqName: testsCase4.B.invoke; typeCall: variable&invoke")!>valueOf("")<!>
-        }
-    }
-
-    enum class Nested {
-        V1;
-
-        private fun case() {
-            <!DEBUG_INFO_CALL("fqName: testsCase4.Super_2.Nested.valueOf; typeCall: function")!>valueOf("")<!>
-        }
-    }
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/3.1.kt
index 55dd0b6e4c6..ff5e15ae057 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/3.1.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/controlFlow/initialization/pos/3.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/controlFlow/initialization/pos/3.fir.kt
index 54dd51278f6..78ab2981a0e 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/controlFlow/initialization/pos/3.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/controlFlow/initialization/pos/3.fir.kt
@@ -147,7 +147,7 @@ fun case_9() {
         }
         throw Exception()
     }
-    println(<!UNINITIALIZED_VARIABLE!>x<!>.inc())
+    println(x.inc())
 }
 
 // TESTCASE NUMBER: 10
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.fir.kt
index a1a07494265..02adb3416d6 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.fir.kt
@@ -103,8 +103,8 @@ fun case_7() {
 
 // TESTCASE NUMBER: 8
 fun case_8(x: TypealiasNullableString) {
-    if (x !== null === null && <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableString")!>x<!> != null != null) <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableString")!>x<!>.get(0)
-    if (x !== null != null && <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableString")!>x<!> != null === null) <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableString")!>x<!>.get(0)
+    if (x !== null === null && <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableString")!>x<!> != null != null) <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableString")!>x<!>.<!INAPPLICABLE_CANDIDATE!>get<!>(0)
+    if (x !== null != null && <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableString")!>x<!> != null === null) <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableString")!>x<!>.<!INAPPLICABLE_CANDIDATE!>get<!>(0)
 }
 
 // TESTCASE NUMBER: 9
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/11.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/11.fir.kt
index 5afcda0cf38..089c8e148a1 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/11.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/11.fir.kt
@@ -25,8 +25,8 @@ fun case_3() {
     var x: Boolean? = true
     if (<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!> is Boolean) {
         funWithAnyArg(try { x = null; true } catch (e: Exception) { false })
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -35,8 +35,8 @@ fun case_4() {
     var x: Boolean? = true
     if (<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!> != null) {
         false || when { else -> {x = null; true} }
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -57,8 +57,8 @@ fun case_6() {
     var x: Boolean? = true
     x as Boolean
     if (if (true) { x = null; true } else { false }) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>.not()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -68,6 +68,6 @@ fun case_7() {
     x!!
     if (if (true) { x = null; true } else { false }) {}
 
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>.not()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/12.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/12.fir.kt
index 7c5793032d5..ea31ce80a81 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/12.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/12.fir.kt
@@ -6,7 +6,7 @@
 fun case_1() {
     var x: Int? = 11
     x!!
-    try {x = null;} finally { <!UNRESOLVED_REFERENCE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!> += 10<!>; }
+    try {x = null;} finally { <!UNRESOLVED_REFERENCE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!> += 10<!>; }
 }
 
 // TESTCASE NUMBER: 2
@@ -18,7 +18,7 @@ fun case_2() {
         } catch (e: Exception) {
             x = null
         }
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -31,7 +31,7 @@ fun case_3() {
         } catch (e: Exception) {
             x = null
         }
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -42,5 +42,5 @@ fun case_4() {
     try {
         x = null
     } finally { }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/13.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/13.fir.kt
index 53307ced28f..6028efb50fe 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/13.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/13.fir.kt
@@ -14,16 +14,16 @@ fun case_1(x: Class?) {
 fun case_2() {
     var x: Class? = 10
     x!!
-    x(if (true) {x=null;0} else 0, <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>)
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_1()
+    <!NONE_APPLICABLE!>x<!>(if (true) {x=null;0} else 0, <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>)
+    <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>fun_1<!>()
 }
 
 // TESTCASE NUMBER: 3
 fun case_3() {
     var x: Class? = Class()
     x!!
-    val y = <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>[if (true) {x=null;0} else 0, <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>[0]]
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_1()
+    val y = <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>[if (true) {x=null;0} else 0, <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>[0]<!>]
+    <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>fun_1<!>()
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/15.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/15.fir.kt
index dc34e80d173..c3035bcc689 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/15.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/15.fir.kt
@@ -37,8 +37,8 @@ fun case_3() {
     var x: Boolean? = true
     if (x != null) {
         false || when { else -> { x = null; true} }
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -64,7 +64,7 @@ fun case_4() {
 fun case_5() {
     var x: Boolean? = true
     if (x != null) {
-        when { else -> { x = null; false} } || <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        when { else -> { x = null; false} } || <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -88,7 +88,7 @@ fun case_6() {
 fun case_7() {
     var x: Boolean? = true
     if (x != null) {
-        (if (true) {x = null; null} else true) ?: <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>.not()
+        (if (true) {x = null; null} else true) ?: <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -96,7 +96,7 @@ fun case_7() {
 fun case_8(y: MutableList<Boolean>) {
     var x: Boolean? = true
     if (x != null) {
-        y[if (true) {x = null;0} else 0] = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>
+        <!INAPPLICABLE_CANDIDATE!>y[if (true) {x = null;0} else 0] = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!><!>
     }
 }
 
@@ -109,8 +109,8 @@ fun case_9() {
     var x: Boolean? = true
     if (x is Boolean) {
         funWithAnyArg(try { x = null; true } catch (e: Exception) { false })
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -122,7 +122,7 @@ fun case_9() {
 fun case_10() {
     var x: Boolean? = true
     if (x is Boolean) {
-        select(if (true) {x = null;Class()} else Class()).prop_9 = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>.not()
+        select(if (true) {x = null;Class()} else Class()).prop_9 = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -130,6 +130,6 @@ fun case_10() {
 fun case_11(y: MutableList<MutableList<Int>>) {
     var x: Int? = 10
     if (x != null) {
-        y[if (true) {x = null;0} else 0][x] = 10
+        <!INAPPLICABLE_CANDIDATE!>y[if (true) {x = null;0} else 0][x] = 10<!>
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/18.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/18.fir.kt
index 0b76ae2e70d..5734223bf9f 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/18.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/18.fir.kt
@@ -50,7 +50,7 @@ fun case_4(x: Interface1?) {
     y as Interface2
     y = null
     fun foo() {
-        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1?")!>y<!>.<!UNRESOLVED_REFERENCE!>itest2<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1? & Interface1?")!>y<!>.<!UNRESOLVED_REFERENCE!>itest2<!>()
     }
     y = x
     foo()
@@ -62,7 +62,7 @@ fun case_5(x: Interface1?) {
     y as Interface2
     y = null
     fun foo() {
-        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1?")!>y<!>.<!UNRESOLVED_REFERENCE!>itest2<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1? & Interface1?")!>y<!>.<!UNRESOLVED_REFERENCE!>itest2<!>()
     }
     y = x
     foo()
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/21.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/21.fir.kt
index c52f76a3c8e..359db004c86 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/21.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/21.fir.kt
@@ -13,7 +13,7 @@ class Case1 {
         val y = this
         if (y.x != null) {
             x = null
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>
             this.x
             y.x
             y.x.<!INAPPLICABLE_CANDIDATE!>inv<!>()
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/23.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/23.fir.kt
index 5b41b6ef0c2..1f7569cc23c 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/23.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/23.fir.kt
@@ -20,7 +20,7 @@ inline fun <reified T, reified K> case_1(x: T) {
 inline fun <reified T, reified K> case_2(x: T) {
     x as K
     <!DEBUG_INFO_EXPRESSION_TYPE("K & T & T")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("K & T & T")!>x<!>.equals(x)
+    <!DEBUG_INFO_EXPRESSION_TYPE("K & T & T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(x)
 }
 
 /*
@@ -31,8 +31,8 @@ inline fun <reified T, reified K> case_3() {
     var x: T? = 10 as T
     x = null
     if (x is K) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("K!! & T?!! & T?")!>x<!>.equals(10)
-        <!DEBUG_INFO_EXPRESSION_TYPE("K!! & T?!! & T?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T?!! & K!! & T?")!>x<!>.equals(10)
+        <!DEBUG_INFO_EXPRESSION_TYPE("T?!! & K!! & T?")!>x<!>
         println(1)
     }
 }
@@ -49,7 +49,7 @@ inline fun <reified T, reified K> case_4(x: T?) {
 inline fun <reified T, reified K> case_5(x: T) {
     if (x is K?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("K? & T & T")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("K? & T & T")!>x<!>.equals(x)
+        <!DEBUG_INFO_EXPRESSION_TYPE("K? & T & T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(x)
     }
 }
 
@@ -61,8 +61,8 @@ inline fun <reified T, reified K> case_6() {
     var x: T? = 10 as T
     if (x is K) {
         x = null
-        <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
-        <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T? & T?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
+        <!DEBUG_INFO_EXPRESSION_TYPE("T? & T?")!>x<!>
         println(1)
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/24.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/24.fir.kt
index 777cc2eeaf5..07df8fe67f9 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/24.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/24.fir.kt
@@ -15,8 +15,8 @@ fun case_1() {
         } catch (e: Exception) {
             x = null
         }
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -31,8 +31,8 @@ fun case_2() {
         try {
             x = null
         } finally { }
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
     }
 }
 
@@ -68,8 +68,8 @@ fun case_4(x: String?) {
             break
         }
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>.length
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -85,8 +85,8 @@ fun case_5(x: String?) {
             break
         }
     } while (true)
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>.length
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/26.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/26.fir.kt
index b341660745a..bfdb0be3edd 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/26.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/26.fir.kt
@@ -10,18 +10,18 @@
 fun case_1() {
     var x: MutableList<Int>? = mutableListOf(1)
     x!!
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[if (true) {x=null;0} else 0] += <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0]
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0].inv()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[if (true) {x=null;0} else 0] += <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int>? & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0]<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int>? & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>
+    <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int>? & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0]<!>.inv()
 }
 
 // TESTCASE NUMBER: 2
 fun case_2() {
     var x: MutableList<Int>? = mutableListOf(1)
     x!!
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[if (true) {x=null;0} else 0] = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0]
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0].inv()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[if (true) {x=null;0} else 0] = <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int>? & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0]<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int>? & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>
+    <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int>? & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0]<!>.inv()
 }
 
 // TESTCASE NUMBER: 3
@@ -29,8 +29,8 @@ fun case_3() {
     var x: MutableList<Int>? = mutableListOf(1)
     x!!
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0] = if (true) {x=null;0} else 0
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0].inv()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int>? & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>
+    <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int>? & kotlin.collections.MutableList<kotlin.Int>?")!>x<!>[0]<!>.inv()
 }
 
 /*
@@ -41,9 +41,9 @@ fun case_3() {
 fun case_4() {
     var x: Class? = Class()
     x!!
-    val y = <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>[if (true) {x=null;0} else 0, <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>[0]]
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>[0].inv()
+    val y = <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>[if (true) {x=null;0} else 0, <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>[0]<!>]
+    <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>
+    <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>[0]<!>.inv()
 }
 
 /*
@@ -54,17 +54,17 @@ fun case_4() {
 fun case_5() {
     var x: Class? = Class()
     x!!
-    x(if (true) {x=null;0} else 0, <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>)
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_1()
+    <!NONE_APPLICABLE!>x<!>(if (true) {x=null;0} else 0, <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>)
+    <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>fun_1<!>()
 }
 
 // TESTCASE NUMBER: 6
 fun case_6() {
     var x: MutableList<MutableList<Int>>? = mutableListOf(mutableListOf(1))
     x!!
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[if (true) {x=null;0} else 0][<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0][0]] += 10
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0][0].inv()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[if (true) {x=null;0} else 0][<!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>? & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0]<!>[0]] += 10
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>? & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>
+    <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>? & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0]<!>[0].inv()
 }
 
 /*
@@ -75,22 +75,22 @@ fun case_6() {
 fun case_7() {
     var x: Class? = Class()
     x!!
-    x(if (true) {x=null;0} else 0)(<!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>)
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_1()
+    <!NONE_APPLICABLE!>x<!>(if (true) {x=null;0} else 0)(<!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>)
+    <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>fun_1<!>()
 }
 
 // TESTCASE NUMBER: 8
 fun case_8() {
     var x: MutableList<MutableList<Int>>? = mutableListOf(mutableListOf(1))
     x!!
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[if (true) {x=null;0} else 0].addAll(1, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0])
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[if (true) {x=null;0} else 0].addAll(1, <!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>? & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0]<!>)
 }
 
 // TESTCASE NUMBER: 9
 fun case_9() {
     var x: MutableList<MutableList<Int>>? = mutableListOf(mutableListOf(1))
     x!!
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[if (true) {x=null;0} else 0].subList(0, 2)[<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0][0]]
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[if (true) {x=null;0} else 0].subList(0, 2)[<!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>? & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0]<!>[0]]
 }
 
 /*
@@ -101,7 +101,7 @@ fun case_9() {
 fun case_10() {
     var x: MutableList<MutableList<Int>>? = mutableListOf(mutableListOf(1))
     x!!
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>.subList(if (true) {x=null;0} else 0, 2)[<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0][0]]
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>.subList(if (true) {x=null;0} else 0, 2)[<!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>? & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0]<!>[0]]
 }
 
 /*
@@ -112,5 +112,5 @@ fun case_10() {
 fun case_11() {
     var x: MutableList<MutableList<Int>>? = mutableListOf(mutableListOf(1))
     x!!
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[if (true) {x=null;0} else 0].subList(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0][0], 2)
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>> & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[if (true) {x=null;0} else 0].subList(<!INAPPLICABLE_CANDIDATE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>? & kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.Int>>?")!>x<!>[0]<!>[0], 2)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/29.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/29.fir.kt
index 28fb0f53e69..c31bf6671be 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/29.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/29.fir.kt
@@ -22,8 +22,8 @@ fun case_2(a: Any?) {
         }
     })()
 
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a<!>.equals(10)
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
 }
 
 // TESTCASE NUMBER: 3
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/34.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/34.fir.kt
index 0c91dc7abe2..767a3147e0d 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/34.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/34.fir.kt
@@ -13,8 +13,8 @@ fun case_1() {
         x = null
         break
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>.length
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -28,8 +28,8 @@ fun case_3() {
         x = null
         break
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>.length
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -43,8 +43,8 @@ fun case_4() {
         x = null
         break
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>.not()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
 
 // TESTCASE NUMBER: 5
@@ -56,8 +56,8 @@ fun case_5() {
         x = null
         break
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>.not()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
 
 // TESTCASE NUMBER: 6
@@ -141,8 +141,8 @@ fun case_12() {
         x = null
         break
     } while (true && x!!)
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
 
 // TESTCASE NUMBER: 13
@@ -154,8 +154,8 @@ fun case_13() {
         x = null
         break
     } while (false && x!!)
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
 
 // TESTCASE NUMBER: 14
@@ -167,8 +167,8 @@ fun case_14() {
         x = null
         break
     } while (true || x!!)
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
 
 // TESTCASE NUMBER: 15
@@ -180,8 +180,8 @@ fun case_15() {
         x = null
         break
     } while (!(false && x!!))
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
 
 /*
@@ -194,8 +194,8 @@ fun case_16() {
     while (x!! && if (true) {x = null; true} else true) {
         break
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>.not()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
 
 /*
@@ -208,6 +208,6 @@ fun case_17() {
     while (x!! && if (true) {x = null; true} else true) {
         break
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean & kotlin.Boolean?")!>x<!>.not()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean? & kotlin.Boolean?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>not<!>()
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/35.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/35.fir.kt
index ba65a252684..e36e5e01c9b 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/35.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/35.fir.kt
@@ -11,8 +11,8 @@ fun case_1() {
     var x: String?
     x = "Test"
     println("${if (true) x = null else 1}")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x<!>.length
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -24,8 +24,8 @@ fun case_2() {
     var x: String?
     x = "Test"
     println("${try { x = null } finally { }}")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -37,8 +37,8 @@ fun case_3() {
     var x: String?
     x = "Test"
     println("${try {  } finally { x = null }}")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -50,8 +50,8 @@ fun case_4() {
     var x: String?
     x = "Test"
     println("${try { x = null } catch (e: Exception) { } finally { }}")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -63,8 +63,8 @@ fun case_5() {
     var x: String?
     x = "Test"
     println("${try { } catch (e: Exception) { x = null } finally {  }}")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -76,8 +76,8 @@ fun case_6() {
     var x: String?
     x = "Test"
     println("${try { } catch (e: Exception) { } finally { x = null }}")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -89,8 +89,8 @@ fun case_7() {
     var x: String?
     x = "Test"
     println("${try { x = null } catch (e: Exception) { }}")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -102,8 +102,8 @@ fun case_8() {
     var x: String?
     x = "Test"
     println("${try { } catch (e: Exception) { x = null }}")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
 
 /*
@@ -115,6 +115,6 @@ fun case_9() {
     var x: String?
     x = "Test"
     println("${when (null) { else -> x = null } }")
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/38.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/38.fir.kt
index 51b93a755d8..36564f9cf74 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/38.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/38.fir.kt
@@ -145,8 +145,8 @@ fun case_9() {
         inner@ do {
             x = null
         } while (x != null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
     }
 }
 
@@ -158,8 +158,8 @@ fun case_10() {
         inner@ do {
             x = null
         } while (true)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
     }
 }
 
@@ -172,7 +172,7 @@ fun case_11() {
             x = null
             break
         } while (x == null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String? & kotlin.String?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>length<!>
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/42.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/42.fir.kt
index f54f3479e0c..3f3d9c5291d 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/42.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/42.fir.kt
@@ -75,7 +75,7 @@ fun <T> case_6(x: T) {
 fun <T> case_7(x: T) {
     if (x is Int? || x is Float?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number? & kotlin.Comparable<kotlin.Int & kotlin.Float>? & T & T")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number? & kotlin.Comparable<kotlin.Int & kotlin.Float>? & T & T")!>x<!>.toByte()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number? & kotlin.Comparable<kotlin.Int & kotlin.Float>? & T & T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>toByte<!>()
     }
 }
 
@@ -86,7 +86,7 @@ fun <T> case_7(x: T) {
 inline fun <reified T> case_8(x: T) {
     if (x is Int? || x is Float?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number? & kotlin.Comparable<kotlin.Int & kotlin.Float>? & T & T")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number? & kotlin.Comparable<kotlin.Int & kotlin.Float>? & T & T")!>x<!>.toByte()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number? & kotlin.Comparable<kotlin.Int & kotlin.Float>? & T & T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>toByte<!>()
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/9.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/9.fir.kt
index de592327951..33826d89042 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/9.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/9.fir.kt
@@ -8,7 +8,7 @@ fun <T, K> case_1(x: T?, y: K?) {
     y as K
     val z = <!DEBUG_INFO_EXPRESSION_TYPE("T & T?")!>x<!> ?: <!DEBUG_INFO_EXPRESSION_TYPE("K & K?")!>y<!>
 
-    <!DEBUG_INFO_EXPRESSION_TYPE("T & T?")!>x<!>.equals(10)
+    <!DEBUG_INFO_EXPRESSION_TYPE("T & T?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>z<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>z<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
 }
@@ -18,5 +18,5 @@ inline fun <reified T: Any, reified K: T?> case_2(y: K?) {
     y as K
 
     <!DEBUG_INFO_EXPRESSION_TYPE("K & K?")!>y<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("K & K?")!>y<!>.equals(10)
+    <!DEBUG_INFO_EXPRESSION_TYPE("K & K?")!>y<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/1.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/1.fir.kt
index afdbf4eb800..bbd90fc5197 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/1.fir.kt
@@ -604,43 +604,43 @@ open class Case29(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.b != null) this.b.funAny()
         if (this.b != null) this.b.funNullableT()
         if (this.b != null) this.b.funNullableAny()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propT
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableT
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableAny
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funT()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableT()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableAny()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float")!>b<!>
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.equals(null)
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propT
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propAny
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableT
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableAny
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funT()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funAny()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableT()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableAny()
         if (b != null) this.b
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (b != null) this.b.equals(null)
         if (b != null) this.b.propT
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (b != null) this.b.propAny
         if (b != null) this.b.propNullableT
         if (b != null) this.b.propNullableAny
         if (b != null) this.b.funT()
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (b != null) this.b.funAny()
         if (b != null) this.b.funNullableT()
         if (b != null) this.b.funNullableAny()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propT
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableT
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableAny
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funT()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableT()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableAny()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.equals(null)
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propT
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propAny
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableT
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableAny
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funT()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funAny()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableT()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableAny()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float")!>b<!>
+        if (b != null || this.b != null) this.b.equals(null)
         if (b != null || this.b != null) this.b.propT
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (b != null || this.b != null) this.b.propAny
         if (b != null || this.b != null) this.b.propNullableT
         if (b != null || this.b != null) this.b.propNullableAny
         if (b != null || this.b != null) this.b.funT()
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (b != null || this.b != null) this.b.funAny()
         if (b != null || this.b != null) this.b.funNullableT()
         if (b != null || this.b != null) this.b.funNullableAny()
         if (b != null || this.b != null) this.b
@@ -673,43 +673,43 @@ open class Case29(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.c != null) this.c.funNullableT()
         if (this.c != null) this.c.funNullableAny()
         if (this.c != null) this.c
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (c != null) this.c.equals(null)
         if (c != null) this.c.propT
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (c != null) this.c.propAny
         if (c != null) this.c.propNullableT
         if (c != null) this.c.propNullableAny
         if (c != null) this.c.funT()
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (c != null) this.c.funAny()
         if (c != null) this.c.funNullableT()
         if (c != null) this.c.funNullableAny()
         if (c != null) this.c
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propT
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableT
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableAny
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funT()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableT()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableAny()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propT
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableT
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableAny
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funT()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableT()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableAny()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.equals(null)
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propT
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propAny
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableT
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableAny
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funT()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funAny()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableT()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableAny()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>c<!>
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.equals(null)
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propT
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propAny
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableT
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableAny
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funT()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funAny()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableT()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableAny()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>c<!>
+        if (c != null || this.c != null) this.c.equals(null)
         if (c != null || this.c != null) this.c.propT
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (c != null || this.c != null) this.c.propAny
         if (c != null || this.c != null) this.c.propNullableT
         if (c != null || this.c != null) this.c.propNullableAny
         if (c != null || this.c != null) this.c.funT()
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (c != null || this.c != null) this.c.funAny()
         if (c != null || this.c != null) this.c.funNullableT()
         if (c != null || this.c != null) this.c.funNullableAny()
         if (c != null || this.c != null) this.c
@@ -744,41 +744,41 @@ open class Case29(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.d != null) this.d
         if (d != null) this.d.equals(null)
         if (d != null) this.d.propT
-        if (d != null) this.d.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (d != null) this.d.propAny
         if (d != null) this.d.propNullableT
         if (d != null) this.d.propNullableAny
         if (d != null) this.d.funT()
-        if (d != null) this.d.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (d != null) this.d.funAny()
         if (d != null) this.d.funNullableT()
         if (d != null) this.d.funNullableAny()
         if (d != null) this.d
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.equals(null)
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propT
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableT
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableAny
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funT()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableT()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableAny()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.equals(null)
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propT
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableT
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableAny
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funT()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableT()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableAny()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.equals(null)
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propT
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propAny
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableT
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableAny
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funT()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funAny()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableT()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableAny()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>d<!>
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.equals(null)
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propT
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propAny
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableT
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableAny
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funT()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funAny()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableT()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableAny()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>d<!>
         if (d != null || this.d != null) this.d.equals(null)
         if (d != null || this.d != null) this.d.propT
-        if (d != null || this.d != null) this.d.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (d != null || this.d != null) this.d.propAny
         if (d != null || this.d != null) this.d.propNullableT
         if (d != null || this.d != null) this.d.propNullableAny
         if (d != null || this.d != null) this.d.funT()
-        if (d != null || this.d != null) this.d.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (d != null || this.d != null) this.d.funAny()
         if (d != null || this.d != null) this.d.funNullableT()
         if (d != null || this.d != null) this.d.funNullableAny()
         if (d != null || this.d != null) this.d
@@ -811,43 +811,43 @@ open class Case29(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.e != null) this.e.funNullableT()
         if (this.e != null) this.e.funNullableAny()
         if (this.e != null) this.e
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propT
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableT
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableAny
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funT()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableT()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableAny()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.equals(null)
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propT
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propAny
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableT
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableAny
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funT()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funAny()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableT()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableAny()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char")!>e<!>
+        if (e != null) this.e.equals(null)
         if (e != null) this.e.propT
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (e != null) this.e.propAny
         if (e != null) this.e.propNullableT
         if (e != null) this.e.propNullableAny
         if (e != null) this.e.funT()
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (e != null) this.e.funAny()
         if (e != null) this.e.funNullableT()
         if (e != null) this.e.funNullableAny()
         if (e != null) this.e
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propT
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableT
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableAny
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funT()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableT()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableAny()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.equals(null)
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propT
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propAny
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableT
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableAny
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funT()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funAny()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableT()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableAny()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char")!>e<!>
+        if (e != null || this.e != null) this.e.equals(null)
         if (e != null || this.e != null) this.e.propT
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (e != null || this.e != null) this.e.propAny
         if (e != null || this.e != null) this.e.propNullableT
         if (e != null || this.e != null) this.e.propNullableAny
         if (e != null || this.e != null) this.e.funT()
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (e != null || this.e != null) this.e.funAny()
         if (e != null || this.e != null) this.e.funNullableT()
         if (e != null || this.e != null) this.e.funNullableAny()
         if (e != null || this.e != null) this.e
@@ -880,43 +880,43 @@ open class Case29(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.f != null) this.f.funNullableT()
         if (this.f != null) this.f.funNullableAny()
         if (this.f != null) this.f
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propT
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableT
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableAny
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funT()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableT()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableAny()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.equals(null)
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propT
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propAny
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableT
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableAny
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funT()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funAny()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableT()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableAny()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>f<!>
+        if (f != null) this.f.equals(null)
         if (f != null) this.f.propT
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (f != null) this.f.propAny
         if (f != null) this.f.propNullableT
         if (f != null) this.f.propNullableAny
         if (f != null) this.f.funT()
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (f != null) this.f.funAny()
         if (f != null) this.f.funNullableT()
         if (f != null) this.f.funNullableAny()
         if (f != null) this.f
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propT
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableT
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableAny
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funT()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableT()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableAny()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.equals(null)
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propT
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propAny
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableT
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableAny
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funT()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funAny()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableT()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableAny()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>f<!>
+        if (f != null || this.f != null) this.f.equals(null)
         if (f != null || this.f != null) this.f.propT
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (f != null || this.f != null) this.f.propAny
         if (f != null || this.f != null) this.f.propNullableT
         if (f != null || this.f != null) this.f.propNullableAny
         if (f != null || this.f != null) this.f.funT()
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (f != null || this.f != null) this.f.funAny()
         if (f != null || this.f != null) this.f.funNullableT()
         if (f != null || this.f != null) this.f.funNullableAny()
         if (f != null || this.f != null) this.f
@@ -1293,8 +1293,8 @@ open class Case29(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (w != null || this.w != null) this.w
 
         s = null
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>s<!>.hashCode()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>s<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any?")!>s<!>.hashCode()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any?")!>s<!>
         if (s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
         if (this.s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
         if (s != null || this.s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
@@ -1648,43 +1648,43 @@ sealed class Case30(a: Int?, val b: Float?, private val c: Unit?, protected val
         if (this.b != null) this.b.funNullableT()
         if (this.b != null) this.b.funNullableAny()
         if (this.b != null) this.b
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propT
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableT
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableAny
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funT()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableT()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableAny()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.equals(null)
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propT
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propAny
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableT
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableAny
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funT()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funAny()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableT()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableAny()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float")!>b<!>
+        if (b != null) this.b.equals(null)
         if (b != null) this.b.propT
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (b != null) this.b.propAny
         if (b != null) this.b.propNullableT
         if (b != null) this.b.propNullableAny
         if (b != null) this.b.funT()
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (b != null) this.b.funAny()
         if (b != null) this.b.funNullableT()
         if (b != null) this.b.funNullableAny()
         if (b != null) this.b
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propT
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableT
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableAny
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funT()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableT()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableAny()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.equals(null)
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propT
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propAny
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableT
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableAny
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funT()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funAny()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableT()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableAny()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float")!>b<!>
+        if (b != null || this.b != null) this.b.equals(null)
         if (b != null || this.b != null) this.b.propT
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (b != null || this.b != null) this.b.propAny
         if (b != null || this.b != null) this.b.propNullableT
         if (b != null || this.b != null) this.b.propNullableAny
         if (b != null || this.b != null) this.b.funT()
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (b != null || this.b != null) this.b.funAny()
         if (b != null || this.b != null) this.b.funNullableT()
         if (b != null || this.b != null) this.b.funNullableAny()
         if (b != null || this.b != null) this.b
@@ -1717,43 +1717,43 @@ sealed class Case30(a: Int?, val b: Float?, private val c: Unit?, protected val
         if (this.c != null) this.c.funNullableT()
         if (this.c != null) this.c.funNullableAny()
         if (this.c != null) this.c
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (c != null) this.c.equals(null)
         if (c != null) this.c.propT
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (c != null) this.c.propAny
         if (c != null) this.c.propNullableT
         if (c != null) this.c.propNullableAny
         if (c != null) this.c.funT()
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (c != null) this.c.funAny()
         if (c != null) this.c.funNullableT()
         if (c != null) this.c.funNullableAny()
         if (c != null) this.c
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propT
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableT
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableAny
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funT()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableT()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableAny()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propT
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableT
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableAny
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funT()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableT()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableAny()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.equals(null)
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propT
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propAny
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableT
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableAny
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funT()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funAny()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableT()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableAny()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>c<!>
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.equals(null)
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propT
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propAny
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableT
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableAny
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funT()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funAny()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableT()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableAny()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>c<!>
+        if (c != null || this.c != null) this.c.equals(null)
         if (c != null || this.c != null) this.c.propT
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (c != null || this.c != null) this.c.propAny
         if (c != null || this.c != null) this.c.propNullableT
         if (c != null || this.c != null) this.c.propNullableAny
         if (c != null || this.c != null) this.c.funT()
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (c != null || this.c != null) this.c.funAny()
         if (c != null || this.c != null) this.c.funNullableT()
         if (c != null || this.c != null) this.c.funNullableAny()
         if (c != null || this.c != null) this.c
@@ -1788,41 +1788,41 @@ sealed class Case30(a: Int?, val b: Float?, private val c: Unit?, protected val
         if (this.d != null) this.d
         if (d != null) this.d.equals(null)
         if (d != null) this.d.propT
-        if (d != null) this.d.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (d != null) this.d.propAny
         if (d != null) this.d.propNullableT
         if (d != null) this.d.propNullableAny
         if (d != null) this.d.funT()
-        if (d != null) this.d.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (d != null) this.d.funAny()
         if (d != null) this.d.funNullableT()
         if (d != null) this.d.funNullableAny()
         if (d != null) this.d
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.equals(null)
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propT
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableT
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableAny
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funT()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableT()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableAny()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.equals(null)
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propT
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableT
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableAny
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funT()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableT()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableAny()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.equals(null)
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propT
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propAny
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableT
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableAny
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funT()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funAny()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableT()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableAny()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>d<!>
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.equals(null)
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propT
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propAny
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableT
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableAny
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funT()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funAny()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableT()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableAny()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>d<!>
         if (d != null || this.d != null) this.d.equals(null)
         if (d != null || this.d != null) this.d.propT
-        if (d != null || this.d != null) this.d.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (d != null || this.d != null) this.d.propAny
         if (d != null || this.d != null) this.d.propNullableT
         if (d != null || this.d != null) this.d.propNullableAny
         if (d != null || this.d != null) this.d.funT()
-        if (d != null || this.d != null) this.d.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (d != null || this.d != null) this.d.funAny()
         if (d != null || this.d != null) this.d.funNullableT()
         if (d != null || this.d != null) this.d.funNullableAny()
         if (d != null || this.d != null) this.d
@@ -1855,43 +1855,43 @@ sealed class Case30(a: Int?, val b: Float?, private val c: Unit?, protected val
         if (this.e != null) this.e.funNullableT()
         if (this.e != null) this.e.funNullableAny()
         if (this.e != null) this.e
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propT
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableT
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableAny
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funT()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableT()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableAny()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.equals(null)
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propT
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propAny
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableT
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableAny
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funT()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funAny()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableT()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableAny()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char")!>e<!>
+        if (e != null) this.e.equals(null)
         if (e != null) this.e.propT
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (e != null) this.e.propAny
         if (e != null) this.e.propNullableT
         if (e != null) this.e.propNullableAny
         if (e != null) this.e.funT()
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (e != null) this.e.funAny()
         if (e != null) this.e.funNullableT()
         if (e != null) this.e.funNullableAny()
         if (e != null) this.e
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propT
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableT
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableAny
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funT()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableT()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableAny()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.equals(null)
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propT
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propAny
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableT
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableAny
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funT()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funAny()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableT()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableAny()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char")!>e<!>
+        if (e != null || this.e != null) this.e.equals(null)
         if (e != null || this.e != null) this.e.propT
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (e != null || this.e != null) this.e.propAny
         if (e != null || this.e != null) this.e.propNullableT
         if (e != null || this.e != null) this.e.propNullableAny
         if (e != null || this.e != null) this.e.funT()
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (e != null || this.e != null) this.e.funAny()
         if (e != null || this.e != null) this.e.funNullableT()
         if (e != null || this.e != null) this.e.funNullableAny()
         if (e != null || this.e != null) this.e
@@ -1924,43 +1924,43 @@ sealed class Case30(a: Int?, val b: Float?, private val c: Unit?, protected val
         if (this.f != null) this.f.funNullableT()
         if (this.f != null) this.f.funNullableAny()
         if (this.f != null) this.f
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propT
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableT
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableAny
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funT()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableT()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableAny()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.equals(null)
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propT
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propAny
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableT
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableAny
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funT()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funAny()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableT()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableAny()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>f<!>
+        if (f != null) this.f.equals(null)
         if (f != null) this.f.propT
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (f != null) this.f.propAny
         if (f != null) this.f.propNullableT
         if (f != null) this.f.propNullableAny
         if (f != null) this.f.funT()
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (f != null) this.f.funAny()
         if (f != null) this.f.funNullableT()
         if (f != null) this.f.funNullableAny()
         if (f != null) this.f
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propT
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableT
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableAny
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funT()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableT()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableAny()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.equals(null)
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propT
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propAny
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableT
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableAny
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funT()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funAny()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableT()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableAny()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>f<!>
+        if (f != null || this.f != null) this.f.equals(null)
         if (f != null || this.f != null) this.f.propT
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (f != null || this.f != null) this.f.propAny
         if (f != null || this.f != null) this.f.propNullableT
         if (f != null || this.f != null) this.f.propNullableAny
         if (f != null || this.f != null) this.f.funT()
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (f != null || this.f != null) this.f.funAny()
         if (f != null || this.f != null) this.f.funNullableT()
         if (f != null || this.f != null) this.f.funNullableAny()
         if (f != null || this.f != null) this.f
@@ -2337,8 +2337,8 @@ sealed class Case30(a: Int?, val b: Float?, private val c: Unit?, protected val
         if (w != null || this.w != null) this.w
 
         s = null
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>s<!>.hashCode()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>s<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any?")!>s<!>.hashCode()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any?")!>s<!>
         if (s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
         if (this.s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
         if (s != null || this.s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
@@ -2694,43 +2694,43 @@ enum class Case31(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.b != null) this.b.funNullableT()
         if (this.b != null) this.b.funNullableAny()
         if (this.b != null) this.b
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propT
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableT
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableAny
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funT()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableT()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableAny()
-        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.equals(null)
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propT
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propAny
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableT
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableAny
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funT()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funAny()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableT()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableAny()
+        if (this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float")!>b<!>
+        if (b != null) this.b.equals(null)
         if (b != null) this.b.propT
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (b != null) this.b.propAny
         if (b != null) this.b.propNullableT
         if (b != null) this.b.propNullableAny
         if (b != null) this.b.funT()
-        if (b != null) this.b.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (b != null) this.b.funAny()
         if (b != null) this.b.funNullableT()
         if (b != null) this.b.funNullableAny()
         if (b != null) this.b
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propT
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableT
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.propNullableAny
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funT()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableT()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>.funNullableAny()
-        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.equals(null)
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propT
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propAny
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableT
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.propNullableAny
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funT()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funAny()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableT()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>.funNullableAny()
+        if (b != null || this.b != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float")!>b<!>
+        if (b != null || this.b != null) this.b.equals(null)
         if (b != null || this.b != null) this.b.propT
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (b != null || this.b != null) this.b.propAny
         if (b != null || this.b != null) this.b.propNullableT
         if (b != null || this.b != null) this.b.propNullableAny
         if (b != null || this.b != null) this.b.funT()
-        if (b != null || this.b != null) this.b.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (b != null || this.b != null) this.b.funAny()
         if (b != null || this.b != null) this.b.funNullableT()
         if (b != null || this.b != null) this.b.funNullableAny()
         if (b != null || this.b != null) this.b
@@ -2763,43 +2763,43 @@ enum class Case31(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.c != null) this.c.funNullableT()
         if (this.c != null) this.c.funNullableAny()
         if (this.c != null) this.c
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (c != null) this.c.equals(null)
         if (c != null) this.c.propT
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (c != null) this.c.propAny
         if (c != null) this.c.propNullableT
         if (c != null) this.c.propNullableAny
         if (c != null) this.c.funT()
-        if (c != null) this.c.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (c != null) this.c.funAny()
         if (c != null) this.c.funNullableT()
         if (c != null) this.c.funNullableAny()
         if (c != null) this.c
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propT
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableT
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableAny
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funT()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableT()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableAny()
-        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propT
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableT
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.propNullableAny
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funT()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableT()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>.funNullableAny()
-        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit?")!>c<!>
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.equals(null)
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propT
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propAny
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableT
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableAny
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funT()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funAny()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableT()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableAny()
+        if (this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>c<!>
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.equals(null)
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propT
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propAny
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableT
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.propNullableAny
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funT()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funAny()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableT()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit & kotlin.Unit?")!>c<!>.funNullableAny()
+        if (c != null || this.c != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>c<!>
+        if (c != null || this.c != null) this.c.equals(null)
         if (c != null || this.c != null) this.c.propT
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (c != null || this.c != null) this.c.propAny
         if (c != null || this.c != null) this.c.propNullableT
         if (c != null || this.c != null) this.c.propNullableAny
         if (c != null || this.c != null) this.c.funT()
-        if (c != null || this.c != null) this.c.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (c != null || this.c != null) this.c.funAny()
         if (c != null || this.c != null) this.c.funNullableT()
         if (c != null || this.c != null) this.c.funNullableAny()
         if (c != null || this.c != null) this.c
@@ -2834,41 +2834,41 @@ enum class Case31(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.d != null) this.d
         if (d != null) this.d.equals(null)
         if (d != null) this.d.propT
-        if (d != null) this.d.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (d != null) this.d.propAny
         if (d != null) this.d.propNullableT
         if (d != null) this.d.propNullableAny
         if (d != null) this.d.funT()
-        if (d != null) this.d.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (d != null) this.d.funAny()
         if (d != null) this.d.funNullableT()
         if (d != null) this.d.funNullableAny()
         if (d != null) this.d
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.equals(null)
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propT
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableT
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableAny
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funT()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableT()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableAny()
-        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.equals(null)
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propT
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableT
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.propNullableAny
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funT()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableT()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>.funNullableAny()
-        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>d<!>
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.equals(null)
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propT
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propAny
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableT
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableAny
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funT()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funAny()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableT()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableAny()
+        if (this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>d<!>
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.equals(null)
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propT
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propAny
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableT
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.propNullableAny
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funT()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funAny()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableT()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>d<!>.funNullableAny()
+        if (d != null || this.d != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>d<!>
         if (d != null || this.d != null) this.d.equals(null)
         if (d != null || this.d != null) this.d.propT
-        if (d != null || this.d != null) this.d.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (d != null || this.d != null) this.d.propAny
         if (d != null || this.d != null) this.d.propNullableT
         if (d != null || this.d != null) this.d.propNullableAny
         if (d != null || this.d != null) this.d.funT()
-        if (d != null || this.d != null) this.d.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (d != null || this.d != null) this.d.funAny()
         if (d != null || this.d != null) this.d.funNullableT()
         if (d != null || this.d != null) this.d.funNullableAny()
         if (d != null || this.d != null) this.d
@@ -2901,43 +2901,43 @@ enum class Case31(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.e != null) this.e.funNullableT()
         if (this.e != null) this.e.funNullableAny()
         if (this.e != null) this.e
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propT
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableT
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableAny
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funT()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableT()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableAny()
-        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.equals(null)
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propT
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propAny
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableT
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableAny
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funT()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funAny()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableT()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableAny()
+        if (this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char")!>e<!>
+        if (e != null) this.e.equals(null)
         if (e != null) this.e.propT
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (e != null) this.e.propAny
         if (e != null) this.e.propNullableT
         if (e != null) this.e.propNullableAny
         if (e != null) this.e.funT()
-        if (e != null) this.e.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (e != null) this.e.funAny()
         if (e != null) this.e.funNullableT()
         if (e != null) this.e.funNullableAny()
         if (e != null) this.e
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propT
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableT
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.propNullableAny
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funT()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableT()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>.funNullableAny()
-        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char?")!>e<!>
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.equals(null)
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propT
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propAny
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableT
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.propNullableAny
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funT()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funAny()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableT()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char & kotlin.Char?")!>e<!>.funNullableAny()
+        if (e != null || this.e != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Char")!>e<!>
+        if (e != null || this.e != null) this.e.equals(null)
         if (e != null || this.e != null) this.e.propT
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (e != null || this.e != null) this.e.propAny
         if (e != null || this.e != null) this.e.propNullableT
         if (e != null || this.e != null) this.e.propNullableAny
         if (e != null || this.e != null) this.e.funT()
-        if (e != null || this.e != null) this.e.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (e != null || this.e != null) this.e.funAny()
         if (e != null || this.e != null) this.e.funNullableT()
         if (e != null || this.e != null) this.e.funNullableAny()
         if (e != null || this.e != null) this.e
@@ -2970,43 +2970,43 @@ enum class Case31(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (this.f != null) this.f.funNullableT()
         if (this.f != null) this.f.funNullableAny()
         if (this.f != null) this.f
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propT
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableT
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableAny
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funT()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableT()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableAny()
-        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.equals(null)
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propT
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propAny
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableT
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableAny
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funT()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funAny()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableT()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableAny()
+        if (this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>f<!>
+        if (f != null) this.f.equals(null)
         if (f != null) this.f.propT
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (f != null) this.f.propAny
         if (f != null) this.f.propNullableT
         if (f != null) this.f.propNullableAny
         if (f != null) this.f.funT()
-        if (f != null) this.f.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (f != null) this.f.funAny()
         if (f != null) this.f.funNullableT()
         if (f != null) this.f.funNullableAny()
         if (f != null) this.f
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propT
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableT
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.propNullableAny
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funT()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableT()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>.funNullableAny()
-        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>f<!>
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.equals(null)
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propT
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propAny
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableT
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.propNullableAny
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funT()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funAny()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableT()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>f<!>.funNullableAny()
+        if (f != null || this.f != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>f<!>
+        if (f != null || this.f != null) this.f.equals(null)
         if (f != null || this.f != null) this.f.propT
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        if (f != null || this.f != null) this.f.propAny
         if (f != null || this.f != null) this.f.propNullableT
         if (f != null || this.f != null) this.f.propNullableAny
         if (f != null || this.f != null) this.f.funT()
-        if (f != null || this.f != null) this.f.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        if (f != null || this.f != null) this.f.funAny()
         if (f != null || this.f != null) this.f.funNullableT()
         if (f != null || this.f != null) this.f.funNullableAny()
         if (f != null || this.f != null) this.f
@@ -3382,8 +3382,8 @@ enum class Case31(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         if (w != null || this.w != null) this.w
 
         s = null
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>s<!>.hashCode()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>s<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any?")!>s<!>.hashCode()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any?")!>s<!>
         if (s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
         if (this.s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
         if (s != null || this.s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
@@ -4030,8 +4030,8 @@ object Case32 {
         if (w != null || this.w != null) this.w
 
         s = null
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>s<!>.hashCode()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>s<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any?")!>s<!>.hashCode()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any?")!>s<!>
         if (s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
         if (this.s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
         if (s != null || this.s != null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>s<!>
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.fir.kt
index 856f27e7993..520b79e3e46 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.fir.kt
@@ -8,7 +8,7 @@ fun <T> case_1(x: T) {
 
     if (y != x) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.propNullableT
@@ -17,7 +17,7 @@ fun <T> case_1(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { equals(null) }
+        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { <!INAPPLICABLE_CANDIDATE!>equals<!>(null) }
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { propT }
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { <!INAPPLICABLE_CANDIDATE!>propAny<!> }
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { propNullableT }
@@ -25,8 +25,8 @@ fun <T> case_1(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { funT() }
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { <!INAPPLICABLE_CANDIDATE!>funAny<!>() }
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { funNullableT() }
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { funNullableAny(); <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.equals(null) }
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.also { <!DEBUG_INFO_EXPRESSION_TYPE("T")!>it<!>.equals(null) }
+        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.apply { funNullableAny(); <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null) }
+        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.also { <!DEBUG_INFO_EXPRESSION_TYPE("T")!>it<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null) }
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.also { <!DEBUG_INFO_EXPRESSION_TYPE("T")!>it<!>.propT }
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.also { <!DEBUG_INFO_EXPRESSION_TYPE("T")!>it<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!> }
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.also { <!DEBUG_INFO_EXPRESSION_TYPE("T")!>it<!>.propNullableT }
@@ -51,7 +51,7 @@ fun <T> case_2(x: T?, y: Nothing?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.apply { equals(null) }
+        <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.apply { <!INAPPLICABLE_CANDIDATE!>equals<!>(null) }
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.apply { propT }
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.apply { <!INAPPLICABLE_CANDIDATE!>propAny<!> }
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>.apply { propNullableT }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/16.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/16.fir.kt
index 0a0564a5320..3f1728cb83a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/16.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/16.fir.kt
@@ -334,7 +334,7 @@ fun <T> case_24(x: Inv<out T?>?, y: Nothing?) {
 fun case_25(x: Int?) {
     val x = (l@ {
         if (x == null) return@l
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.inv()
     })()
 }
@@ -660,7 +660,7 @@ fun case_44(x: Inv<out Inv<out Inv<out Inv<out Inv<out Inv<out Inv<out Number>>>
 fun <T> case_45(x: T) {
     val y = (l@ {
         if (x == null) return@l
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T!!")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T")!>x<!>.equals(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T")!>x<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T")!>x<!>.propAny
@@ -677,7 +677,7 @@ fun <T> case_45(x: T) {
 fun <T> case_46(x: T?) {
     (l@ {
         if (x === null) return@l
-        <!DEBUG_INFO_EXPRESSION_TYPE("T?!! & T?!!")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T?!! & T?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("T?!! & T?")!>x<!>.equals(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("T?!! & T?")!>x<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("T?!! & T?")!>x<!>.propAny
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/18.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/18.fir.kt
index 707ddf6652d..973070c70d5 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/18.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/18.fir.kt
@@ -244,7 +244,7 @@ fun <T>case_18(x: T, f: Boolean) {
     while (f) {
         if (false || false || false || x == nullableNothingProperty) break
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("T")!>x<!>.propNullableT
@@ -261,7 +261,7 @@ fun <K, V>case_19(map: MutableMap<K, V>, y: Nothing?) {
     for ((k, v) in map) {
         if (k !== implicitNullableNothingProperty && true && v != y) else { break }
         <!DEBUG_INFO_EXPRESSION_TYPE("K")!>k<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("K")!>k<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("K")!>k<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("K")!>k<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("K")!>k<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("K")!>k<!>.propNullableT
@@ -271,7 +271,7 @@ fun <K, V>case_19(map: MutableMap<K, V>, y: Nothing?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("K")!>k<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("K")!>k<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("V")!>v<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("V")!>v<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("V")!>v<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("V")!>v<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("V")!>v<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("V")!>v<!>.propNullableT
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/52.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/52.fir.kt
index 08af6541739..9415700500e 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/52.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/52.fir.kt
@@ -12,7 +12,7 @@ fun case_1(x: Int?) = x
 fun case_1() {
     var x: Int? = 10
     x = null
-    case_1(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>)
+    case_1(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>)
 }
 
 // TESTCASE NUMBER: 2
@@ -21,7 +21,7 @@ fun case_2(x: Nothing?) = x
 fun case_2() {
     var x: Int? = 10
     x = null
-    case_2(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>)
+    case_2(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>)
 }
 
 // TESTCASE NUMBER: 3
@@ -29,7 +29,7 @@ fun case_3(x: String?) = x
 fun case_3() {
     var x: Int? = 10
     x = null
-    <!INAPPLICABLE_CANDIDATE!>case_3<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>)
+    <!INAPPLICABLE_CANDIDATE!>case_3<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>)
 }
 
 /*
@@ -42,7 +42,7 @@ fun Int?.case_4() = this
 fun case_4() {
     var x: Int? = 10
     x = null
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.case_4()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>.case_4()
 }
 
 // TESTCASE NUMBER: 5
@@ -51,7 +51,7 @@ fun Nothing?.case_5() = this
 fun case_5() {
     var x: Int? = 10
     x = null
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.case_5()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>.case_5()
 }
 
 // TESTCASE NUMBER: 6
@@ -59,7 +59,7 @@ fun String?.case_6() = this
 fun case_6() {
     var x: Int? = 10
     x = null
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>case_6<!>()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>case_6<!>()
 }
 
 /*
@@ -72,7 +72,7 @@ fun <T : Int?> T.case_7() = this
 fun case_7() {
     var x: Int? = 10
     x = null
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.case_7()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>.case_7()
 }
 
 // TESTCASE NUMBER: 8
@@ -81,7 +81,7 @@ fun <T : Nothing?> T.case_8() = this
 fun case_8() {
     var x: Int? = 10
     x = null
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.case_8()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>.case_8()
 }
 
 // TESTCASE NUMBER: 9
@@ -89,7 +89,7 @@ fun <T : String?> T.case_9() = this
 fun case_9() {
     var x: Int? = 10
     x = null
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>case_9<!>()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>case_9<!>()
 }
 
 /*
@@ -102,7 +102,7 @@ fun <T : Int> T?.case_10() = this
 fun case_10() {
     var x: Int? = 10
     x = null
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.case_10()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>.case_10()
 }
 
 // TESTCASE NUMBER: 11
@@ -110,5 +110,5 @@ fun <T : String> T?.case_11() = this
 fun case_11() {
     var x: Int? = 10
     x = null
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>case_11<!>()
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>case_11<!>()
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 6ff186956b4..bf42951674e 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -927,6 +927,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTestWithFirVali
                 runTest("compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.kt");
             }
 
+            @TestMetadata("dontReportWarningAboutChangingExecutionOrderForVararg.kt")
+            public void testDontReportWarningAboutChangingExecutionOrderForVararg() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.kt");
+            }
+
             @TestMetadata("extensionFunctionType.kt")
             public void testExtensionFunctionType() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/annotations/extensionFunctionType.kt");
@@ -12393,6 +12398,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTestWithFirVali
                 runTest("compiler/testData/diagnostics/tests/inline/kt19679.kt");
             }
 
+            @TestMetadata("kt21177.kt")
+            public void testKt21177() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inline/kt21177.kt");
+            }
+
             @TestMetadata("kt4869.kt")
             public void testKt4869() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/inline/kt4869.kt");
@@ -12834,6 +12844,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTestWithFirVali
                 runTest("compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.kt");
             }
 
+            @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
+            public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
+            }
+
             @TestMetadata("constructorsJvmSignaturesClash.kt")
             public void testConstructorsJvmSignaturesClash() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt");
@@ -14553,6 +14568,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTestWithFirVali
                 runTest("compiler/testData/diagnostics/tests/modifiers/NoLocalVisibility.kt");
             }
 
+            @TestMetadata("openInExpectInterface.kt")
+            public void testOpenInExpectInterface() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.kt");
+            }
+
             @TestMetadata("openInInterface.kt")
             public void testOpenInInterface() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/modifiers/openInInterface.kt");
@@ -15012,6 +15032,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTestWithFirVali
                 KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
             }
 
+            @TestMetadata("expectInterfaceApplicability.kt")
+            public void testExpectInterfaceApplicability() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt");
+            }
+
             @TestMetadata("headerFunInNonHeaderClass.kt")
             public void testHeaderFunInNonHeaderClass() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt");
@@ -21987,6 +22012,16 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTestWithFirVali
                     runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/basicOn.kt");
                 }
 
+                @TestMetadata("castInTryWithCatch.kt")
+                public void testCastInTryWithCatch() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.kt");
+                }
+
+                @TestMetadata("castInTryWithoutCatch.kt")
+                public void testCastInTryWithoutCatch() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.kt");
+                }
+
                 @TestMetadata("impossible.kt")
                 public void testImpossible() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/impossible.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJvmIrBackendGenerated.java
index e0cd9473b27..865e2a9417a 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJvmIrBackendGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJvmIrBackendGenerated.java
@@ -61,6 +61,11 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.kt");
         }
 
+        @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
+        public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
+        }
+
         @TestMetadata("vararg.kt")
         public void testVararg() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithOldJvmBackendGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithOldJvmBackendGenerated.java
index 8589ffca787..7caddc4167e 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithOldJvmBackendGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithOldJvmBackendGenerated.java
@@ -61,6 +61,11 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
             runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.kt");
         }
 
+        @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
+        public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
+        }
+
         @TestMetadata("vararg.kt")
         public void testVararg() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
index cb721803ced..002db0b9399 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
@@ -39,6 +39,11 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
         runTest("compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt");
     }
 
+    @TestMetadata("assignedInSynchronized.kt")
+    public void testAssignedInSynchronized() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.kt");
+    }
+
     @TestMetadata("CallCompanionProtectedNonStatic.kt")
     public void testCallCompanionProtectedNonStatic() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.kt");
@@ -3507,6 +3512,11 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
             public void testDontInferToNullableNothingInDelegates() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontInferToNullableNothingInDelegates.kt");
             }
+
+            @TestMetadata("dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt")
+            public void testDontSpreadWarningToNotReturningNothingSubResolvedAtoms() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt");
+            }
         }
     }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
index 46035bf425a..989dc657726 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
@@ -39,6 +39,11 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno
         runTest("compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt");
     }
 
+    @TestMetadata("assignedInSynchronized.kt")
+    public void testAssignedInSynchronized() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithStdLib/assignedInSynchronized.kt");
+    }
+
     @TestMetadata("CallCompanionProtectedNonStatic.kt")
     public void testCallCompanionProtectedNonStatic() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.kt");
@@ -3507,6 +3512,11 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno
             public void testDontInferToNullableNothingInDelegates() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontInferToNullableNothingInDelegates.kt");
             }
+
+            @TestMetadata("dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt")
+            public void testDontSpreadWarningToNotReturningNothingSubResolvedAtoms() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/inference/nothingType/dontSpreadWarningToNotReturningNothingSubResolvedAtoms.kt");
+            }
         }
     }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
index 0c013339bac..2c8875e5bf0 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
@@ -922,6 +922,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 runTest("compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.kt");
             }
 
+            @TestMetadata("dontReportWarningAboutChangingExecutionOrderForVararg.kt")
+            public void testDontReportWarningAboutChangingExecutionOrderForVararg() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/annotations/dontReportWarningAboutChangingExecutionOrderForVararg.kt");
+            }
+
             @TestMetadata("extensionFunctionType.kt")
             public void testExtensionFunctionType() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/annotations/extensionFunctionType.kt");
@@ -12388,6 +12393,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 runTest("compiler/testData/diagnostics/tests/inline/kt19679.kt");
             }
 
+            @TestMetadata("kt21177.kt")
+            public void testKt21177() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inline/kt21177.kt");
+            }
+
             @TestMetadata("kt4869.kt")
             public void testKt4869() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/inline/kt4869.kt");
@@ -12829,6 +12839,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 runTest("compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.kt");
             }
 
+            @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
+            public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
+            }
+
             @TestMetadata("constructorsJvmSignaturesClash.kt")
             public void testConstructorsJvmSignaturesClash() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt");
@@ -14548,6 +14563,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 runTest("compiler/testData/diagnostics/tests/modifiers/NoLocalVisibility.kt");
             }
 
+            @TestMetadata("openInExpectInterface.kt")
+            public void testOpenInExpectInterface() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.kt");
+            }
+
             @TestMetadata("openInInterface.kt")
             public void testOpenInInterface() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/modifiers/openInInterface.kt");
@@ -15007,6 +15027,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
             }
 
+            @TestMetadata("expectInterfaceApplicability.kt")
+            public void testExpectInterfaceApplicability() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt");
+            }
+
             @TestMetadata("headerFunInNonHeaderClass.kt")
             public void testHeaderFunInNonHeaderClass() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt");
@@ -21912,6 +21937,16 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/basicOn.kt");
                 }
 
+                @TestMetadata("castInTryWithCatch.kt")
+                public void testCastInTryWithCatch() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithCatch.kt");
+                }
+
+                @TestMetadata("castInTryWithoutCatch.kt")
+                public void testCastInTryWithoutCatch() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/castInTryWithoutCatch.kt");
+                }
+
                 @TestMetadata("impossible.kt")
                 public void testImpossible() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/smartCasts/castchecks/impossible.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/DeterministicOutputTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/DeterministicOutputTest.kt
new file mode 100644
index 00000000000..4ba2a4cf8c3
--- /dev/null
+++ b/compiler/tests/org/jetbrains/kotlin/cli/DeterministicOutputTest.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.cli
+
+import java.io.File
+import java.io.FileInputStream
+import java.util.jar.JarInputStream
+import java.util.zip.ZipEntry
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
+import org.jetbrains.kotlin.cli.jvm.compiler.CompileEnvironmentUtil.DOS_EPOCH
+import org.jetbrains.kotlin.test.TestCaseWithTmpdir
+
+class DeterministicOutputTest : TestCaseWithTmpdir() {
+
+    fun testDeterministicOutput() {
+        val fooKt = tmpdir.resolve("foo.kt").also {
+            it.writeText("class Foo")
+        }
+
+        val firstJar = tmpdir.resolve("first.jar")
+        AbstractCliTest.executeCompilerGrabOutput(
+            K2JVMCompiler(),
+            listOf(fooKt.path, "-d", firstJar.path, "-include-runtime"))
+
+        val secondJar = tmpdir.resolve("second.jar")
+        AbstractCliTest.executeCompilerGrabOutput(
+            K2JVMCompiler(),
+            listOf(fooKt.path, "-d", secondJar.path, "-include-runtime"))
+
+        assertEquals(
+            firstJar.readBytes().toList(),
+            secondJar.readBytes().toList(),
+            "jar contents should be identical if compiler command and inputs are the same")
+        assertAllTimestampsAreReset(firstJar)
+        assertAllTimestampsAreReset(secondJar)
+    }
+
+    fun testNoResetJarTimestamps() {
+        val fooKt = tmpdir.resolve("foo.kt").also {
+            it.writeText("class Foo")
+        }
+        val jar = tmpdir.resolve("jarWithTimestamps.jar")
+        AbstractCliTest.executeCompilerGrabOutput(
+            K2JVMCompiler(),
+            listOf(fooKt.path, "-d", jar.path, "-include-runtime", "-Xno-reset-jar-timestamps"))
+
+        assertNoTimestampsAreReset(jar)
+    }
+
+    private fun assertAllTimestampsAreReset(jar: File) {
+        val zis = JarInputStream(FileInputStream(jar))
+        var entry: ZipEntry? = zis.nextEntry
+        while (entry != null) {
+            assertEquals(entry.time, DOS_EPOCH, "$entry timestamp should be reset")
+            entry = zis.nextEntry
+        }
+    }
+
+    private fun assertNoTimestampsAreReset(jar: File) {
+        val zis = JarInputStream(FileInputStream(jar))
+        var entry: ZipEntry? = zis.nextEntry
+        while (entry != null) {
+            assertNotEquals(entry.time, DOS_EPOCH, "$entry timestamp should not be reset")
+            entry = zis.nextEntry
+        }
+    }
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AsmLikeInstructionListingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/AsmLikeInstructionListingTestGenerated.java
index 3745900f1b1..e4b4f5340f9 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/AsmLikeInstructionListingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AsmLikeInstructionListingTestGenerated.java
@@ -81,11 +81,6 @@ public class AsmLikeInstructionListingTestGenerated extends AbstractAsmLikeInstr
             runTest("compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.kt");
         }
 
-        @TestMetadata("innerClass.kt")
-        public void testInnerClass() throws Exception {
-            runTest("compiler/testData/codegen/asmLike/receiverMangling/innerClass.kt");
-        }
-
         @TestMetadata("localFunctions.kt")
         public void testLocalFunctions() throws Exception {
             runTest("compiler/testData/codegen/asmLike/receiverMangling/localFunctions.kt");
@@ -105,11 +100,6 @@ public class AsmLikeInstructionListingTestGenerated extends AbstractAsmLikeInstr
         public void testNonInlineReceivers_before() throws Exception {
             runTest("compiler/testData/codegen/asmLike/receiverMangling/nonInlineReceivers_before.kt");
         }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/codegen/asmLike/receiverMangling/simple.kt");
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/asmLike/typeAnnotations")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java
index bb87213aa4c..bf6e05f1343 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java
@@ -1096,6 +1096,34 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxAga
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/boxAgainstJava/varargs")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Varargs extends AbstractBlackBoxAgainstJavaCodegenTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInVarargs() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/varargs"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("varargsOverride.kt")
+        public void testVarargsOverride() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride.kt");
+        }
+
+        @TestMetadata("varargsOverride2.kt")
+        public void testVarargsOverride2() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride2.kt");
+        }
+
+        @TestMetadata("varargsOverride3.kt")
+        public void testVarargsOverride3() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride3.kt");
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
index 8c27483ec16..fa369720281 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -1497,6 +1497,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/bridges/genericProperty.kt");
         }
 
+        @TestMetadata("innerClassTypeParameters.kt")
+        public void testInnerClassTypeParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt");
+        }
+
         @TestMetadata("kt12416.kt")
         public void testKt12416() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/kt12416.kt");
@@ -1537,6 +1542,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/bridges/kt318.kt");
         }
 
+        @TestMetadata("kt42137.kt")
+        public void testKt42137() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt42137.kt");
+        }
+
         @TestMetadata("longChainOneBridge.kt")
         public void testLongChainOneBridge() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
@@ -7208,6 +7218,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("nonLocalReturn.kt")
+        public void testNonLocalReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt");
+        }
+
         @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt")
         public void testNonLocalReturnFromInlineLambdaDeep_1_2() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines.experimental");
@@ -11423,6 +11438,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/extensionPropertyAndExtensionGetValue.kt");
         }
 
+        @TestMetadata("functionRefDelefate.kt")
+        public void testFunctionRefDelefate() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt");
+        }
+
         @TestMetadata("genericDelegate.kt")
         public void testGenericDelegate() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
@@ -13815,6 +13835,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
         }
 
+        @TestMetadata("typeParameterAsUpperBound.kt")
+        public void testTypeParameterAsUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt");
+        }
+
         @TestMetadata("typeParametersInLocalFunction.kt")
         public void testTypeParametersInLocalFunction() throws Exception {
             runTest("compiler/testData/codegen/box/functions/typeParametersInLocalFunction.kt");
@@ -14817,6 +14842,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
         }
 
+        @TestMetadata("boxImplDoesNotExecuteInitBlock.kt")
+        public void testBoxImplDoesNotExecuteInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt");
+        }
+
         @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -14962,6 +14992,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/inlineClasses/conformToComparableAndCallInterfaceMethod.kt");
         }
 
+        @TestMetadata("constructorImplVisibility.kt")
+        public void testConstructorImplVisibility() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibility.kt");
+        }
+
         @TestMetadata("correctBoxingForBranchExpressions.kt")
         public void testCorrectBoxingForBranchExpressions() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt");
@@ -14982,6 +15017,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("defaultWithInlineClassArgument.kt")
         public void testDefaultWithInlineClassArgument() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultWithInlineClassArgument.kt");
@@ -15102,6 +15142,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt");
         }
 
+        @TestMetadata("initBlock.kt")
+        public void testInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/initBlock.kt");
+        }
+
         @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
         public void testInlineClassAsLastExpressionInInLambda() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
@@ -15517,6 +15562,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt");
         }
 
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/stringPlus.kt");
+        }
+
         @TestMetadata("toStringCallingPrivateFun.kt")
         public void testToStringCallingPrivateFun() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
@@ -15537,6 +15587,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt");
         }
 
+        @TestMetadata("UIntSafeAsInt.kt")
+        public void testUIntSafeAsInt() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt");
+        }
+
         @TestMetadata("unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testUnboxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -15747,6 +15802,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt");
             }
 
+            @TestMetadata("overrideGenericWithInlineClass.kt")
+            public void testOverrideGenericWithInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt");
+            }
+
             @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt")
             public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");
@@ -16712,6 +16772,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
         }
 
+        @TestMetadata("innerWithDefaultInner.kt")
+        public void testInnerWithDefaultInner() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
+        }
+
         @TestMetadata("kt3132.kt")
         public void testKt3132() throws Exception {
             runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
@@ -17182,6 +17247,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/ir/simple.kt");
         }
 
+        @TestMetadata("suppressConflictingSignatureErrors.kt")
+        public void testSuppressConflictingSignatureErrors() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/suppressConflictingSignatureErrors.kt");
+        }
+
         @TestMetadata("compiler/testData/codegen/box/ir/closureConversion")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -17349,6 +17419,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt");
         }
 
+        @TestMetadata("kt43217.kt")
+        public void testKt43217() throws Exception {
+            runTest("compiler/testData/codegen/box/javaInterop/kt43217.kt");
+        }
+
         @TestMetadata("lambdaInstanceOf.kt")
         public void testLambdaInstanceOf() throws Exception {
             runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");
@@ -17401,6 +17476,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/javaInterop/generics/javaNestedSamInterface.kt");
             }
 
+            @TestMetadata("kt42824.kt")
+            public void testKt42824() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42824.kt");
+            }
+
+            @TestMetadata("kt42825.kt")
+            public void testKt42825() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42825.kt");
+            }
+
             @TestMetadata("propertyVarianceConflict.kt")
             public void testPropertyVarianceConflict() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/generics/propertyVarianceConflict.kt");
@@ -17499,6 +17584,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/paramAssertionMessage.kt");
             }
 
+            @TestMetadata("privateOperatorParameterAssertions.kt")
+            public void testPrivateOperatorParameterAssertions() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/privateOperatorParameterAssertions.kt");
+            }
+
             @TestMetadata("staticCallErrorMessage.kt")
             public void testStaticCallErrorMessage() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/staticCallErrorMessage.kt");
@@ -18099,6 +18189,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @TestMetadata("deprecatedDefaultMethod.kt")
+                public void testDeprecatedDefaultMethod() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
+                }
+
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/funInterface.kt");
@@ -18230,6 +18325,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
                 }
 
+                @TestMetadata("deprecatedDefaultMethod.kt")
+                public void testDeprecatedDefaultMethod() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
+                }
+
                 @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
                 public void testInheritedFunctionWithDefaultParameters() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
@@ -19089,6 +19189,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/jvmStatic/funAccess.kt");
         }
 
+        @TestMetadata("functionReference.kt")
+        public void testFunctionReference() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmStatic/functionReference.kt");
+        }
+
         @TestMetadata("importStaticMemberFromObject.kt")
         public void testImportStaticMemberFromObject() throws Exception {
             runTest("compiler/testData/codegen/box/jvmStatic/importStaticMemberFromObject.kt");
@@ -19124,6 +19229,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/jvmStatic/kt21246a.kt");
         }
 
+        @TestMetadata("kt35716.kt")
+        public void testKt35716() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmStatic/kt35716.kt");
+        }
+
         @TestMetadata("kt9897_static.kt")
         public void testKt9897_static() throws Exception {
             runTest("compiler/testData/codegen/box/jvmStatic/kt9897_static.kt");
@@ -20783,6 +20893,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/objects/kt4086.kt");
         }
 
+        @TestMetadata("kt42758.kt")
+        public void testKt42758() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt42758.kt");
+        }
+
         @TestMetadata("kt535.kt")
         public void testKt535() throws Exception {
             runTest("compiler/testData/codegen/box/objects/kt535.kt");
@@ -22451,6 +22566,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
             }
 
+            @TestMetadata("kt42281.kt")
+            public void testKt42281() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
+            }
+
             @TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
             public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
@@ -24313,6 +24433,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             public void testKt13241_Collection() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Collection.kt");
             }
+
+            @TestMetadata("kt43159_ArrayUpperBound.kt")
+            public void testKt43159_ArrayUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt");
+            }
+
+            @TestMetadata("kt43159_GenericArray.kt")
+            public void testKt43159_GenericArray() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/ranges/forInProgressionWithIndex")
@@ -28270,6 +28400,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 public void testProperties() throws Exception {
                     runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/properties.kt");
                 }
+
+                @TestMetadata("suspendFunction.kt")
+                public void testSuspendFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt");
+                }
             }
         }
 
@@ -29168,11 +29303,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/reflection/mapping/functions.kt");
             }
 
-            @TestMetadata("inlineClassPrimaryVal.kt")
-            public void testInlineClassPrimaryVal() throws Exception {
-                runTest("compiler/testData/codegen/box/reflection/mapping/inlineClassPrimaryVal.kt");
-            }
-
             @TestMetadata("inlineReifiedFun.kt")
             public void testInlineReifiedFun() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/mapping/inlineReifiedFun.kt");
@@ -29261,6 +29391,29 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 }
             }
 
+            @TestMetadata("compiler/testData/codegen/box/reflection/mapping/inlineClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class InlineClasses extends AbstractBlackBoxCodegenTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInlineClasses() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/mapping/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+                }
+
+                @TestMetadata("inlineClassPrimaryVal.kt")
+                public void testInlineClassPrimaryVal() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/mapping/inlineClasses/inlineClassPrimaryVal.kt");
+                }
+
+                @TestMetadata("suspendFunctionWithInlineClassInSignature.kt")
+                public void testSuspendFunctionWithInlineClassInSignature() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt");
+                }
+            }
+
             @TestMetadata("compiler/testData/codegen/box/reflection/mapping/jvmStatic")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -33002,6 +33155,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/traits/abstractClassInheritsFromInterface.kt");
         }
 
+        @TestMetadata("abstractClassWithFakeOverride.kt")
+        public void testAbstractClassWithFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt");
+        }
+
         public void testAllFilesPresentInTraits() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
@@ -33895,6 +34053,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/when/kt2466.kt");
         }
 
+        @TestMetadata("kt43242.kt")
+        public void testKt43242() throws Exception {
+            runTest("compiler/testData/codegen/box/when/kt43242.kt");
+        }
+
         @TestMetadata("kt5307.kt")
         public void testKt5307() throws Exception {
             runTest("compiler/testData/codegen/box/when/kt5307.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java
index 680ee0fb00f..9509566f674 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
     }
 
     @TestMetadata("accessorForProtectedPropertyWithPrivateSetter.kt")
@@ -36,7 +36,7 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     }
 
     public void testAllFilesPresentInBytecodeListing() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
     }
 
     @TestMetadata("callableNameIntrinsic.kt")
@@ -44,6 +44,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         runTest("compiler/testData/codegen/bytecodeListing/callableNameIntrinsic.kt");
     }
 
+    @TestMetadata("cloneable.kt")
+    public void testCloneable() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/cloneable.kt");
+    }
+
     @TestMetadata("companionObjectVisibility_after.kt")
     public void testCompanionObjectVisibility_after() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.kt");
@@ -84,6 +89,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         runTest("compiler/testData/codegen/bytecodeListing/immutableCollection.kt");
     }
 
+    @TestMetadata("javaDeprecated.kt")
+    public void testJavaDeprecated() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/javaDeprecated.kt");
+    }
+
     @TestMetadata("jvmOverloadsAndParametersAnnotations.kt")
     public void testJvmOverloadsAndParametersAnnotations() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.kt");
@@ -94,6 +104,21 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         runTest("compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters.kt");
     }
 
+    @TestMetadata("kt42137.kt")
+    public void testKt42137() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/kt42137.kt");
+    }
+
+    @TestMetadata("kt42879.kt")
+    public void testKt42879() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/kt42879.kt");
+    }
+
+    @TestMetadata("kt43217.kt")
+    public void testKt43217() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/kt43217.kt");
+    }
+
     @TestMetadata("localFunctionInInitBlock.kt")
     public void testLocalFunctionInInitBlock() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/localFunctionInInitBlock.kt");
@@ -134,6 +159,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         runTest("compiler/testData/codegen/bytecodeListing/noToArrayInJava.kt");
     }
 
+    @TestMetadata("privateCompanionFields.kt")
+    public void testPrivateCompanionFields() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/privateCompanionFields.kt");
+    }
+
     @TestMetadata("privateDefaultImpls.kt")
     public void testPrivateDefaultImpls() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/privateDefaultImpls.kt");
@@ -159,16 +189,26 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         runTest("compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.kt");
     }
 
+    @TestMetadata("varargsBridge.kt")
+    public void testVarargsBridge() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/varargsBridge.kt");
+    }
+
     @TestMetadata("compiler/testData/codegen/bytecodeListing/annotations")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Annotations extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInAnnotations() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/annotations"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+        }
+
+        @TestMetadata("annotationsOnDelegatedMembers.kt")
+        public void testAnnotationsOnDelegatedMembers() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/annotations/annotationsOnDelegatedMembers.kt");
         }
 
         @TestMetadata("defaultTargets.kt")
@@ -242,11 +282,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CollectionStubs extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInCollectionStubs() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/collectionStubs"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/collectionStubs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("collectionByDelegation.kt")
@@ -304,6 +344,21 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.kt");
         }
 
+        @TestMetadata("inheritingFromAbstractCollections.kt")
+        public void testInheritingFromAbstractCollections() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractCollections.kt");
+        }
+
+        @TestMetadata("inheritingFromAbstractMap.kt")
+        public void testInheritingFromAbstractMap() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt");
+        }
+
+        @TestMetadata("inheritingFromAbstractMutableList.kt")
+        public void testInheritingFromAbstractMutableList() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.kt");
+        }
+
         @TestMetadata("mapOfPrimitivesFullJdk.kt")
         public void testMapOfPrimitivesFullJdk() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.kt");
@@ -369,6 +424,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunWithCovariantOverride.kt");
         }
 
+        @TestMetadata("stubLikeMethodSignatures.kt")
+        public void testStubLikeMethodSignatures() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/stubLikeMethodSignatures.kt");
+        }
+
         @TestMetadata("stubsFromSuperclass.kt")
         public void testStubsFromSuperclass() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclass.kt");
@@ -384,11 +444,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class AbstractStubSignatures extends AbstractBytecodeListingTest {
             private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
 
             public void testAllFilesPresentInAbstractStubSignatures() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
             @TestMetadata("byteShortMap.kt")
@@ -533,15 +593,15 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Coroutines extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception {
-            KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath);
+            KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInCoroutines() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("coroutineContextIntrinsic.kt")
@@ -614,11 +674,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Spilling extends AbstractBytecodeListingTest {
             private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
 
             public void testAllFilesPresentInSpilling() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/coroutines/spilling"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/coroutines/spilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
             @TestMetadata("booleanParameter.kt")
@@ -663,22 +723,27 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultArguments extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInDefaultArguments() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+        }
+
+        @TestMetadata("functionInMultifileClass.kt")
+        public void testFunctionInMultifileClass() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClass.kt");
+        }
+
+        @TestMetadata("functionInMultifileClassWithInheritedParts.kt")
+        public void testFunctionInMultifileClassWithInheritedParts() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClassWithInheritedParts.kt");
         }
 
         @TestMetadata("internalNameMangling.kt")
         public void testInternalNameMangling() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/defaultArguments/internalNameMangling.kt");
         }
-
-        @TestMetadata("privateFunctionInMultifilePart.kt")
-        public void testPrivateFunctionInMultifilePart() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart.kt");
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeListing/deprecated")
@@ -686,11 +751,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Deprecated extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInDeprecated() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/deprecated"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/deprecated"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("deprecatedClass.kt")
@@ -703,6 +768,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.kt");
         }
 
+        @TestMetadata("deprecatedInMultifileClass.kt")
+        public void testDeprecatedInMultifileClass() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/deprecated/deprecatedInMultifileClass.kt");
+        }
+
         @TestMetadata("deprecatedLateinitVar.kt")
         public void testDeprecatedLateinitVar() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/deprecated/deprecatedLateinitVar.kt");
@@ -712,6 +782,21 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         public void testDeprecatedProperty() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.kt");
         }
+
+        @TestMetadata("hidden.kt")
+        public void testHidden() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/deprecated/hidden.kt");
+        }
+
+        @TestMetadata("inheritingDeprecation.kt")
+        public void testInheritingDeprecation() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.kt");
+        }
+
+        @TestMetadata("inlineClassTypesInSignature.kt")
+        public void testInlineClassTypesInSignature() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/deprecated/inlineClassTypesInSignature.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeListing/inline")
@@ -719,11 +804,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Inline extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInInline() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inline"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("inlineOnly.kt")
@@ -776,11 +861,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EnclosingInfo extends AbstractBytecodeListingTest {
             private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
 
             public void testAllFilesPresentInEnclosingInfo() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inline/enclosingInfo"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inline/enclosingInfo"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
             @TestMetadata("crossinlineLambdaChain.kt")
@@ -820,11 +905,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InlineClasses extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInInlineClasses() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("annotatedPropertyWithInlineClassTypeInSignature.kt")
@@ -847,11 +932,21 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.kt");
         }
 
+        @TestMetadata("constructor.kt")
+        public void testConstructor() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.kt");
+        }
+
         @TestMetadata("constructorsWithDefaultParameterValues.kt")
         public void testConstructorsWithDefaultParameterValues() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("inlineCharSequence.kt")
         public void testInlineCharSequence() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.kt");
@@ -877,6 +972,16 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.kt");
         }
 
+        @TestMetadata("memberExtensionProperty.kt")
+        public void testMemberExtensionProperty() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.kt");
+        }
+
+        @TestMetadata("noArgConstructorForInlineClassParameter.kt")
+        public void testNoArgConstructorForInlineClassParameter() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.kt");
+        }
+
         @TestMetadata("noBridgesForErasedInlineClass.kt")
         public void testNoBridgesForErasedInlineClass() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.kt");
@@ -887,6 +992,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.kt");
         }
 
+        @TestMetadata("nullableAndNotNullPrimitive.kt")
+        public void testNullableAndNotNullPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.kt");
+        }
+
         @TestMetadata("overridingGenericMethodWithInlineClassParameterType.kt")
         public void testOverridingGenericMethodWithInlineClassParameterType() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/overridingGenericMethodWithInlineClassParameterType.kt");
@@ -917,11 +1027,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class InlineCollection extends AbstractBytecodeListingTest {
             private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
 
             public void testAllFilesPresentInInlineCollection() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
             @TestMetadata("collection.kt")
@@ -1000,11 +1110,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class InlineCollectionOfInlineClass extends AbstractBytecodeListingTest {
             private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
 
             public void testAllFilesPresentInInlineCollectionOfInlineClass() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
             @TestMetadata("collection.kt")
@@ -1082,6 +1192,29 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
                 runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.kt");
             }
         }
+
+        @TestMetadata("compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class StdlibManglingIn1430 extends AbstractBytecodeListingTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInStdlibManglingIn1430() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+            }
+
+            @TestMetadata("new.kt")
+            public void testNew() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.kt");
+            }
+
+            @TestMetadata("old.kt")
+            public void testOld() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8")
@@ -1089,11 +1222,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Jvm8 extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInJvm8() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults")
@@ -1101,11 +1234,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Defaults extends AbstractBytecodeListingTest {
             private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
 
             public void testAllFilesPresentInDefaults() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
             @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility")
@@ -1113,11 +1246,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class AllCompatibility extends AbstractBytecodeListingTest {
                 private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
                 }
 
                 public void testAllFilesPresentInAllCompatibility() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
                 }
 
                 @TestMetadata("deprecation.kt")
@@ -1145,11 +1278,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
                 @RunWith(JUnit3RunnerWithInners.class)
                 public static class Specialization extends AbstractBytecodeListingTest {
                     private void runTest(String testDataFilePath) throws Exception {
-                        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                        KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
                     }
 
                     public void testAllFilesPresentInSpecialization() throws Exception {
-                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
                     }
 
                     @TestMetadata("primitiveAndAny.kt")
@@ -1171,11 +1304,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Main extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInMain() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/main"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/main"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("multifileSuspend.kt")
@@ -1209,11 +1342,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Multiplatform extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInMultiplatform() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("optionalExpectation.kt")
@@ -1227,11 +1360,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class NullabilityAnnotations extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("lateInitNotNull.kt")
@@ -1265,7 +1398,7 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SpecialBridges extends AbstractBytecodeListingTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
 
         @TestMetadata("abstractCollections.kt")
@@ -1309,7 +1442,7 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         }
 
         public void testAllFilesPresentInSpecialBridges() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/specialBridges"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/specialBridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("charSequence.kt")
@@ -1367,11 +1500,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Signatures extends AbstractBytecodeListingTest {
             private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
 
             public void testAllFilesPresentInSignatures() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/specialBridges/signatures"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/specialBridges/signatures"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
             @TestMetadata("genericClass.kt")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
index fd5d59cf89b..93a10805ec3 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
@@ -3112,6 +3112,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noAssertionsForInlineClassesBasedOnNullableTypes.kt");
         }
 
+        @TestMetadata("noBoxingInMethod.kt")
+        public void testNoBoxingInMethod() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingInMethod.kt");
+        }
+
         @TestMetadata("noBoxingOnCastOperations.kt")
         public void testNoBoxingOnCastOperations() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOnCastOperations.kt");
@@ -4391,6 +4396,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperForNullableInitialization.kt");
         }
 
+        @TestMetadata("samWrapperInInlineLambda.kt")
+        public void testSamWrapperInInlineLambda() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperInInlineLambda.kt");
+        }
+
         @TestMetadata("samWrapperOfLambda.kt")
         public void testSamWrapperOfLambda() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperOfLambda.kt");
@@ -4400,6 +4410,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         public void testSamWrapperOfReference() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperOfReference.kt");
         }
+
+        @TestMetadata("samWrapperRawTypes.kt")
+        public void testSamWrapperRawTypes() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperRawTypes.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeText/statements")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java
index ca782f86282..d3d28f6a96c 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java
@@ -163,6 +163,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassesOldMangling.kt")
+    public void testInlineClassesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
+    }
+
     @TestMetadata("inlinedConstants.kt")
     public void testInlinedConstants() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlinedConstants.kt");
@@ -410,6 +415,16 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin/fir"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @TestMetadata("AnonymousObjectInProperty.kt")
+        public void testAnonymousObjectInProperty() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt");
+        }
+
+        @TestMetadata("ExistingSymbolInFakeOverride.kt")
+        public void testExistingSymbolInFakeOverride() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt");
+        }
+
         @TestMetadata("LibraryProperty.kt")
         public void testLibraryProperty() throws Exception {
             runTest("compiler/testData/compileKotlinAgainstKotlin/fir/LibraryProperty.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index 78065a1b245..6cbd283fad3 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -1497,6 +1497,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/bridges/genericProperty.kt");
         }
 
+        @TestMetadata("innerClassTypeParameters.kt")
+        public void testInnerClassTypeParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt");
+        }
+
         @TestMetadata("kt12416.kt")
         public void testKt12416() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/kt12416.kt");
@@ -1537,6 +1542,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/bridges/kt318.kt");
         }
 
+        @TestMetadata("kt42137.kt")
+        public void testKt42137() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt42137.kt");
+        }
+
         @TestMetadata("longChainOneBridge.kt")
         public void testLongChainOneBridge() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
@@ -7208,6 +7218,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("nonLocalReturn.kt")
+        public void testNonLocalReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt");
+        }
+
         @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt")
         public void testNonLocalReturnFromInlineLambdaDeep_1_2() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines.experimental");
@@ -11428,6 +11443,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/delegatedProperty/extensionPropertyAndExtensionGetValue.kt");
         }
 
+        @TestMetadata("functionRefDelefate.kt")
+        public void testFunctionRefDelefate() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt");
+        }
+
         @TestMetadata("genericDelegate.kt")
         public void testGenericDelegate() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
@@ -13815,6 +13835,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
         }
 
+        @TestMetadata("typeParameterAsUpperBound.kt")
+        public void testTypeParameterAsUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt");
+        }
+
         @TestMetadata("typeParametersInLocalFunction.kt")
         public void testTypeParametersInLocalFunction() throws Exception {
             runTest("compiler/testData/codegen/box/functions/typeParametersInLocalFunction.kt");
@@ -14832,6 +14857,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
         }
 
+        @TestMetadata("boxImplDoesNotExecuteInitBlock.kt")
+        public void testBoxImplDoesNotExecuteInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt");
+        }
+
         @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -14977,6 +15007,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inlineClasses/conformToComparableAndCallInterfaceMethod.kt");
         }
 
+        @TestMetadata("constructorImplVisibility.kt")
+        public void testConstructorImplVisibility() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibility.kt");
+        }
+
         @TestMetadata("correctBoxingForBranchExpressions.kt")
         public void testCorrectBoxingForBranchExpressions() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt");
@@ -14997,6 +15032,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("defaultWithInlineClassArgument.kt")
         public void testDefaultWithInlineClassArgument() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultWithInlineClassArgument.kt");
@@ -15117,6 +15157,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt");
         }
 
+        @TestMetadata("initBlock.kt")
+        public void testInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/initBlock.kt");
+        }
+
         @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
         public void testInlineClassAsLastExpressionInInLambda() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
@@ -15522,6 +15567,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt");
         }
 
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/stringPlus.kt");
+        }
+
         @TestMetadata("toStringCallingPrivateFun.kt")
         public void testToStringCallingPrivateFun() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
@@ -15537,6 +15587,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt");
         }
 
+        @TestMetadata("UIntSafeAsInt.kt")
+        public void testUIntSafeAsInt() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt");
+        }
+
         @TestMetadata("unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testUnboxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -15747,6 +15802,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt");
             }
 
+            @TestMetadata("overrideGenericWithInlineClass.kt")
+            public void testOverrideGenericWithInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt");
+            }
+
             @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt")
             public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");
@@ -16712,6 +16772,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
         }
 
+        @TestMetadata("innerWithDefaultInner.kt")
+        public void testInnerWithDefaultInner() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
+        }
+
         @TestMetadata("kt3132.kt")
         public void testKt3132() throws Exception {
             runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
@@ -17182,6 +17247,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/ir/simple.kt");
         }
 
+        @TestMetadata("suppressConflictingSignatureErrors.kt")
+        public void testSuppressConflictingSignatureErrors() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/suppressConflictingSignatureErrors.kt");
+        }
+
         @TestMetadata("compiler/testData/codegen/box/ir/closureConversion")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -17349,6 +17419,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt");
         }
 
+        @TestMetadata("kt43217.kt")
+        public void testKt43217() throws Exception {
+            runTest("compiler/testData/codegen/box/javaInterop/kt43217.kt");
+        }
+
         @TestMetadata("lambdaInstanceOf.kt")
         public void testLambdaInstanceOf() throws Exception {
             runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");
@@ -17401,6 +17476,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/javaInterop/generics/javaNestedSamInterface.kt");
             }
 
+            @TestMetadata("kt42824.kt")
+            public void testKt42824() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42824.kt");
+            }
+
+            @TestMetadata("kt42825.kt")
+            public void testKt42825() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42825.kt");
+            }
+
             @TestMetadata("propertyVarianceConflict.kt")
             public void testPropertyVarianceConflict() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/generics/propertyVarianceConflict.kt");
@@ -17499,6 +17584,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/paramAssertionMessage.kt");
             }
 
+            @TestMetadata("privateOperatorParameterAssertions.kt")
+            public void testPrivateOperatorParameterAssertions() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/privateOperatorParameterAssertions.kt");
+            }
+
             @TestMetadata("staticCallErrorMessage.kt")
             public void testStaticCallErrorMessage() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/staticCallErrorMessage.kt");
@@ -18099,6 +18189,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @TestMetadata("deprecatedDefaultMethod.kt")
+                public void testDeprecatedDefaultMethod() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
+                }
+
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/funInterface.kt");
@@ -18230,6 +18325,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
                 }
 
+                @TestMetadata("deprecatedDefaultMethod.kt")
+                public void testDeprecatedDefaultMethod() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
+                }
+
                 @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
                 public void testInheritedFunctionWithDefaultParameters() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
@@ -19089,6 +19189,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/jvmStatic/funAccess.kt");
         }
 
+        @TestMetadata("functionReference.kt")
+        public void testFunctionReference() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmStatic/functionReference.kt");
+        }
+
         @TestMetadata("importStaticMemberFromObject.kt")
         public void testImportStaticMemberFromObject() throws Exception {
             runTest("compiler/testData/codegen/box/jvmStatic/importStaticMemberFromObject.kt");
@@ -19124,6 +19229,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/jvmStatic/kt21246a.kt");
         }
 
+        @TestMetadata("kt35716.kt")
+        public void testKt35716() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmStatic/kt35716.kt");
+        }
+
         @TestMetadata("kt9897_static.kt")
         public void testKt9897_static() throws Exception {
             runTest("compiler/testData/codegen/box/jvmStatic/kt9897_static.kt");
@@ -20783,6 +20893,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/objects/kt4086.kt");
         }
 
+        @TestMetadata("kt42758.kt")
+        public void testKt42758() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt42758.kt");
+        }
+
         @TestMetadata("kt535.kt")
         public void testKt535() throws Exception {
             runTest("compiler/testData/codegen/box/objects/kt535.kt");
@@ -22451,6 +22566,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
             }
 
+            @TestMetadata("kt42281.kt")
+            public void testKt42281() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
+            }
+
             @TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
             public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
@@ -24211,6 +24331,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ForInIndices extends AbstractLightAnalysisModeTest {
+            @TestMetadata("kt43159_ArrayUpperBound.kt")
+            public void ignoreKt43159_ArrayUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt");
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
@@ -24313,6 +24438,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             public void testKt13241_Collection() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Collection.kt");
             }
+
+            @TestMetadata("kt43159_GenericArray.kt")
+            public void testKt43159_GenericArray() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/ranges/forInProgressionWithIndex")
@@ -25904,6 +26034,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 public void testProperties() throws Exception {
                     runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/properties.kt");
                 }
+
+                @TestMetadata("suspendFunction.kt")
+                public void testSuspendFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt");
+                }
             }
         }
 
@@ -26802,11 +26937,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/reflection/mapping/functions.kt");
             }
 
-            @TestMetadata("inlineClassPrimaryVal.kt")
-            public void testInlineClassPrimaryVal() throws Exception {
-                runTest("compiler/testData/codegen/box/reflection/mapping/inlineClassPrimaryVal.kt");
-            }
-
             @TestMetadata("inlineReifiedFun.kt")
             public void testInlineReifiedFun() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/mapping/inlineReifiedFun.kt");
@@ -26895,6 +27025,29 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 }
             }
 
+            @TestMetadata("compiler/testData/codegen/box/reflection/mapping/inlineClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class InlineClasses extends AbstractLightAnalysisModeTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInlineClasses() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/mapping/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+                }
+
+                @TestMetadata("inlineClassPrimaryVal.kt")
+                public void testInlineClassPrimaryVal() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/mapping/inlineClasses/inlineClassPrimaryVal.kt");
+                }
+
+                @TestMetadata("suspendFunctionWithInlineClassInSignature.kt")
+                public void testSuspendFunctionWithInlineClassInSignature() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt");
+                }
+            }
+
             @TestMetadata("compiler/testData/codegen/box/reflection/mapping/jvmStatic")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -30636,6 +30789,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/traits/abstractClassInheritsFromInterface.kt");
         }
 
+        @TestMetadata("abstractClassWithFakeOverride.kt")
+        public void testAbstractClassWithFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt");
+        }
+
         public void testAllFilesPresentInTraits() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
@@ -31529,6 +31687,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/when/kt2466.kt");
         }
 
+        @TestMetadata("kt43242.kt")
+        public void testKt43242() throws Exception {
+            runTest("compiler/testData/codegen/box/when/kt43242.kt");
+        }
+
         @TestMetadata("kt5307.kt")
         public void testKt5307() throws Exception {
             runTest("compiler/testData/codegen/box/when/kt5307.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrLocalVariableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrLocalVariableTestGenerated.java
index e18962bb9ca..06f802eb132 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrLocalVariableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrLocalVariableTestGenerated.java
@@ -73,18 +73,74 @@ public class IrLocalVariableTestGenerated extends AbstractIrLocalVariableTest {
         runTest("compiler/testData/debug/localVariables/localFun.kt");
     }
 
-    @Test
-    @TestMetadata("receiverParameter.kt")
-    public void testReceiverParameter() throws Exception {
-        runTest("compiler/testData/debug/localVariables/receiverParameter.kt");
-    }
-
     @Test
     @TestMetadata("underscoreNames.kt")
     public void testUnderscoreNames() throws Exception {
         runTest("compiler/testData/debug/localVariables/underscoreNames.kt");
     }
 
+    @TestMetadata("compiler/testData/debug/localVariables/receiverMangling")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(BlockJUnit4ClassRunner.class)
+    public static class ReceiverMangling extends AbstractIrLocalVariableTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
+        }
+
+        @Test
+        public void testAllFilesPresentInReceiverMangling() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables/receiverMangling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @Test
+        @TestMetadata("capturedThisField.kt")
+        public void testCapturedThisField() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt");
+        }
+
+        @Test
+        @TestMetadata("labeledThisParameterLabel.kt")
+        public void testLabeledThisParameterLabel() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaWithExtensionReceiver.kt")
+        public void testLambdaWithExtensionReceiver() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/lambdaWithExtensionReceiver.kt");
+        }
+
+        @Test
+        @TestMetadata("receiverParameter.kt")
+        public void testReceiverParameter() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/receiverParameter.kt");
+        }
+
+        @Test
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simple.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiver.kt")
+        public void testSimpleCapturedReceiver() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiverWithLabel.kt")
+        public void testSimpleCapturedReceiverWithLabel() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiverWithParenthesis.kt")
+        public void testSimpleCapturedReceiverWithParenthesis() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt");
+        }
+    }
+
     @TestMetadata("compiler/testData/debug/localVariables/suspend")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(BlockJUnit4ClassRunner.class)
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrSteppingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrSteppingTestGenerated.java
index 8960d684f4a..86f69ce6205 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrSteppingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/IrSteppingTestGenerated.java
@@ -379,6 +379,18 @@ public class IrSteppingTestGenerated extends AbstractIrSteppingTest {
         runTest("compiler/testData/debug/stepping/stringSwitchesSmall.kt");
     }
 
+    @Test
+    @TestMetadata("suspendFunWithLambdaParameter.kt")
+    public void testSuspendFunWithLambdaParameter() throws Exception {
+        runTest("compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt");
+    }
+
+    @Test
+    @TestMetadata("suspendFunWithSuspendLambdaParameter.kt")
+    public void testSuspendFunWithSuspendLambdaParameter() throws Exception {
+        runTest("compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt");
+    }
+
     @Test
     @TestMetadata("throwException.kt")
     public void testThrowException() throws Exception {
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/LocalVariableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/LocalVariableTestGenerated.java
index 0b4d60c9060..abcc2223d1a 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/LocalVariableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/LocalVariableTestGenerated.java
@@ -73,18 +73,74 @@ public class LocalVariableTestGenerated extends AbstractLocalVariableTest {
         runTest("compiler/testData/debug/localVariables/localFun.kt");
     }
 
-    @Test
-    @TestMetadata("receiverParameter.kt")
-    public void testReceiverParameter() throws Exception {
-        runTest("compiler/testData/debug/localVariables/receiverParameter.kt");
-    }
-
     @Test
     @TestMetadata("underscoreNames.kt")
     public void testUnderscoreNames() throws Exception {
         runTest("compiler/testData/debug/localVariables/underscoreNames.kt");
     }
 
+    @TestMetadata("compiler/testData/debug/localVariables/receiverMangling")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(BlockJUnit4ClassRunner.class)
+    public static class ReceiverMangling extends AbstractLocalVariableTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
+        }
+
+        @Test
+        public void testAllFilesPresentInReceiverMangling() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables/receiverMangling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+        }
+
+        @Test
+        @TestMetadata("capturedThisField.kt")
+        public void testCapturedThisField() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt");
+        }
+
+        @Test
+        @TestMetadata("labeledThisParameterLabel.kt")
+        public void testLabeledThisParameterLabel() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaWithExtensionReceiver.kt")
+        public void testLambdaWithExtensionReceiver() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/lambdaWithExtensionReceiver.kt");
+        }
+
+        @Test
+        @TestMetadata("receiverParameter.kt")
+        public void testReceiverParameter() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/receiverParameter.kt");
+        }
+
+        @Test
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simple.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiver.kt")
+        public void testSimpleCapturedReceiver() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiverWithLabel.kt")
+        public void testSimpleCapturedReceiverWithLabel() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleCapturedReceiverWithParenthesis.kt")
+        public void testSimpleCapturedReceiverWithParenthesis() throws Exception {
+            runTest("compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt");
+        }
+    }
+
     @TestMetadata("compiler/testData/debug/localVariables/suspend")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(BlockJUnit4ClassRunner.class)
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/SteppingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/SteppingTestGenerated.java
index 15ce7f88602..6fde0447a82 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/SteppingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/debugInformation/SteppingTestGenerated.java
@@ -379,6 +379,18 @@ public class SteppingTestGenerated extends AbstractSteppingTest {
         runTest("compiler/testData/debug/stepping/stringSwitchesSmall.kt");
     }
 
+    @Test
+    @TestMetadata("suspendFunWithLambdaParameter.kt")
+    public void testSuspendFunWithLambdaParameter() throws Exception {
+        runTest("compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt");
+    }
+
+    @Test
+    @TestMetadata("suspendFunWithSuspendLambdaParameter.kt")
+    public void testSuspendFunWithSuspendLambdaParameter() throws Exception {
+        runTest("compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt");
+    }
+
     @Test
     @TestMetadata("throwException.kt")
     public void testThrowException() throws Exception {
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
index 184bb0e2a2d..45c5350c65b 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
@@ -153,6 +153,11 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             public void testSimpleFilePackageFacade() throws Exception {
                 runTest("compiler/testData/writeFlags/class/accessFlags/simpleFilePackageFacade.kt");
             }
+
+            @TestMetadata("syntheticFile.kt")
+            public void testSyntheticFile() throws Exception {
+                runTest("compiler/testData/writeFlags/class/accessFlags/syntheticFile.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/writeFlags/class/deprecatedFlag")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrAsmLikeInstructionListingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrAsmLikeInstructionListingTestGenerated.java
index 10e79362e40..c8cadd0b059 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrAsmLikeInstructionListingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrAsmLikeInstructionListingTestGenerated.java
@@ -81,11 +81,6 @@ public class IrAsmLikeInstructionListingTestGenerated extends AbstractIrAsmLikeI
             runTest("compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.kt");
         }
 
-        @TestMetadata("innerClass.kt")
-        public void testInnerClass() throws Exception {
-            runTest("compiler/testData/codegen/asmLike/receiverMangling/innerClass.kt");
-        }
-
         @TestMetadata("localFunctions.kt")
         public void testLocalFunctions() throws Exception {
             runTest("compiler/testData/codegen/asmLike/receiverMangling/localFunctions.kt");
@@ -105,11 +100,6 @@ public class IrAsmLikeInstructionListingTestGenerated extends AbstractIrAsmLikeI
         public void testNonInlineReceivers_before() throws Exception {
             runTest("compiler/testData/codegen/asmLike/receiverMangling/nonInlineReceivers_before.kt");
         }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/codegen/asmLike/receiverMangling/simple.kt");
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/asmLike/typeAnnotations")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java
index 29a0d786631..e77d6e67d6a 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java
@@ -1066,6 +1066,34 @@ public class IrBlackBoxAgainstJavaCodegenTestGenerated extends AbstractIrBlackBo
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/boxAgainstJava/varargs")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Varargs extends AbstractIrBlackBoxAgainstJavaCodegenTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInVarargs() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @TestMetadata("varargsOverride.kt")
+        public void testVarargsOverride() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride.kt");
+        }
+
+        @TestMetadata("varargsOverride2.kt")
+        public void testVarargsOverride2() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride2.kt");
+        }
+
+        @TestMetadata("varargsOverride3.kt")
+        public void testVarargsOverride3() throws Exception {
+            runTest("compiler/testData/codegen/boxAgainstJava/varargs/varargsOverride3.kt");
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
index 23a26d18b43..11dd8f2ffc8 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
@@ -1477,6 +1477,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/bridges/genericProperty.kt");
         }
 
+        @TestMetadata("innerClassTypeParameters.kt")
+        public void testInnerClassTypeParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt");
+        }
+
         @TestMetadata("kt12416.kt")
         public void testKt12416() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/kt12416.kt");
@@ -1517,6 +1522,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/bridges/kt318.kt");
         }
 
+        @TestMetadata("kt42137.kt")
+        public void testKt42137() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt42137.kt");
+        }
+
         @TestMetadata("longChainOneBridge.kt")
         public void testLongChainOneBridge() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
@@ -6883,6 +6893,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("nonLocalReturn.kt")
+        public void testNonLocalReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt");
+        }
+
         @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt")
         public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines");
@@ -10023,6 +10038,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/delegatedProperty/extensionPropertyAndExtensionGetValue.kt");
         }
 
+        @TestMetadata("functionRefDelefate.kt")
+        public void testFunctionRefDelefate() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt");
+        }
+
         @TestMetadata("genericDelegate.kt")
         public void testGenericDelegate() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
@@ -12415,6 +12435,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
         }
 
+        @TestMetadata("typeParameterAsUpperBound.kt")
+        public void testTypeParameterAsUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt");
+        }
+
         @TestMetadata("typeParametersInLocalFunction.kt")
         public void testTypeParametersInLocalFunction() throws Exception {
             runTest("compiler/testData/codegen/box/functions/typeParametersInLocalFunction.kt");
@@ -13417,6 +13442,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
         }
 
+        @TestMetadata("boxImplDoesNotExecuteInitBlock.kt")
+        public void testBoxImplDoesNotExecuteInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt");
+        }
+
         @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -13562,6 +13592,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inlineClasses/conformToComparableAndCallInterfaceMethod.kt");
         }
 
+        @TestMetadata("constructorImplVisibility.kt")
+        public void testConstructorImplVisibility() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibility.kt");
+        }
+
         @TestMetadata("correctBoxingForBranchExpressions.kt")
         public void testCorrectBoxingForBranchExpressions() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt");
@@ -13582,6 +13617,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("defaultWithInlineClassArgument.kt")
         public void testDefaultWithInlineClassArgument() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultWithInlineClassArgument.kt");
@@ -13702,6 +13742,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt");
         }
 
+        @TestMetadata("initBlock.kt")
+        public void testInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/initBlock.kt");
+        }
+
         @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
         public void testInlineClassAsLastExpressionInInLambda() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
@@ -14117,6 +14162,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt");
         }
 
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/stringPlus.kt");
+        }
+
         @TestMetadata("toStringCallingPrivateFun.kt")
         public void testToStringCallingPrivateFun() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
@@ -14137,6 +14187,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt");
         }
 
+        @TestMetadata("UIntSafeAsInt.kt")
+        public void testUIntSafeAsInt() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt");
+        }
+
         @TestMetadata("unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testUnboxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -14347,6 +14402,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt");
             }
 
+            @TestMetadata("overrideGenericWithInlineClass.kt")
+            public void testOverrideGenericWithInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt");
+            }
+
             @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt")
             public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");
@@ -15312,6 +15372,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
         }
 
+        @TestMetadata("innerWithDefaultInner.kt")
+        public void testInnerWithDefaultInner() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
+        }
+
         @TestMetadata("kt3132.kt")
         public void testKt3132() throws Exception {
             runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
@@ -15782,6 +15847,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/ir/simple.kt");
         }
 
+        @TestMetadata("suppressConflictingSignatureErrors.kt")
+        public void testSuppressConflictingSignatureErrors() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/suppressConflictingSignatureErrors.kt");
+        }
+
         @TestMetadata("compiler/testData/codegen/box/ir/closureConversion")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -15949,6 +16019,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt");
         }
 
+        @TestMetadata("kt43217.kt")
+        public void testKt43217() throws Exception {
+            runTest("compiler/testData/codegen/box/javaInterop/kt43217.kt");
+        }
+
         @TestMetadata("lambdaInstanceOf.kt")
         public void testLambdaInstanceOf() throws Exception {
             runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");
@@ -16001,6 +16076,16 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/javaInterop/generics/javaNestedSamInterface.kt");
             }
 
+            @TestMetadata("kt42824.kt")
+            public void testKt42824() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42824.kt");
+            }
+
+            @TestMetadata("kt42825.kt")
+            public void testKt42825() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42825.kt");
+            }
+
             @TestMetadata("propertyVarianceConflict.kt")
             public void testPropertyVarianceConflict() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/generics/propertyVarianceConflict.kt");
@@ -16099,6 +16184,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/paramAssertionMessage.kt");
             }
 
+            @TestMetadata("privateOperatorParameterAssertions.kt")
+            public void testPrivateOperatorParameterAssertions() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/privateOperatorParameterAssertions.kt");
+            }
+
             @TestMetadata("staticCallErrorMessage.kt")
             public void testStaticCallErrorMessage() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/staticCallErrorMessage.kt");
@@ -16699,6 +16789,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @TestMetadata("deprecatedDefaultMethod.kt")
+                public void testDeprecatedDefaultMethod() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
+                }
+
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/funInterface.kt");
@@ -16830,6 +16925,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
                 }
 
+                @TestMetadata("deprecatedDefaultMethod.kt")
+                public void testDeprecatedDefaultMethod() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
+                }
+
                 @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
                 public void testInheritedFunctionWithDefaultParameters() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
@@ -17689,6 +17789,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/jvmStatic/funAccess.kt");
         }
 
+        @TestMetadata("functionReference.kt")
+        public void testFunctionReference() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmStatic/functionReference.kt");
+        }
+
         @TestMetadata("importStaticMemberFromObject.kt")
         public void testImportStaticMemberFromObject() throws Exception {
             runTest("compiler/testData/codegen/box/jvmStatic/importStaticMemberFromObject.kt");
@@ -17724,6 +17829,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/jvmStatic/kt21246a.kt");
         }
 
+        @TestMetadata("kt35716.kt")
+        public void testKt35716() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmStatic/kt35716.kt");
+        }
+
         @TestMetadata("kt9897_static.kt")
         public void testKt9897_static() throws Exception {
             runTest("compiler/testData/codegen/box/jvmStatic/kt9897_static.kt");
@@ -19383,6 +19493,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/objects/kt4086.kt");
         }
 
+        @TestMetadata("kt42758.kt")
+        public void testKt42758() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt42758.kt");
+        }
+
         @TestMetadata("kt535.kt")
         public void testKt535() throws Exception {
             runTest("compiler/testData/codegen/box/objects/kt535.kt");
@@ -20680,6 +20795,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
             }
 
+            @TestMetadata("kt42281.kt")
+            public void testKt42281() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
+            }
+
             @TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
             public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
@@ -22542,6 +22662,16 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             public void testKt13241_Collection() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Collection.kt");
             }
+
+            @TestMetadata("kt43159_ArrayUpperBound.kt")
+            public void testKt43159_ArrayUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt");
+            }
+
+            @TestMetadata("kt43159_GenericArray.kt")
+            public void testKt43159_GenericArray() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/ranges/forInProgressionWithIndex")
@@ -26499,6 +26629,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 public void testProperties() throws Exception {
                     runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/properties.kt");
                 }
+
+                @TestMetadata("suspendFunction.kt")
+                public void testSuspendFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt");
+                }
             }
         }
 
@@ -27397,11 +27532,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/reflection/mapping/functions.kt");
             }
 
-            @TestMetadata("inlineClassPrimaryVal.kt")
-            public void testInlineClassPrimaryVal() throws Exception {
-                runTest("compiler/testData/codegen/box/reflection/mapping/inlineClassPrimaryVal.kt");
-            }
-
             @TestMetadata("inlineReifiedFun.kt")
             public void testInlineReifiedFun() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/mapping/inlineReifiedFun.kt");
@@ -27490,6 +27620,29 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 }
             }
 
+            @TestMetadata("compiler/testData/codegen/box/reflection/mapping/inlineClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class InlineClasses extends AbstractIrBlackBoxCodegenTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInlineClasses() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/mapping/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("inlineClassPrimaryVal.kt")
+                public void testInlineClassPrimaryVal() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/mapping/inlineClasses/inlineClassPrimaryVal.kt");
+                }
+
+                @TestMetadata("suspendFunctionWithInlineClassInSignature.kt")
+                public void testSuspendFunctionWithInlineClassInSignature() throws Exception {
+                    runTest("compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt");
+                }
+            }
+
             @TestMetadata("compiler/testData/codegen/box/reflection/mapping/jvmStatic")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -31231,6 +31384,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/traits/abstractClassInheritsFromInterface.kt");
         }
 
+        @TestMetadata("abstractClassWithFakeOverride.kt")
+        public void testAbstractClassWithFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt");
+        }
+
         public void testAllFilesPresentInTraits() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
@@ -32124,6 +32282,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/when/kt2466.kt");
         }
 
+        @TestMetadata("kt43242.kt")
+        public void testKt43242() throws Exception {
+            runTest("compiler/testData/codegen/box/when/kt43242.kt");
+        }
+
         @TestMetadata("kt5307.kt")
         public void testKt5307() throws Exception {
             runTest("compiler/testData/codegen/box/when/kt5307.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java
index 8adce5c33bf..b7edbcea4a3 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java
@@ -44,6 +44,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
         runTest("compiler/testData/codegen/bytecodeListing/callableNameIntrinsic.kt");
     }
 
+    @TestMetadata("cloneable.kt")
+    public void testCloneable() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/cloneable.kt");
+    }
+
     @TestMetadata("companionObjectVisibility_after.kt")
     public void testCompanionObjectVisibility_after() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.kt");
@@ -84,6 +89,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
         runTest("compiler/testData/codegen/bytecodeListing/immutableCollection.kt");
     }
 
+    @TestMetadata("javaDeprecated.kt")
+    public void testJavaDeprecated() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/javaDeprecated.kt");
+    }
+
     @TestMetadata("jvmOverloadsAndParametersAnnotations.kt")
     public void testJvmOverloadsAndParametersAnnotations() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.kt");
@@ -94,6 +104,21 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
         runTest("compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters.kt");
     }
 
+    @TestMetadata("kt42137.kt")
+    public void testKt42137() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/kt42137.kt");
+    }
+
+    @TestMetadata("kt42879.kt")
+    public void testKt42879() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/kt42879.kt");
+    }
+
+    @TestMetadata("kt43217.kt")
+    public void testKt43217() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/kt43217.kt");
+    }
+
     @TestMetadata("localFunctionInInitBlock.kt")
     public void testLocalFunctionInInitBlock() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/localFunctionInInitBlock.kt");
@@ -134,6 +159,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
         runTest("compiler/testData/codegen/bytecodeListing/noToArrayInJava.kt");
     }
 
+    @TestMetadata("privateCompanionFields.kt")
+    public void testPrivateCompanionFields() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/privateCompanionFields.kt");
+    }
+
     @TestMetadata("privateDefaultImpls.kt")
     public void testPrivateDefaultImpls() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/privateDefaultImpls.kt");
@@ -159,6 +189,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
         runTest("compiler/testData/codegen/bytecodeListing/samAdapterAndInlinedOne.kt");
     }
 
+    @TestMetadata("varargsBridge.kt")
+    public void testVarargsBridge() throws Exception {
+        runTest("compiler/testData/codegen/bytecodeListing/varargsBridge.kt");
+    }
+
     @TestMetadata("compiler/testData/codegen/bytecodeListing/annotations")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -171,6 +206,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
+        @TestMetadata("annotationsOnDelegatedMembers.kt")
+        public void testAnnotationsOnDelegatedMembers() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/annotations/annotationsOnDelegatedMembers.kt");
+        }
+
         @TestMetadata("defaultTargets.kt")
         public void testDefaultTargets() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.kt");
@@ -304,6 +344,21 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.kt");
         }
 
+        @TestMetadata("inheritingFromAbstractCollections.kt")
+        public void testInheritingFromAbstractCollections() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractCollections.kt");
+        }
+
+        @TestMetadata("inheritingFromAbstractMap.kt")
+        public void testInheritingFromAbstractMap() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt");
+        }
+
+        @TestMetadata("inheritingFromAbstractMutableList.kt")
+        public void testInheritingFromAbstractMutableList() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.kt");
+        }
+
         @TestMetadata("mapOfPrimitivesFullJdk.kt")
         public void testMapOfPrimitivesFullJdk() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.kt");
@@ -369,6 +424,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunWithCovariantOverride.kt");
         }
 
+        @TestMetadata("stubLikeMethodSignatures.kt")
+        public void testStubLikeMethodSignatures() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/stubLikeMethodSignatures.kt");
+        }
+
         @TestMetadata("stubsFromSuperclass.kt")
         public void testStubsFromSuperclass() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclass.kt");
@@ -640,15 +700,20 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
+        @TestMetadata("functionInMultifileClass.kt")
+        public void testFunctionInMultifileClass() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClass.kt");
+        }
+
+        @TestMetadata("functionInMultifileClassWithInheritedParts.kt")
+        public void testFunctionInMultifileClassWithInheritedParts() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/defaultArguments/functionInMultifileClassWithInheritedParts.kt");
+        }
+
         @TestMetadata("internalNameMangling.kt")
         public void testInternalNameMangling() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/defaultArguments/internalNameMangling.kt");
         }
-
-        @TestMetadata("privateFunctionInMultifilePart.kt")
-        public void testPrivateFunctionInMultifilePart() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeListing/defaultArguments/privateFunctionInMultifilePart.kt");
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeListing/deprecated")
@@ -673,6 +738,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.kt");
         }
 
+        @TestMetadata("deprecatedInMultifileClass.kt")
+        public void testDeprecatedInMultifileClass() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/deprecated/deprecatedInMultifileClass.kt");
+        }
+
         @TestMetadata("deprecatedLateinitVar.kt")
         public void testDeprecatedLateinitVar() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/deprecated/deprecatedLateinitVar.kt");
@@ -682,6 +752,21 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
         public void testDeprecatedProperty() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/deprecated/deprecatedProperty.kt");
         }
+
+        @TestMetadata("hidden.kt")
+        public void testHidden() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/deprecated/hidden.kt");
+        }
+
+        @TestMetadata("inheritingDeprecation.kt")
+        public void testInheritingDeprecation() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.kt");
+        }
+
+        @TestMetadata("inlineClassTypesInSignature.kt")
+        public void testInlineClassTypesInSignature() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/deprecated/inlineClassTypesInSignature.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeListing/inline")
@@ -817,11 +902,21 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.kt");
         }
 
+        @TestMetadata("constructor.kt")
+        public void testConstructor() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.kt");
+        }
+
         @TestMetadata("constructorsWithDefaultParameterValues.kt")
         public void testConstructorsWithDefaultParameterValues() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("inlineCharSequence.kt")
         public void testInlineCharSequence() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.kt");
@@ -847,6 +942,16 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.kt");
         }
 
+        @TestMetadata("memberExtensionProperty.kt")
+        public void testMemberExtensionProperty() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.kt");
+        }
+
+        @TestMetadata("noArgConstructorForInlineClassParameter.kt")
+        public void testNoArgConstructorForInlineClassParameter() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.kt");
+        }
+
         @TestMetadata("noBridgesForErasedInlineClass.kt")
         public void testNoBridgesForErasedInlineClass() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.kt");
@@ -857,6 +962,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.kt");
         }
 
+        @TestMetadata("nullableAndNotNullPrimitive.kt")
+        public void testNullableAndNotNullPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.kt");
+        }
+
         @TestMetadata("overridingGenericMethodWithInlineClassParameterType.kt")
         public void testOverridingGenericMethodWithInlineClassParameterType() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/overridingGenericMethodWithInlineClassParameterType.kt");
@@ -1052,6 +1162,29 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
                 runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.kt");
             }
         }
+
+        @TestMetadata("compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class StdlibManglingIn1430 extends AbstractIrBytecodeListingTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInStdlibManglingIn1430() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("new.kt")
+            public void testNew() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.kt");
+            }
+
+            @TestMetadata("old.kt")
+            public void testOld() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
index 4bb2ca1297b..5c6213c0ca3 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
@@ -3167,6 +3167,11 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noAssertionsForInlineClassesBasedOnNullableTypes.kt");
         }
 
+        @TestMetadata("noBoxingInMethod.kt")
+        public void testNoBoxingInMethod() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingInMethod.kt");
+        }
+
         @TestMetadata("noBoxingOnCastOperations.kt")
         public void testNoBoxingOnCastOperations() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOnCastOperations.kt");
@@ -4319,6 +4324,11 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperForNullableInitialization.kt");
         }
 
+        @TestMetadata("samWrapperInInlineLambda.kt")
+        public void testSamWrapperInInlineLambda() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperInInlineLambda.kt");
+        }
+
         @TestMetadata("samWrapperOfLambda.kt")
         public void testSamWrapperOfLambda() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperOfLambda.kt");
@@ -4328,6 +4338,11 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
         public void testSamWrapperOfReference() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperOfReference.kt");
         }
+
+        @TestMetadata("samWrapperRawTypes.kt")
+        public void testSamWrapperRawTypes() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/sam/samWrapperRawTypes.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeText/statements")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java
index 934a3e50494..11946037910 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java
@@ -158,6 +158,11 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassesOldMangling.kt")
+    public void testInlineClassesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
+    }
+
     @TestMetadata("inlinedConstants.kt")
     public void testInlinedConstants() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlinedConstants.kt");
@@ -405,6 +410,16 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin/fir"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
+        @TestMetadata("AnonymousObjectInProperty.kt")
+        public void testAnonymousObjectInProperty() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt");
+        }
+
+        @TestMetadata("ExistingSymbolInFakeOverride.kt")
+        public void testExistingSymbolInFakeOverride() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt");
+        }
+
         @TestMetadata("LibraryProperty.kt")
         public void testLibraryProperty() throws Exception {
             runTest("compiler/testData/compileKotlinAgainstKotlin/fir/LibraryProperty.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrScriptCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrScriptCodegenTestGenerated.java
new file mode 100644
index 00000000000..005803d5dd9
--- /dev/null
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrScriptCodegenTestGenerated.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.codegen.ir;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("compiler/testData/codegen/script")
+@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public class IrScriptCodegenTestGenerated extends AbstractIrScriptCodegenTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
+    }
+
+    @TestMetadata("adder.kts")
+    public void testAdder() throws Exception {
+        runTest("compiler/testData/codegen/script/adder.kts");
+    }
+
+    public void testAllFilesPresentInScript() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/script"), Pattern.compile("^(.+)\\.kts$"), null, TargetBackend.JVM_IR, true);
+    }
+
+    @TestMetadata("classLiteralInsideFunction.kts")
+    public void testClassLiteralInsideFunction() throws Exception {
+        runTest("compiler/testData/codegen/script/classLiteralInsideFunction.kts");
+    }
+
+    @TestMetadata("destructuringDeclaration.kts")
+    public void testDestructuringDeclaration() throws Exception {
+        runTest("compiler/testData/codegen/script/destructuringDeclaration.kts");
+    }
+
+    @TestMetadata("destructuringDeclarationUnderscore.kts")
+    public void testDestructuringDeclarationUnderscore() throws Exception {
+        runTest("compiler/testData/codegen/script/destructuringDeclarationUnderscore.kts");
+    }
+
+    @TestMetadata("empty.kts")
+    public void testEmpty() throws Exception {
+        runTest("compiler/testData/codegen/script/empty.kts");
+    }
+
+    @TestMetadata("helloWorld.kts")
+    public void testHelloWorld() throws Exception {
+        runTest("compiler/testData/codegen/script/helloWorld.kts");
+    }
+
+    @TestMetadata("inline.kts")
+    public void testInline() throws Exception {
+        runTest("compiler/testData/codegen/script/inline.kts");
+    }
+
+    @TestMetadata("kt20707.kts")
+    public void testKt20707() throws Exception {
+        runTest("compiler/testData/codegen/script/kt20707.kts");
+    }
+
+    @TestMetadata("kt22029.kts")
+    public void testKt22029() throws Exception {
+        runTest("compiler/testData/codegen/script/kt22029.kts");
+    }
+
+    @TestMetadata("localDelegatedProperty.kts")
+    public void testLocalDelegatedProperty() throws Exception {
+        runTest("compiler/testData/codegen/script/localDelegatedProperty.kts");
+    }
+
+    @TestMetadata("localDelegatedPropertyNoExplicitType.kts")
+    public void testLocalDelegatedPropertyNoExplicitType() throws Exception {
+        runTest("compiler/testData/codegen/script/localDelegatedPropertyNoExplicitType.kts");
+    }
+
+    @TestMetadata("localFunction.kts")
+    public void testLocalFunction() throws Exception {
+        runTest("compiler/testData/codegen/script/localFunction.kts");
+    }
+
+    @TestMetadata("outerCapture.kts")
+    public void testOuterCapture() throws Exception {
+        runTest("compiler/testData/codegen/script/outerCapture.kts");
+    }
+
+    @TestMetadata("parameter.kts")
+    public void testParameter() throws Exception {
+        runTest("compiler/testData/codegen/script/parameter.kts");
+    }
+
+    @TestMetadata("parameterArray.kts")
+    public void testParameterArray() throws Exception {
+        runTest("compiler/testData/codegen/script/parameterArray.kts");
+    }
+
+    @TestMetadata("parameterClosure.kts")
+    public void testParameterClosure() throws Exception {
+        runTest("compiler/testData/codegen/script/parameterClosure.kts");
+    }
+
+    @TestMetadata("parameterLong.kts")
+    public void testParameterLong() throws Exception {
+        runTest("compiler/testData/codegen/script/parameterLong.kts");
+    }
+
+    @TestMetadata("secondLevelFunction.kts")
+    public void testSecondLevelFunction() throws Exception {
+        runTest("compiler/testData/codegen/script/secondLevelFunction.kts");
+    }
+
+    @TestMetadata("secondLevelFunctionClosure.kts")
+    public void testSecondLevelFunctionClosure() throws Exception {
+        runTest("compiler/testData/codegen/script/secondLevelFunctionClosure.kts");
+    }
+
+    @TestMetadata("secondLevelVal.kts")
+    public void testSecondLevelVal() throws Exception {
+        runTest("compiler/testData/codegen/script/secondLevelVal.kts");
+    }
+
+    @TestMetadata("simpleClass.kts")
+    public void testSimpleClass() throws Exception {
+        runTest("compiler/testData/codegen/script/simpleClass.kts");
+    }
+
+    @TestMetadata("string.kts")
+    public void testString() throws Exception {
+        runTest("compiler/testData/codegen/script/string.kts");
+    }
+
+    @TestMetadata("topLevelFunction.kts")
+    public void testTopLevelFunction() throws Exception {
+        runTest("compiler/testData/codegen/script/topLevelFunction.kts");
+    }
+
+    @TestMetadata("topLevelFunctionClosure.kts")
+    public void testTopLevelFunctionClosure() throws Exception {
+        runTest("compiler/testData/codegen/script/topLevelFunctionClosure.kts");
+    }
+
+    @TestMetadata("topLevelLocalDelegatedProperty.kts")
+    public void testTopLevelLocalDelegatedProperty() throws Exception {
+        runTest("compiler/testData/codegen/script/topLevelLocalDelegatedProperty.kts");
+    }
+
+    @TestMetadata("topLevelPropertiesWithGetSet.kts")
+    public void testTopLevelPropertiesWithGetSet() throws Exception {
+        runTest("compiler/testData/codegen/script/topLevelPropertiesWithGetSet.kts");
+    }
+
+    @TestMetadata("topLevelProperty.kts")
+    public void testTopLevelProperty() throws Exception {
+        runTest("compiler/testData/codegen/script/topLevelProperty.kts");
+    }
+
+    @TestMetadata("topLevelPropertyWithProvideDelegate.kts")
+    public void testTopLevelPropertyWithProvideDelegate() throws Exception {
+        runTest("compiler/testData/codegen/script/topLevelPropertyWithProvideDelegate.kts");
+    }
+
+    @TestMetadata("topLevelTypealias.kts")
+    public void testTopLevelTypealias() throws Exception {
+        runTest("compiler/testData/codegen/script/topLevelTypealias.kts");
+    }
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrWriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrWriteFlagsTestGenerated.java
index 9bed820bd69..12f8f98ce30 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrWriteFlagsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrWriteFlagsTestGenerated.java
@@ -153,6 +153,11 @@ public class IrWriteFlagsTestGenerated extends AbstractIrWriteFlagsTest {
             public void testSimpleFilePackageFacade() throws Exception {
                 runTest("compiler/testData/writeFlags/class/accessFlags/simpleFilePackageFacade.kt");
             }
+
+            @TestMetadata("syntheticFile.kt")
+            public void testSyntheticFile() throws Exception {
+                runTest("compiler/testData/writeFlags/class/accessFlags/syntheticFile.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/writeFlags/class/deprecatedFlag")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java
index 2a67be36af2..f97bdc77ab4 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java
@@ -158,6 +158,11 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassesOldMangling.kt")
+    public void testInlineClassesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
+    }
+
     @TestMetadata("inlinedConstants.kt")
     public void testInlinedConstants() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlinedConstants.kt");
@@ -405,6 +410,16 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin/fir"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
         }
 
+        @TestMetadata("AnonymousObjectInProperty.kt")
+        public void testAnonymousObjectInProperty() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt");
+        }
+
+        @TestMetadata("ExistingSymbolInFakeOverride.kt")
+        public void testExistingSymbolInFakeOverride() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt");
+        }
+
         @TestMetadata("LibraryProperty.kt")
         public void testLibraryProperty() throws Exception {
             runTest("compiler/testData/compileKotlinAgainstKotlin/fir/LibraryProperty.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java
index 5004645338e..55d67906415 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java
@@ -158,6 +158,11 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassesOldMangling.kt")
+    public void testInlineClassesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
+    }
+
     @TestMetadata("inlinedConstants.kt")
     public void testInlinedConstants() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlinedConstants.kt");
@@ -405,6 +410,16 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin/fir"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
         }
 
+        @TestMetadata("AnonymousObjectInProperty.kt")
+        public void testAnonymousObjectInProperty() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt");
+        }
+
+        @TestMetadata("ExistingSymbolInFakeOverride.kt")
+        public void testExistingSymbolInFakeOverride() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt");
+        }
+
         @TestMetadata("LibraryProperty.kt")
         public void testLibraryProperty() throws Exception {
             runTest("compiler/testData/compileKotlinAgainstKotlin/fir/LibraryProperty.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
index 57828febba9..baa0aa3778c 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.ir.AbstractIrSourceRangesTestCase
 import org.jetbrains.kotlin.ir.AbstractIrTextTestCase
 import org.jetbrains.kotlin.jvm.compiler.*
 import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrCompileJavaAgainstKotlinTest
+import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrCompileKotlinAgainstJavaTest
 import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrLoadJavaTest
 import org.jetbrains.kotlin.jvm.compiler.javac.AbstractLoadJavaUsingJavacTest
 import org.jetbrains.kotlin.lexer.kdoc.AbstractKDocLexerTest
@@ -242,7 +243,7 @@ fun main(args: Array<String>) {
 
 
             testClass<AbstractBytecodeListingTest> {
-                model("codegen/bytecodeListing")
+                model("codegen/bytecodeListing", targetBackend = TargetBackend.JVM)
             }
 
             testClass<AbstractTopLevelMembersInvocationTest> {
@@ -329,8 +330,18 @@ fun main(args: Array<String>) {
             }
 
             testClass<AbstractCompileKotlinAgainstJavaTest> {
-                model("compileKotlinAgainstJava", testClassName = "WithAPT", testMethod = "doTestWithAPT")
-                model("compileKotlinAgainstJava", testClassName = "WithoutAPT", testMethod = "doTestWithoutAPT")
+                model(
+                    "compileKotlinAgainstJava",
+                    testClassName = "WithAPT",
+                    testMethod = "doTestWithAPT",
+                    targetBackend = TargetBackend.JVM
+                )
+                model(
+                    "compileKotlinAgainstJava",
+                    testClassName = "WithoutAPT",
+                    testMethod = "doTestWithoutAPT",
+                    targetBackend = TargetBackend.JVM
+                )
             }
 
             testClass<AbstractCompileKotlinAgainstKotlinTest> {
@@ -438,7 +449,27 @@ fun main(args: Array<String>) {
                     testMethod = "doTestWithoutJavac",
                     targetBackend = TargetBackend.JVM_IR
                 )
-                //model("compileJavaAgainstKotlin", testClassName = "WithJavac", testMethod = "doTestWithJavac", targetBackend = TargetBackend.JVM_IR)
+                model(
+                    "compileJavaAgainstKotlin",
+                    testClassName = "WithJavac",
+                    testMethod = "doTestWithJavac",
+                    targetBackend = TargetBackend.JVM_IR
+                )
+            }
+
+            testClass<AbstractIrCompileKotlinAgainstJavaTest> {
+                model(
+                    "compileKotlinAgainstJava",
+                    testClassName = "WithAPT",
+                    testMethod = "doTestWithAPT",
+                    targetBackend = TargetBackend.JVM_IR
+                )
+                model(
+                    "compileKotlinAgainstJava",
+                    testClassName = "WithoutAPT",
+                    testMethod = "doTestWithoutAPT",
+                    targetBackend = TargetBackend.JVM_IR
+                )
             }
 
             testClass<AbstractIrCompileKotlinAgainstKotlinTest> {
@@ -526,6 +557,10 @@ fun main(args: Array<String>) {
             testClass<AbstractIrAsmLikeInstructionListingTest> {
                 model("codegen/asmLike", targetBackend = TargetBackend.JVM_IR)
             }
+
+            testClass<AbstractIrScriptCodegenTest> {
+                model("codegen/script", extension = "kts", targetBackend = TargetBackend.JVM_IR)
+            }
         }
 
         testGroup(
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt
index a395a59e644..20ca38df93b 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt
@@ -16,6 +16,8 @@ object GenerateInRangeExpressionTestData {
 
     private val PREAMBLE_MESSAGE = "Auto-generated by ${GenerateInRangeExpressionTestData::class.java.simpleName}. Do not edit!"
 
+    private val FILES_MUTED_IN_WASM = listOf("charDownTo.kt", "intDownTo.kt", "longDownTo.kt")
+
     private fun generateMatrixTestCase(
         fileName: String,
         rangeExpressions: List<String>,
@@ -24,16 +26,20 @@ object GenerateInRangeExpressionTestData {
     ) {
         PrintWriter(File(GENERATED_DIR, fileName)).use {
             it.generateTestCaseBody(
-                header, rangeExpressions, elementExpressions
+                fileName, header, rangeExpressions, elementExpressions
             )
         }
     }
 
     private fun PrintWriter.generateTestCaseBody(
+        fileName: String,
         header: String,
         rangeExpressions: List<String>,
         elementExpressions: List<String>
     ) {
+        if (fileName in FILES_MUTED_IN_WASM) {
+            println("// DONT_TARGET_EXACT_BACKEND: WASM")
+        }
         println("// KJS_WITH_FULL_RUNTIME")
         println("// $PREAMBLE_MESSAGE")
         println("// WITH_RUNTIME")
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
index 6a38ba0fa7e..8c536678c22 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
@@ -74,6 +74,36 @@ public class GenerateRangesCodegenTestData {
 
     private static final List<String> JVM_IR_FAILING_UNSIGNED_EXPRESSION_TESTS = Collections.emptyList();
 
+    private static final List<String> USE_OLD_MANGLING_IN_UNSIGNED_LITERAL_TESTS = new ArrayList<String>() {{
+        add("inexactDownToMinValue");
+        add("progressionMaxValueMinusTwoToMaxValue");
+        add("inexactToMaxValue");
+        add("simpleRangeWithNonConstantEnds");
+        add("maxValueMinusTwoToMaxValue");
+        add("progressionDownToMinValue");
+        add("overflowZeroToMinValue");
+    }};
+
+    private static final List<String> USE_OLD_MANGLING_IN_UNSIGNED_EXPRESSION_TESTS = new ArrayList<String>() {{
+        add("inexactDownToMinValue");
+        add("progressionMaxValueMinusTwoToMaxValue");
+        add("inexactToMaxValue");
+        add("simpleRangeWithNonConstantEnds");
+        add("maxValueMinusTwoToMaxValue");
+        add("progressionDownToMinValue");
+        add("openRange");
+        add("overflowZeroDownToMaxValue");
+        add("reversedBackSequence");
+        add("overflowZeroToMinValue");
+        add("simpleDownTo");
+        add("emptyDownto");
+        add("reversedInexactSteppedDownTo");
+        add("simpleSteppedDownTo");
+        add("oneElementDownTo");
+        add("reversedEmptyBackSequence");
+        add("inexactSteppedDownTo");
+    }};
+
     static {
         for (String integerType : INTEGER_PRIMITIVES) {
             String suffix = integerType.substring(0, integerType.startsWith("U") ? 2 : 1);
@@ -138,7 +168,13 @@ public class GenerateRangesCodegenTestData {
         out.printf("// IGNORE_BACKEND: %s%n%n", backendName);
     }
 
-    private static void writeToFile(File file, String generatedBody, boolean isForUnsigned, boolean ignoreJvmIR) {
+    private static void writeToFile(
+            File file,
+            String generatedBody,
+            boolean isForUnsigned,
+            boolean ignoreJvmIR,
+            boolean useOldManglingScheme
+    ) {
         PrintWriter out;
         try {
             //noinspection IOResourceOpenedButNotSafelyClosed
@@ -151,9 +187,13 @@ public class GenerateRangesCodegenTestData {
         if (ignoreJvmIR) {
             out.println("// IGNORE_BACKEND: JVM_IR");
         }
+        out.println("// DONT_TARGET_EXACT_BACKEND: WASM");
         out.println("// KJS_WITH_FULL_RUNTIME");
         out.println("// Auto-generated by " + GenerateRangesCodegenTestData.class.getName() + ". DO NOT EDIT!");
         out.println("// WITH_RUNTIME");
+        if (useOldManglingScheme) {
+            out.println("// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME");
+        }
         out.println();
         // Import min/max values, but only in case when the generated test case actually uses them (not to clutter tests which don't)
         out.println();
@@ -232,12 +272,14 @@ public class GenerateRangesCodegenTestData {
                     }
 
                     String fileName = testFunName + ".kt";
-                    writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, false);
-                    writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, false);
+                    writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, false, false);
+                    writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, false, false);
                     writeToFile(new File(UNSIGNED_AS_LITERAL_DIR, fileName), unsignedAsLiteralBody.toString(), true,
-                                JVM_IR_FAILING_UNSIGNED_LITERAL_TESTS.contains(testFunName));
+                                JVM_IR_FAILING_UNSIGNED_LITERAL_TESTS.contains(testFunName),
+                                USE_OLD_MANGLING_IN_UNSIGNED_LITERAL_TESTS.contains(testFunName));
                     writeToFile(new File(UNSIGNED_AS_EXPRESSION_DIR, fileName), unsignedAsExpressionBody.toString(), true,
-                                JVM_IR_FAILING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName));
+                                JVM_IR_FAILING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName),
+                                USE_OLD_MANGLING_IN_UNSIGNED_EXPRESSION_TESTS.contains(testFunName));
                 }
             }
         }
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt
index cc8afc8a765..ddd4132d684 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt
@@ -19,6 +19,54 @@ object GenerateSteppedRangesCodegenTestData {
     private val KT_34166_AFFECTED_FILENAMES = setOf("illegalStepZero.kt", "illegalStepNegative.kt", "illegalStepNonConst.kt")
 
     private val JVM_IR_FAILING_FOR_UNSIGNED_FILENAMES = setOf<String>()
+    private val USE_OLD_MANGLING_SCHEME = setOf(
+        "minValueToMaxValueStepMaxValue.kt",
+        "zeroToMaxValueStepMaxValue.kt",
+        "emptyDownto.kt",
+        "emptyProgression.kt",
+        "emptyProgressionToMinValue.kt",
+        "illegalStepNegative.kt",
+        "illegalStepNonConst.kt",
+        "illegalStepThenLegalStep.kt",
+        "illegalStepZero.kt",
+        "inexactSteppedDownTo.kt",
+        "legalStepThenIllegalStep.kt",
+        "maxValueToMinValueStepMaxValue.kt",
+        "maxValueToOneStepMaxValue.kt",
+        "maxValueToZeroStepMaxValue.kt",
+        "mixedTypeStep.kt",
+        "oneElementDownTo.kt",
+        "openRange.kt",
+        "overflowZeroDownToMaxValue.kt",
+        "overflowZeroToMinValue.kt",
+        "progressionToNonConst.kt",
+        "reversedBackSequence.kt",
+        "reversedEmptyBackSequence.kt",
+        "reversedInexactSteppedDownTo.kt",
+        "reversedThenStep.kt",
+        "reversedThenStepThenReversed.kt",
+        "reversedThenStepThenReversedThenStep.kt",
+        "simpleDownTo.kt",
+        "simpleSteppedDownTo.kt",
+        "singleElementStepTwo.kt",
+        "stepNonConst.kt",
+        "stepOne.kt",
+        "stepOneThenStepOne.kt",
+        "stepThenReversed.kt",
+        "stepThenReversedThenStep.kt",
+        "stepThenReversedThenStepThenReversed.kt",
+        "stepThenSameStep.kt",
+        "stepToOutsideRange.kt",
+        "stepToSameLast.kt",
+        "stepToSameLastThenStepOne.kt",
+        "stepToSameLastThenStepToSameLast.kt",
+        "stepToSameLastThenStepToSmallerLast.kt",
+        "stepToSmallerLast.kt",
+        "stepToSmallerLastThenStepOne.kt",
+        "stepToSmallerLastThenStepToSameLast.kt",
+        "stepToSmallerLastThenStepToSmallerLast.kt",
+        "unsignedRangeIterator.kt",
+    )
 
     private enum class Type(val type: String, val isLong: Boolean = false, val isUnsigned: Boolean = false) {
         INT("Int"),
@@ -163,15 +211,20 @@ object GenerateSteppedRangesCodegenTestData {
         extraCode: String?,
         fullSubdir: File,
         asLiteral: Boolean,
-        shouldIgnoreForJvmIR: Boolean = false
+        shouldIgnoreForJvmIR: Boolean = false,
+        shouldUseOldManglingScheme: Boolean = false,
     ) {
         fullSubdir.mkdirs()
         PrintWriter(File(fullSubdir, fileName)).use {
             with(it) {
                 println("// $PREAMBLE_MESSAGE")
+                if (shouldUseOldManglingScheme) {
+                    println("// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME")
+                }
                 if (shouldIgnoreForJvmIR) {
                     println("// IGNORE_BACKEND: JVM_IR")
                 }
+                println("// DONT_TARGET_EXACT_BACKEND: WASM")
                 println("// KJS_WITH_FULL_RUNTIME")
                 println("// WITH_RUNTIME")
                 if (asLiteral && KT_34166_AFFECTED_FILENAMES.contains(fileName)) {
@@ -219,6 +272,7 @@ object GenerateSteppedRangesCodegenTestData {
                 File(UNSIGNED_TEST_DATA_DIR, fullSubdirPath),
                 asLiteral,
                 shouldIgnoreForJvmIR = fileName in JVM_IR_FAILING_FOR_UNSIGNED_FILENAMES,
+                shouldUseOldManglingScheme = fileName in USE_OLD_MANGLING_SCHEME,
             )
         }
         if (signedTests.isNotEmpty()) {
diff --git a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
index c223eaa5e5a..3d038845229 100644
--- a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
@@ -65,6 +65,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/classes/classes.kt");
         }
 
+        @TestMetadata("cloneable.kt")
+        public void testCloneable() throws Exception {
+            runTest("compiler/testData/ir/irText/classes/cloneable.kt");
+        }
+
         @TestMetadata("companionObject.kt")
         public void testCompanionObject() throws Exception {
             runTest("compiler/testData/ir/irText/classes/companionObject.kt");
@@ -190,6 +195,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/classes/kt31649.kt");
         }
 
+        @TestMetadata("kt43217.kt")
+        public void testKt43217() throws Exception {
+            runTest("compiler/testData/ir/irText/classes/kt43217.kt");
+        }
+
         @TestMetadata("lambdaInDataClassDefaultParameter.kt")
         public void testLambdaInDataClassDefaultParameter() throws Exception {
             runTest("compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt");
@@ -400,6 +410,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
                 runTest("compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.kt");
             }
 
+            @TestMetadata("annotationsOnDelegatedMembers.kt")
+            public void testAnnotationsOnDelegatedMembers() throws Exception {
+                runTest("compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt");
+            }
+
             @TestMetadata("annotationsWithDefaultParameterValues.kt")
             public void testAnnotationsWithDefaultParameterValues() throws Exception {
                 runTest("compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt");
@@ -470,6 +485,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
                 runTest("compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.kt");
             }
 
+            @TestMetadata("inheritingDeprecation.kt")
+            public void testInheritingDeprecation() throws Exception {
+                runTest("compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt");
+            }
+
             @TestMetadata("javaAnnotation.kt")
             public void testJavaAnnotation() throws Exception {
                 runTest("compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt");
@@ -1171,6 +1191,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/expressions/objectAsCallable.kt");
         }
 
+        @TestMetadata("objectByNameInsideObject.kt")
+        public void testObjectByNameInsideObject() throws Exception {
+            runTest("compiler/testData/ir/irText/expressions/objectByNameInsideObject.kt");
+        }
+
         @TestMetadata("objectClassReference.kt")
         public void testObjectClassReference() throws Exception {
             runTest("compiler/testData/ir/irText/expressions/objectClassReference.kt");
@@ -1751,11 +1776,21 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt");
         }
 
+        @TestMetadata("coercionToUnitForNestedWhen.kt")
+        public void testCoercionToUnitForNestedWhen() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt");
+        }
+
         @TestMetadata("DeepCopyIrTree.kt")
         public void testDeepCopyIrTree() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt");
         }
 
+        @TestMetadata("DelegationAndInheritanceFromJava.kt")
+        public void testDelegationAndInheritanceFromJava() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt");
+        }
+
         @TestMetadata("deprecated.kt")
         public void testDeprecated() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/deprecated.kt");
@@ -1771,11 +1806,21 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.kt");
         }
 
+        @TestMetadata("MultiList.kt")
+        public void testMultiList() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/MultiList.kt");
+        }
+
         @TestMetadata("putIfAbsent.kt")
         public void testPutIfAbsent() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/putIfAbsent.kt");
         }
 
+        @TestMetadata("recursiveCapturedTypeInPropertyReference.kt")
+        public void testRecursiveCapturedTypeInPropertyReference() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.kt");
+        }
+
         @TestMetadata("SameJavaFieldReferences.kt")
         public void testSameJavaFieldReferences() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/SameJavaFieldReferences.kt");
@@ -1786,10 +1831,20 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/firProblems/SignatureClash.kt");
         }
 
+        @TestMetadata("throwableStackTrace.kt")
+        public void testThrowableStackTrace() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/throwableStackTrace.kt");
+        }
+
         @TestMetadata("V8ArrayToList.kt")
         public void testV8ArrayToList() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/V8ArrayToList.kt");
         }
+
+        @TestMetadata("VarInInit.kt")
+        public void testVarInInit() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/VarInInit.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/ir/irText/lambdas")
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
index c0210951b13..cfe3369ee02 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.metadata.K2MetadataCompiler
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
-import org.jetbrains.kotlin.codegen.inline.GENERATE_SMAP
 import org.jetbrains.kotlin.codegen.inline.remove
 import org.jetbrains.kotlin.codegen.optimization.common.asSequence
 import org.jetbrains.kotlin.codegen.optimization.common.intConstant
@@ -714,6 +713,28 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
         )
     }
 
+    fun testInlineClassesManglingAgainstLV13() {
+        val library = compileLibrary(
+            "library",
+            additionalOptions = listOf("-language-version", "1.3", "-Xinline-classes"),
+            checkKotlinOutput = {}
+        )
+        compileKotlin(
+            "source.kt",
+            tmpdir,
+            listOf(library),
+            additionalOptions = listOf("-XXLanguage:-MangleClassMembersReturningInlineClasses", "-Xinline-classes")
+        )
+        // Difference in mangling becomes apparent only on load time as NSME, so, to check the mangling we need to load the classfile
+        loadClassFile("SourceKt", tmpdir, library)
+    }
+
+    private fun loadClassFile(className: String, dir: File, library: File) {
+        val classLoader = URLClassLoader(arrayOf(dir.toURI().toURL(), library.toURI().toURL()))
+        val mainClass = classLoader.loadClass(className)
+        mainClass.getDeclaredMethod("main", Array<String>::class.java).invoke(null, arrayOf<String>())
+    }
+
     companion object {
         // compiler before 1.1.4 version  did not include suspension marks into bytecode.
         private fun stripSuspensionMarksToImitateLegacyCompiler(bytes: ByteArray): Pair<ByteArray, Int> {
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstJavaTestGenerated.java
index 656534e10f3..b443cd8ab9b 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstJavaTestGenerated.java
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jvm.compiler;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TargetBackend;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -23,7 +24,7 @@ public class CompileKotlinAgainstJavaTestGenerated extends AbstractCompileKotlin
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithAPT extends AbstractCompileKotlinAgainstJavaTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithAPT, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTestWithAPT, TargetBackend.JVM, testDataFilePath);
         }
 
         @TestMetadata("AbstractClass.kt")
@@ -37,7 +38,7 @@ public class CompileKotlinAgainstJavaTestGenerated extends AbstractCompileKotlin
         }
 
         public void testAllFilesPresentInWithAPT() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("AnnotationWithArguments.kt")
@@ -311,7 +312,7 @@ public class CompileKotlinAgainstJavaTestGenerated extends AbstractCompileKotlin
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithoutAPT extends AbstractCompileKotlinAgainstJavaTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutAPT, this, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTestWithoutAPT, TargetBackend.JVM, testDataFilePath);
         }
 
         @TestMetadata("AbstractClass.kt")
@@ -325,7 +326,7 @@ public class CompileKotlinAgainstJavaTestGenerated extends AbstractCompileKotlin
         }
 
         public void testAllFilesPresentInWithoutAPT() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
         @TestMetadata("AnnotationWithArguments.kt")
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileJavaAgainstKotlinTestGenerated.java
index 773162ba140..bae13882d2b 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileJavaAgainstKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileJavaAgainstKotlinTestGenerated.java
@@ -17,665 +17,1331 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/compileJavaAgainstKotlin")
-@TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IrCompileJavaAgainstKotlinTestGenerated extends AbstractIrCompileJavaAgainstKotlinTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInWithoutJavac() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-    }
-
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/annotation")
+    @TestMetadata("compiler/testData/compileJavaAgainstKotlin")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Annotation extends AbstractIrCompileJavaAgainstKotlinTest {
+    public static class WithoutJavac extends AbstractIrCompileJavaAgainstKotlinTest {
         private void runTest(String testDataFilePath) throws Exception {
             KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
         }
 
-        public void testAllFilesPresentInAnnotation() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/annotation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        public void testAllFilesPresentInWithoutJavac() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
-        @TestMetadata("retention.kt")
-        public void testRetention() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/annotation/retention.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/callableReference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class CallableReference extends AbstractIrCompileJavaAgainstKotlinTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInCallableReference() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @TestMetadata("GenericSignature.kt")
-        public void testGenericSignature() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/callableReference/GenericSignature.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/class")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Class extends AbstractIrCompileJavaAgainstKotlinTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInClass() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @TestMetadata("ClassObject.kt")
-        public void testClassObject() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt");
-        }
-
-        @TestMetadata("DefaultConstructor.kt")
-        public void testDefaultConstructor() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt");
-        }
-
-        @TestMetadata("DefaultConstructorWithTwoArgs.kt")
-        public void testDefaultConstructorWithTwoArgs() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt");
-        }
-
-        @TestMetadata("ExtendsAbstractListT.kt")
-        public void testExtendsAbstractListT() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt");
-        }
-
-        @TestMetadata("ImplementsListString.kt")
-        public void testImplementsListString() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt");
-        }
-
-        @TestMetadata("ImplementsMapPP.kt")
-        public void testImplementsMapPP() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt");
-        }
-
-        @TestMetadata("InnerClass.kt")
-        public void testInnerClass() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt");
-        }
-
-        @TestMetadata("InnerClassConstructors.kt")
-        public void testInnerClassConstructors() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt");
-        }
-
-        @TestMetadata("InnerClassOfGeneric.kt")
-        public void testInnerClassOfGeneric() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt");
-        }
-
-        @TestMetadata("kt3561.kt")
-        public void testKt3561() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt");
-        }
-
-        @TestMetadata("kt4050.kt")
-        public void testKt4050() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt");
-        }
-
-        @TestMetadata("MapImpl.kt")
-        public void testMapImpl() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/MapImpl.kt");
-        }
-
-        @TestMetadata("Simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt");
-        }
-
-        @TestMetadata("StarProjection.kt")
-        public void testStarProjection() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/class/StarProjection.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/enum")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Enum extends AbstractIrCompileJavaAgainstKotlinTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInEnum() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @TestMetadata("DefaultArgumentInEnumConstructor.kt")
-        public void testDefaultArgumentInEnumConstructor() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class JvmStatic extends AbstractIrCompileJavaAgainstKotlinTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJvmStatic() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @TestMetadata("simpleCompanionObject.kt")
-        public void testSimpleCompanionObject() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.kt");
-        }
-
-        @TestMetadata("simpleCompanionObjectProperty.kt")
-        public void testSimpleCompanionObjectProperty() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.kt");
-        }
-
-        @TestMetadata("simpleObject.kt")
-        public void testSimpleObject() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.kt");
-        }
-
-        @TestMetadata("simpleObjectProperty.kt")
-        public void testSimpleObjectProperty() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Method extends AbstractIrCompileJavaAgainstKotlinTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        @TestMetadata("AccessorGenericSignature.kt")
-        public void testAccessorGenericSignature() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt");
-        }
-
-        public void testAllFilesPresentInMethod() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @TestMetadata("Any.kt")
-        public void testAny() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/Any.kt");
-        }
-
-        @TestMetadata("ArrayOfIntArray.kt")
-        public void testArrayOfIntArray() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt");
-        }
-
-        @TestMetadata("ArrayOfIntegerArray.kt")
-        public void testArrayOfIntegerArray() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt");
-        }
-
-        @TestMetadata("ClashingSignaturesWithoutReturnType.kt")
-        public void testClashingSignaturesWithoutReturnType() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt");
-        }
-
-        @TestMetadata("Delegation.kt")
-        public void testDelegation() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt");
-        }
-
-        @TestMetadata("Extensions.kt")
-        public void testExtensions() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt");
-        }
-
-        @TestMetadata("GenericArray.kt")
-        public void testGenericArray() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt");
-        }
-
-        @TestMetadata("Hello.kt")
-        public void testHello() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt");
-        }
-
-        @TestMetadata("Int.kt")
-        public void testInt() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/Int.kt");
-        }
-
-        @TestMetadata("IntArray.kt")
-        public void testIntArray() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt");
-        }
-
-        @TestMetadata("IntWithDefault.kt")
-        public void testIntWithDefault() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt");
-        }
-
-        @TestMetadata("IntegerArray.kt")
-        public void testIntegerArray() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt");
-        }
-
-        @TestMetadata("ListOfInt.kt")
-        public void testListOfInt() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt");
-        }
-
-        @TestMetadata("ListOfString.kt")
-        public void testListOfString() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt");
-        }
-
-        @TestMetadata("ListOfT.kt")
-        public void testListOfT() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt");
-        }
-
-        @TestMetadata("MapOfKString.kt")
-        public void testMapOfKString() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt");
-        }
-
-        @TestMetadata("MapOfStringIntQ.kt")
-        public void testMapOfStringIntQ() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt");
-        }
-
-        @TestMetadata("QExtendsListString.kt")
-        public void testQExtendsListString() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt");
-        }
-
-        @TestMetadata("QExtendsString.kt")
-        public void testQExtendsString() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt");
-        }
-
-        @TestMetadata("TraitImpl.kt")
-        public void testTraitImpl() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt");
-        }
-
-        @TestMetadata("TypeParamInInner.kt")
-        public void testTypeParamInInner() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/TypeParamInInner.kt");
-        }
-
-        @TestMetadata("TypeParamInInner2.kt")
-        public void testTypeParamInInner2() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/TypeParamInInner2.kt");
-        }
-
-        @TestMetadata("Vararg.kt")
-        public void testVararg() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt");
-        }
-
-        @TestMetadata("Void.kt")
-        public void testVoid() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt");
-        }
-
-        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName")
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/annotation")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
-        public static class PlatformName extends AbstractIrCompileJavaAgainstKotlinTest {
+        public static class Annotation extends AbstractIrCompileJavaAgainstKotlinTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
             }
 
-            public void testAllFilesPresentInPlatformName() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/platformName"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            public void testAllFilesPresentInAnnotation() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/annotation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @TestMetadata("PlatformName.kt")
-            public void testPlatformName() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt");
+            @TestMetadata("retention.kt")
+            public void testRetention() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/annotation/retention.kt");
             }
         }
 
-        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride")
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/callableReference")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
-        public static class PrimitiveOverride extends AbstractIrCompileJavaAgainstKotlinTest {
+        public static class CallableReference extends AbstractIrCompileJavaAgainstKotlinTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
             }
 
-            public void testAllFilesPresentInPrimitiveOverride() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            public void testAllFilesPresentInCallableReference() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @TestMetadata("ByteOverridesObject.kt")
-            public void testByteOverridesObject() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt");
-            }
-
-            @TestMetadata("CallFinalNotInSubclass.kt")
-            public void testCallFinalNotInSubclass() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt");
-            }
-
-            @TestMetadata("CallNotInSubclass.kt")
-            public void testCallNotInSubclass() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt");
-            }
-
-            @TestMetadata("CovariantReturnTypeOverride.kt")
-            public void testCovariantReturnTypeOverride() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt");
-            }
-
-            @TestMetadata("FinalOverride.kt")
-            public void testFinalOverride() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt");
-            }
-
-            @TestMetadata("IntOverridesComparable.kt")
-            public void testIntOverridesComparable() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt");
-            }
-
-            @TestMetadata("IntOverridesNumber.kt")
-            public void testIntOverridesNumber() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt");
-            }
-
-            @TestMetadata("IntOverridesObject.kt")
-            public void testIntOverridesObject() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt");
-            }
-
-            @TestMetadata("ManyClassesHierarchy.kt")
-            public void testManyClassesHierarchy() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt");
-            }
-
-            @TestMetadata("NullableIntOverridesObject.kt")
-            public void testNullableIntOverridesObject() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt");
-            }
-
-            @TestMetadata("OverrideInJava.kt")
-            public void testOverrideInJava() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt");
+            @TestMetadata("GenericSignature.kt")
+            public void testGenericSignature() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/callableReference/GenericSignature.kt");
             }
         }
 
-        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass")
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/class")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
-        public static class PrimitiveOverrideWithInlineClass extends AbstractIrCompileJavaAgainstKotlinTest {
+        public static class Class extends AbstractIrCompileJavaAgainstKotlinTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
             }
 
-            public void testAllFilesPresentInPrimitiveOverrideWithInlineClass() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            public void testAllFilesPresentInClass() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @TestMetadata("InlineIntOverridesObject.kt")
-            public void testInlineIntOverridesObject() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass/InlineIntOverridesObject.kt");
+            @TestMetadata("ClassObject.kt")
+            public void testClassObject() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt");
+            }
+
+            @TestMetadata("DefaultConstructor.kt")
+            public void testDefaultConstructor() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt");
+            }
+
+            @TestMetadata("DefaultConstructorWithTwoArgs.kt")
+            public void testDefaultConstructorWithTwoArgs() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt");
+            }
+
+            @TestMetadata("ExtendsAbstractListT.kt")
+            public void testExtendsAbstractListT() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt");
+            }
+
+            @TestMetadata("ImplementsListString.kt")
+            public void testImplementsListString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt");
+            }
+
+            @TestMetadata("ImplementsMapPP.kt")
+            public void testImplementsMapPP() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt");
+            }
+
+            @TestMetadata("InnerClass.kt")
+            public void testInnerClass() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt");
+            }
+
+            @TestMetadata("InnerClassConstructors.kt")
+            public void testInnerClassConstructors() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt");
+            }
+
+            @TestMetadata("InnerClassOfGeneric.kt")
+            public void testInnerClassOfGeneric() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt");
+            }
+
+            @TestMetadata("kt3561.kt")
+            public void testKt3561() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt");
+            }
+
+            @TestMetadata("kt4050.kt")
+            public void testKt4050() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt");
+            }
+
+            @TestMetadata("MapImpl.kt")
+            public void testMapImpl() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/MapImpl.kt");
+            }
+
+            @TestMetadata("Simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt");
+            }
+
+            @TestMetadata("StarProjection.kt")
+            public void testStarProjection() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/StarProjection.kt");
             }
         }
 
-        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws")
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/enum")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
-        public static class Throws extends AbstractIrCompileJavaAgainstKotlinTest {
+        public static class Enum extends AbstractIrCompileJavaAgainstKotlinTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
             }
 
-            public void testAllFilesPresentInThrows() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            public void testAllFilesPresentInEnum() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @TestMetadata("ClassMembers.kt")
-            public void testClassMembers() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt");
+            @TestMetadata("DefaultArgumentInEnumConstructor.kt")
+            public void testDefaultArgumentInEnumConstructor() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class JvmStatic extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
             }
 
-            @TestMetadata("Constructor.kt")
-            public void testConstructor() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt");
+            public void testAllFilesPresentInJvmStatic() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @TestMetadata("DefaultArgs.kt")
-            public void testDefaultArgs() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt");
+            @TestMetadata("simpleCompanionObject.kt")
+            public void testSimpleCompanionObject() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.kt");
+            }
+
+            @TestMetadata("simpleCompanionObjectProperty.kt")
+            public void testSimpleCompanionObjectProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.kt");
+            }
+
+            @TestMetadata("simpleObject.kt")
+            public void testSimpleObject() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.kt");
+            }
+
+            @TestMetadata("simpleObjectProperty.kt")
+            public void testSimpleObjectProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Method extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            @TestMetadata("AccessorGenericSignature.kt")
+            public void testAccessorGenericSignature() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt");
+            }
+
+            public void testAllFilesPresentInMethod() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("Any.kt")
+            public void testAny() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Any.kt");
+            }
+
+            @TestMetadata("ArrayOfIntArray.kt")
+            public void testArrayOfIntArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt");
+            }
+
+            @TestMetadata("ArrayOfIntegerArray.kt")
+            public void testArrayOfIntegerArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt");
+            }
+
+            @TestMetadata("ClashingSignaturesWithoutReturnType.kt")
+            public void testClashingSignaturesWithoutReturnType() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt");
             }
 
             @TestMetadata("Delegation.kt")
             public void testDelegation() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt");
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt");
             }
 
-            @TestMetadata("GenericSubstitution.kt")
-            public void testGenericSubstitution() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt");
+            @TestMetadata("Extensions.kt")
+            public void testExtensions() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt");
             }
 
-            @TestMetadata("KotlinThrows.kt")
-            public void testKotlinThrows() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/KotlinThrows.kt");
+            @TestMetadata("GenericArray.kt")
+            public void testGenericArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt");
             }
 
-            @TestMetadata("TopLevel.kt")
-            public void testTopLevel() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt");
+            @TestMetadata("Hello.kt")
+            public void testHello() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt");
             }
 
-            @TestMetadata("TraitMembers.kt")
-            public void testTraitMembers() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt");
+            @TestMetadata("Int.kt")
+            public void testInt() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Int.kt");
+            }
+
+            @TestMetadata("IntArray.kt")
+            public void testIntArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt");
+            }
+
+            @TestMetadata("IntWithDefault.kt")
+            public void testIntWithDefault() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt");
+            }
+
+            @TestMetadata("IntegerArray.kt")
+            public void testIntegerArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt");
+            }
+
+            @TestMetadata("ListOfInt.kt")
+            public void testListOfInt() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt");
+            }
+
+            @TestMetadata("ListOfString.kt")
+            public void testListOfString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt");
+            }
+
+            @TestMetadata("ListOfT.kt")
+            public void testListOfT() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt");
+            }
+
+            @TestMetadata("MapOfKString.kt")
+            public void testMapOfKString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt");
+            }
+
+            @TestMetadata("MapOfStringIntQ.kt")
+            public void testMapOfStringIntQ() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt");
+            }
+
+            @TestMetadata("QExtendsListString.kt")
+            public void testQExtendsListString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt");
+            }
+
+            @TestMetadata("QExtendsString.kt")
+            public void testQExtendsString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt");
+            }
+
+            @TestMetadata("TraitImpl.kt")
+            public void testTraitImpl() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt");
+            }
+
+            @TestMetadata("TypeParamInInner.kt")
+            public void testTypeParamInInner() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/TypeParamInInner.kt");
+            }
+
+            @TestMetadata("TypeParamInInner2.kt")
+            public void testTypeParamInInner2() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/TypeParamInInner2.kt");
+            }
+
+            @TestMetadata("Vararg.kt")
+            public void testVararg() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt");
+            }
+
+            @TestMetadata("Void.kt")
+            public void testVoid() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt");
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PlatformName extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPlatformName() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/platformName"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("PlatformName.kt")
+                public void testPlatformName() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PrimitiveOverride extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPrimitiveOverride() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("ByteOverridesObject.kt")
+                public void testByteOverridesObject() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt");
+                }
+
+                @TestMetadata("CallFinalNotInSubclass.kt")
+                public void testCallFinalNotInSubclass() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt");
+                }
+
+                @TestMetadata("CallNotInSubclass.kt")
+                public void testCallNotInSubclass() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt");
+                }
+
+                @TestMetadata("CovariantReturnTypeOverride.kt")
+                public void testCovariantReturnTypeOverride() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt");
+                }
+
+                @TestMetadata("FinalOverride.kt")
+                public void testFinalOverride() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt");
+                }
+
+                @TestMetadata("IntOverridesComparable.kt")
+                public void testIntOverridesComparable() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt");
+                }
+
+                @TestMetadata("IntOverridesNumber.kt")
+                public void testIntOverridesNumber() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt");
+                }
+
+                @TestMetadata("IntOverridesObject.kt")
+                public void testIntOverridesObject() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt");
+                }
+
+                @TestMetadata("ManyClassesHierarchy.kt")
+                public void testManyClassesHierarchy() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt");
+                }
+
+                @TestMetadata("NullableIntOverridesObject.kt")
+                public void testNullableIntOverridesObject() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt");
+                }
+
+                @TestMetadata("OverrideInJava.kt")
+                public void testOverrideInJava() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PrimitiveOverrideWithInlineClass extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPrimitiveOverrideWithInlineClass() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("InlineIntOverridesObject.kt")
+                public void testInlineIntOverridesObject() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass/InlineIntOverridesObject.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Throws extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInThrows() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("ClassMembers.kt")
+                public void testClassMembers() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt");
+                }
+
+                @TestMetadata("Constructor.kt")
+                public void testConstructor() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt");
+                }
+
+                @TestMetadata("DefaultArgs.kt")
+                public void testDefaultArgs() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt");
+                }
+
+                @TestMetadata("Delegation.kt")
+                public void testDelegation() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt");
+                }
+
+                @TestMetadata("GenericSubstitution.kt")
+                public void testGenericSubstitution() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt");
+                }
+
+                @TestMetadata("KotlinThrows.kt")
+                public void testKotlinThrows() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/KotlinThrows.kt");
+                }
+
+                @TestMetadata("TopLevel.kt")
+                public void testTopLevel() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt");
+                }
+
+                @TestMetadata("TraitMembers.kt")
+                public void testTraitMembers() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt");
+                }
             }
         }
-    }
 
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Property extends AbstractIrCompileJavaAgainstKotlinTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInProperty() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @TestMetadata("ConstVal.kt")
-        public void testConstVal() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/property/ConstVal.kt");
-        }
-
-        @TestMetadata("Extensions.kt")
-        public void testExtensions() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt");
-        }
-
-        @TestMetadata("GenericProperty.kt")
-        public void testGenericProperty() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt");
-        }
-
-        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName")
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
-        public static class PlatformName extends AbstractIrCompileJavaAgainstKotlinTest {
+        public static class Property extends AbstractIrCompileJavaAgainstKotlinTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
             }
 
-            public void testAllFilesPresentInPlatformName() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property/platformName"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            public void testAllFilesPresentInProperty() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @TestMetadata("PlatformName.kt")
-            public void testPlatformName() throws Exception {
-                runTest("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt");
+            @TestMetadata("ConstVal.kt")
+            public void testConstVal() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/property/ConstVal.kt");
+            }
+
+            @TestMetadata("Extensions.kt")
+            public void testExtensions() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt");
+            }
+
+            @TestMetadata("GenericProperty.kt")
+            public void testGenericProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt");
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PlatformName extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPlatformName() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property/platformName"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("PlatformName.kt")
+                public void testPlatformName() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt");
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/sealed")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Sealed extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInSealed() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/sealed"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("Derived.kt")
+            public void testDerived() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/sealed/Derived.kt");
+            }
+
+            @TestMetadata("Instance.kt")
+            public void testInstance() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/sealed/Instance.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class StaticFields extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInStaticFields() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/staticFields"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("AnnotationClass.kt")
+            public void testAnnotationClass() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt");
+            }
+
+            @TestMetadata("AnnotationTrait.kt")
+            public void testAnnotationTrait() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt");
+            }
+
+            @TestMetadata("kt3698.kt")
+            public void testKt3698() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt");
+            }
+
+            @TestMetadata("staticClassProperty.kt")
+            public void testStaticClassProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt");
+            }
+
+            @TestMetadata("staticTraitProperty.kt")
+            public void testStaticTraitProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/targets")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Targets extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInTargets() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/targets"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("annotation.kt")
+            public void testAnnotation() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt");
+            }
+
+            @TestMetadata("base.kt")
+            public void testBase() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/base.kt");
+            }
+
+            @TestMetadata("classifier.kt")
+            public void testClassifier() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt");
+            }
+
+            @TestMetadata("constructor.kt")
+            public void testConstructor() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt");
+            }
+
+            @TestMetadata("empty.kt")
+            public void testEmpty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/empty.kt");
+            }
+
+            @TestMetadata("field.kt")
+            public void testField() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/field.kt");
+            }
+
+            @TestMetadata("function.kt")
+            public void testFunction() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/function.kt");
+            }
+
+            @TestMetadata("getter.kt")
+            public void testGetter() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/getter.kt");
+            }
+
+            @TestMetadata("local.kt")
+            public void testLocal() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/local.kt");
+            }
+
+            @TestMetadata("multiple.kt")
+            public void testMultiple() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt");
+            }
+
+            @TestMetadata("parameter.kt")
+            public void testParameter() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt");
+            }
+
+            @TestMetadata("property.kt")
+            public void testProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/property.kt");
+            }
+
+            @TestMetadata("setter.kt")
+            public void testSetter() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/setter.kt");
             }
         }
     }
 
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/sealed")
+    @TestMetadata("compiler/testData/compileJavaAgainstKotlin")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Sealed extends AbstractIrCompileJavaAgainstKotlinTest {
+    public static class WithJavac extends AbstractIrCompileJavaAgainstKotlinTest {
         private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+            KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
         }
 
-        public void testAllFilesPresentInSealed() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/sealed"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        public void testAllFilesPresentInWithJavac() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
-        @TestMetadata("Derived.kt")
-        public void testDerived() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/sealed/Derived.kt");
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/annotation")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Annotation extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInAnnotation() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/annotation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("retention.kt")
+            public void testRetention() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/annotation/retention.kt");
+            }
         }
 
-        @TestMetadata("Instance.kt")
-        public void testInstance() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/sealed/Instance.kt");
-        }
-    }
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/callableReference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CallableReference extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
 
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class StaticFields extends AbstractIrCompileJavaAgainstKotlinTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+            public void testAllFilesPresentInCallableReference() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("GenericSignature.kt")
+            public void testGenericSignature() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/callableReference/GenericSignature.kt");
+            }
         }
 
-        public void testAllFilesPresentInStaticFields() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/staticFields"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/class")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Class extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInClass() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("ClassObject.kt")
+            public void testClassObject() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt");
+            }
+
+            @TestMetadata("DefaultConstructor.kt")
+            public void testDefaultConstructor() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt");
+            }
+
+            @TestMetadata("DefaultConstructorWithTwoArgs.kt")
+            public void testDefaultConstructorWithTwoArgs() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt");
+            }
+
+            @TestMetadata("ExtendsAbstractListT.kt")
+            public void testExtendsAbstractListT() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt");
+            }
+
+            @TestMetadata("ImplementsListString.kt")
+            public void testImplementsListString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt");
+            }
+
+            @TestMetadata("ImplementsMapPP.kt")
+            public void testImplementsMapPP() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt");
+            }
+
+            @TestMetadata("InnerClass.kt")
+            public void testInnerClass() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt");
+            }
+
+            @TestMetadata("InnerClassConstructors.kt")
+            public void testInnerClassConstructors() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt");
+            }
+
+            @TestMetadata("InnerClassOfGeneric.kt")
+            public void testInnerClassOfGeneric() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt");
+            }
+
+            @TestMetadata("kt3561.kt")
+            public void testKt3561() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt");
+            }
+
+            @TestMetadata("kt4050.kt")
+            public void testKt4050() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt");
+            }
+
+            @TestMetadata("MapImpl.kt")
+            public void testMapImpl() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/MapImpl.kt");
+            }
+
+            @TestMetadata("Simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt");
+            }
+
+            @TestMetadata("StarProjection.kt")
+            public void testStarProjection() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/class/StarProjection.kt");
+            }
         }
 
-        @TestMetadata("AnnotationClass.kt")
-        public void testAnnotationClass() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt");
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/enum")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Enum extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEnum() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("DefaultArgumentInEnumConstructor.kt")
+            public void testDefaultArgumentInEnumConstructor() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.kt");
+            }
         }
 
-        @TestMetadata("AnnotationTrait.kt")
-        public void testAnnotationTrait() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt");
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class JvmStatic extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInJvmStatic() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("simpleCompanionObject.kt")
+            public void testSimpleCompanionObject() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.kt");
+            }
+
+            @TestMetadata("simpleCompanionObjectProperty.kt")
+            public void testSimpleCompanionObjectProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.kt");
+            }
+
+            @TestMetadata("simpleObject.kt")
+            public void testSimpleObject() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.kt");
+            }
+
+            @TestMetadata("simpleObjectProperty.kt")
+            public void testSimpleObjectProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.kt");
+            }
         }
 
-        @TestMetadata("kt3698.kt")
-        public void testKt3698() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt");
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Method extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            @TestMetadata("AccessorGenericSignature.kt")
+            public void testAccessorGenericSignature() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt");
+            }
+
+            public void testAllFilesPresentInMethod() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("Any.kt")
+            public void testAny() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Any.kt");
+            }
+
+            @TestMetadata("ArrayOfIntArray.kt")
+            public void testArrayOfIntArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt");
+            }
+
+            @TestMetadata("ArrayOfIntegerArray.kt")
+            public void testArrayOfIntegerArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt");
+            }
+
+            @TestMetadata("ClashingSignaturesWithoutReturnType.kt")
+            public void testClashingSignaturesWithoutReturnType() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt");
+            }
+
+            @TestMetadata("Delegation.kt")
+            public void testDelegation() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt");
+            }
+
+            @TestMetadata("Extensions.kt")
+            public void testExtensions() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt");
+            }
+
+            @TestMetadata("GenericArray.kt")
+            public void testGenericArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt");
+            }
+
+            @TestMetadata("Hello.kt")
+            public void testHello() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt");
+            }
+
+            @TestMetadata("Int.kt")
+            public void testInt() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Int.kt");
+            }
+
+            @TestMetadata("IntArray.kt")
+            public void testIntArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt");
+            }
+
+            @TestMetadata("IntWithDefault.kt")
+            public void testIntWithDefault() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt");
+            }
+
+            @TestMetadata("IntegerArray.kt")
+            public void testIntegerArray() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt");
+            }
+
+            @TestMetadata("ListOfInt.kt")
+            public void testListOfInt() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt");
+            }
+
+            @TestMetadata("ListOfString.kt")
+            public void testListOfString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt");
+            }
+
+            @TestMetadata("ListOfT.kt")
+            public void testListOfT() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt");
+            }
+
+            @TestMetadata("MapOfKString.kt")
+            public void testMapOfKString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt");
+            }
+
+            @TestMetadata("MapOfStringIntQ.kt")
+            public void testMapOfStringIntQ() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt");
+            }
+
+            @TestMetadata("QExtendsListString.kt")
+            public void testQExtendsListString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt");
+            }
+
+            @TestMetadata("QExtendsString.kt")
+            public void testQExtendsString() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt");
+            }
+
+            @TestMetadata("TraitImpl.kt")
+            public void testTraitImpl() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt");
+            }
+
+            @TestMetadata("TypeParamInInner.kt")
+            public void testTypeParamInInner() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/TypeParamInInner.kt");
+            }
+
+            @TestMetadata("TypeParamInInner2.kt")
+            public void testTypeParamInInner2() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/TypeParamInInner2.kt");
+            }
+
+            @TestMetadata("Vararg.kt")
+            public void testVararg() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt");
+            }
+
+            @TestMetadata("Void.kt")
+            public void testVoid() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt");
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PlatformName extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPlatformName() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/platformName"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("PlatformName.kt")
+                public void testPlatformName() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PrimitiveOverride extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPrimitiveOverride() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("ByteOverridesObject.kt")
+                public void testByteOverridesObject() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt");
+                }
+
+                @TestMetadata("CallFinalNotInSubclass.kt")
+                public void testCallFinalNotInSubclass() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt");
+                }
+
+                @TestMetadata("CallNotInSubclass.kt")
+                public void testCallNotInSubclass() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt");
+                }
+
+                @TestMetadata("CovariantReturnTypeOverride.kt")
+                public void testCovariantReturnTypeOverride() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt");
+                }
+
+                @TestMetadata("FinalOverride.kt")
+                public void testFinalOverride() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt");
+                }
+
+                @TestMetadata("IntOverridesComparable.kt")
+                public void testIntOverridesComparable() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt");
+                }
+
+                @TestMetadata("IntOverridesNumber.kt")
+                public void testIntOverridesNumber() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt");
+                }
+
+                @TestMetadata("IntOverridesObject.kt")
+                public void testIntOverridesObject() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt");
+                }
+
+                @TestMetadata("ManyClassesHierarchy.kt")
+                public void testManyClassesHierarchy() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt");
+                }
+
+                @TestMetadata("NullableIntOverridesObject.kt")
+                public void testNullableIntOverridesObject() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt");
+                }
+
+                @TestMetadata("OverrideInJava.kt")
+                public void testOverrideInJava() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PrimitiveOverrideWithInlineClass extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPrimitiveOverrideWithInlineClass() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("InlineIntOverridesObject.kt")
+                public void testInlineIntOverridesObject() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass/InlineIntOverridesObject.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Throws extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInThrows() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("ClassMembers.kt")
+                public void testClassMembers() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt");
+                }
+
+                @TestMetadata("Constructor.kt")
+                public void testConstructor() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt");
+                }
+
+                @TestMetadata("DefaultArgs.kt")
+                public void testDefaultArgs() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt");
+                }
+
+                @TestMetadata("Delegation.kt")
+                public void testDelegation() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt");
+                }
+
+                @TestMetadata("GenericSubstitution.kt")
+                public void testGenericSubstitution() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt");
+                }
+
+                @TestMetadata("KotlinThrows.kt")
+                public void testKotlinThrows() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/KotlinThrows.kt");
+                }
+
+                @TestMetadata("TopLevel.kt")
+                public void testTopLevel() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt");
+                }
+
+                @TestMetadata("TraitMembers.kt")
+                public void testTraitMembers() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt");
+                }
+            }
         }
 
-        @TestMetadata("staticClassProperty.kt")
-        public void testStaticClassProperty() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt");
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Property extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInProperty() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("ConstVal.kt")
+            public void testConstVal() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/property/ConstVal.kt");
+            }
+
+            @TestMetadata("Extensions.kt")
+            public void testExtensions() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt");
+            }
+
+            @TestMetadata("GenericProperty.kt")
+            public void testGenericProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt");
+            }
+
+            @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PlatformName extends AbstractIrCompileJavaAgainstKotlinTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPlatformName() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property/platformName"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("PlatformName.kt")
+                public void testPlatformName() throws Exception {
+                    runTest("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt");
+                }
+            }
         }
 
-        @TestMetadata("staticTraitProperty.kt")
-        public void testStaticTraitProperty() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt");
-        }
-    }
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/sealed")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Sealed extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
 
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/targets")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Targets extends AbstractIrCompileJavaAgainstKotlinTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath);
+            public void testAllFilesPresentInSealed() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/sealed"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("Derived.kt")
+            public void testDerived() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/sealed/Derived.kt");
+            }
+
+            @TestMetadata("Instance.kt")
+            public void testInstance() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/sealed/Instance.kt");
+            }
         }
 
-        public void testAllFilesPresentInTargets() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/targets"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class StaticFields extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInStaticFields() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/staticFields"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("AnnotationClass.kt")
+            public void testAnnotationClass() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt");
+            }
+
+            @TestMetadata("AnnotationTrait.kt")
+            public void testAnnotationTrait() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt");
+            }
+
+            @TestMetadata("kt3698.kt")
+            public void testKt3698() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt");
+            }
+
+            @TestMetadata("staticClassProperty.kt")
+            public void testStaticClassProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt");
+            }
+
+            @TestMetadata("staticTraitProperty.kt")
+            public void testStaticTraitProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt");
+            }
         }
 
-        @TestMetadata("annotation.kt")
-        public void testAnnotation() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt");
-        }
+        @TestMetadata("compiler/testData/compileJavaAgainstKotlin/targets")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Targets extends AbstractIrCompileJavaAgainstKotlinTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath);
+            }
 
-        @TestMetadata("base.kt")
-        public void testBase() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/base.kt");
-        }
+            public void testAllFilesPresentInTargets() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/targets"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
 
-        @TestMetadata("classifier.kt")
-        public void testClassifier() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt");
-        }
+            @TestMetadata("annotation.kt")
+            public void testAnnotation() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt");
+            }
 
-        @TestMetadata("constructor.kt")
-        public void testConstructor() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt");
-        }
+            @TestMetadata("base.kt")
+            public void testBase() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/base.kt");
+            }
 
-        @TestMetadata("empty.kt")
-        public void testEmpty() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/empty.kt");
-        }
+            @TestMetadata("classifier.kt")
+            public void testClassifier() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt");
+            }
 
-        @TestMetadata("field.kt")
-        public void testField() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/field.kt");
-        }
+            @TestMetadata("constructor.kt")
+            public void testConstructor() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt");
+            }
 
-        @TestMetadata("function.kt")
-        public void testFunction() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/function.kt");
-        }
+            @TestMetadata("empty.kt")
+            public void testEmpty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/empty.kt");
+            }
 
-        @TestMetadata("getter.kt")
-        public void testGetter() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/getter.kt");
-        }
+            @TestMetadata("field.kt")
+            public void testField() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/field.kt");
+            }
 
-        @TestMetadata("local.kt")
-        public void testLocal() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/local.kt");
-        }
+            @TestMetadata("function.kt")
+            public void testFunction() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/function.kt");
+            }
 
-        @TestMetadata("multiple.kt")
-        public void testMultiple() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt");
-        }
+            @TestMetadata("getter.kt")
+            public void testGetter() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/getter.kt");
+            }
 
-        @TestMetadata("parameter.kt")
-        public void testParameter() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt");
-        }
+            @TestMetadata("local.kt")
+            public void testLocal() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/local.kt");
+            }
 
-        @TestMetadata("property.kt")
-        public void testProperty() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/property.kt");
-        }
+            @TestMetadata("multiple.kt")
+            public void testMultiple() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt");
+            }
 
-        @TestMetadata("setter.kt")
-        public void testSetter() throws Exception {
-            runTest("compiler/testData/compileJavaAgainstKotlin/targets/setter.kt");
+            @TestMetadata("parameter.kt")
+            public void testParameter() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt");
+            }
+
+            @TestMetadata("property.kt")
+            public void testProperty() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/property.kt");
+            }
+
+            @TestMetadata("setter.kt")
+            public void testSetter() throws Exception {
+                runTest("compiler/testData/compileJavaAgainstKotlin/targets/setter.kt");
+            }
         }
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileKotlinAgainstJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileKotlinAgainstJavaTestGenerated.java
new file mode 100644
index 00000000000..247a25adf23
--- /dev/null
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileKotlinAgainstJavaTestGenerated.java
@@ -0,0 +1,597 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.jvm.compiler.ir;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@RunWith(JUnit3RunnerWithInners.class)
+public class IrCompileKotlinAgainstJavaTestGenerated extends AbstractIrCompileKotlinAgainstJavaTest {
+    @TestMetadata("compiler/testData/compileKotlinAgainstJava")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class WithAPT extends AbstractIrCompileKotlinAgainstJavaTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithAPT, TargetBackend.JVM_IR, testDataFilePath);
+        }
+
+        @TestMetadata("AbstractClass.kt")
+        public void testAbstractClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AbstractClass.kt");
+        }
+
+        @TestMetadata("AbstractEnum.kt")
+        public void testAbstractEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AbstractEnum.kt");
+        }
+
+        public void testAllFilesPresentInWithAPT() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @TestMetadata("AnnotationWithArguments.kt")
+        public void testAnnotationWithArguments() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithArguments.kt");
+        }
+
+        @TestMetadata("AnnotationWithField.kt")
+        public void testAnnotationWithField() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithField.kt");
+        }
+
+        @TestMetadata("AsteriskInImport.kt")
+        public void testAsteriskInImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AsteriskInImport.kt");
+        }
+
+        @TestMetadata("CheckKotlinStub.kt")
+        public void testCheckKotlinStub() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CheckKotlinStub.kt");
+        }
+
+        @TestMetadata("CheckNotNull.kt")
+        public void testCheckNotNull() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CheckNotNull.kt");
+        }
+
+        @TestMetadata("Class.kt")
+        public void testClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Class.kt");
+        }
+
+        @TestMetadata("ClassDefaultConstructor.kt")
+        public void testClassDefaultConstructor() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassDefaultConstructor.kt");
+        }
+
+        @TestMetadata("ClassWithNestedEnum.kt")
+        public void testClassWithNestedEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassWithNestedEnum.kt");
+        }
+
+        @TestMetadata("ClassWithTypeParameter.kt")
+        public void testClassWithTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt");
+        }
+
+        @TestMetadata("CyclicDependencies.kt")
+        public void testCyclicDependencies() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CyclicDependencies.kt");
+        }
+
+        @TestMetadata("DefaultModifier.kt")
+        public void testDefaultModifier() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/DefaultModifier.kt");
+        }
+
+        @TestMetadata("EnclosingClassInner.kt")
+        public void testEnclosingClassInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnclosingClassInner.kt");
+        }
+
+        @TestMetadata("Enum.kt")
+        public void testEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Enum.kt");
+        }
+
+        @TestMetadata("EnumName.kt")
+        public void testEnumName() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnumName.kt");
+        }
+
+        @TestMetadata("EnumValues.kt")
+        public void testEnumValues() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnumValues.kt");
+        }
+
+        @TestMetadata("Inheritance.kt")
+        public void testInheritance() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Inheritance.kt");
+        }
+
+        @TestMetadata("InheritedInner.kt")
+        public void testInheritedInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InheritedInner.kt");
+        }
+
+        @TestMetadata("InnerCanonicalName.kt")
+        public void testInnerCanonicalName() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerCanonicalName.kt");
+        }
+
+        @TestMetadata("InnerClass.kt")
+        public void testInnerClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClass.kt");
+        }
+
+        @TestMetadata("InnerClassFromAsteriskImport.kt")
+        public void testInnerClassFromAsteriskImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.kt");
+        }
+
+        @TestMetadata("InnerClassFromImport.kt")
+        public void testInnerClassFromImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromImport.kt");
+        }
+
+        @TestMetadata("InnerWithGenericOuter.kt")
+        public void testInnerWithGenericOuter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerWithGenericOuter.kt");
+        }
+
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Interface.kt");
+        }
+
+        @TestMetadata("InterfaceField.kt")
+        public void testInterfaceField() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceField.kt");
+        }
+
+        @TestMetadata("InterfaceMemberClass.kt")
+        public void testInterfaceMemberClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceMemberClass.kt");
+        }
+
+        @TestMetadata("InterfaceWithDefault.kt")
+        public void testInterfaceWithDefault() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceWithDefault.kt");
+        }
+
+        @TestMetadata("JavaLangClass.kt")
+        public void testJavaLangClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/JavaLangClass.kt");
+        }
+
+        @TestMetadata("ListImpl.kt")
+        public void testListImpl() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ListImpl.kt");
+        }
+
+        @TestMetadata("MapExample.kt")
+        public void testMapExample() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MapExample.kt");
+        }
+
+        @TestMetadata("Method.kt")
+        public void testMethod() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Method.kt");
+        }
+
+        @TestMetadata("MethodWithArgument.kt")
+        public void testMethodWithArgument() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithArgument.kt");
+        }
+
+        @TestMetadata("MethodWithSeveralTypeParameters.kt")
+        public void testMethodWithSeveralTypeParameters() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithSeveralTypeParameters.kt");
+        }
+
+        @TestMetadata("MethodWithTypeParameter.kt")
+        public void testMethodWithTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithTypeParameter.kt");
+        }
+
+        @TestMetadata("MethodWithWildcard.kt")
+        public void testMethodWithWildcard() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithWildcard.kt");
+        }
+
+        @TestMetadata("Nesting.kt")
+        public void testNesting() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Nesting.kt");
+        }
+
+        @TestMetadata("RawReturnType.kt")
+        public void testRawReturnType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/RawReturnType.kt");
+        }
+
+        @TestMetadata("ReturnEnum.kt")
+        public void testReturnEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnEnum.kt");
+        }
+
+        @TestMetadata("ReturnInnerClass.kt")
+        public void testReturnInnerClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerClass.kt");
+        }
+
+        @TestMetadata("ReturnInnerInInner.kt")
+        public void testReturnInnerInInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInInner.kt");
+        }
+
+        @TestMetadata("ReturnInnerInner.kt")
+        public void testReturnInnerInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInner.kt");
+        }
+
+        @TestMetadata("ReturnNested.kt")
+        public void testReturnNested() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnNested.kt");
+        }
+
+        @TestMetadata("ReturnNestedFQ.kt")
+        public void testReturnNestedFQ() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnNestedFQ.kt");
+        }
+
+        @TestMetadata("ReturnType.kt")
+        public void testReturnType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnType.kt");
+        }
+
+        @TestMetadata("ReturnTypeResolution.kt")
+        public void testReturnTypeResolution() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnTypeResolution.kt");
+        }
+
+        @TestMetadata("SeveralInnerClasses.kt")
+        public void testSeveralInnerClasses() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SeveralInnerClasses.kt");
+        }
+
+        @TestMetadata("SimpleAnnotation.kt")
+        public void testSimpleAnnotation() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SimpleAnnotation.kt");
+        }
+
+        @TestMetadata("SimpleWildcard.kt")
+        public void testSimpleWildcard() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SimpleWildcard.kt");
+        }
+
+        @TestMetadata("Singleton.kt")
+        public void testSingleton() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Singleton.kt");
+        }
+
+        @TestMetadata("StaticNestedClass.kt")
+        public void testStaticNestedClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/StaticNestedClass.kt");
+        }
+
+        @TestMetadata("TypeArgumentInSuperType.kt")
+        public void testTypeArgumentInSuperType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/TypeArgumentInSuperType.kt");
+        }
+
+        @TestMetadata("TypeParameter.kt")
+        public void testTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/TypeParameter.kt");
+        }
+
+        @TestMetadata("UseKtClass.kt")
+        public void testUseKtClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/UseKtClass.kt");
+        }
+
+        @TestMetadata("Vararg.kt")
+        public void testVararg() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Vararg.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/compileKotlinAgainstJava")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class WithoutAPT extends AbstractIrCompileKotlinAgainstJavaTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithoutAPT, TargetBackend.JVM_IR, testDataFilePath);
+        }
+
+        @TestMetadata("AbstractClass.kt")
+        public void testAbstractClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AbstractClass.kt");
+        }
+
+        @TestMetadata("AbstractEnum.kt")
+        public void testAbstractEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AbstractEnum.kt");
+        }
+
+        public void testAllFilesPresentInWithoutAPT() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @TestMetadata("AnnotationWithArguments.kt")
+        public void testAnnotationWithArguments() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithArguments.kt");
+        }
+
+        @TestMetadata("AnnotationWithField.kt")
+        public void testAnnotationWithField() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithField.kt");
+        }
+
+        @TestMetadata("AsteriskInImport.kt")
+        public void testAsteriskInImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AsteriskInImport.kt");
+        }
+
+        @TestMetadata("CheckKotlinStub.kt")
+        public void testCheckKotlinStub() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CheckKotlinStub.kt");
+        }
+
+        @TestMetadata("CheckNotNull.kt")
+        public void testCheckNotNull() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CheckNotNull.kt");
+        }
+
+        @TestMetadata("Class.kt")
+        public void testClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Class.kt");
+        }
+
+        @TestMetadata("ClassDefaultConstructor.kt")
+        public void testClassDefaultConstructor() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassDefaultConstructor.kt");
+        }
+
+        @TestMetadata("ClassWithNestedEnum.kt")
+        public void testClassWithNestedEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassWithNestedEnum.kt");
+        }
+
+        @TestMetadata("ClassWithTypeParameter.kt")
+        public void testClassWithTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt");
+        }
+
+        @TestMetadata("CyclicDependencies.kt")
+        public void testCyclicDependencies() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CyclicDependencies.kt");
+        }
+
+        @TestMetadata("DefaultModifier.kt")
+        public void testDefaultModifier() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/DefaultModifier.kt");
+        }
+
+        @TestMetadata("EnclosingClassInner.kt")
+        public void testEnclosingClassInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnclosingClassInner.kt");
+        }
+
+        @TestMetadata("Enum.kt")
+        public void testEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Enum.kt");
+        }
+
+        @TestMetadata("EnumName.kt")
+        public void testEnumName() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnumName.kt");
+        }
+
+        @TestMetadata("EnumValues.kt")
+        public void testEnumValues() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnumValues.kt");
+        }
+
+        @TestMetadata("Inheritance.kt")
+        public void testInheritance() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Inheritance.kt");
+        }
+
+        @TestMetadata("InheritedInner.kt")
+        public void testInheritedInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InheritedInner.kt");
+        }
+
+        @TestMetadata("InnerCanonicalName.kt")
+        public void testInnerCanonicalName() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerCanonicalName.kt");
+        }
+
+        @TestMetadata("InnerClass.kt")
+        public void testInnerClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClass.kt");
+        }
+
+        @TestMetadata("InnerClassFromAsteriskImport.kt")
+        public void testInnerClassFromAsteriskImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.kt");
+        }
+
+        @TestMetadata("InnerClassFromImport.kt")
+        public void testInnerClassFromImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromImport.kt");
+        }
+
+        @TestMetadata("InnerWithGenericOuter.kt")
+        public void testInnerWithGenericOuter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerWithGenericOuter.kt");
+        }
+
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Interface.kt");
+        }
+
+        @TestMetadata("InterfaceField.kt")
+        public void testInterfaceField() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceField.kt");
+        }
+
+        @TestMetadata("InterfaceMemberClass.kt")
+        public void testInterfaceMemberClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceMemberClass.kt");
+        }
+
+        @TestMetadata("InterfaceWithDefault.kt")
+        public void testInterfaceWithDefault() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceWithDefault.kt");
+        }
+
+        @TestMetadata("JavaLangClass.kt")
+        public void testJavaLangClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/JavaLangClass.kt");
+        }
+
+        @TestMetadata("ListImpl.kt")
+        public void testListImpl() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ListImpl.kt");
+        }
+
+        @TestMetadata("MapExample.kt")
+        public void testMapExample() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MapExample.kt");
+        }
+
+        @TestMetadata("Method.kt")
+        public void testMethod() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Method.kt");
+        }
+
+        @TestMetadata("MethodWithArgument.kt")
+        public void testMethodWithArgument() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithArgument.kt");
+        }
+
+        @TestMetadata("MethodWithSeveralTypeParameters.kt")
+        public void testMethodWithSeveralTypeParameters() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithSeveralTypeParameters.kt");
+        }
+
+        @TestMetadata("MethodWithTypeParameter.kt")
+        public void testMethodWithTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithTypeParameter.kt");
+        }
+
+        @TestMetadata("MethodWithWildcard.kt")
+        public void testMethodWithWildcard() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithWildcard.kt");
+        }
+
+        @TestMetadata("Nesting.kt")
+        public void testNesting() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Nesting.kt");
+        }
+
+        @TestMetadata("RawReturnType.kt")
+        public void testRawReturnType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/RawReturnType.kt");
+        }
+
+        @TestMetadata("ReturnEnum.kt")
+        public void testReturnEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnEnum.kt");
+        }
+
+        @TestMetadata("ReturnInnerClass.kt")
+        public void testReturnInnerClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerClass.kt");
+        }
+
+        @TestMetadata("ReturnInnerInInner.kt")
+        public void testReturnInnerInInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInInner.kt");
+        }
+
+        @TestMetadata("ReturnInnerInner.kt")
+        public void testReturnInnerInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInner.kt");
+        }
+
+        @TestMetadata("ReturnNested.kt")
+        public void testReturnNested() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnNested.kt");
+        }
+
+        @TestMetadata("ReturnNestedFQ.kt")
+        public void testReturnNestedFQ() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnNestedFQ.kt");
+        }
+
+        @TestMetadata("ReturnType.kt")
+        public void testReturnType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnType.kt");
+        }
+
+        @TestMetadata("ReturnTypeResolution.kt")
+        public void testReturnTypeResolution() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnTypeResolution.kt");
+        }
+
+        @TestMetadata("SeveralInnerClasses.kt")
+        public void testSeveralInnerClasses() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SeveralInnerClasses.kt");
+        }
+
+        @TestMetadata("SimpleAnnotation.kt")
+        public void testSimpleAnnotation() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SimpleAnnotation.kt");
+        }
+
+        @TestMetadata("SimpleWildcard.kt")
+        public void testSimpleWildcard() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SimpleWildcard.kt");
+        }
+
+        @TestMetadata("Singleton.kt")
+        public void testSingleton() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Singleton.kt");
+        }
+
+        @TestMetadata("StaticNestedClass.kt")
+        public void testStaticNestedClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/StaticNestedClass.kt");
+        }
+
+        @TestMetadata("TypeArgumentInSuperType.kt")
+        public void testTypeArgumentInSuperType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/TypeArgumentInSuperType.kt");
+        }
+
+        @TestMetadata("TypeParameter.kt")
+        public void testTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/TypeParameter.kt");
+        }
+
+        @TestMetadata("UseKtClass.kt")
+        public void testUseKtClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/UseKtClass.kt");
+        }
+
+        @TestMetadata("Vararg.kt")
+        public void testVararg() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Vararg.kt");
+        }
+    }
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractVersionRequirementTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractVersionRequirementTest.kt
index 1d23a4ef8fa..2fb39032f46 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractVersionRequirementTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractVersionRequirementTest.kt
@@ -203,7 +203,7 @@ abstract class AbstractVersionRequirementTest : TestCaseWithTmpdir() {
         )
     }
 
-    fun testInlineClassesAndRelevantDeclarations() {
+    fun testInlineClassesAndRelevantDeclarations13() {
         doTest(
             VersionRequirement.Version(1, 3), DeprecationLevel.ERROR, null, ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION, null,
             fqNamesWithRequirements = listOf(
@@ -215,7 +215,8 @@ abstract class AbstractVersionRequirementTest : TestCaseWithTmpdir() {
                 "test.result",
                 "test.Foo",
                 "test.Bar"
-            )
+            ),
+            shouldBeSingleRequirement = false
         )
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/JvmVersionRequirementTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/JvmVersionRequirementTest.kt
index c3edf7c915a..4ce945f71b9 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/JvmVersionRequirementTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/JvmVersionRequirementTest.kt
@@ -130,7 +130,8 @@ class JvmVersionRequirementTest : AbstractVersionRequirementTest() {
 
     fun testInlineClassReturnTypeMangled() {
         // Class members returning inline class values are mangled,
-        // and have "since 1.4" version requirement along with "since 1.3" version requirement for inline class in signature
+        // and have "since 1.4", "require 1.4.30" version requirement along with
+        // "since 1.3" version requirement for inline class in signature
         doTest(
             VersionRequirement.Version(1, 4, 0), DeprecationLevel.ERROR, null, LANGUAGE_VERSION, null,
             fqNamesWithRequirements = listOf(
@@ -140,16 +141,24 @@ class JvmVersionRequirementTest : AbstractVersionRequirementTest() {
             customLanguageVersion = LanguageVersion.KOTLIN_1_4,
             shouldBeSingleRequirement = false
         )
+        doTest(
+            VersionRequirement.Version(1, 4, 30), DeprecationLevel.ERROR, null, COMPILER_VERSION, null,
+            fqNamesWithRequirements = listOf(
+                "test.C.propertyOfInlineClassType",
+                "test.C.returnsInlineClassType",
+            ),
+            shouldBeSingleRequirement = false,
+            customLanguageVersion = LanguageVersion.KOTLIN_1_4
+        )
         // Top-level functions and properties returning inline class values are NOT mangled,
         // and have "since 1.3" version requirement for inline class in signature only.
         doTest(
             VersionRequirement.Version(1, 3, 0), DeprecationLevel.ERROR, null, LANGUAGE_VERSION, null,
             fqNamesWithRequirements = listOf(
-                "test.C.returnsInlineClassTypeJvmName",
+                "test.propertyOfInlineClassType",
                 "test.returnsInlineClassType",
-                "test.propertyOfInlineClassType"
             ),
-            shouldBeSingleRequirement = true,
+            shouldBeSingleRequirement = false,
             customLanguageVersion = LanguageVersion.KOTLIN_1_4
         )
         // In Kotlin 1.3, all functions and properties returning inline class values are NOT mangled,
@@ -157,10 +166,11 @@ class JvmVersionRequirementTest : AbstractVersionRequirementTest() {
         doTest(
             VersionRequirement.Version(1, 3, 0), DeprecationLevel.ERROR, null, LANGUAGE_VERSION, null,
             fqNamesWithRequirements = listOf(
-                "test.returnsInlineClassType",
                 "test.propertyOfInlineClassType",
-                "test.C.returnsInlineClassType",
-                "test.C.propertyOfInlineClassType"
+                "test.C.propertyOfInlineClassType",
+                "test.C.returnsInlineClassTypeJvmName",
+                "test.returnsInlineClassType",
+                "test.C.returnsInlineClassType"
             ),
             shouldBeSingleRequirement = true,
             customLanguageVersion = LanguageVersion.KOTLIN_1_3
@@ -183,4 +193,15 @@ class JvmVersionRequirementTest : AbstractVersionRequirementTest() {
             )
         )
     }
+
+    fun testInlineClassesAndRelevantDeclarations1430() {
+        doTest(
+            VersionRequirement.Version(1, 4, 30), DeprecationLevel.ERROR, null, COMPILER_VERSION, null,
+            fqNamesWithRequirements = listOf(
+                "test.simpleFun",
+                "test.aliasedFun",
+            ),
+            shouldBeSingleRequirement = false
+        )
+    }
 }
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt
index 8d747764f9b..37c17d80def 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt
@@ -26,13 +26,40 @@ fun String.parseKotlinAbiVersion(): KotlinAbiVersion {
     }
 }
 
-// For 1.4 compiler we switch klib abi_version to a triple,
-// but we don't break if we still encounter a single digit from 1.3.
+// TODO: it would be nice to inherit this one from BinaryVersion,
+// but that requires a module structure refactoring.
 data class KotlinAbiVersion(val major: Int, val minor: Int, val patch: Int) {
+    // For 1.4 compiler we switched klib abi_version to a triple,
+    // but we don't break if we still encounter a single digit from 1.3.
     constructor(single: Int) : this(0, single, 0)
-    companion object {
-        val CURRENT = KotlinAbiVersion(1, 4, 1)
+
+    fun isCompatible(): Boolean = isCompatibleTo(CURRENT)
+
+    private fun isCompatibleTo(ourVersion: KotlinAbiVersion): Boolean {
+        // Versions before 1.4.1 were the active development phase.
+        // Starting with 1.4.1 we are trying to maintain some backward compatibility.
+        return if (this.isAtLeast(1, 4, 1))
+            major == ourVersion.major && minor <= ourVersion.minor
+        else
+            this == ourVersion
+    }
+
+    fun isAtLeast(version: KotlinAbiVersion): Boolean =
+        isAtLeast(version.major, version.minor, version.patch)
+
+    fun isAtLeast(major: Int, minor: Int, patch: Int): Boolean {
+        if (this.major > major) return true
+        if (this.major < major) return false
+
+        if (this.minor > minor) return true
+        if (this.minor < minor) return false
+
+        return this.patch >= patch
     }
 
     override fun toString() = "$major.$minor.$patch"
+
+    companion object {
+        val CURRENT = KotlinAbiVersion(1, 4, 2)
+    }
 }
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
index 244afda4296..d82138c6964 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
@@ -20,11 +20,6 @@ interface SearchPathResolver<L : KotlinLibrary> : WithLogger {
     fun isProvidedByDefault(unresolved: UnresolvedLibrary): Boolean = false
 }
 
-interface SearchPathResolverWithAttributes<L : KotlinLibrary> : SearchPathResolver<L> {
-    val knownAbiVersions: List<KotlinAbiVersion>?
-    val knownCompilerVersions: List<CompilerVersion>?
-}
-
 // This is a simple library resolver that only cares for file names.
 abstract class KotlinLibrarySearchPathResolver<L : KotlinLibrary>(
     repositories: List<String>,
@@ -132,22 +127,28 @@ abstract class KotlinLibrarySearchPathResolver<L : KotlinLibrary>(
         }
     }
 
-    override fun resolve(unresolved: UnresolvedLibrary, isDefaultLink: Boolean): L {
-        val givenPath = unresolved.path
-        try {
-            val fileSequence = resolutionSequence(givenPath)
-            val matching = fileSequence
-                .filterOutPre_1_4_libraries()
-                .flatMap { libraryComponentBuilder(it, isDefaultLink).asSequence() }
-                .map { it.takeIf { libraryMatch(it, unresolved) } }
-                .filterNotNull()
+    // Default libraries could be resolved several times during findLibraries and resolveDependencies.
+    // Store already resolved libraries.
+    private val resolvedLibraries = HashMap<UnresolvedLibrary, L>()
 
-            return matching.firstOrNull() ?: run {
-                logger.fatal("Could not find \"$givenPath\" in ${searchRoots.map { it.absolutePath }}.")
+    override fun resolve(unresolved: UnresolvedLibrary, isDefaultLink: Boolean): L {
+        return resolvedLibraries.getOrPut(unresolved) {
+            val givenPath = unresolved.path
+            try {
+                val fileSequence = resolutionSequence(givenPath)
+                val matching = fileSequence
+                        .filterOutPre_1_4_libraries()
+                        .flatMap { libraryComponentBuilder(it, isDefaultLink).asSequence() }
+                        .map { it.takeIf { libraryMatch(it, unresolved) } }
+                        .filterNotNull()
+
+                matching.firstOrNull() ?: run {
+                    logger.fatal("Could not find \"$givenPath\" in ${searchRoots.map { it.absolutePath }}.")
+                }
+            } catch (e: Throwable) {
+                logger.error("Failed to resolve Kotlin library: $givenPath")
+                throw e
             }
-        } catch (e: Throwable) {
-            logger.error("Failed to resolve Kotlin library: $givenPath")
-            throw e
         }
     }
 
@@ -209,15 +210,13 @@ fun CompilerVersion.compatible(other: CompilerVersion) =
 abstract class KotlinLibraryProperResolverWithAttributes<L : KotlinLibrary>(
     repositories: List<String>,
     directLibs: List<String>,
-    override val knownAbiVersions: List<KotlinAbiVersion>?,
-    override val knownCompilerVersions: List<CompilerVersion>?,
     distributionKlib: String?,
     localKotlinDir: String?,
     skipCurrentDir: Boolean,
     override val logger: Logger,
     private val knownIrProviders: List<String>
 ) : KotlinLibrarySearchPathResolver<L>(repositories, directLibs, distributionKlib, localKotlinDir, skipCurrentDir, logger),
-    SearchPathResolverWithAttributes<L> {
+    SearchPathResolver<L> {
     override fun libraryMatch(candidate: L, unresolved: UnresolvedLibrary): Boolean {
         val candidatePath = candidate.libraryFile.absolutePath
 
@@ -225,13 +224,8 @@ abstract class KotlinLibraryProperResolverWithAttributes<L : KotlinLibrary>(
         val candidateAbiVersion = candidate.versions.abiVersion
         val candidateLibraryVersion = candidate.versions.libraryVersion
 
-
-        val abiVersionMatch = candidateAbiVersion != null &&
-                knownAbiVersions != null &&
-                knownAbiVersions!!.contains(candidateAbiVersion)
-
-        if (!abiVersionMatch) {
-            logger.warning("skipping $candidatePath. The abi versions don't match. Expected '${knownAbiVersions}', found '${candidateAbiVersion}'. The library produced by ${candidateCompilerVersion} compiler")
+        if (candidateAbiVersion?.isCompatible() != true) {
+            logger.warning("skipping $candidatePath. Incompatible abi version. The current default is '${KotlinAbiVersion.CURRENT}', found '${candidateAbiVersion}'. The library produced by ${candidateCompilerVersion} compiler")
             return false
         }
 
@@ -256,11 +250,10 @@ abstract class KotlinLibraryProperResolverWithAttributes<L : KotlinLibrary>(
 
 class SingleKlibComponentResolver(
     klibFile: String,
-    knownAbiVersions: List<KotlinAbiVersion>?,
     logger: Logger,
     knownIrProviders: List<String>
 ) : KotlinLibraryProperResolverWithAttributes<KotlinLibrary>(
-    emptyList(), listOf(klibFile), knownAbiVersions, emptyList(),
+    emptyList(), listOf(klibFile),
     null, null, false, logger, knownIrProviders
 ) {
     override fun libraryComponentBuilder(file: File, isDefault: Boolean) = createKotlinLibraryComponents(file, isDefault)
@@ -281,7 +274,7 @@ class SingleKlibComponentResolver(
 object CompilerSingleFileKlibResolveStrategy : SingleFileKlibResolveStrategy {
     override fun resolve(libraryFile: File, logger: Logger) =
         SingleKlibComponentResolver(
-            libraryFile.absolutePath, listOf(KotlinAbiVersion.CURRENT), logger, emptyList()
+            libraryFile.absolutePath, logger, emptyList()
         ).resolve(libraryFile.absolutePath)
 }
 
@@ -297,6 +290,6 @@ class CompilerSingleFileKlibResolveAllowingIrProvidersStrategy(
 ) : SingleFileKlibResolveStrategy {
     override fun resolve(libraryFile: File, logger: Logger) =
         SingleKlibComponentResolver(
-            libraryFile.absolutePath, listOf(KotlinAbiVersion.CURRENT), logger, knownIrProviders
+            libraryFile.absolutePath, logger, knownIrProviders
         ).resolve(libraryFile.absolutePath)
 }
\ No newline at end of file
diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts
index e721a7c0c62..0795c093dd8 100644
--- a/compiler/util/build.gradle.kts
+++ b/compiler/util/build.gradle.kts
@@ -6,8 +6,6 @@ plugins {
 dependencies {
     api(kotlinStdlib())
     api(project(":compiler:compiler.version"))
-    compile(project(":core:deserialization"))
-    compileOnly(project(":kotlin-reflect-api"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt b/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
index aed5a27045c..4d1a20ddfb1 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.config
 
-import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty
 
@@ -34,14 +33,6 @@ class AnalysisFlag<out T> internal constructor(
             operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, ExplicitApiMode.DISABLED)
         }
 
-        object JavaTypeEnhancementStateWarnByDefault {
-            operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, JavaTypeEnhancementState.DEFAULT)
-        }
-
-        object JvmDefaultModeDisabledByDefault {
-            operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, JvmDefaultMode.DISABLE)
-        }
-
         object ListOfStrings {
             operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, emptyList<String>())
         }
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
index 996a20fdcfa..32fe3d2ba10 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
@@ -36,6 +36,8 @@ object PathUtil {
     const val SAM_WITH_RECEIVER_PLUGIN_JAR_NAME = "$SAM_WITH_RECEIVER_PLUGIN_NAME.jar"
     const val SERIALIZATION_PLUGIN_NAME = "kotlinx-serialization-compiler-plugin"
     const val SERIALIZATION_PLUGIN_JAR_NAME = "$SERIALIZATION_PLUGIN_NAME.jar"
+    const val ANDROID_EXTENSIONS_RUNTIME_PLUGIN_JAR_NAME = "android-extensions-runtime.jar"
+    const val PARCELIZE_RUNTIME_PLUGIN_JAR_NAME = "parcelize-runtime.jar"
     const val JS_LIB_SRC_JAR_NAME = "kotlin-stdlib-js-sources.jar"
 
     const val KOTLIN_JAVA_RUNTIME_JRE7_NAME = "kotlin-stdlib-jre7"
diff --git a/core/compiler.common/src/org/jetbrains/kotlin/platform/platformUtil.kt b/core/compiler.common/src/org/jetbrains/kotlin/platform/platformUtil.kt
index 86a997e8dd5..9bb60b1c894 100644
--- a/core/compiler.common/src/org/jetbrains/kotlin/platform/platformUtil.kt
+++ b/core/compiler.common/src/org/jetbrains/kotlin/platform/platformUtil.kt
@@ -1,15 +1,17 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.platform
 
+import kotlin.reflect.KClass
+
 inline fun <reified T : SimplePlatform> TargetPlatform.subplatformsOfType(): List<T> = componentPlatforms.filterIsInstance<T>()
 fun <T> TargetPlatform.subplatformsOfType(klass: Class<T>): List<T> = componentPlatforms.filterIsInstance(klass)
 
 inline fun <reified T : SimplePlatform> TargetPlatform?.has(): Boolean = this != null && subplatformsOfType<T>().isNotEmpty()
-fun <T> TargetPlatform?.has(klass: Class<T>): Boolean = this != null && subplatformsOfType(klass).isNotEmpty()
+fun TargetPlatform?.has(klass: KClass<*>): Boolean = this != null && subplatformsOfType(klass.java).isNotEmpty()
 
 
 /**
diff --git a/core/compiler.common/src/org/jetbrains/kotlin/resolve/descriptorUtil/annotationsForResolve.kt b/core/compiler.common/src/org/jetbrains/kotlin/resolve/descriptorUtil/annotationsForResolve.kt
index a14053195e5..a2798c003e0 100644
--- a/core/compiler.common/src/org/jetbrains/kotlin/resolve/descriptorUtil/annotationsForResolve.kt
+++ b/core/compiler.common/src/org/jetbrains/kotlin/resolve/descriptorUtil/annotationsForResolve.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.resolve.descriptorUtil
 
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
@@ -16,5 +17,8 @@ val ONLY_INPUT_TYPES_FQ_NAME = FqName("kotlin.internal.OnlyInputTypes")
 val DYNAMIC_EXTENSION_FQ_NAME = FqName("kotlin.internal.DynamicExtension")
 val BUILDER_INFERENCE_ANNOTATION_FQ_NAME = FqName("kotlin.BuilderInference")
 
+val OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION_CLASS_ID = ClassId(FqName("kotlin"), Name.identifier("OverloadResolutionByLambdaReturnType"))
+val OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION_FQ_NAME = OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION_CLASS_ID.asSingleFqName()
+
 // @HidesMembers annotation only has effect for members with these names
 val HIDES_MEMBERS_NAME_LIST = setOf(Name.identifier("forEach"), Name.identifier("addSuppressed"))
diff --git a/core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
index 992c4c0a8a5..da6799b18da 100644
--- a/core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
+++ b/core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
@@ -404,12 +404,21 @@ object AbstractTypeChecker {
 
         if (subType.isStubType() || superType.isStubType()) return isStubTypeEqualsToAnything
 
-        val superTypeCaptured = superType.asCapturedType()
+        // superType might be a definitely notNull type (see KT-42824)
+        val superOriginalType = superType.asDefinitelyNotNullType()?.original() ?: superType
+        val superTypeCaptured = superOriginalType.asCapturedType()
         val lowerType = superTypeCaptured?.lowerType()
         if (superTypeCaptured != null && lowerType != null) {
+            // If superType is nullable, e.g., to check if Foo? a subtype of Captured<in Foo>?, we check the LHS, Foo?,
+            // against the nullable version of the lower type of RHS. See KT-42825
+            val nullableLowerType = if (superType.isMarkedNullable()) {
+                lowerType.withNullability(true)
+            } else {
+                if (superType.isDefinitelyNotNullType()) lowerType.makeDefinitelyNotNullOrNotNull() else lowerType
+            }
             when (getLowerCapturedTypePolicy(subType, superTypeCaptured)) {
-                CHECK_ONLY_LOWER -> return isSubtypeOf(this, subType, lowerType)
-                CHECK_SUBTYPE_AND_LOWER -> if (isSubtypeOf(this, subType, lowerType)) return true
+                CHECK_ONLY_LOWER -> return isSubtypeOf(this, subType, nullableLowerType)
+                CHECK_SUBTYPE_AND_LOWER -> if (isSubtypeOf(this, subType, nullableLowerType)) return true
                 SKIP_LOWER -> Unit
             }
         }
diff --git a/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
index d6bd8ab2765..9bb9a8020a7 100644
--- a/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
+++ b/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.types.model
 
 import org.jetbrains.kotlin.types.AbstractTypeCheckerContext
 import org.jetbrains.kotlin.types.Variance
-import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
@@ -144,12 +143,6 @@ interface TypeSystemInferenceExtensionContext : TypeSystemContext, TypeSystemBui
 
     fun KotlinTypeMarker.isBuiltinFunctionalTypeOrSubtype(): Boolean
 
-    fun KotlinTypeMarker.withNullability(nullable: Boolean): KotlinTypeMarker
-
-
-    fun KotlinTypeMarker.makeDefinitelyNotNullOrNotNull(): KotlinTypeMarker
-    fun SimpleTypeMarker.makeSimpleTypeDefinitelyNotNullOrNotNull(): SimpleTypeMarker
-
     fun createCapturedType(
         constructorProjection: TypeArgumentMarker,
         constructorSupertypes: List<KotlinTypeMarker>,
@@ -174,8 +167,6 @@ interface TypeSystemInferenceExtensionContext : TypeSystemContext, TypeSystemBui
     fun CapturedTypeMarker.typeParameter(): TypeParameterMarker?
     fun CapturedTypeMarker.withNotNullProjection(): KotlinTypeMarker
 
-    fun DefinitelyNotNullTypeMarker.original(): SimpleTypeMarker
-
     fun typeSubstitutorByTypeConstructor(map: Map<TypeConstructorMarker, KotlinTypeMarker>): TypeSubstitutorMarker
     fun createEmptySubstitutor(): TypeSubstitutorMarker
 
@@ -241,7 +232,6 @@ interface TypeSystemContext : TypeSystemOptimizationContext {
     fun KotlinTypeMarker.isError(): Boolean
     fun TypeConstructorMarker.isError(): Boolean
     fun KotlinTypeMarker.isUninferredParameter(): Boolean
-
     fun FlexibleTypeMarker.asDynamicType(): DynamicTypeMarker?
 
     fun FlexibleTypeMarker.asRawType(): RawTypeMarker?
@@ -253,12 +243,16 @@ interface TypeSystemContext : TypeSystemOptimizationContext {
     fun KotlinTypeMarker.isCapturedType() = asSimpleType()?.asCapturedType() != null
 
     fun SimpleTypeMarker.asDefinitelyNotNullType(): DefinitelyNotNullTypeMarker?
+    fun DefinitelyNotNullTypeMarker.original(): SimpleTypeMarker
+    fun KotlinTypeMarker.makeDefinitelyNotNullOrNotNull(): KotlinTypeMarker
+    fun SimpleTypeMarker.makeSimpleTypeDefinitelyNotNullOrNotNull(): SimpleTypeMarker
     fun SimpleTypeMarker.isMarkedNullable(): Boolean
     fun KotlinTypeMarker.isMarkedNullable(): Boolean =
         this is SimpleTypeMarker && isMarkedNullable()
 
     fun SimpleTypeMarker.withNullability(nullable: Boolean): SimpleTypeMarker
     fun SimpleTypeMarker.typeConstructor(): TypeConstructorMarker
+    fun KotlinTypeMarker.withNullability(nullable: Boolean): KotlinTypeMarker
 
     fun CapturedTypeMarker.typeConstructor(): CapturedTypeConstructorMarker
     fun CapturedTypeMarker.captureStatus(): CaptureStatus
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt
index c7dbcd01447..44d84d0eb6d 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt
@@ -85,7 +85,7 @@ class AnnotationTypeQualifierResolver(storageManager: StorageManager, private va
 
         return BUILT_IN_TYPE_QUALIFIER_DEFAULT_ANNOTATIONS[annotationDescriptor.fqName]?.let { qualifierForDefaultingAnnotation ->
             val state = resolveDefaultAnnotationState(annotationDescriptor).takeIf { it != ReportLevel.IGNORE } ?: return null
-            return qualifierForDefaultingAnnotation.copy(
+            qualifierForDefaultingAnnotation.copy(
                 nullabilityQualifier = qualifierForDefaultingAnnotation.nullabilityQualifier.copy(isForWarningOnly = state.isWarning)
             )
         }
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
index d33fa57941f..7abdd88f83c 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.load.java.lazy
 
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
-import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackageFragmentProviderOptimized
 import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull
 
 class LazyJavaPackageFragmentProvider(
     components: JavaResolverComponents
-) : PackageFragmentProvider {
+) : PackageFragmentProviderOptimized {
 
     private val c = LazyJavaResolverContext(components, TypeParameterResolver.EMPTY, lazyOf(null))
 
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt
index a339bea3804..b521752f4c4 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt
@@ -40,6 +40,7 @@ class JavaDescriptorResolver(
 
         if (fqName == null) return null
 
+        @Suppress("DEPRECATION")
         return packageFragmentProvider.getPackageFragments(fqName.parent()).firstOrNull()?.findClassifierByJavaClass(javaClass)
     }
 }
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index a9ca8f234ce..29fb641da9c 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -14,10 +14,8 @@ dependencies {
     testCompile(projectTests(":generators:test-generator"))
 
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
-        testRuntimeOnly(jpsStandalone()) { includeJars("jps-model") }
-    }
+    testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
+    testRuntimeOnly(jpsStandalone()) { includeJars("jps-model") }
 }
 
 sourceSets {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt
index 5fed4e669cb..7222cad74c5 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt
@@ -52,6 +52,8 @@ interface ModuleDescriptor : DeclarationDescriptor {
 
     val expectedByModules: List<ModuleDescriptor>
 
+    val allExpectedByModules: Set<ModuleDescriptor>
+
     fun <T> getCapability(capability: ModuleCapability<T>): T?
 
     class Capability<T>(val name: String) {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProvider.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProvider.kt
index 64a15597ec7..a0644a36db6 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProvider.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProvider.kt
@@ -20,27 +20,34 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
 interface PackageFragmentProvider {
-    fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) {
-        // default implementation is provided only for BWC
-        packageFragments.addAll(getPackageFragments(fqName))
-    }
-
     @Deprecated("for usages use #packageFragments(FqName) at final point, for impl use #collectPackageFragments(FqName, MutableCollection<PackageFragmentDescriptor>)")
     fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor>
 
     fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName>
 
     object Empty : PackageFragmentProvider {
-        override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) {}
-
         override fun getPackageFragments(fqName: FqName) = emptyList<PackageFragmentDescriptor>()
 
         override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean) = emptySet<FqName>()
     }
 }
 
+interface PackageFragmentProviderOptimized : PackageFragmentProvider {
+    fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>)
+}
+
 fun PackageFragmentProvider.packageFragments(fqName: FqName): List<PackageFragmentDescriptor> {
     val packageFragments = mutableListOf<PackageFragmentDescriptor>()
-    collectPackageFragments(fqName, packageFragments)
+    collectPackageFragmentsOptimizedIfPossible(fqName, packageFragments)
     return packageFragments
 }
+
+fun PackageFragmentProvider.collectPackageFragmentsOptimizedIfPossible(
+    fqName: FqName,
+    packageFragments: MutableCollection<PackageFragmentDescriptor>
+) {
+    when (this) {
+        is PackageFragmentProviderOptimized -> collectPackageFragments(fqName, packageFragments)
+        else -> packageFragments.addAll(@Suppress("DEPRECATION") getPackageFragments(fqName))
+    }
+}
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProviderImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProviderImpl.kt
index dc822c6b217..de18cfd7766 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProviderImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProviderImpl.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.Name
 
 class PackageFragmentProviderImpl(
     private val packageFragments: Collection<PackageFragmentDescriptor>
-) : PackageFragmentProvider {
+) : PackageFragmentProviderOptimized {
     override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) {
         this.packageFragments.filterTo(packageFragments) { it.fqName == fqName }
     }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java
index bd1cbdca035..aedaf8722de 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java
@@ -36,4 +36,13 @@ public interface ScriptDescriptor extends ClassDescriptor {
 
     @Nullable
     PropertyDescriptor getResultValue();
+
+    @NotNull
+    List<ValueParameterDescriptor> getExplicitConstructorParameters();
+
+    @NotNull
+    List<ValueParameterDescriptor> getImplicitReceiversParameters();
+
+    @NotNull
+    List<ValueParameterDescriptor> getScriptProvidedPropertiesParameters();
 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/CompositePackageFragmentProvider.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/CompositePackageFragmentProvider.kt
index b2cfc935b2d..3b2dab2ef0d 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/CompositePackageFragmentProvider.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/CompositePackageFragmentProvider.kt
@@ -18,13 +18,15 @@ package org.jetbrains.kotlin.descriptors.impl
 
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackageFragmentProviderOptimized
+import org.jetbrains.kotlin.descriptors.collectPackageFragmentsOptimizedIfPossible
 import org.jetbrains.kotlin.name.FqName
 import java.util.*
 import org.jetbrains.kotlin.name.Name
 
 class CompositePackageFragmentProvider(// can be modified from outside
     private val providers: List<PackageFragmentProvider>
-) : PackageFragmentProvider {
+) : PackageFragmentProviderOptimized {
 
     init {
         assert(providers.size == providers.toSet().size) {
@@ -35,14 +37,14 @@ class CompositePackageFragmentProvider(// can be modified from outside
     override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> {
         val result = ArrayList<PackageFragmentDescriptor>()
         for (provider in providers) {
-            provider.collectPackageFragments(fqName, result)
+            provider.collectPackageFragmentsOptimizedIfPossible(fqName, result)
         }
         return result.toList()
     }
 
     override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) {
         for (provider in providers) {
-            provider.collectPackageFragments(fqName, packageFragments)
+            provider.collectPackageFragmentsOptimizedIfPossible(fqName, packageFragments)
         }
     }
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
index 2d745b24777..c32cfaa0a93 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
@@ -75,7 +75,10 @@ class ModuleDescriptorImpl @JvmOverloads constructor(
         get() = this.dependencies.sure { "Dependencies of module $id were not set" }.allDependencies.filter { it != this }
 
     override val expectedByModules: List<ModuleDescriptor>
-        get() = this.dependencies.sure { "Dependencies of module $id were not set" }.expectedByDependencies
+        get() = this.dependencies.sure { "Dependencies of module $id were not set" }.directExpectedByDependencies
+
+    override val allExpectedByModules: Set<ModuleDescriptor>
+        get() = this.dependencies.sure { "Dependencies of module $id were not set" }.allExpectedByDependencies
 
     override fun getPackage(fqName: FqName): PackageViewDescriptor {
         assertValid()
@@ -118,7 +121,7 @@ class ModuleDescriptorImpl @JvmOverloads constructor(
     }
 
     fun setDependencies(descriptors: List<ModuleDescriptorImpl>, friends: Set<ModuleDescriptorImpl>) {
-        setDependencies(ModuleDependenciesImpl(descriptors, friends, emptyList()))
+        setDependencies(ModuleDependenciesImpl(descriptors, friends, emptyList(), emptySet()))
     }
 
     override fun shouldSeeInternalsOf(targetModule: ModuleDescriptor): Boolean {
@@ -154,11 +157,13 @@ class ModuleDescriptorImpl @JvmOverloads constructor(
 interface ModuleDependencies {
     val allDependencies: List<ModuleDescriptorImpl>
     val modulesWhoseInternalsAreVisible: Set<ModuleDescriptorImpl>
-    val expectedByDependencies: List<ModuleDescriptorImpl>
+    val directExpectedByDependencies: List<ModuleDescriptorImpl>
+    val allExpectedByDependencies: Set<ModuleDescriptorImpl>
 }
 
 class ModuleDependenciesImpl(
     override val allDependencies: List<ModuleDescriptorImpl>,
     override val modulesWhoseInternalsAreVisible: Set<ModuleDescriptorImpl>,
-    override val expectedByDependencies: List<ModuleDescriptorImpl>
+    override val directExpectedByDependencies: List<ModuleDescriptorImpl>,
+    override val allExpectedByDependencies: Set<ModuleDescriptorImpl>,
 ) : ModuleDependencies
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/inlineClassesUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/inlineClassesUtils.kt
index 91d6094ee33..2c3a5bf9ea6 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/inlineClassesUtils.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/inlineClassesUtils.kt
@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.resolve
 
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeSubstitutor
 import org.jetbrains.kotlin.types.TypeUtils
@@ -64,6 +63,7 @@ fun CallableDescriptor.isGetterOfUnderlyingPropertyOfInlineClass() =
     this is PropertyGetterDescriptor && correspondingProperty.isUnderlyingPropertyOfInlineClass()
 
 fun VariableDescriptor.isUnderlyingPropertyOfInlineClass(): Boolean {
+    if (extensionReceiverParameter != null) return false
     val containingDeclaration = this.containingDeclaration
     if (!containingDeclaration.isInlineClass()) return false
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
index 857768d90bc..9ac55d4ee28 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
@@ -107,6 +107,12 @@ public class ErrorUtils {
                 return emptyList();
             }
 
+            @NotNull
+            @Override
+            public Set<ModuleDescriptor> getAllExpectedByModules() {
+                return emptySet();
+            }
+
             @Override
             public <R, D> R accept(@NotNull DeclarationDescriptorVisitor<R, D> visitor, D data) {
                 return null;
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeCheckerContext.kt b/core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeCheckerContext.kt
index 9aaf1f2160f..47b2463e5d8 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeCheckerContext.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeCheckerContext.kt
@@ -47,10 +47,10 @@ open class ClassicTypeCheckerContext(
     override val isStubTypeEqualsToAnything: Boolean
         get() = stubTypeEqualsToAnything
 
-    override fun areEqualTypeConstructors(a: TypeConstructorMarker, b: TypeConstructorMarker): Boolean {
-        require(a is TypeConstructor, a::errorMessage)
-        require(b is TypeConstructor, b::errorMessage)
-        return areEqualTypeConstructors(a, b)
+    override fun areEqualTypeConstructors(c1: TypeConstructorMarker, c2: TypeConstructorMarker): Boolean {
+        require(c1 is TypeConstructor, c1::errorMessage)
+        require(c2 is TypeConstructor, c2::errorMessage)
+        return areEqualTypeConstructors(c1, c2)
     }
 
     open fun areEqualTypeConstructors(a: TypeConstructor, b: TypeConstructor): Boolean = when {
@@ -89,4 +89,4 @@ open class ClassicTypeCheckerContext(
 
 private fun Any.errorMessage(): String {
     return "ClassicTypeCheckerContext couldn't handle ${this::class} $this"
-}
\ No newline at end of file
+}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AbstractDeserializedPackageFragmentProvider.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AbstractDeserializedPackageFragmentProvider.kt
index 7780b4a1cce..48f3b14e273 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AbstractDeserializedPackageFragmentProvider.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AbstractDeserializedPackageFragmentProvider.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
-import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackageFragmentProviderOptimized
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.storage.StorageManager
@@ -28,7 +28,7 @@ abstract class AbstractDeserializedPackageFragmentProvider(
     protected val storageManager: StorageManager,
     protected val finder: KotlinMetadataFinder,
     protected val moduleDescriptor: ModuleDescriptor
-) : PackageFragmentProvider {
+) : PackageFragmentProviderOptimized {
     protected lateinit var components: DeserializationComponents
 
     private val fragments = storageManager.createMemoizedFunctionWithNullableValues<FqName, PackageFragmentDescriptor> { fqName ->
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
index 6eda126338e..69efe153489 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
@@ -168,7 +168,8 @@ class DeserializedClassDescriptor(
 
     override fun getSealedSubclasses() = sealedSubclasses()
 
-    override fun toString() = "deserialized ${if (isExpect()) "expect" else ""} class $name" // not using descriptor render to preserve laziness
+    override fun toString() =
+        "deserialized ${if (isExpect) "expect " else ""}class $name" // not using descriptor renderer to preserve laziness
 
     override fun getSource() = sourceElement
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
index ffa77b52a1e..275064758b2 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
@@ -99,24 +99,13 @@ abstract class DeserializedMemberScope protected constructor(
         return impl.getContributedVariables(name, location)
     }
 
-    /**
-     * N.B. Currently the order of declarations here and in the [MemberComparator] is intentionally different:
-     * [MemberComparator] places classes first and typealiases second.
-     *
-     * However, `ClassClsStubBuilder` places typealiases first and classes second. This leads to
-     * Stub vs Psi mismatch error, when we have a class which have both inner typealiases and inner classes.
-     * This is unintentional and should be fixed.
-     *
-     * We do not want to update stubs versions prematurely, so we temporary mitigate the issue by making sure that
-     * order in stubs (in `ClassClsStubBuilder`) and here (in [DeserializedMemberScope]) is the same. As soon as the
-     * opportunity to bump the stubs version arises, we should fix the bug in the `ClassClsStubBuilder`, and
-     * fix the order here accordingly.
-     */
     protected fun computeDescriptors(
         kindFilter: DescriptorKindFilter,
         nameFilter: (Name) -> Boolean,
         location: LookupLocation
     ): Collection<DeclarationDescriptor> {
+        //NOTE: descriptors should be in the same order they were serialized in
+        // see MemberComparator
         val result = ArrayList<DeclarationDescriptor>(0)
 
         if (kindFilter.acceptsKinds(DescriptorKindFilter.SINGLETON_CLASSIFIERS_MASK)) {
@@ -125,14 +114,6 @@ abstract class DeserializedMemberScope protected constructor(
 
         impl.addFunctionsAndPropertiesTo(result, kindFilter, nameFilter, location)
 
-        if (kindFilter.acceptsKinds(DescriptorKindFilter.TYPE_ALIASES_MASK)) {
-            for (typeAliasName in impl.typeAliasNames) {
-                if (nameFilter(typeAliasName)) {
-                    result.addIfNotNull(impl.getTypeAliasByName(typeAliasName))
-                }
-            }
-        }
-
         if (kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK)) {
             for (className in classNames) {
                 if (nameFilter(className)) {
@@ -141,6 +122,14 @@ abstract class DeserializedMemberScope protected constructor(
             }
         }
 
+        if (kindFilter.acceptsKinds(DescriptorKindFilter.TYPE_ALIASES_MASK)) {
+            for (typeAliasName in impl.typeAliasNames) {
+                if (nameFilter(typeAliasName)) {
+                    result.addIfNotNull(impl.getTypeAliasByName(typeAliasName))
+                }
+            }
+        }
+
         return result.compact()
     }
 
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/InlineClassAwareCaller.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/InlineClassAwareCaller.kt
index 4e867a5bbf7..6e3187ec6fa 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/InlineClassAwareCaller.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/InlineClassAwareCaller.kt
@@ -76,7 +76,8 @@ internal class InlineClassAwareCaller<out M : Member?>(
             else -> 0
         }
 
-        val extraArgumentsTail = if (isDefault) 2 else 0
+        val extraArgumentsTail = (if (isDefault) 2 else 0) +
+                (if (descriptor is FunctionDescriptor && descriptor.isSuspend) 1 else 0)
 
         val kotlinParameterTypes: List<KotlinType> = ArrayList<KotlinType>().also { kotlinParameterTypes ->
             val extensionReceiverType = descriptor.extensionReceiverParameter?.type
diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
index 6ef9d8f7257..6a48f0c8e2c 100644
--- a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
+++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "org.jetbrains.kotlin"
-version = "0.0.20"
+version = "0.0.21"
 
 repositories {
     mavenCentral()
diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
index bd3cef41421..20505223d6a 100644
--- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
+++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
@@ -101,6 +101,16 @@ class KotlinBuildProperties(
 
     val localBootstrapPath: String? = getOrNull("bootstrap.local.path") as String?
 
+    val useIR: Boolean = getBoolean("kotlin.build.useIR")
+
+    val useIRForLibraries: Boolean = getBoolean("kotlin.build.useIRForLibraries")
+
+    val useFir: Boolean = getBoolean("kotlin.build.useFir")
+
+    val useFirForLibraries: Boolean = getBoolean("kotlin.build.useFirForLibraries")
+
+    val useFirIdeaPlugin: Boolean = getBoolean("idea.fir.plugin")
+
     val teamCityBootstrapVersion: String? = getOrNull("bootstrap.teamcity.kotlin.version") as String?
 
     val teamCityBootstrapBuildNumber: String? = getOrNull("bootstrap.teamcity.build.number") as String?
@@ -143,4 +153,4 @@ val Settings.kotlinBuildProperties: KotlinBuildProperties
     get() = extensions.findByName(extensionName) as KotlinBuildProperties?
         ?: KotlinBuildProperties(SettingsProperties(this)).also {
             extensions.add(extensionName, it)
-        }
\ No newline at end of file
+        }
diff --git a/dependencies/tools-jar-api/build.gradle.kts b/dependencies/tools-jar-api/build.gradle.kts
index e8e093fd56b..5bd79972988 100644
--- a/dependencies/tools-jar-api/build.gradle.kts
+++ b/dependencies/tools-jar-api/build.gradle.kts
@@ -1,8 +1,5 @@
-import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
-import org.jetbrains.org.objectweb.asm.ClassReader
+import org.jetbrains.org.objectweb.asm.*
 import org.jetbrains.org.objectweb.asm.ClassReader.SKIP_CODE
-import org.jetbrains.org.objectweb.asm.ClassVisitor
-import org.jetbrains.org.objectweb.asm.ClassWriter
 import org.jetbrains.org.objectweb.asm.Opcodes.*
 import java.util.zip.ZipFile
 
@@ -20,11 +17,9 @@ val runtimeElements by configurations.creating {
 
 val JDK_18: String by rootProject.extra
 val toolsJarFile = toolsJarFile(jdkHome = File(JDK_18)) ?: error("Couldn't find tools.jar in $JDK_18")
-
-// tools.jar from JDK has different public api on different platforms which makes impossible to reuse caches
-// for tasks which depend on it. Since we can't compile against those classes & stay cross-platform anyway,
-// we may just exclude them from compile classpath. Since method bodies are not required for compilation
-// strip them out to remove noise between different versions.
+val usedInternalApiPackages = listOf(
+    "com/sun/tools/javac" // Used in KAPT
+)
 
 val toolsJarStubs by tasks.registering {
     inputs.file(toolsJarFile)
@@ -33,6 +28,7 @@ val toolsJarStubs by tasks.registering {
     outputs.dir(outDir)
 
     doLast {
+        outDir.deleteRecursively()
         val zipFile = ZipFile(toolsJarFile)
         zipFile.stream()
             .filter { it.name.endsWith(".class") }
@@ -40,12 +36,37 @@ val toolsJarStubs by tasks.registering {
                 zipFile.getInputStream(zipEntry).use { entryStream ->
                     val classReader = ClassReader(entryStream)
                     val classWriter = ClassWriter( 0)
+                    var isExported = false
                     classReader.accept(object : ClassVisitor(API_VERSION, classWriter) {
+                        override fun visit(
+                            version: Int,
+                            access: Int,
+                            name: String?,
+                            signature: String?,
+                            superName: String?,
+                            interfaces: Array<out String>?
+                        ) {
+                            val isPublic = access and ACC_PUBLIC != 0
+                            if (isPublic && usedInternalApiPackages.any { name?.startsWith(it) == true }) {
+                                isExported = true
+                            }
 
+                            super.visit(version, access, name, signature, superName, interfaces)
+                        }
+                        override fun visitAnnotation(descriptor: String?, visible: Boolean): AnnotationVisitor {
+                            if (descriptor == "Ljdk/Exported;") {
+                                isExported = true
+                            }
+
+                            return super.visitAnnotation(descriptor, visible)
+                        }
                     }, SKIP_CODE)
-                    val result = File(outDir, zipEntry.name)
-                    result.ensureParentDirsCreated()
-                    result.writeBytes(classWriter.toByteArray())
+
+                    if (isExported) {
+                        val result = File(outDir, zipEntry.name)
+                        result.parentFile.mkdirs()
+                        result.writeBytes(classWriter.toByteArray())
+                    }
                 }
             }
     }
@@ -54,32 +75,7 @@ val toolsJarStubs by tasks.registering {
 val jar = tasks.register<Jar>("jar") {
     dependsOn(toolsJarStubs)
     from {
-        fileTree(toolsJarStubs.get().outputs.files.singleFile).matching {
-            exclude("META-INF/**")
-
-            exclude("sun/tools/attach/LinuxAttachProvider.class")
-            exclude("sun/tools/attach/LinuxVirtualMachine*")
-
-            exclude("sun/tools/attach/BsdAttachProvider.class")
-            exclude("sun/tools/attach/BsdVirtualMachine*")
-
-            exclude("sun/tools/attach/WindowsAttachProvider.class")
-            exclude("sun/tools/attach/WindowsVirtualMachine*")
-
-            // Windows only classes
-            exclude("com/sun/tools/jdi/SharedMemoryAttachingConnector$1.class")
-            exclude("com/sun/tools/jdi/SharedMemoryAttachingConnector.class")
-            exclude("com/sun/tools/jdi/SharedMemoryConnection.class")
-            exclude("com/sun/tools/jdi/SharedMemoryListeningConnector$1.class")
-            exclude("com/sun/tools/jdi/SharedMemoryListeningConnector.class")
-            exclude("com/sun/tools/jdi/SharedMemoryTransportService${'$'}SharedMemoryListenKey.class")
-            exclude("com/sun/tools/jdi/SharedMemoryTransportService.class")
-            exclude("com/sun/tools/jdi/SharedMemoryTransportServiceCapabilities.class")
-            exclude("com/sun/tools/jdi/SunSDK.class")
-
-            // Deprecated class which has differences in api between versions
-            exclude("com/sun/tools/javadoc/JavaScriptScanner.class")
-        }
+        fileTree(toolsJarStubs.get().outputs.files.singleFile)
     }
 }
 
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index 24af3bdc15c..56404acce8e 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -27,7 +27,7 @@ val (interpreterSourceSet, interpreterApi) = extraSourceSet("interpreter")
 
 dependencies {
     // for GeneratorsFileUtil
-    compile(kotlinStdlib())
+    compile(kotlinStdlib("jdk8"))
     compile(intellijDep()) { includeJars("util") }
 
     builtinsApi("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") { isTransitive = false }
diff --git a/generators/main/GeneratorsFileUtil.kt b/generators/main/GeneratorsFileUtil.kt
index 8b6fdd222bf..cf45f05a5e7 100644
--- a/generators/main/GeneratorsFileUtil.kt
+++ b/generators/main/GeneratorsFileUtil.kt
@@ -8,10 +8,10 @@ import com.intellij.openapi.util.SystemInfo
 import com.intellij.openapi.util.text.StringUtil
 import java.io.File
 import java.io.IOException
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
+import kotlin.io.path.*
 
 object GeneratorsFileUtil {
+    @OptIn(ExperimentalPathApi::class)
     @JvmStatic
     @JvmOverloads
     @Throws(IOException::class)
@@ -31,13 +31,14 @@ object GeneratorsFileUtil {
             return
         }
         val useTempFile = !SystemInfo.isWindows
+        val targetFile = file.toPath()
         val tempFile =
-            if (useTempFile) File(createTempDir(file.name), file.name + ".tmp") else file
+            if (useTempFile) createTempDirectory(targetFile.name) / "${targetFile.name}.tmp" else targetFile
         tempFile.writeText(newText, Charsets.UTF_8)
-        println("File written: " + tempFile.absolutePath)
+        println("File written: ${tempFile.toAbsolutePath()}")
         if (useTempFile) {
-            Files.move(tempFile.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING)
-            println("Renamed $tempFile to $file")
+            tempFile.moveTo(targetFile, overwrite = true)
+            println("Renamed $tempFile to $targetFile")
         }
         println()
     }
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 4ad91838165..6b04d526dc7 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -17,10 +17,7 @@ import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBoxTest
 import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBytecodeShapeTest
 import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidIrBoxTest
 import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidSyntheticPropertyDescriptorTest
-import org.jetbrains.kotlin.asJava.classes.AbstractUltraLightClassLoadingTest
-import org.jetbrains.kotlin.asJava.classes.AbstractUltraLightClassSanityTest
-import org.jetbrains.kotlin.asJava.classes.AbstractUltraLightFacadeClassTest
-import org.jetbrains.kotlin.asJava.classes.AbstractUltraLightScriptLoadingTest
+import org.jetbrains.kotlin.asJava.classes.*
 import org.jetbrains.kotlin.checkers.*
 import org.jetbrains.kotlin.copyright.AbstractUpdateKotlinCopyrightTest
 import org.jetbrains.kotlin.findUsages.*
@@ -1222,6 +1219,20 @@ fun main(args: Array<String>) {
             }
         }
 
+        testGroup("idea/idea-fir/tests", "compiler/testData") {
+            testClass<AbstractFirLightClassTest> {
+                model("asJava/lightClasses", excludeDirs = listOf("delegation", "script"), pattern = KT_WITHOUT_DOTS_IN_NAME)
+            }
+
+            testClass<AbstractFirClassLoadingTest> {
+                model("asJava/ultraLightClasses", pattern = KT_OR_KTS)
+            }
+
+            testClass<AbstractFirLightFacadeClassTest> {
+                model("asJava/ultraLightFacades", pattern = KT_OR_KTS)
+            }
+        }
+
         testGroup("idea/idea-completion/tests", "idea/idea-completion/testData") {
             testClass<AbstractCompiledKotlinInJavaCompletionTest> {
                 model("injava", extension = "java", recursive = false)
diff --git a/gradle.properties b/gradle.properties
index 3c72a90844c..60aa6b515ad 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ kotlin.compiler.newInferenceEnabled=true
 #maven.repository.mirror=http://repository.jetbrains.com/remote-repos/
 #bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
 #bootstrap.kotlin.version=1.1.50-dev-1451
-bootstrap.kotlin.default.version=1.4.30-dev-1423
+bootstrap.kotlin.default.version=1.4.30-dev-2196
 
 kotlin.build.publishing.attempts=20
 #signingRequired=true
diff --git a/gradle/versions.properties.193 b/gradle/versions.properties.193
deleted file mode 100644
index 0d985de36f1..00000000000
--- a/gradle/versions.properties.193
+++ /dev/null
@@ -1,18 +0,0 @@
-versions.intellijSdk=193.6494.35
-versions.androidBuildTools=r23.0.1
-versions.idea.NodeJS=181.3494.12
-versions.jar.asm-all=7.0.1
-versions.jar.guava=27.1-jre
-versions.jar.groovy-all=2.4.17
-versions.jar.lombok-ast=0.2.3
-versions.jar.swingx-core=1.6.2-2
-versions.jar.kxml2=2.3.0
-versions.jar.streamex=0.6.8
-versions.jar.gson=2.8.5
-versions.jar.oro=2.0.8
-versions.jar.picocontainer=1.2
-versions.jar.serviceMessages=2019.1.4
-versions.jar.lz4-java=1.6.0
-ignore.jar.snappy-in-java=true
-versions.gradle-api=4.5.1
-versions.shadow=5.2.0
\ No newline at end of file
diff --git a/gradle/versions.properties.as42 b/gradle/versions.properties.as42
index f2de0b7e5c4..31a6cad549b 100644
--- a/gradle/versions.properties.as42
+++ b/gradle/versions.properties.as42
@@ -1,8 +1,8 @@
 versions.intellijSdk=202.6397.94
 versions.androidBuildTools=r23.0.1
 versions.idea.NodeJS=193.6494.7
-versions.androidStudioRelease=4.2.0.13
-versions.androidStudioBuild=202.6863838
+versions.androidStudioRelease=4.2.0.16
+versions.androidStudioBuild=202.6939830
 versions.jar.asm-all=8.0.1
 versions.jar.guava=29.0-jre
 versions.jar.groovy=2.5.11
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 590ccdcb9a4..2dfd4cd040a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
-distributionSha256Sum=7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionSha256Sum=8ad57759019a9233dc7dc4d1a530cefe109dc122000d57f7e623f8cf4ba9dfc4
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 064bbc21a9e..f86fdd2e425 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -6,9 +6,6 @@ plugins {
 }
 
 val kotlinVersion: String by rootProject.extra
-val isFirPlugin: Boolean
-    get() = rootProject.findProperty("idea.fir.plugin") == "true"
-
 
 repositories {
     maven("https://jetbrains.bintray.com/markdown")
@@ -28,7 +25,7 @@ sourceSets {
             "idea-repl/resources",
             "resources-en"
         )
-        if (isFirPlugin) {
+        if (kotlinBuildProperties.useFirIdeaPlugin) {
             resources.srcDir("resources-fir")
         } else {
             resources.srcDir("resources-descriptors")
@@ -95,17 +92,14 @@ dependencies {
     compileOnly(project(":kotlin-daemon-client"))
 
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntime(intellijPluginDep("java"))
-    }
 
-    Platform[193].orHigher {
-        implementation(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))
-        Ide.IJ {
-            implementation(intellijPluginDep("stats-collector"))
-        }
+    compileOnly(intellijPluginDep("java"))
+    testCompileOnly(intellijPluginDep("java"))
+    testRuntime(intellijPluginDep("java"))
+
+    implementation(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))
+    Ide.IJ {
+        implementation(intellijPluginDep("stats-collector"))
     }
 
     compileOnly(commonDep("org.jetbrains", "markdown"))
@@ -189,7 +183,7 @@ dependencies {
     testRuntime(intellijPluginDep("smali"))
     testRuntime(intellijPluginDep("testng"))
 
-    if (isFirPlugin) {
+    if (kotlinBuildProperties.useFirIdeaPlugin) {
         testRuntime(project(":idea:idea-fir"))
     }
 
@@ -229,4 +223,4 @@ projectTest(parallel = true) {
 
 configureFormInstrumentation()
 
-testsJar()
\ No newline at end of file
+testsJar()
diff --git a/idea/formatter/build.gradle.kts b/idea/formatter/build.gradle.kts
index 77679d76b69..b81f849c879 100644
--- a/idea/formatter/build.gradle.kts
+++ b/idea/formatter/build.gradle.kts
@@ -8,9 +8,7 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 }
 
 sourceSets {
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.193 b/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.193
deleted file mode 100644
index b7670d34e5d..00000000000
--- a/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.193
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.util
-
-import com.intellij.AbstractBundle
-
-abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : AbstractBundle(pathToBundle) {
-    protected fun String.withHtml(): String = "<html>$this</html>"
-}
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
index 63fca1e3dc0..c8afb190af6 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
@@ -49,13 +49,13 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
 
     //region Classes
 
-    override fun processAllClassNames(processor: StringProcessor): Boolean {
+    override fun processAllClassNames(processor: Processor<in String>): Boolean {
         if (disableSearch.get()) return true
         return KotlinClassShortNameIndex.getInstance().processAllKeys(project, processor) &&
                 KotlinFileFacadeShortNameIndex.INSTANCE.processAllKeys(project, processor)
     }
 
-    override fun processAllClassNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
+    override fun processAllClassNames(processor: Processor<in String>, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
         if (disableSearch.get()) return true
         return processAllClassNames(processor)
     }
@@ -150,7 +150,11 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
 
     //region Methods
 
-    override fun processAllMethodNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
+    override fun processAllMethodNames(
+        processor: Processor<in String>,
+        scope: GlobalSearchScope,
+        filter: IdFilter?
+    ): Boolean {
         if (disableSearch.get()) return true
         return processAllMethodNames(processor)
     }
@@ -162,7 +166,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
         }
     }
 
-    private fun processAllMethodNames(processor: StringProcessor): Boolean {
+    private fun processAllMethodNames(processor: Processor<in String>): Boolean {
         if (disableSearch.get()) return true
         if (!KotlinFunctionShortNameIndex.getInstance().processAllKeys(project, processor)) {
             return false
@@ -245,7 +249,11 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
         }
     }
 
-    override fun processMethodsWithName(name: String, scope: GlobalSearchScope, processor: PsiMethodProcessor): Boolean {
+    override fun processMethodsWithName(
+        name: String,
+        scope: GlobalSearchScope,
+        processor: Processor<in PsiMethod>
+    ): Boolean {
         if (disableSearch.get()) return true
         return ContainerUtil.process(getMethodsByName(name, scope), processor)
     }
@@ -253,7 +261,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
 
     //region Fields
 
-    override fun processAllFieldNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
+    override fun processAllFieldNames(processor: Processor<in String>, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
         if (disableSearch.get()) return true
         return processAllFieldNames(processor)
     }
@@ -265,7 +273,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
         }
     }
 
-    private fun processAllFieldNames(processor: StringProcessor): Boolean {
+    private fun processAllFieldNames(processor: Processor<in String>): Boolean {
         if (disableSearch.get()) return true
         return KotlinPropertyShortNameIndex.getInstance().processAllKeys(project, processor)
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt
deleted file mode 100644
index a265dd04b7d..00000000000
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.caches
-
-import com.intellij.psi.PsiMethod
-import com.intellij.util.Processor
-
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias StringProcessor = Processor<in String>
-typealias PsiMethodProcessor = Processor<in PsiMethod>
-
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.193 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.193
deleted file mode 100644
index 1b2cf1f7396..00000000000
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.193
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.caches
-
-import com.intellij.psi.PsiMethod
-import com.intellij.util.Processor
-
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias StringProcessor = Processor<String>
-typealias PsiMethodProcessor = Processor<PsiMethod>
-
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
index 372013b9479..805f6ed485b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
@@ -36,9 +36,21 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.utils.sure
 
-class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSupport() {
+open class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSupport() {
     private val psiManager: PsiManager = PsiManager.getInstance(project)
 
+    protected open fun createLightClassForSourceDeclaration(classOrObject: KtClassOrObject): KtLightClass? =
+        KtLightClassForSourceDeclaration.create(classOrObject)
+
+    protected open fun createLightClassForScript(script: KtScript): KtLightClass? =
+        KtLightClassForScript.create(script)
+
+    protected open fun createLightClassForFacade(
+        manager: PsiManager,
+        facadeClassFqName: FqName,
+        searchScope: GlobalSearchScope
+    ): KtLightClass? = KtLightClassForFacade.createForFacade(psiManager, facadeClassFqName, searchScope)
+
     override fun getFacadeNames(packageFqName: FqName, scope: GlobalSearchScope): Collection<String> {
         val facadeFilesInPackage = project.runReadActionInSmartMode {
             KotlinFileFacadeClassByPackageIndex.getInstance().get(packageFqName.asString(), project, scope)
@@ -139,7 +151,7 @@ class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSupport
         if (virtualFile != null) {
             when {
                 ProjectRootsUtil.isProjectSourceFile(project, virtualFile) ->
-                    return KtLightClassForSourceDeclaration.create(classOrObject)
+                    return createLightClassForSourceDeclaration(classOrObject)
                 ProjectRootsUtil.isLibraryClassFile(project, virtualFile) ->
                     return getLightClassForDecompiledClassOrObject(classOrObject)
                 ProjectRootsUtil.isLibrarySourceFile(project, virtualFile) ->
@@ -152,17 +164,17 @@ class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSupport
             classOrObject.containingFile.originalFile.virtualFile != null
         ) {
             // explicit request to create light class from dummy.kt
-            return KtLightClassForSourceDeclaration.create(classOrObject)
+            return createLightClassForSourceDeclaration(classOrObject)
         }
         return null
     }
 
-    override fun getLightClassForScript(script: KtScript): KtLightClassForScript? {
+    override fun getLightClassForScript(script: KtScript): KtLightClass? {
         if (!script.isValid) {
             return null
         }
 
-        return KtLightClassForScript.create(script)
+        return createLightClassForScript(script)
     }
 
     override fun getFacadeClasses(facadeFqName: FqName, scope: GlobalSearchScope): Collection<PsiClass> {
@@ -229,7 +241,7 @@ class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSupport
 
     private fun tryCreateFacadesForSourceFiles(moduleInfo: IdeaModuleInfo, facadeFqName: FqName): PsiClass? {
         if (moduleInfo !is ModuleSourceInfo && moduleInfo !is PlatformModuleInfo) return null
-        return KtLightClassForFacade.createForFacade(psiManager, facadeFqName, moduleInfo.contentScope())
+        return createLightClassForFacade(psiManager, facadeFqName, moduleInfo.contentScope())
     }
 
     override fun findFilesForFacade(facadeFqName: FqName, scope: GlobalSearchScope): Collection<KtFile> {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
index 96adfd6ff51..00c01264e52 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
@@ -81,6 +81,7 @@ class IDELightClassGenerationSupport(project: Project) : LightClassGenerationSup
             KotlinTypeMapper(
                 BindingContext.EMPTY, ClassBuilderMode.LIGHT_CLASSES,
                 moduleName, languageVersionSettings,
+                useOldInlineClassesManglingScheme = false,
                 jvmTarget = JvmTarget.JVM_1_8,
                 typePreprocessor = KotlinType::cleanFromAnonymousTypes,
                 namePreprocessor = ::tryGetPredefinedName
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt
index a6529c054b2..dabe3a6dfb5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt
@@ -47,7 +47,7 @@ open class KotlinMetadataStubBuilder(
                 val context = components.createContext(nameResolver, packageFqName, TypeTable(packageProto.typeTable))
 
                 val fileStub = createFileStub(packageFqName, isScript = false)
-                createDeclarationsStubs(
+                createPackageDeclarationsStubs(
                     fileStub, context,
                     ProtoContainer.Package(packageFqName, context.nameResolver, context.typeTable, source = null),
                     packageProto
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
index 506bc686f73..d966f000fd8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
@@ -26,15 +26,14 @@ import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.serialization.deserialization.getName
 
-fun createDeclarationsStubs(
+fun createPackageDeclarationsStubs(
     parentStub: StubElement<out PsiElement>,
     outerContext: ClsStubBuilderContext,
-    protoContainer: ProtoContainer,
+    protoContainer: ProtoContainer.Package,
     packageProto: ProtoBuf.Package
 ) {
-    createDeclarationsStubs(
-        parentStub, outerContext, protoContainer, packageProto.functionList, packageProto.propertyList, packageProto.typeAliasList
-    )
+    createDeclarationsStubs(parentStub, outerContext, protoContainer, packageProto.functionList, packageProto.propertyList)
+    createTypeAliasesStubs(parentStub, outerContext, protoContainer, packageProto.typeAliasList)
 }
 
 fun createDeclarationsStubs(
@@ -43,7 +42,6 @@ fun createDeclarationsStubs(
     protoContainer: ProtoContainer,
     functionProtos: List<ProtoBuf.Function>,
     propertyProtos: List<ProtoBuf.Property>,
-    typeAliasesProtos: List<ProtoBuf.TypeAlias>
 ) {
     for (propertyProto in propertyProtos) {
         if (!shouldSkip(propertyProto.flags, outerContext.nameResolver.getName(propertyProto.name))) {
@@ -55,7 +53,14 @@ fun createDeclarationsStubs(
             FunctionClsStubBuilder(parentStub, outerContext, protoContainer, functionProto).build()
         }
     }
+}
 
+fun createTypeAliasesStubs(
+    parentStub: StubElement<out PsiElement>,
+    outerContext: ClsStubBuilderContext,
+    protoContainer: ProtoContainer,
+    typeAliasesProtos: List<ProtoBuf.TypeAlias>
+) {
     for (typeAliasProto in typeAliasesProtos) {
         createTypeAliasStub(parentStub, typeAliasProto, protoContainer, outerContext)
     }
@@ -139,7 +144,7 @@ private class FunctionClsStubBuilder(
                 .map { ClassIdWithTarget(it, AnnotationUseSiteTarget.RECEIVER) }
         }
 
-    override val returnType: ProtoBuf.Type?
+    override val returnType: ProtoBuf.Type
         get() = functionProto.returnType(c.typeTable)
 
     override fun createValueParameterList() {
@@ -153,6 +158,9 @@ private class FunctionClsStubBuilder(
             listOf(VISIBILITY, OPERATOR, INFIX, EXTERNAL_FUN, INLINE, TAILREC, SUSPEND) + modalityModifier
         )
 
+        // If function is marked as having no annotations, we don't create stubs for it
+        if (!Flags.HAS_ANNOTATIONS.get(functionProto.flags)) return
+
         val annotationIds = c.components.annotationLoader.loadCallableAnnotations(
             protoContainer, functionProto, AnnotatedCallableKind.FUNCTION
         )
@@ -192,7 +200,7 @@ private class PropertyClsStubBuilder(
             .loadExtensionReceiverParameterAnnotations(protoContainer, propertyProto, AnnotatedCallableKind.PROPERTY_GETTER)
             .map { ClassIdWithTarget(it, AnnotationUseSiteTarget.RECEIVER) }
 
-    override val returnType: ProtoBuf.Type?
+    override val returnType: ProtoBuf.Type
         get() = propertyProto.returnType(c.typeTable)
 
     override fun createValueParameterList() {
@@ -207,6 +215,9 @@ private class PropertyClsStubBuilder(
             listOf(VISIBILITY, LATEINIT, EXTERNAL_PROPERTY) + constModifier + modalityModifier
         )
 
+        // If field is marked as having no annotations, we don't create stubs for it
+        if (!Flags.HAS_ANNOTATIONS.get(propertyProto.flags)) return
+
         val propertyAnnotations =
             c.components.annotationLoader.loadCallableAnnotations(protoContainer, propertyProto, AnnotatedCallableKind.PROPERTY)
         val backingFieldAnnotations =
@@ -260,6 +271,9 @@ private class ConstructorClsStubBuilder(
     override fun createModifierListStub() {
         val modifierListStubImpl = createModifierListStubForDeclaration(callableStub, constructorProto.flags, listOf(VISIBILITY))
 
+        // If constructor is marked as having no annotations, we don't create stubs for it
+        if (!Flags.HAS_ANNOTATIONS.get(constructorProto.flags)) return
+
         val annotationIds = c.components.annotationLoader.loadCallableAnnotations(
             protoContainer, constructorProto, AnnotatedCallableKind.FUNCTION
         )
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
index 579d6968648..608a6b77610 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
@@ -178,6 +178,7 @@ private class ClassClsStubBuilder(
         createCompanionObjectStub(classBody)
         createCallableMemberStubs(classBody)
         createInnerAndNestedClasses(classBody)
+        createTypeAliasesStubs(classBody)
     }
 
     private fun createCompanionObjectStub(classBody: KotlinPlaceHolderStubImpl<KtClassBody>) {
@@ -219,10 +220,7 @@ private class ClassClsStubBuilder(
             }
         }
 
-        // FIXME using this function breaks the order of `MemberComparator` (see KT-41859)
-        createDeclarationsStubs(
-            classBody, c, thisAsProtoContainer, classProto.functionList, classProto.propertyList, classProto.typeAliasList
-        )
+        createDeclarationsStubs(classBody, c, thisAsProtoContainer, classProto.functionList, classProto.propertyList)
     }
 
     private fun isClass(): Boolean {
@@ -245,6 +243,10 @@ private class ClassClsStubBuilder(
         }
     }
 
+    private fun createTypeAliasesStubs(classBody: KotlinPlaceHolderStubImpl<KtClassBody>) {
+        createTypeAliasesStubs(classBody, c, thisAsProtoContainer, classProto.typeAliasList)
+    }
+
     private fun createNestedClassStub(classBody: StubElement<out PsiElement>, nestedClassId: ClassId) {
         val (nameResolver, classProto, _, sourceElement) =
             c.components.classDataFinder.findClassData(nestedClassId)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
index 0495951abaa..fcfb0f43b83 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
@@ -50,7 +50,7 @@ fun createPackageFacadeStub(
 ): KotlinFileStubImpl {
     val fileStub = KotlinFileStubForIde.forFile(packageFqName, isScript = false)
     setupFileStub(fileStub, packageFqName)
-    createDeclarationsStubs(
+    createPackageDeclarationsStubs(
         fileStub, c, ProtoContainer.Package(packageFqName, c.nameResolver, c.typeTable, source = null), packageProto
     )
     return fileStub
@@ -68,7 +68,7 @@ fun createFileFacadeStub(
         packageFqName, c.nameResolver, c.typeTable,
         JvmPackagePartSource(JvmClassName.byClassId(ClassId.topLevel(facadeFqName)), null, packageProto, c.nameResolver)
     )
-    createDeclarationsStubs(fileStub, c, container, packageProto)
+    createPackageDeclarationsStubs(fileStub, c, container, packageProto)
     return fileStub
 }
 
@@ -90,7 +90,7 @@ fun createMultifileClassStub(
             packageFqName, partContext.nameResolver, partContext.typeTable,
             JvmPackagePartSource(partFile, packageProto, nameResolver)
         )
-        createDeclarationsStubs(fileStub, partContext, container, packageProto)
+        createPackageDeclarationsStubs(fileStub, partContext, container, packageProto)
     }
     return fileStub
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompilerBase.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompilerBase.kt
index f6e38226811..9a3b3d551c9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompilerBase.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompilerBase.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackageFragmentProviderOptimized
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor
 import org.jetbrains.kotlin.name.ClassId
@@ -28,7 +29,7 @@ abstract class DeserializerForDecompilerBase(val directoryPackageFqName: FqName)
 
     protected val moduleDescriptor: ModuleDescriptorImpl = createDummyModule("module for building decompiled sources")
 
-    protected val packageFragmentProvider: PackageFragmentProvider = object : PackageFragmentProvider {
+    protected val packageFragmentProvider: PackageFragmentProvider = object : PackageFragmentProviderOptimized {
         override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) {
             packageFragments.add(createDummyPackageFragment(fqName))
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AnnotationPresentationInfo.kt.193 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AnnotationPresentationInfo.kt.193
deleted file mode 100644
index 107e57169c9..00000000000
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AnnotationPresentationInfo.kt.193
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.highlighter
-
-import com.intellij.codeInsight.intention.EmptyIntentionAction
-import com.intellij.codeInsight.intention.IntentionAction
-import com.intellij.codeInspection.ProblemHighlightType
-import com.intellij.lang.annotation.Annotation
-import com.intellij.lang.annotation.AnnotationHolder
-import com.intellij.openapi.editor.colors.TextAttributesKey
-import com.intellij.openapi.util.TextRange
-import com.intellij.util.containers.MultiMap
-import org.jetbrains.kotlin.diagnostics.Diagnostic
-import org.jetbrains.kotlin.diagnostics.Severity
-import org.jetbrains.kotlin.idea.inspections.KotlinUniversalQuickFix
-
-class AnnotationPresentationInfo(
-    val ranges: List<TextRange>,
-    val nonDefaultMessage: String? = null,
-    val highlightType: ProblemHighlightType? = null,
-    val textAttributes: TextAttributesKey? = null
-) {
-
-    fun processDiagnostics(holder: AnnotationHolder, diagnostics: List<Diagnostic>, fixesMap: MultiMap<Diagnostic, IntentionAction>) {
-        for (range in ranges) {
-            for (diagnostic in diagnostics) {
-                val fixes = fixesMap[diagnostic]
-                val annotation = create(diagnostic, range, holder)
-
-                fixes.forEach {
-                    when (it) {
-                        is KotlinUniversalQuickFix -> annotation.registerUniversalFix(it, null, null)
-                        is IntentionAction -> annotation.registerFix(it)
-                    }
-                }
-
-                if (diagnostic.severity == Severity.WARNING) {
-                    annotation.problemGroup = KotlinSuppressableWarningProblemGroup(diagnostic.factory)
-
-                    if (fixes.isEmpty()) {
-                        // if there are no quick fixes we need to register an EmptyIntentionAction to enable 'suppress' actions
-                        annotation.registerFix(EmptyIntentionAction(diagnostic.factory.name))
-                    }
-                }
-            }
-        }
-    }
-
-    private fun create(diagnostic: Diagnostic, range: TextRange, holder: AnnotationHolder): Annotation =
-        Diagnostic2Annotation.createAnnotation(
-            diagnostic,
-            range,
-            holder,
-            nonDefaultMessage,
-            textAttributes,
-            highlightType,
-            IdeErrorMessages::render
-        )
-}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/modules/ModuleHighlightUtil2.java.193 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/modules/ModuleHighlightUtil2.java.193
deleted file mode 100644
index 053f070e51d..00000000000
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/modules/ModuleHighlightUtil2.java.193
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.modules;
-
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.vfs.JarFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiJavaFile;
-import com.intellij.psi.PsiJavaModule;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.impl.light.LightJavaModule;
-import kotlin.collections.ArraysKt;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.core.FileIndexUtilsKt;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import static com.intellij.psi.PsiJavaModule.MODULE_INFO_FILE;
-
-// Copied from com.intellij.codeInsight.daemon.impl.analysis.ModuleHighlightUtil
-public class ModuleHighlightUtil2 {
-    private static final Attributes.Name MULTI_RELEASE = new Attributes.Name("Multi-Release");
-
-    @Nullable
-    static PsiJavaModule getModuleDescriptor(@NotNull VirtualFile file, @NotNull Project project) {
-        ProjectFileIndex index = ProjectFileIndex.SERVICE.getInstance(project);
-        if (index.isInLibrary(file)) {
-            VirtualFile root;
-            if ((root = index.getClassRootForFile(file)) != null) {
-                VirtualFile descriptorFile = root.findChild(PsiJavaModule.MODULE_INFO_CLS_FILE);
-                if (descriptorFile == null) {
-                    VirtualFile alt = root.findFileByRelativePath("META-INF/versions/9/" + PsiJavaModule.MODULE_INFO_CLS_FILE);
-                    if (alt != null && isMultiReleaseJar(root)) {
-                        descriptorFile = alt;
-                    }
-                }
-                if (descriptorFile != null) {
-                    PsiFile psiFile = PsiManager.getInstance(project).findFile(descriptorFile);
-                    if (psiFile instanceof PsiJavaFile) {
-                        return ((PsiJavaFile) psiFile).getModuleDeclaration();
-                    }
-                }
-                else if (root.getFileSystem() instanceof JarFileSystem && "jar".equalsIgnoreCase(root.getExtension())) {
-                    return LightJavaModule.getModule(PsiManager.getInstance(project), root);
-                }
-            }
-            else if ((root = index.getSourceRootForFile(file)) != null) {
-                VirtualFile descriptorFile = root.findChild(MODULE_INFO_FILE);
-                if (descriptorFile != null) {
-                    PsiFile psiFile = PsiManager.getInstance(project).findFile(descriptorFile);
-                    if (psiFile instanceof PsiJavaFile) {
-                        return ((PsiJavaFile) psiFile).getModuleDeclaration();
-                    }
-                }
-            }
-        }
-        else {
-            Module module = index.getModuleForFile(file);
-            if (module != null) {
-                boolean isTest = FileIndexUtilsKt.isInTestSourceContentKotlinAware(index, file);
-                VirtualFile modularRoot = ArraysKt.singleOrNull(ModuleRootManager.getInstance(module).getSourceRoots(isTest),
-                                                                root -> root.findChild(MODULE_INFO_FILE) != null);
-                if (modularRoot != null) {
-                    VirtualFile moduleInfo = modularRoot.findChild(MODULE_INFO_FILE);
-                    assert moduleInfo != null : modularRoot;
-                    PsiFile psiFile = PsiManager.getInstance(project).findFile(moduleInfo);
-                    if (psiFile instanceof PsiJavaFile) {
-                        return ((PsiJavaFile) psiFile).getModuleDeclaration();
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private static boolean isMultiReleaseJar(VirtualFile root) {
-        if (root.getFileSystem() instanceof JarFileSystem) {
-            VirtualFile manifest = root.findFileByRelativePath(JarFile.MANIFEST_NAME);
-            if (manifest != null) {
-                try (InputStream stream = manifest.getInputStream()) {
-                    return Boolean.valueOf(new Manifest(stream).getMainAttributes().getValue(MULTI_RELEASE));
-                }
-                catch (IOException ignored) {
-                }
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/versioning.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/versioning.kt
index 6e510513b1e..bb1df504666 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/versioning.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/versioning.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 
 fun isEap(version: String): Boolean {
-    return version.contains("rc") || version.contains("eap") || version.contains("-M")
+    return version.contains("rc") || version.contains("eap") || version.contains("-M") || version.contains("RC")
 }
 
 fun isDev(version: String): Boolean {
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt
index 9945894273d..6cca2d0b1d3 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt
@@ -6,10 +6,7 @@
 package org.jetbrains.kotlin.idea.completion.test.handlers
 
 import com.intellij.codeInsight.completion.CompletionType
-import com.intellij.codeInsight.lookup.LookupElement
-import com.intellij.codeInsight.lookup.LookupElementPresentation
-import com.intellij.codeInsight.lookup.LookupEvent
-import com.intellij.codeInsight.lookup.LookupManager
+import com.intellij.codeInsight.lookup.*
 import com.intellij.codeInsight.lookup.impl.LookupImpl
 import com.intellij.openapi.project.Project
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
@@ -136,7 +133,7 @@ abstract class CompletionHandlerTestBase : KotlinLightCodeInsightFixtureTestCase
             if (lookup.currentItem != item) { // do not touch selection if not changed - important for char filter tests
                 lookup.currentItem = item
             }
-            lookup.setFocusedFocusDegree()
+            lookup.lookupFocusDegree = LookupFocusDegree.FOCUSED
             if (LookupEvent.isSpecialCompletionChar(completionChar)) {
                 lookup.finishLookup(completionChar)
             } else {
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt
deleted file mode 100644
index b40f0149539..00000000000
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.completion.test.handlers
-
-import com.intellij.codeInsight.lookup.LookupFocusDegree
-import com.intellij.codeInsight.lookup.impl.LookupImpl
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun LookupImpl.setFocusedFocusDegree() {
-    this.lookupFocusDegree = LookupFocusDegree.FOCUSED
-}
\ No newline at end of file
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt.193 b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt.193
deleted file mode 100644
index fdd15cc431c..00000000000
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt.193
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.completion.test.handlers
-
-import com.intellij.codeInsight.lookup.impl.LookupImpl
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun LookupImpl.setFocusedFocusDegree() {
-    focusDegree = LookupImpl.FocusDegree.FOCUSED
-}
\ No newline at end of file
diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index ca419c0cd0f..4705c035796 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -31,10 +31,8 @@ dependencies {
 
     compileOnly(intellijDep())
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
-    
+    compileOnly(intellijPluginDep("java"))
+
     compileOnly(intellijPluginDep("gradle"))
 }
 
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt
index fac55d36536..83e91491184 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt
@@ -24,7 +24,7 @@ import com.intellij.psi.impl.java.stubs.index.JavaShortClassNameIndex
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.PsiShortNamesCache
 import com.intellij.psi.stubs.StubIndex
-import org.jetbrains.kotlin.idea.caches.PsiMethodProcessor
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
 
 // Allow searching java classes in jars in script dependencies, this is needed for stuff like completion and autoimport
@@ -47,7 +47,11 @@ class JavaClassesInScriptDependenciesShortNameCache(private val project: Project
 
     override fun getMethodsByNameIfNotMoreThan(name: String, scope: GlobalSearchScope, maxCount: Int): Array<PsiMethod> = PsiMethod.EMPTY_ARRAY
 
-    override fun processMethodsWithName(name: String, scope: GlobalSearchScope, processor: PsiMethodProcessor) = true
+    override fun processMethodsWithName(
+        name: String,
+        scope: GlobalSearchScope,
+        processor: Processor<in PsiMethod>
+    ) = true
 
     override fun getAllFieldNames() = emptyArray<String>()
 
diff --git a/idea/idea-fir-performance-tests/build.gradle.kts b/idea/idea-fir-performance-tests/build.gradle.kts
index 40386845a4d..5e390461d87 100644
--- a/idea/idea-fir-performance-tests/build.gradle.kts
+++ b/idea/idea-fir-performance-tests/build.gradle.kts
@@ -29,9 +29,7 @@ dependencies {
     testCompileOnly(intellijDep())
     testRuntime(intellijDep())
 
-    Platform[192].orHigher {
-        compile(intellijPluginDep("java"))
-    }
+    compile(intellijPluginDep("java"))
 }
 
 sourceSets {
@@ -39,7 +37,7 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-if (rootProject.findProperty("idea.fir.plugin") == "true") {
+if (kotlinBuildProperties.useFirIdeaPlugin) {
     projectTest(parallel = true) {
         dependsOn(":dist")
         workingDir = rootDir
@@ -90,4 +88,4 @@ projectTest(taskName = "ideaFirPerformanceTest") {
             systemProperty("kotlin.test.gradle.import.arguments", "-PcacheRedirectorEnabled=$it")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-fir-performance-tests/tests/org/jetbrains/kotlin/idea/highlighter/AbstractFirHighlightingPerformanceTest.kt b/idea/idea-fir-performance-tests/tests/org/jetbrains/kotlin/idea/highlighter/AbstractFirHighlightingPerformanceTest.kt
index 3b3d0d0bd8a..8f23d1d76d6 100644
--- a/idea/idea-fir-performance-tests/tests/org/jetbrains/kotlin/idea/highlighter/AbstractFirHighlightingPerformanceTest.kt
+++ b/idea/idea-fir-performance-tests/tests/org/jetbrains/kotlin/idea/highlighter/AbstractFirHighlightingPerformanceTest.kt
@@ -47,8 +47,7 @@ abstract class AbstractFirHighlightingPerformanceTest : AbstractHighlightingTest
     override fun tearDown() {
         commitAllDocuments()
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { stats.flush() }
+            ThrowableRunnable { super.tearDown() }
         ).run()
     }
 
diff --git a/idea/idea-fir/build.gradle.kts b/idea/idea-fir/build.gradle.kts
index 1240187e69c..40925a12564 100644
--- a/idea/idea-fir/build.gradle.kts
+++ b/idea/idea-fir/build.gradle.kts
@@ -25,9 +25,7 @@ dependencies {
     testCompileOnly(intellijDep())
     testRuntime(intellijDep())
 
-    Platform[192].orHigher {
-        compile(intellijPluginDep("java"))
-    }
+    compile(intellijPluginDep("java"))
 }
 
 sourceSets {
@@ -35,11 +33,11 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-if (rootProject.findProperty("idea.fir.plugin") == "true") {
+if (kotlinBuildProperties.useFirIdeaPlugin) {
     projectTest(parallel = true) {
         dependsOn(":dist")
         workingDir = rootDir
     }
 }
 
-testsJar()
\ No newline at end of file
+testsJar()
diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
new file mode 100644
index 00000000000..3c741617e5d
--- /dev/null
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.caches.resolve
+
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiManager
+import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.util.CachedValueProvider
+import com.intellij.psi.util.CachedValuesManager
+import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.asJava.classes.shouldNotBeVisibleAsLightClass
+import org.jetbrains.kotlin.idea.asJava.FirLightClassForFacade
+import org.jetbrains.kotlin.idea.asJava.FirLightClassForSymbol
+import org.jetbrains.kotlin.idea.frontend.api.analyze
+import org.jetbrains.kotlin.idea.util.ifTrue
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtEnumEntry
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtScript
+
+class IDEKotlinAsJavaFirSupport(project: Project) : IDEKotlinAsJavaSupport(project) {
+
+
+    //TODO Make caching
+    override fun createLightClassForFacade(manager: PsiManager, facadeClassFqName: FqName, searchScope: GlobalSearchScope): KtLightClass? {
+        val sources = findFilesForFacade(facadeClassFqName, searchScope)
+            .filterNot { it.isCompiled }
+
+        if (sources.isEmpty()) return null
+
+        return FirLightClassForFacade(manager, facadeClassFqName, sources)
+    }
+
+    override fun createLightClassForScript(script: KtScript): KtLightClass? = null
+
+    private fun KtClassOrObject.isSupportedByFitLightClasses() =
+        containingFile.let { it is KtFile && !it.isCompiled } &&
+                !isLocal /*TODO*/ &&
+                this !is KtEnumEntry /*TODO*/ &&
+                !shouldNotBeVisibleAsLightClass()
+
+    override fun createLightClassForSourceDeclaration(classOrObject: KtClassOrObject): KtLightClass? =
+        classOrObject.isSupportedByFitLightClasses().ifTrue {
+            CachedValuesManager.getCachedValue(classOrObject) {
+                CachedValueProvider.Result
+                    .create(
+                        FirLightClassForSymbol(
+                            analyze(classOrObject) { classOrObject.getClassOrObjectSymbol() },
+                            classOrObject.manager
+                        ),
+                        KotlinModificationTrackerService.getInstance(classOrObject.project).outOfBlockModificationTracker
+                    )
+            }
+        }
+}
\ No newline at end of file
diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
index 868e12de9f0..58c610c2b4f 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
@@ -9,6 +9,7 @@ import com.intellij.codeInsight.completion.*
 import com.intellij.patterns.PlatformPatterns
 import com.intellij.patterns.PsiJavaPatterns
 import com.intellij.util.ProcessingContext
+import org.jetbrains.kotlin.idea.fir.low.level.api.util.originalKtFile
 import org.jetbrains.kotlin.idea.frontend.api.InvalidWayOfUsingAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.getAnalysisSessionFor
@@ -71,9 +72,16 @@ private class KotlinAvailableScopesCompletionProvider(prefixMatcher: PrefixMatch
         lookupElementFactory.createLookupElement(symbol)?.let(::addElement)
     }
 
+    private fun recordOriginalFile(completionParameters: CompletionParameters) {
+        val originalFile = completionParameters.originalFile as? KtFile ?: return
+        val fakeFile = completionParameters.position.containingFile as? KtFile ?: return
+        fakeFile.originalKtFile = originalFile
+    }
+
     @OptIn(InvalidWayOfUsingAnalysisSession::class)
     fun addCompletions(parameters: CompletionParameters, result: CompletionResultSet) {
         val originalFile = parameters.originalFile as? KtFile ?: return
+        recordOriginalFile(parameters)
 
         val reference = (parameters.position.parent as? KtSimpleNameExpression)?.mainReference ?: return
         val nameExpression = reference.expression.takeIf { it !is KtLabelReferenceExpression } ?: return
diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FunctionCallHighlightingVisitor.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FunctionCallHighlightingVisitor.kt
index a81200665a3..3a90c7c15d9 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FunctionCallHighlightingVisitor.kt
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FunctionCallHighlightingVisitor.kt
@@ -8,9 +8,7 @@ package org.jetbrains.kotlin.idea.fir.highlighter.visitors
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import org.jetbrains.kotlin.idea.frontend.api.*
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtAnonymousFunctionSymbol
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorSymbol
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
@@ -66,6 +64,7 @@ internal class FunctionCallHighlightingVisitor(
                 function.symbolKind == KtSymbolKind.TOP_LEVEL -> Colors.PACKAGE_FUNCTION_CALL
                 else -> Colors.FUNCTION_CALL
             }
+            else -> Colors.FUNCTION_CALL //TODO ()
         }
         callInfo is VariableAsFunctionCallInfo -> Colors.VARIABLE_AS_FUNCTION_CALL
         callInfo is VariableAsFunctionLikeCallInfo -> Colors.VARIABLE_AS_FUNCTION_LIKE_CALL
diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirClassLoadingTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirClassLoadingTest.kt
new file mode 100644
index 00000000000..7cc888354e2
--- /dev/null
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirClassLoadingTest.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.asJava.classes
+
+import com.intellij.openapi.application.ApplicationManager
+import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
+import org.jetbrains.kotlin.doTestWithFIRFlagsByPath
+import org.jetbrains.kotlin.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.debugger.readAction
+import org.jetbrains.kotlin.idea.perf.UltraLightChecker
+import org.jetbrains.kotlin.idea.perf.UltraLightChecker.checkByJavaFile
+import org.jetbrains.kotlin.idea.perf.UltraLightChecker.getJavaFileForTest
+import org.jetbrains.kotlin.idea.perf.UltraLightChecker.renderLightClasses
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.KotlinTestUtils
+import java.io.File
+
+abstract class AbstractFirClassLoadingTest : AbstractUltraLightClassLoadingTest() {
+
+    override fun isFirPlugin(): Boolean = true
+
+    override fun doTest(testDataPath: String) = doTestWithFIRFlagsByPath(testDataPath) {
+        doTestImpl(testDataPath)
+    }
+
+    private fun doTestImpl(testDataPath: String) {
+
+        val testDataFile = File(testDataPath)
+        val sourceText = testDataFile.readText()
+        val file = myFixture.addFileToProject(testDataPath, sourceText) as KtFile
+
+        val classFabric = KotlinAsJavaSupport.getInstance(project)
+
+        val expectedTextFile = getJavaFileForTest(testDataPath)
+
+        val renderedClasses = executeOnPooledThreadInReadAction {
+            val lightClasses = UltraLightChecker.allClasses(file).mapNotNull { classFabric.getLightClass(it) }
+            renderLightClasses(testDataPath, lightClasses)
+        }!!
+
+        KotlinTestUtils.assertEqualsToFile(expectedTextFile, renderedClasses)
+    }
+}
diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightClassTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightClassTest.kt
new file mode 100644
index 00000000000..3555abe7814
--- /dev/null
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightClassTest.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.asJava.classes
+
+import org.jetbrains.kotlin.asJava.LightClassTestCommon
+import org.jetbrains.kotlin.doTestWithFIRFlagsByPath
+import org.jetbrains.kotlin.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.caches.resolve.PsiElementChecker
+import org.jetbrains.kotlin.idea.caches.resolve.findClass
+import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.KotlinTestUtils
+import java.io.File
+
+abstract class AbstractFirLightClassTest : KotlinLightCodeInsightFixtureTestCase() {
+
+    override fun isFirPlugin(): Boolean = true
+
+    fun doTest(path: String) = doTestWithFIRFlagsByPath(path) {
+        doTestImpl()
+    }
+
+    private fun doTestImpl() {
+        val fileName = fileName()
+        val extraFilePath = when {
+            fileName.endsWith(fileExtension) -> fileName.replace(fileExtension, ".extra" + fileExtension)
+            else -> error("Invalid test data extension")
+        }
+
+        val testFiles = if (File(testDataPath, extraFilePath).isFile) listOf(fileName, extraFilePath) else listOf(fileName)
+
+        myFixture.configureByFiles(*testFiles.toTypedArray())
+        if ((myFixture.file as? KtFile)?.isScript() == true) {
+            error { "FIR for scripts does not supported yet" }
+            ScriptConfigurationManager.updateScriptDependenciesSynchronously(myFixture.file)
+        }
+
+        val ktFile = myFixture.file as KtFile
+        val testData = testDataFile()
+
+        val actual = executeOnPooledThreadInReadAction {
+            LightClassTestCommon.getActualLightClassText(
+                testData,
+                { fqName ->
+                    findClass(fqName, ktFile, project)?.apply {
+                        PsiElementChecker.checkPsiElementStructure(this)
+                    }
+                },
+                { it }
+            )
+        }!!
+
+        KotlinTestUtils.assertEqualsToFile(KotlinTestUtils.replaceExtension(testData, "java"), actual)
+    }
+
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+
+    open val fileExtension = ".kt"
+}
\ No newline at end of file
diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightFacadeClassTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightFacadeClassTest.kt
new file mode 100644
index 00000000000..7844c1322d5
--- /dev/null
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightFacadeClassTest.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.asJava.classes
+
+import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
+import org.jetbrains.kotlin.doTestWithFIRFlagsByPath
+import org.jetbrains.kotlin.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.perf.UltraLightChecker
+import org.jetbrains.kotlin.idea.perf.UltraLightChecker.checkByJavaFile
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.test.KotlinTestUtils
+
+abstract class AbstractFirLightFacadeClassTest : AbstractUltraLightFacadeClassTest() {
+
+    override fun isFirPlugin(): Boolean = true
+
+    override fun doTest(testDataPath: String) = doTestWithFIRFlagsByPath(testDataPath) {
+        super.doTest(testDataPath)
+    }
+
+    override fun checkLightFacades(testDataPath: String, facades: Collection<String>, scope: GlobalSearchScope) {
+
+        val expectedTextFile = UltraLightChecker.getJavaFileForTest(testDataPath)
+
+        val classFabric = KotlinAsJavaSupport.getInstance(project)
+
+        val renderedResult = executeOnPooledThreadInReadAction {
+            val lightClasses = facades.flatMap {
+                classFabric.getFacadeClasses(FqName(it), scope)
+            }.filterIsInstance<KtLightClass>()
+            UltraLightChecker.renderLightClasses(testDataPath, lightClasses)
+        }!!
+
+        KotlinTestUtils.assertEqualsToFile(expectedTextFile, renderedResult)
+    }
+}
diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirClassLoadingTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirClassLoadingTestGenerated.java
new file mode 100644
index 00000000000..e3396f98fbb
--- /dev/null
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirClassLoadingTestGenerated.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.asJava.classes;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("compiler/testData/asJava/ultraLightClasses")
+@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public class FirClassLoadingTestGenerated extends AbstractFirClassLoadingTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+    }
+
+    public void testAllFilesPresentInUltraLightClasses() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/ultraLightClasses"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
+    }
+
+    @TestMetadata("annotationWithSetParamPropertyModifier.kt")
+    public void testAnnotationWithSetParamPropertyModifier() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt");
+    }
+
+    @TestMetadata("annotations.kt")
+    public void testAnnotations() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/annotations.kt");
+    }
+
+    @TestMetadata("classModifiers.kt")
+    public void testClassModifiers() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/classModifiers.kt");
+    }
+
+    @TestMetadata("constructors.kt")
+    public void testConstructors() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/constructors.kt");
+    }
+
+    @TestMetadata("coroutines.kt")
+    public void testCoroutines() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/coroutines.kt");
+    }
+
+    @TestMetadata("dataClasses.kt")
+    public void testDataClasses() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/dataClasses.kt");
+    }
+
+    @TestMetadata("delegatesWithAnnotations.kt")
+    public void testDelegatesWithAnnotations() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt");
+    }
+
+    @TestMetadata("delegatingToInterfaces.kt")
+    public void testDelegatingToInterfaces() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.kt");
+    }
+
+    @TestMetadata("dollarsInNameLocal.kt")
+    public void testDollarsInNameLocal() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt");
+    }
+
+    @TestMetadata("enums.kt")
+    public void testEnums() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/enums.kt");
+    }
+
+    @TestMetadata("generics.kt")
+    public void testGenerics() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/generics.kt");
+    }
+
+    @TestMetadata("implementingKotlinCollections.kt")
+    public void testImplementingKotlinCollections() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.kt");
+    }
+
+    @TestMetadata("importAliases.kt")
+    public void testImportAliases() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/importAliases.kt");
+    }
+
+    @TestMetadata("inferringAnonymousObjectTypes.kt")
+    public void testInferringAnonymousObjectTypes() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt");
+    }
+
+    @TestMetadata("inheritance.kt")
+    public void testInheritance() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/inheritance.kt");
+    }
+
+    @TestMetadata("inlineClasses.kt")
+    public void testInlineClasses() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/inlineClasses.kt");
+    }
+
+    @TestMetadata("inlineOnly.kt")
+    public void testInlineOnly() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/inlineOnly.kt");
+    }
+
+    @TestMetadata("inlineReified.kt")
+    public void testInlineReified() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/inlineReified.kt");
+    }
+
+    @TestMetadata("jvmField.kt")
+    public void testJvmField() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/jvmField.kt");
+    }
+
+    @TestMetadata("jvmName.kt")
+    public void testJvmName() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/jvmName.kt");
+    }
+
+    @TestMetadata("jvmOverloads.kt")
+    public void testJvmOverloads() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt");
+    }
+
+    @TestMetadata("jvmSynthetic.kt")
+    public void testJvmSynthetic() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt");
+    }
+
+    @TestMetadata("jvmSyntheticForAccessors.kt")
+    public void testJvmSyntheticForAccessors() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt");
+    }
+
+    @TestMetadata("jvmWildcardAnnotations.kt")
+    public void testJvmWildcardAnnotations() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.kt");
+    }
+
+    @TestMetadata("lateinitProperty.kt")
+    public void testLateinitProperty() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/lateinitProperty.kt");
+    }
+
+    @TestMetadata("localClassDerived.kt")
+    public void testLocalClassDerived() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/localClassDerived.kt");
+    }
+
+    @TestMetadata("objects.kt")
+    public void testObjects() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/objects.kt");
+    }
+
+    @TestMetadata("properties.kt")
+    public void testProperties() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/properties.kt");
+    }
+
+    @TestMetadata("simpleFunctions.kt")
+    public void testSimpleFunctions() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/simpleFunctions.kt");
+    }
+
+    @TestMetadata("throwsAnnotation.kt")
+    public void testThrowsAnnotation() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt");
+    }
+
+    @TestMetadata("typeAliases.kt")
+    public void testTypeAliases() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/typeAliases.kt");
+    }
+
+    @TestMetadata("typeAnnotations.kt")
+    public void testTypeAnnotations() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt");
+    }
+
+    @TestMetadata("wildcardOptimization.kt")
+    public void testWildcardOptimization() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt");
+    }
+}
diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightClassTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightClassTestGenerated.java
new file mode 100644
index 00000000000..9281c68683a
--- /dev/null
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightClassTestGenerated.java
@@ -0,0 +1,493 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.asJava.classes;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("compiler/testData/asJava/lightClasses")
+@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public class FirLightClassTestGenerated extends AbstractFirLightClassTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+    }
+
+    public void testAllFilesPresentInLightClasses() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "delegation", "script");
+    }
+
+    @TestMetadata("AnnotatedParameterInEnumConstructor.kt")
+    public void testAnnotatedParameterInEnumConstructor() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt");
+    }
+
+    @TestMetadata("AnnotatedParameterInInnerClassConstructor.kt")
+    public void testAnnotatedParameterInInnerClassConstructor() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
+    }
+
+    @TestMetadata("AnnotatedPropertyWithSites.kt")
+    public void testAnnotatedPropertyWithSites() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt");
+    }
+
+    @TestMetadata("AnnotationClass.kt")
+    public void testAnnotationClass() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
+    }
+
+    @TestMetadata("DataClassWithCustomImplementedMembers.kt")
+    public void testDataClassWithCustomImplementedMembers() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
+    }
+
+    @TestMetadata("DelegatedNested.kt")
+    public void testDelegatedNested() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
+    }
+
+    @TestMetadata("Delegation.kt")
+    public void testDelegation() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/Delegation.kt");
+    }
+
+    @TestMetadata("DeprecatedEnumEntry.kt")
+    public void testDeprecatedEnumEntry() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
+    }
+
+    @TestMetadata("DeprecatedNotHiddenInClass.kt")
+    public void testDeprecatedNotHiddenInClass() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
+    }
+
+    @TestMetadata("DollarsInName.kt")
+    public void testDollarsInName() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/DollarsInName.kt");
+    }
+
+    @TestMetadata("DollarsInNameNoPackage.kt")
+    public void testDollarsInNameNoPackage() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
+    }
+
+    @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
+    public void testExtendingInterfaceWithDefaultImpls() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
+    }
+
+    @TestMetadata("HiddenDeprecated.kt")
+    public void testHiddenDeprecated() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
+    }
+
+    @TestMetadata("HiddenDeprecatedInClass.kt")
+    public void testHiddenDeprecatedInClass() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
+    }
+
+    @TestMetadata("InheritingInterfaceDefaultImpls.kt")
+    public void testInheritingInterfaceDefaultImpls() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
+    }
+
+    @TestMetadata("InlineReified.kt")
+    public void testInlineReified() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/InlineReified.kt");
+    }
+
+    @TestMetadata("JvmNameOnMember.kt")
+    public void testJvmNameOnMember() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
+    }
+
+    @TestMetadata("JvmStatic.kt")
+    public void testJvmStatic() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/JvmStatic.kt");
+    }
+
+    @TestMetadata("NestedObjects.kt")
+    public void testNestedObjects() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/NestedObjects.kt");
+    }
+
+    @TestMetadata("NonDataClassWithComponentFunctions.kt")
+    public void testNonDataClassWithComponentFunctions() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
+    }
+
+    @TestMetadata("PublishedApi.kt")
+    public void testPublishedApi() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/PublishedApi.kt");
+    }
+
+    @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
+    public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
+    }
+
+    @TestMetadata("StubOrderForOverloads.kt")
+    public void testStubOrderForOverloads() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+    }
+
+    @TestMetadata("TypePararametersInClass.kt")
+    public void testTypePararametersInClass() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/TypePararametersInClass.kt");
+    }
+
+    @TestMetadata("VarArgs.kt")
+    public void testVarArgs() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/VarArgs.kt");
+    }
+
+    @TestMetadata("compiler/testData/asJava/lightClasses/compilationErrors")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class CompilationErrors extends AbstractFirLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("ActualClass.kt")
+        public void testActualClass() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt");
+        }
+
+        @TestMetadata("ActualTypeAlias.kt")
+        public void testActualTypeAlias() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt");
+        }
+
+        @TestMetadata("ActualTypeAliasCustomJvmPackageName.kt")
+        public void testActualTypeAliasCustomJvmPackageName() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
+        }
+
+        public void testAllFilesPresentInCompilationErrors() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("AllInlineOnly.kt")
+        public void testAllInlineOnly() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt");
+        }
+
+        @TestMetadata("AnnotationModifiers.kt")
+        public void testAnnotationModifiers() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt");
+        }
+
+        @TestMetadata("EnumNameOverride.kt")
+        public void testEnumNameOverride() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.kt");
+        }
+
+        @TestMetadata("ExpectClass.kt")
+        public void testExpectClass() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt");
+        }
+
+        @TestMetadata("ExpectObject.kt")
+        public void testExpectObject() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt");
+        }
+
+        @TestMetadata("ExpectedNestedClass.kt")
+        public void testExpectedNestedClass() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt");
+        }
+
+        @TestMetadata("ExpectedNestedClassInObject.kt")
+        public void testExpectedNestedClassInObject() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
+        }
+
+        @TestMetadata("JvmPackageName.kt")
+        public void testJvmPackageName() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt");
+        }
+
+        @TestMetadata("LocalInAnnotation.kt")
+        public void testLocalInAnnotation() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt");
+        }
+
+        @TestMetadata("PrivateInTrait.kt")
+        public void testPrivateInTrait() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt");
+        }
+
+        @TestMetadata("RepetableAnnotations.kt")
+        public void testRepetableAnnotations() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt");
+        }
+
+        @TestMetadata("SameName.kt")
+        public void testSameName() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt");
+        }
+
+        @TestMetadata("TopLevelDestructuring.kt")
+        public void testTopLevelDestructuring() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt");
+        }
+
+        @TestMetadata("TraitClassObjectField.kt")
+        public void testTraitClassObjectField() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt");
+        }
+
+        @TestMetadata("TwoOverrides.kt")
+        public void testTwoOverrides() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.kt");
+        }
+
+        @TestMetadata("WrongAnnotations.kt")
+        public void testWrongAnnotations() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/asJava/lightClasses/facades")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Facades extends AbstractFirLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFacades() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("AllPrivate.kt")
+        public void testAllPrivate() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
+        }
+
+        @TestMetadata("MultiFile.kt")
+        public void testMultiFile() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
+        }
+
+        @TestMetadata("SingleFile.kt")
+        public void testSingleFile() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
+        }
+
+        @TestMetadata("SingleJvmClassName.kt")
+        public void testSingleJvmClassName() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/asJava/lightClasses/ideRegression")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class IdeRegression extends AbstractFirLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInIdeRegression() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("AllOpenAnnotatedClasses.kt")
+        public void testAllOpenAnnotatedClasses() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
+        }
+
+        @TestMetadata("ImplementingCharSequenceAndNumber.kt")
+        public void testImplementingCharSequenceAndNumber() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
+        }
+
+        @TestMetadata("ImplementingMap.kt")
+        public void testImplementingMap() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt");
+        }
+
+        @TestMetadata("ImplementingMutableSet.kt")
+        public void testImplementingMutableSet() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt");
+        }
+
+        @TestMetadata("InheritingInterfaceDefaultImpls.kt")
+        public void testInheritingInterfaceDefaultImpls() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
+        }
+
+        @TestMetadata("OverridingFinalInternal.kt")
+        public void testOverridingFinalInternal() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt");
+        }
+
+        @TestMetadata("OverridingInternal.kt")
+        public void testOverridingInternal() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt");
+        }
+
+        @TestMetadata("OverridingProtected.kt")
+        public void testOverridingProtected() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class NullabilityAnnotations extends AbstractFirLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("Class.kt")
+        public void testClass() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+        }
+
+        @TestMetadata("ClassObjectField.kt")
+        public void testClassObjectField() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+        }
+
+        @TestMetadata("ClassWithConstructor.kt")
+        public void testClassWithConstructor() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+        }
+
+        @TestMetadata("ClassWithConstructorAndProperties.kt")
+        public void testClassWithConstructorAndProperties() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+        }
+
+        @TestMetadata("FileFacade.kt")
+        public void testFileFacade() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
+        }
+
+        @TestMetadata("Generic.kt")
+        public void testGeneric() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+        }
+
+        @TestMetadata("IntOverridesAny.kt")
+        public void testIntOverridesAny() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+        }
+
+        @TestMetadata("JvmOverloads.kt")
+        public void testJvmOverloads() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
+        }
+
+        @TestMetadata("NullableUnitReturn.kt")
+        public void testNullableUnitReturn() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+        }
+
+        @TestMetadata("OverrideAnyWithUnit.kt")
+        public void testOverrideAnyWithUnit() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+        }
+
+        @TestMetadata("PlatformTypes.kt")
+        public void testPlatformTypes() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
+        }
+
+        @TestMetadata("Primitives.kt")
+        public void testPrimitives() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+        }
+
+        @TestMetadata("PrivateInClass.kt")
+        public void testPrivateInClass() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+        }
+
+        @TestMetadata("Synthetic.kt")
+        public void testSynthetic() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+        }
+
+        @TestMetadata("Trait.kt")
+        public void testTrait() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+        }
+
+        @TestMetadata("UnitAsGenericArgument.kt")
+        public void testUnitAsGenericArgument() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+        }
+
+        @TestMetadata("UnitParameter.kt")
+        public void testUnitParameter() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+        }
+
+        @TestMetadata("VoidReturn.kt")
+        public void testVoidReturn() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/asJava/lightClasses/object")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Object extends AbstractFirLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInObject() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("SimpleObject.kt")
+        public void testSimpleObject() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PublicField extends AbstractFirLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPublicField() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("CompanionObject.kt")
+        public void testCompanionObject() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
+        }
+
+        @TestMetadata("Simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
+        }
+    }
+}
diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightFacadeClassTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightFacadeClassTestGenerated.java
new file mode 100644
index 00000000000..c35f7fcfdae
--- /dev/null
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightFacadeClassTestGenerated.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.asJava.classes;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("compiler/testData/asJava/ultraLightFacades")
+@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public class FirLightFacadeClassTestGenerated extends AbstractFirLightFacadeClassTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+    }
+
+    public void testAllFilesPresentInUltraLightFacades() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/ultraLightFacades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
+    }
+
+    @TestMetadata("coroutines.kt")
+    public void testCoroutines() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/coroutines.kt");
+    }
+
+    @TestMetadata("importAliases.kt")
+    public void testImportAliases() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/importAliases.kt");
+    }
+
+    @TestMetadata("inlineOnly.kt")
+    public void testInlineOnly() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/inlineOnly.kt");
+    }
+
+    @TestMetadata("jvmField.kt")
+    public void testJvmField() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/jvmField.kt");
+    }
+
+    @TestMetadata("jvmName.kt")
+    public void testJvmName() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/jvmName.kt");
+    }
+
+    @TestMetadata("jvmWildcardAnnotations.kt")
+    public void testJvmWildcardAnnotations() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.kt");
+    }
+
+    @TestMetadata("lateinitProperty.kt")
+    public void testLateinitProperty() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/lateinitProperty.kt");
+    }
+
+    @TestMetadata("multifileFacade.kt")
+    public void testMultifileFacade() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/multifileFacade.kt");
+    }
+
+    @TestMetadata("multifileFacadeJvmName.kt")
+    public void testMultifileFacadeJvmName() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt");
+    }
+
+    @TestMetadata("properties.kt")
+    public void testProperties() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/properties.kt");
+    }
+
+    @TestMetadata("simpleFunctions.kt")
+    public void testSimpleFunctions() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/simpleFunctions.kt");
+    }
+
+    @TestMetadata("throwsAnnotation.kt")
+    public void testThrowsAnnotation() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt");
+    }
+
+    @TestMetadata("wildcardOptimization.kt")
+    public void testWildcardOptimization() throws Exception {
+        runTest("compiler/testData/asJava/ultraLightFacades/wildcardOptimization.kt");
+    }
+}
diff --git a/idea/idea-frontend-api/build.gradle.kts b/idea/idea-frontend-api/build.gradle.kts
index 5e8fff7146a..9b3e4650ab9 100644
--- a/idea/idea-frontend-api/build.gradle.kts
+++ b/idea/idea-frontend-api/build.gradle.kts
@@ -13,14 +13,7 @@ dependencies {
     compileOnly(project(":compiler:psi"))
     compileOnly(intellijCoreDep())
     compileOnly(intellijDep())
-
-    Platform[191].orLower {
-        compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
-    }
-
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
-    }
+    compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
 }
 
 sourceSets {
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ReadActionConfinementValidityToken.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ReadActionConfinementValidityToken.kt
index 4753f4cf1a4..f23d1512d53 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ReadActionConfinementValidityToken.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ReadActionConfinementValidityToken.kt
@@ -13,18 +13,45 @@ class ReadActionConfinementValidityToken(project: Project) : ValidityToken() {
     private val modificationTracker = KotlinModificationTrackerService.getInstance(project).modificationTracker
     private val onCreatedTimeStamp = modificationTracker.modificationCount
 
+    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
     override fun isValid(): Boolean {
         val application = ApplicationManager.getApplication()
-        if (application.isDispatchThread) return false
+        if (application.isDispatchThread && !allowOnEdt.get()) return false
         if (!application.isReadAccessAllowed) return false
         return onCreatedTimeStamp == modificationTracker.modificationCount
     }
 
+    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
     override fun getInvalidationReason(): String {
         val application = ApplicationManager.getApplication()
-        if (application.isDispatchThread) return "Called in EDT thread"
+        if (application.isDispatchThread && !allowOnEdt.get()) return "Called in EDT thread"
         if (!application.isReadAccessAllowed) return "Called outside read action"
         if (onCreatedTimeStamp != modificationTracker.modificationCount) return "PSI has changed since creation"
         error("Getting invalidation reason for valid validity token")
     }
+
+    companion object {
+        @HackToForceAllowRunningAnalyzeOnEDT
+        val allowOnEdt: ThreadLocal<Boolean> = ThreadLocal.withInitial { false }
+    }
+}
+
+@RequiresOptIn("All frontend related work should not be allowed to be ran from EDT thread. Only use it as a temporary solution")
+annotation class HackToForceAllowRunningAnalyzeOnEDT
+
+/**
+ * All frontend related work should not be allowed to be ran from EDT thread. Only use it as a temporary solution.
+ *
+ * @see KtAnalysisSession
+ * @see ReadActionConfinementValidityToken
+ */
+@HackToForceAllowRunningAnalyzeOnEDT
+inline fun <T> hackyAllowRunningOnEdt(action: () -> T): T {
+    if (ReadActionConfinementValidityToken.allowOnEdt.get()) return action()
+    ReadActionConfinementValidityToken.allowOnEdt.set(true)
+    try {
+        return action()
+    } finally {
+        ReadActionConfinementValidityToken.allowOnEdt.set(false)
+    }
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt
index 51e701bfa3e..3c88cbcb3e6 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.idea.frontend.api.symbols
 
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
@@ -35,6 +35,7 @@ object DebugSymbolRenderer {
         null -> "null"
         is String -> value
         is Boolean -> value.toString()
+        is Long -> value.toString()
         is Name -> value.asString()
         is FqName -> value.asString()
         is ClassId -> value.asString()
@@ -51,10 +52,17 @@ object DebugSymbolRenderer {
                 is KtFunctionSymbol -> renderValue(value.callableIdIfNonLocal ?: "<local>/${value.name}")
                 is KtConstructorSymbol -> "<constructor>"
                 is KtNamedSymbol -> renderValue(value.name)
+                is KtPropertyGetterSymbol -> "<getter>"
+                is KtPropertySetterSymbol -> "<setter>"
                 else -> TODO(value::class.toString())
             }
             "${value::class.simpleName!!}($symbolTag)"
         }
+        is KtSimpleConstantValue<*> -> renderValue(value.constant)
+        is KtNamedConstantValue -> "${renderValue(value.name)} = ${renderValue(value.expression)}"
+        is KtAnnotationCall ->
+            "${renderValue(value.classId)}${value.arguments.joinToString(prefix = "(", postfix = ")") { renderValue(it) }}"
+
         else -> value::class.simpleName!!
     }
 
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtClassLikeSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtClassLikeSymbol.kt
index 4ee0f723d84..6b047a67edc 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtClassLikeSymbol.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtClassLikeSymbol.kt
@@ -7,6 +7,8 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols
 
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.idea.frontend.api.types.KtClassType
+import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.name.ClassId
 
 sealed class KtClassifierSymbol : KtSymbol, KtNamedSymbol
@@ -31,9 +33,19 @@ abstract class KtTypeAliasSymbol : KtClassLikeSymbol() {
 
 abstract class KtClassOrObjectSymbol : KtClassLikeSymbol(),
     KtSymbolWithTypeParameters,
-    KtSymbolWithModality<KtSymbolModality> {
+    KtSymbolWithModality<KtSymbolModality>,
+    KtSymbolWithVisibility,
+    KtAnnotatedSymbol {
     abstract val classKind: KtClassKind
 
+    abstract val isInner: Boolean
+
+    abstract val companionObject: KtClassOrObjectSymbol?
+
+    abstract val superTypes: List<KtType>
+
+    abstract val primaryConstructor: KtConstructorSymbol?
+
     abstract override fun createPointer(): KtSymbolPointer<KtClassOrObjectSymbol>
 }
 
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt
index e2417cfd755..f5ebf6e4f90 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 
-sealed class KtFunctionLikeSymbol : KtCallableSymbol(), KtTypedSymbol, KtSymbolWithKind {
+abstract class KtFunctionLikeSymbol : KtCallableSymbol(), KtTypedSymbol, KtSymbolWithKind {
     abstract val valueParameters: List<KtParameterSymbol>
 
     abstract override fun createPointer(): KtSymbolPointer<KtFunctionLikeSymbol>
@@ -26,18 +26,23 @@ abstract class KtFunctionSymbol : KtFunctionLikeSymbol(),
     KtNamedSymbol,
     KtPossibleExtensionSymbol,
     KtSymbolWithTypeParameters,
-    KtSymbolWithModality<KtCommonSymbolModality> {
+    KtSymbolWithModality<KtCommonSymbolModality>,
+    KtSymbolWithVisibility,
+    KtAnnotatedSymbol {
     abstract val callableIdIfNonLocal: FqName?
 
     abstract val isSuspend: Boolean
     abstract val isOperator: Boolean
+    abstract val isExternal: Boolean
+    abstract val isInline: Boolean
+    abstract val isOverride: Boolean
 
     abstract override val valueParameters: List<KtFunctionParameterSymbol>
 
     abstract override fun createPointer(): KtSymbolPointer<KtFunctionSymbol>
 }
 
-abstract class KtConstructorSymbol : KtFunctionLikeSymbol() {
+abstract class KtConstructorSymbol : KtFunctionLikeSymbol(), KtAnnotatedSymbol, KtSymbolWithVisibility {
     abstract val isPrimary: Boolean
     abstract val containingClassIdIfNonLocal: ClassId?
 
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt
index c8e767fb74a..e902aaf6b0b 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt
@@ -5,14 +5,17 @@
 
 package org.jetbrains.kotlin.idea.frontend.api.symbols
 
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithModality
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypedSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 
-sealed class KtPropertyAccessorSymbol : KtSymbol,
-    KtSymbolWithModality<KtCommonSymbolModality> {
+sealed class KtPropertyAccessorSymbol : KtCallableSymbol(),
+    KtSymbolWithModality<KtCommonSymbolModality>,
+    KtSymbolWithVisibility {
     abstract val isDefault: Boolean
+    abstract val isInline: Boolean
+    abstract val isOverride: Boolean
+
+    abstract val symbolKind: KtSymbolKind
 
     abstract override fun createPointer(): KtSymbolPointer<KtPropertyAccessorSymbol>
 }
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbol.kt
index 469c83002ae..28ef7591a53 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbol.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbol.kt
@@ -17,5 +17,14 @@ interface KtSymbol : ValidityTokenOwner {
 }
 
 enum class KtSymbolOrigin {
-    SOURCE, LIBRARY, JAVA, SAM_CONSTRUCTOR
+    SOURCE,
+
+    /**
+     * Declaration which do not have it's PSI source and was generated, they are:
+     * For data classes the `copy`, `component{N}`, `toString`, `equals`, `hashCode` functions are generated
+     * For enum classes the `valueOf` & `values` functions are generated
+     */
+    SOURCE_MEMBER_GENERATED,
+    LIBRARY,
+    JAVA, SAM_CONSTRUCTOR
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt
index 33971386ef6..bed3b085f86 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt
@@ -27,7 +27,11 @@ sealed class KtVariableSymbol : KtVariableLikeSymbol() {
     abstract override fun createPointer(): KtSymbolPointer<KtVariableSymbol>
 }
 
-abstract class KtJavaFieldSymbol : KtVariableSymbol(), KtSymbolWithModality<KtCommonSymbolModality>, KtSymbolWithKind {
+abstract class KtJavaFieldSymbol :
+    KtVariableSymbol(),
+    KtSymbolWithModality<KtCommonSymbolModality>,
+    KtSymbolWithVisibility,
+    KtSymbolWithKind {
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
 
     abstract val callableIdIfNonLocal: FqName?
@@ -35,14 +39,24 @@ abstract class KtJavaFieldSymbol : KtVariableSymbol(), KtSymbolWithModality<KtCo
     abstract override fun createPointer(): KtSymbolPointer<KtJavaFieldSymbol>
 }
 
-// TODO getters & setters
 abstract class KtPropertySymbol : KtVariableSymbol(),
     KtPossibleExtensionSymbol,
     KtSymbolWithModality<KtCommonSymbolModality>,
+    KtSymbolWithVisibility,
+    KtAnnotatedSymbol,
     KtSymbolWithKind {
 
     abstract val callableIdIfNonLocal: FqName?
 
+    abstract val getter: KtPropertyGetterSymbol?
+    abstract val setter: KtPropertySetterSymbol?
+
+    abstract val hasBackingField: Boolean
+
+    abstract val isConst: Boolean
+
+    abstract val isOverride: Boolean
+
     abstract override fun createPointer(): KtSymbolPointer<KtPropertySymbol>
 }
 
@@ -50,15 +64,15 @@ abstract class KtLocalVariableSymbol : KtVariableSymbol(), KtSymbolWithKind {
     abstract override fun createPointer(): KtSymbolPointer<KtLocalVariableSymbol>
 }
 
-sealed class KtParameterSymbol : KtVariableLikeSymbol(), KtSymbolWithKind {
+sealed class KtParameterSymbol : KtVariableLikeSymbol(), KtSymbolWithKind, KtAnnotatedSymbol {
     abstract val hasDefaultValue: Boolean
 
+    abstract val isVararg: Boolean
+
     abstract override fun createPointer(): KtSymbolPointer<KtParameterSymbol>
 }
 
 abstract class KtFunctionParameterSymbol : KtParameterSymbol() {
-    abstract val isVararg: Boolean
-
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.NON_PROPERTY_PARAMETER
 
     abstract override fun createPointer(): KtSymbolPointer<KtFunctionParameterSymbol>
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt
new file mode 100644
index 00000000000..91cf77a23e7
--- /dev/null
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.frontend.api.symbols.markers
+
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.psi.KtCallElement
+
+abstract class KtAnnotationCall {
+    abstract val classId: ClassId?
+    abstract val useSiteTarget: AnnotationUseSiteTarget?
+    abstract val psi: KtCallElement?
+    abstract val arguments: List<KtNamedConstantValue>
+}
+
+sealed class KtConstantValue
+object KtUnsupportedConstantValue : KtConstantValue()
+
+data class KtSimpleConstantValue<T>(val constant: T) : KtConstantValue()
+data class KtNamedConstantValue(val name: String, val expression: KtConstantValue)
+
+interface KtAnnotatedSymbol : KtSymbol {
+    val annotations: List<KtAnnotationCall>
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt
index d5bb69781fd..abba9a00adc 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt
@@ -17,4 +17,4 @@ sealed class KtCommonSymbolModality : KtSymbolModality() {
     object FINAL : KtCommonSymbolModality()
     object ABSTRACT : KtCommonSymbolModality()
     object OPEN : KtCommonSymbolModality()
-}
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt
new file mode 100644
index 00000000000..30490f62875
--- /dev/null
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.frontend.api.symbols.markers
+
+interface KtSymbolWithVisibility {
+    val visibility: KtSymbolVisibility
+}
+
+sealed class KtSymbolVisibility {
+    object PUBLIC : KtSymbolVisibility()
+    object PRIVATE : KtSymbolVisibility()
+    object PROTECTED : KtSymbolVisibility()
+    object INTERNAL : KtSymbolVisibility()
+    object UNKNOWN : KtSymbolVisibility()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/KtType.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/KtType.kt
index 8adbee05673..fdcb0f6c7f6 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/KtType.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/KtType.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.idea.frontend.api.types
 
+import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.idea.frontend.api.KtTypeArgument
 import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassLikeSymbol
diff --git a/idea/idea-frontend-fir/build.gradle.kts b/idea/idea-frontend-fir/build.gradle.kts
index 89be8d84f88..fc1a1dbdfe5 100644
--- a/idea/idea-frontend-fir/build.gradle.kts
+++ b/idea/idea-frontend-fir/build.gradle.kts
@@ -33,9 +33,7 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
 
-    Platform[192].orHigher {
-        compile(intellijPluginDep("java"))
-    }
+    compile(intellijPluginDep("java"))
 }
 
 sourceSets {
@@ -43,7 +41,7 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-if (rootProject.findProperty("idea.fir.plugin") == "true")  {
+if (kotlinBuildProperties.useFirIdeaPlugin)  {
     projectTest {
         dependsOn(":dist")
         workingDir = rootDir
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
index 1f4e32b5f30..1afaef59769 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
@@ -36,9 +36,7 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
 
-    Platform[192].orHigher {
-        compile(intellijPluginDep("java"))
-    }
+    compile(intellijPluginDep("java"))
 }
 
 sourceSets {
@@ -46,7 +44,7 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-if (rootProject.findProperty("idea.fir.plugin") == "true") {
+if (kotlinBuildProperties.useFirIdeaPlugin) {
     projectTest {
         dependsOn(":dist")
         workingDir = rootDir
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
index dbebb5758b5..66d3303041d 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
@@ -33,7 +33,6 @@ internal class FirIdeResolveStateService(project: Project) {
         ConcurrentHashMap<IdeaModuleInfo, FirModuleResolveStateImpl>()
     }
 
-
     fun getResolveState(moduleInfo: IdeaModuleInfo): FirModuleResolveStateImpl =
         stateCache.computeIfAbsent(moduleInfo) { createResolveStateFor(moduleInfo, sessionProviderStorage) }
 
@@ -48,6 +47,7 @@ internal class FirIdeResolveStateService(project: Project) {
             val sessionProvider = sessionProviderStorage.getSessionProvider(moduleInfo)
             val firFileBuilder = sessionProvider.rootModuleSession.firFileBuilder
             return FirModuleResolveStateImpl(
+                moduleInfo.project,
                 moduleInfo,
                 sessionProvider,
                 firFileBuilder,
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateForCompletion.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateForCompletion.kt
index fb5cd9e9427..5fe56061d2e 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateForCompletion.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateForCompletion.kt
@@ -5,22 +5,29 @@
 
 package org.jetbrains.kotlin.idea.fir.low.level.api
 
+import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirTowerDataContextCollector
+import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.FirElementsRecorder
+import org.jetbrains.kotlin.idea.fir.low.level.api.util.containingKtFileIfAny
+import org.jetbrains.kotlin.idea.fir.low.level.api.util.originalKtFile
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtLambdaExpression
 
 internal class FirModuleResolveStateForCompletion(
+    override val project: Project,
     private val originalState: FirModuleResolveStateImpl
 ) : FirModuleResolveState() {
     override val moduleInfo: IdeaModuleInfo get() = originalState.moduleInfo
@@ -35,7 +42,8 @@ internal class FirModuleResolveStateForCompletion(
         originalState.getSessionFor(moduleInfo)
 
     override fun getOrBuildFirFor(element: KtElement): FirElement {
-        completionMapping[originalState.elementBuilder.getPsiAsFirElementSource(element)]?.let { return it }
+        val psi = originalState.elementBuilder.getPsiAsFirElementSource(element)
+        synchronized(completionMapping) { completionMapping[psi] }?.let { return it }
         return originalState.elementBuilder.getOrBuildFirFor(
             element,
             originalState.rootModuleSession.cache,
@@ -51,7 +59,7 @@ internal class FirModuleResolveStateForCompletion(
     }
 
     override fun recordPsiToFirMappingsForCompletionFrom(fir: FirDeclaration, firFile: FirFile, ktFile: KtFile) {
-        fir.accept(FirElementsRecorder(), completionMapping)
+        synchronized(completionMapping) { fir.accept(FirElementsRecorder(), completionMapping) }
     }
 
     override fun <D : FirDeclaration> resolvedFirToPhase(declaration: D, toPhase: FirResolvePhase): D {
@@ -68,6 +76,14 @@ internal class FirModuleResolveStateForCompletion(
         originalState.lazyResolveDeclarationForCompletion(firFunction, containerFirFile, firIdeProvider, toPhase, towerDataContextCollector)
     }
 
+    override fun getFirFile(declaration: FirDeclaration, cache: ModuleFileCache): FirFile? {
+        val ktFile = declaration.containingKtFileIfAny ?: return null
+        cache.getCachedFirFile(ktFile)?.let { return it }
+        ktFile.originalKtFile?.let(cache::getCachedFirFile)?.let { return it }
+        return null
+    }
+
+
     override fun getDiagnostics(element: KtElement): List<Diagnostic> {
         error("Diagnostics should not be retrieved in completion")
     }
@@ -80,6 +96,14 @@ internal class FirModuleResolveStateForCompletion(
         error("Should not be used in completion")
     }
 
+    override fun findSourceFirDeclaration(ktDeclaration: KtDeclaration): FirDeclaration {
+        error("Should not be used in completion")
+    }
+
+    override fun findSourceFirDeclaration(ktDeclaration: KtLambdaExpression): FirDeclaration {
+        error("Should not be used in completion")
+    }
+
     override fun getBuiltFirFileOrNull(ktFile: KtFile): FirFile? {
         error("Should not be used in completion")
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateImpl.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateImpl.kt
index 91fac3d20f1..3ffdd11f705 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateImpl.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateImpl.kt
@@ -5,12 +5,14 @@
 
 package org.jetbrains.kotlin.idea.fir.low.level.api
 
+import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
@@ -19,18 +21,21 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.fir.low.level.api.diagnostics.DiagnosticsCollector
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirElementBuilder
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirTowerDataContextCollector
+import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.getNonLocalContainingOrThisDeclaration
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.FirFileBuilder
+import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.FileStructureCache
 import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.FirLazyDeclarationResolver
 import org.jetbrains.kotlin.idea.fir.low.level.api.providers.firIdeProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSessionProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSourcesSession
+import org.jetbrains.kotlin.idea.fir.low.level.api.util.FirElementFinder
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.findSourceNonLocalFirDeclaration
-import org.jetbrains.kotlin.psi.KtDeclaration
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.idea.util.getElementTextInContext
+import org.jetbrains.kotlin.psi.*
 
 internal class FirModuleResolveStateImpl(
+    override val project: Project,
     override val moduleInfo: IdeaModuleInfo,
     private val sessionProvider: FirIdeSessionProvider,
     val firFileBuilder: FirFileBuilder,
@@ -74,6 +79,31 @@ internal class FirModuleResolveStateImpl(
         sessionProvider.getModuleCache(ktDeclaration.getModuleInfo() as ModuleSourceInfo)
     )
 
+    override fun findSourceFirDeclaration(ktDeclaration: KtDeclaration): FirDeclaration =
+        findSourceFirDeclarationByExpression(ktDeclaration)
+
+    override fun findSourceFirDeclaration(ktDeclaration: KtLambdaExpression): FirDeclaration =
+        findSourceFirDeclarationByExpression(ktDeclaration)
+
+    /**
+     * [ktDeclaration] should be either [KtDeclaration] or [KtLambdaExpression]
+     */
+    private fun findSourceFirDeclarationByExpression(ktDeclaration: KtExpression): FirDeclaration {
+        val nonLocalFirDeclaration = ktDeclaration.getNonLocalContainingOrThisDeclaration()
+            ?: error("Declaration should have non-local container${ktDeclaration.getElementTextInContext()}")
+        if (ktDeclaration == nonLocalFirDeclaration) return findNonLocalSourceFirDeclaration(ktDeclaration as KtDeclaration)
+        val container = nonLocalFirDeclaration.findSourceNonLocalFirDeclaration(
+            firFileBuilder,
+            rootModuleSession.firIdeProvider.symbolProvider,
+            sessionProvider.getModuleCache(ktDeclaration.getModuleInfo() as ModuleSourceInfo)
+        )
+        val firDeclaration = FirElementFinder.findElementIn<FirDeclaration>(container) { firDeclaration ->
+            firDeclaration.psi == ktDeclaration
+        }
+        return firDeclaration
+            ?: error("FirDeclaration was not found for\n${ktDeclaration.getElementTextInContext()}")
+    }
+
     override fun isFirFileBuilt(ktFile: KtFile): Boolean {
         val moduleSourceInfo = ktFile.getModuleInfo() as? ModuleSourceInfo ?: return true
         val cache = sessionProvider.getModuleCache(moduleSourceInfo)
@@ -109,4 +139,7 @@ internal class FirModuleResolveStateImpl(
             )
         }
     }
+
+    override fun getFirFile(declaration: FirDeclaration, cache: ModuleFileCache): FirFile? =
+        cache.getContainerFirFile(declaration)
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/FirModuleResolveState.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/FirModuleResolveState.kt
index a54540bbe01..4850b8649db 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/FirModuleResolveState.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/FirModuleResolveState.kt
@@ -6,14 +6,13 @@
 package org.jetbrains.kotlin.idea.fir.low.level.api.api
 
 import org.jetbrains.annotations.TestOnly
+import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.diagnostics.Diagnostic
-import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.declarations.FirDeclaration
-import org.jetbrains.kotlin.fir.declarations.FirFile
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.*
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
+import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
 import org.jetbrains.kotlin.idea.fir.low.level.api.FirIdeResolveStateService
@@ -21,14 +20,21 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.FirTransformerProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirTowerDataContextCollector
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.FirFileBuilder
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
+import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.withReadLock
+import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSourcesSession
+import org.jetbrains.kotlin.idea.fir.low.level.api.util.ktDeclaration
+import org.jetbrains.kotlin.idea.util.getElementTextInContext
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtLambdaExpression
 
 abstract class FirModuleResolveState {
+    abstract val project: Project
+
     abstract val rootModuleSession: FirSession
 
-    internal abstract val moduleInfo: IdeaModuleInfo
+    abstract val moduleInfo: IdeaModuleInfo
 
     abstract val firTransformerProvider: FirTransformerProvider
 
@@ -51,6 +57,15 @@ abstract class FirModuleResolveState {
         ktDeclaration: KtDeclaration,
     ): FirDeclaration
 
+    abstract fun findSourceFirDeclaration(
+        ktDeclaration: KtDeclaration,
+    ): FirDeclaration
+
+    abstract fun findSourceFirDeclaration(
+        ktDeclaration: KtLambdaExpression,
+    ): FirDeclaration
+
+
     // todo temporary, used only in completion
     internal abstract fun recordPsiToFirMappingsForCompletionFrom(fir: FirDeclaration, firFile: FirFile, ktFile: KtFile)
 
@@ -64,5 +79,22 @@ abstract class FirModuleResolveState {
         toPhase: FirResolvePhase,
         towerDataContextCollector: FirTowerDataContextCollector
     )
-}
 
+    internal abstract fun getFirFile(declaration: FirDeclaration, cache: ModuleFileCache): FirFile?
+
+    fun <D : FirDeclaration, R> withFirDeclaration(declaration: D, action: (D) -> R): R {
+        val originalDeclaration = (declaration as? FirCallableDeclaration<*>)?.unwrapFakeOverrides() ?: declaration
+        val session = originalDeclaration.session
+        return when {
+            originalDeclaration.origin == FirDeclarationOrigin.Source
+                    && session is FirIdeSourcesSession
+            -> {
+                val cache = session.cache
+                val file = getFirFile(declaration, cache)
+                    ?: error("Fir file was not found for\n${declaration.render()}\n${declaration.ktDeclaration.getElementTextInContext()}")
+                cache.firFileLockProvider.withReadLock(file) { action(declaration) }
+            }
+            else -> action(declaration)
+        }
+    }
+}
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacade.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacade.kt
index c8c21b7329c..ec84ddd9dcc 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacade.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacade.kt
@@ -8,15 +8,21 @@ package org.jetbrains.kotlin.idea.fir.low.level.api.api
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.FirSymbolOwner
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.psi
+import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
 import org.jetbrains.kotlin.idea.fir.low.level.api.FirIdeResolveStateService
+import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSourcesSession
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtLambdaExpression
 import kotlin.reflect.KClass
 
 object LowLevelFirApiFacade {
@@ -29,24 +35,15 @@ object LowLevelFirApiFacade {
     fun getSessionFor(element: KtElement): FirSession =
         getResolveStateFor(element).getSessionFor(element.getModuleInfo())
 
-    @Deprecated("Consider using withFirElement")
     fun getOrBuildFirFor(element: KtElement, resolveState: FirModuleResolveState): FirElement =
         resolveState.getOrBuildFirFor(element)
 
-    @Suppress("DEPRECATION")
-    inline fun <R> withFirElement(element: KtElement, resolveState: FirModuleResolveState, action: (FirElement) -> R): R =
-        action(getOrBuildFirFor(element, resolveState))
-
-    @Deprecated("Consider using withFirFile")
     fun getFirFile(ktFile: KtFile, resolveState: FirModuleResolveState) =
         resolveState.getFirFile(ktFile)
 
-    @Suppress("DEPRECATION")
-    inline fun <R> withFirFile(ktFile: KtFile, resolveState: FirModuleResolveState, action: (FirFile) -> R): R =
-        action(getFirFile(ktFile, resolveState))
-
     /**
      * Creates [FirDeclaration] by [KtDeclaration] and runs an [action] with it
+     * [ktDeclaration]
      * [FirDeclaration] passed to [action] should not be leaked outside [action] lambda
      * [FirDeclaration] passed to [action] will be resolved at least to [phase]
      * Otherwise, some threading problems may arise,
@@ -59,11 +56,31 @@ object LowLevelFirApiFacade {
         phase: FirResolvePhase = FirResolvePhase.RAW_FIR,
         action: (FirDeclaration) -> R
     ): R {
-        val firDeclaration = resolveState.findNonLocalSourceFirDeclaration(ktDeclaration)
+        val firDeclaration = resolveState.findSourceFirDeclaration(ktDeclaration)
         resolvedFirToPhase(firDeclaration, phase, resolveState)
         return action(firDeclaration)
     }
 
+    inline fun <reified F : FirDeclaration, R> withFirDeclarationOfType(
+        ktDeclaration: KtDeclaration,
+        resolveState: FirModuleResolveState,
+        action: (F) -> R
+    ): R {
+        val firDeclaration = resolveState.findSourceFirDeclaration(ktDeclaration)
+        if (firDeclaration !is F) throw InvalidFirElementTypeException(ktDeclaration, F::class, firDeclaration::class)
+        return action(firDeclaration)
+    }
+
+    inline fun <reified F : FirDeclaration, R> withFirDeclarationOfType(
+        ktDeclaration: KtLambdaExpression,
+        resolveState: FirModuleResolveState,
+        action: (F) -> R
+    ): R {
+        val firDeclaration = resolveState.findSourceFirDeclaration(ktDeclaration)
+        if (firDeclaration !is F) throw InvalidFirElementTypeException(ktDeclaration, F::class, firDeclaration::class)
+        return action(firDeclaration)
+    }
+
     inline fun <F : FirElement, R> withFir(fir: F, action: (F) -> R): R {
         // TODO locking
         return action(fir)
@@ -83,17 +100,16 @@ object LowLevelFirApiFacade {
         resolveState.resolvedFirToPhase(firDeclaration, phase)
 }
 
-@Deprecated("Consider using withFir")
+
+
 fun KtElement.getOrBuildFir(
     resolveState: FirModuleResolveState,
 ) = LowLevelFirApiFacade.getOrBuildFirFor(this, resolveState)
 
-@Deprecated("Consider using withFirSafe")
 inline fun <reified E : FirElement> KtElement.getOrBuildFirSafe(
     resolveState: FirModuleResolveState,
 ) = LowLevelFirApiFacade.getOrBuildFirFor(this, resolveState) as? E
 
-@Deprecated("Consider using withFirOfType")
 inline fun <reified E : FirElement> KtElement.getOrBuildFirOfType(
     resolveState: FirModuleResolveState,
 ): E {
@@ -102,25 +118,6 @@ inline fun <reified E : FirElement> KtElement.getOrBuildFirOfType(
     throw InvalidFirElementTypeException(this, E::class, fir::class)
 }
 
-inline fun <R> KtElement.withFir(
-    resolveState: FirModuleResolveState,
-    action: (FirElement) -> R,
-) = LowLevelFirApiFacade.withFirElement(this, resolveState, action)
-
-
-inline fun <R : Any, reified E : FirElement> KtElement.withFirSafe(
-    resolveState: FirModuleResolveState,
-    action: (E) -> R?
-) = LowLevelFirApiFacade.withFirElement(this, resolveState) { element -> (element as? E)?.let(action) }
-
-
-@Suppress("DEPRECATION")
-inline fun <R, reified E : FirElement> KtElement.withFirOfType(
-    resolveState: FirModuleResolveState,
-    action: (E) -> R
-): R = action(getOrBuildFirOfType(resolveState))
-
-
 class InvalidFirElementTypeException(
     ktElement: KtElement,
     expectedFirClass: KClass<out FirElement>,
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForCompletion.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForCompletion.kt
index 824ce66aee5..61c1ea3cea8 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForCompletion.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForCompletion.kt
@@ -27,9 +27,9 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtProperty
 
 object LowLevelFirApiFacadeForCompletion {
-    fun getResolveStateForCompletion(element: KtElement, originalState: FirModuleResolveState): FirModuleResolveState {
+    fun getResolveStateForCompletion(originalState: FirModuleResolveState): FirModuleResolveState {
         check(originalState is FirModuleResolveStateImpl)
-        return FirModuleResolveStateForCompletion(originalState)
+        return FirModuleResolveStateForCompletion(originalState.project, originalState)
     }
 
     class FirCompletionContext internal constructor(
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt
index bcffaf80017..91f22f69474 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt
@@ -56,7 +56,7 @@ internal abstract class AbstractFirIdeDiagnosticsCollector(
         checkCanceled()
     }
 
-    override fun getCollectedDiagnostics(): Iterable<FirDiagnostic<*>> {
+    override fun getCollectedDiagnostics(): List<FirDiagnostic<*>> {
         // Not necessary in IDE
         return emptyList()
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt
index f20d11fb637..e61bc0475ab 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt
@@ -73,6 +73,7 @@ fun KtElement.getNonLocalContainingOrThisDeclaration(): KtNamedDeclaration? {
     while (container != null && container !is KtFile) {
         if (container is KtNamedDeclaration
             && (container is KtClassOrObject || container is KtDeclarationWithBody || container is KtProperty || container is KtTypeAlias)
+            && container !is KtPrimaryConstructor
             && !KtPsiUtil.isLocal(container)
             && container !is KtEnumEntry
             && container.containingClassOrObject !is KtEnumEntry
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/FirFileBuilder.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/FirFileBuilder.kt
index 20027dde956..718d0ba6a18 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/FirFileBuilder.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/FirFileBuilder.kt
@@ -54,8 +54,8 @@ internal class FirFileBuilder(
         val needResolve = toPhase > FirResolvePhase.RAW_FIR
         val firFile = buildRawFirFileWithCaching(ktFile, cache, lazyBodiesMode = !needResolve)
         if (needResolve) {
-            cache.firFileLockProvider.withLock(firFile) {
-                if (firFile.resolvePhase >= toPhase) return@withLock
+            cache.firFileLockProvider.withWriteLock(firFile) {
+                if (firFile.resolvePhase >= toPhase) return@withWriteLock
                 runResolveWithoutLock(firFile, fromPhase = firFile.resolvePhase, toPhase = toPhase, checkPCE = checkPCE)
             }
         }
@@ -66,11 +66,11 @@ internal class FirFileBuilder(
      * Runs [resolve] function (which is considered to do some resolve on [firFile]) under a lock for [firFile]
      */
     inline fun <R> runCustomResolveUnderLock(firFile: FirFile, cache: ModuleFileCache, resolve: () -> R): R =
-        cache.firFileLockProvider.withLock(firFile) { resolve() }
+        cache.firFileLockProvider.withWriteLock(firFile) { resolve() }
 
     inline fun <R : Any> runCustomResolveWithPCECheck(firFile: FirFile, cache: ModuleFileCache, resolve: () -> R): R {
         val lock = cache.firFileLockProvider.getLockFor(firFile)
-        return lock.lockWithPCECheck(LOCKING_INTERVAL_MS) { resolve() }
+        return lock.writeLock().lockWithPCECheck(LOCKING_INTERVAL_MS) { resolve() }
     }
 
     fun runResolveWithoutLock(
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/ModuleFileCache.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/ModuleFileCache.kt
index 0762b1d215d..6f7e273f381 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/ModuleFileCache.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/ModuleFileCache.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.psi
+import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.name.ClassId
@@ -50,12 +51,13 @@ internal abstract class ModuleFileCache {
 
     abstract fun getCachedFirFile(ktFile: KtFile): FirFile?
 
-    // todo make it ReadWriteLock and allow access fir elements only under read lock
-    // for now locks only held for resolve
-    // but there can be a situation when we are accessing some fir element in one thread without lock
-    // in the same time other thread performs resolve of it
-    // which can cause weird errors on user side
-    abstract val firFileLockProvider: LockProvider<FirFile, ReentrantLock>
+    abstract val firFileLockProvider: LockProvider<FirFile, ReentrantReadWriteLock>
+
+    inline fun <D : FirDeclaration, R> withReadLockOn(declaration: D, action: (D) -> R): R {
+        val file = getContainerFirFile(declaration)
+            ?: error("No fir file found for\n${declaration.render()}")
+        return firFileLockProvider.withReadLock(file) { action(declaration) }
+    }
 }
 
 internal class ModuleFileCacheImpl(override val session: FirSession) : ModuleFileCache() {
@@ -74,5 +76,5 @@ internal class ModuleFileCacheImpl(override val session: FirSession) : ModuleFil
         return getCachedFirFile(ktFile)
     }
 
-    override val firFileLockProvider: LockProvider<FirFile, ReentrantLock> = LockProvider { ReentrantLock() }
+    override val firFileLockProvider: LockProvider<FirFile, ReentrantReadWriteLock> = LockProvider { ReentrantReadWriteLock() }
 }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt
index 96b6cb1c8b6..cdfbf7313b4 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt
@@ -6,10 +6,14 @@
 package org.jetbrains.kotlin.idea.fir.low.level.api.file.structure
 
 import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.getNonLocalContainingOrThisDeclaration
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.FirFileBuilder
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
+import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.withReadLock
+import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.withWriteLock
 import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.FirLazyDeclarationResolver
 import org.jetbrains.kotlin.idea.fir.low.level.api.providers.firIdeProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.findSourceNonLocalFirDeclaration
@@ -74,9 +78,9 @@ internal class FileStructure(
         val declarations = if (from.symbol.callableId.className == null) {
             firFile.declarations as MutableList<FirDeclaration>
         } else {
-            val classId = from.symbol.callableId.classId
+            val classLikeLookupTag = from.containingClass()
                 ?: error("Class name should not be null for non-top-level & non-local declarations")
-            val containingClass = firIdeProvider.getFirClassifierByFqName(classId) as FirRegularClass
+            val containingClass = classLikeLookupTag.toSymbol(firFile.session)?.fir as FirRegularClass
             containingClass.declarations as MutableList<FirDeclaration>
         }
         declarations.replaceFirst(from, to)
@@ -88,7 +92,10 @@ internal class FileStructure(
     ): WithInBlockModificationFileStructureElement {
         val newFunction = firIdeProvider.buildFunctionWithBody(containerKtFunction) as FirSimpleFunction
         val originalFunction = original.firSymbol.fir as FirSimpleFunction
-        replaceFunction(originalFunction, newFunction)
+
+        moduleFileCache.firFileLockProvider.withWriteLock(firFile) {
+            replaceFunction(originalFunction, newFunction)
+        }
 
         try {
             firLazyDeclarationResolver.lazyResolveDeclaration(
@@ -98,41 +105,52 @@ internal class FileStructure(
                 checkPCE = true,
                 reresolveFile = true,
             )
-            return WithInBlockModificationFileStructureElement(
-                firFile,
-                containerKtFunction,
-                newFunction.symbol,
-                containerKtFunction.modificationStamp,
-            )
+            return moduleFileCache.firFileLockProvider.withReadLock(firFile) {
+                WithInBlockModificationFileStructureElement(
+                    firFile,
+                    containerKtFunction,
+                    newFunction.symbol,
+                    containerKtFunction.modificationStamp,
+                )
+            }
         } catch (e: Throwable) {
-            replaceFunction(newFunction, originalFunction)
+            moduleFileCache.firFileLockProvider.withWriteLock(firFile) {
+                replaceFunction(newFunction, originalFunction)
+            }
             throw e
         }
     }
 
     private fun createDeclarationStructure(declaration: KtDeclaration): FileStructureElement {
-        val firDeclaration = declaration.findSourceNonLocalFirDeclaration(firFileBuilder, firIdeProvider.symbolProvider, moduleFileCache)
+        val firDeclaration = declaration.findSourceNonLocalFirDeclaration(
+            firFileBuilder,
+            firIdeProvider.symbolProvider,
+            moduleFileCache,
+            firFile
+        )
         firLazyDeclarationResolver.lazyResolveDeclaration(
             firDeclaration,
             moduleFileCache,
             FirResolvePhase.BODY_RESOLVE,
             checkPCE = true
         )
-        return when {
-            declaration is KtNamedFunction && declaration.hasExplicitTypeOrUnit -> {
-                WithInBlockModificationFileStructureElement(
-                    firFile,
-                    declaration,
-                    (firDeclaration as FirSimpleFunction).symbol,
-                    declaration.modificationStamp,
-                )
-            }
-            else -> {
-                NonLocalDeclarationFileStructureElement(
-                    firFile,
-                    firDeclaration,
-                    declaration,
-                )
+        return moduleFileCache.firFileLockProvider.withReadLock(firFile) {
+            when {
+                declaration is KtNamedFunction && declaration.hasExplicitTypeOrUnit -> {
+                    WithInBlockModificationFileStructureElement(
+                        firFile,
+                        declaration,
+                        (firDeclaration as FirSimpleFunction).symbol,
+                        declaration.modificationStamp,
+                    )
+                }
+                else -> {
+                    NonLocalDeclarationFileStructureElement(
+                        firFile,
+                        firDeclaration,
+                        declaration,
+                    )
+                }
             }
         }
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt
index 28c4081318a..39c7826a514 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt
@@ -5,10 +5,12 @@
 
 package org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve
 
+import com.intellij.psi.util.parentsOfType
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.ResolutionMode
+import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirTowerDataContextCollector
 import org.jetbrains.kotlin.idea.fir.low.level.api.trasformers.FirDesignatedBodyResolveTransformerForIDE
@@ -18,11 +20,12 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
 import org.jetbrains.kotlin.idea.fir.low.level.api.providers.firIdeProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.trasformers.FirDesignatedContractsResolveTransformerForIDE
 import org.jetbrains.kotlin.idea.fir.low.level.api.trasformers.FirDesignatedImplicitTypesTransformerForIDE
+import org.jetbrains.kotlin.idea.fir.low.level.api.util.*
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.checkCanceled
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.executeWithoutPCE
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.findSourceNonLocalFirDeclaration
-import org.jetbrains.kotlin.idea.fir.low.level.api.util.getContainingFile
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 
 internal class FirLazyDeclarationResolver(
     private val firFileBuilder: FirFileBuilder
@@ -36,6 +39,20 @@ internal class FirLazyDeclarationResolver(
         reresolveFile: Boolean = false,
     ) {
         if (declaration.resolvePhase >= toPhase) return
+
+        if (declaration is FirPropertyAccessor) {
+            val ktContainingProperty = when (val ktDeclaration = declaration.ktDeclaration) {
+                is KtPropertyAccessor -> ktDeclaration.property
+                is KtProperty -> ktDeclaration
+                is KtParameter -> ktDeclaration.getNonLocalContainingOrThisDeclaration()
+                    ?: error("Cannot find containing declaration for KtParameter")
+                else -> error("Invalid source of property accessor ${ktDeclaration::class}")
+            }
+            val containingProperty = ktContainingProperty
+                .findSourceNonLocalFirDeclaration(firFileBuilder, declaration.session.firSymbolProvider, moduleFileCache)
+            return lazyResolveDeclaration(containingProperty, moduleFileCache, toPhase, towerDataContextCollector)
+        }
+
         val firFile = declaration.getContainingFile()
             ?: error("FirFile was not found for\n${declaration.render()}")
         val provider = firFile.session.firIdeProvider
@@ -129,20 +146,14 @@ internal class FirLazyDeclarationResolver(
         val nonLocalDeclarationToResolve = firDeclarationToResolve.getNonLocalDeclarationToResolve(provider, moduleFileCache)
 
         val designation = mutableListOf<FirDeclaration>(containerFirFile)
+
         if (nonLocalDeclarationToResolve !is FirFile) {
-            val id = when (nonLocalDeclarationToResolve) {
-                is FirCallableDeclaration<*> -> {
-                    nonLocalDeclarationToResolve.symbol.callableId.classId
-                }
-                is FirClassLikeDeclaration<*> -> {
-                    nonLocalDeclarationToResolve.symbol.classId
-                }
-                else -> error("Unsupported: ${nonLocalDeclarationToResolve.render()}")
-            }
-            val outerClasses = generateSequence(id) { classId ->
-                classId.outerClassId
-            }.mapTo(mutableListOf()) { provider.getFirClassifierByFqName(it)!! }
-            designation += outerClasses.asReversed()
+            val ktDeclaration = firDeclarationToResolve.ktDeclaration
+            designation += ktDeclaration.parentsOfType<KtClassOrObject>()
+                .filter { it !is KtEnumEntry }
+                .map { it.findSourceNonLocalFirDeclaration(firFileBuilder, provider.symbolProvider, moduleFileCache, containerFirFile) }
+                .toList()
+                .asReversed()
             if (nonLocalDeclarationToResolve is FirCallableDeclaration<*>) {
                 designation += nonLocalDeclarationToResolve
             }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt
index 5dab0fd4ec1..16f47e39360 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.ThreadSafeMutableState
 import org.jetbrains.kotlin.fir.builder.RawFirBuilder
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
+import org.jetbrains.kotlin.fir.originalForSubstitutionOverride
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirProviderInternals
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
@@ -79,7 +80,7 @@ internal class FirIdeProvider(
 
 
     override fun getFirCallableContainerFile(symbol: FirCallableSymbol<*>): FirFile? {
-        symbol.overriddenSymbol?.let {
+        symbol.fir.originalForSubstitutionOverride?.symbol?.let {
             return getFirCallableContainerFile(it)
         }
         if (symbol is FirAccessorSymbol) {
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/resolver/SingleCandidateResolver.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/resolver/SingleCandidateResolver.kt
index 52efff7391d..92fac2677f1 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/resolver/SingleCandidateResolver.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/resolver/SingleCandidateResolver.kt
@@ -65,10 +65,15 @@ class SingleCandidateResolver(
         val resolutionContext = stubBodyResolveTransformer.resolutionContext
 
         val candidate = CandidateFactory(resolutionContext, callInfo).createCandidate(
+            callInfo,
             resolutionParameters.callableSymbol,
             explicitReceiverKind = explicitReceiverKind,
             dispatchReceiverValue = dispatchReceiverValue,
-            implicitExtensionReceiverValue = implicitExtensionReceiverValue,
+            extensionReceiverValue =
+            if (explicitReceiverKind.isExtensionReceiver)
+                callInfo.explicitReceiver?.let { ExpressionReceiverValue(it) }
+            else
+                implicitExtensionReceiverValue,
             scope = null,
         )
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt
index 1df5fa60c0d..99394ee786c 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt
@@ -6,9 +6,12 @@
 package org.jetbrains.kotlin.idea.fir.low.level.api.sessions
 
 import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.config.LanguageVersionSettings
+import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.fir.BuiltinTypes
 import org.jetbrains.kotlin.fir.PrivateSessionConstructor
 import org.jetbrains.kotlin.fir.SessionConfiguration
+import org.jetbrains.kotlin.fir.backend.jvm.FirJvmTypeMapper
 import org.jetbrains.kotlin.fir.checkers.registerCommonCheckers
 import org.jetbrains.kotlin.fir.dependenciesWithoutSelf
 import org.jetbrains.kotlin.fir.java.JavaSymbolProvider
@@ -34,6 +37,7 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCacheI
 import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.FirLazyDeclarationResolver
 import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirModuleWithDependenciesSymbolProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirIdeProvider
+import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSessionFactory.registerIdeComponents
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.ModuleLibrariesSearchScope
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.checkCanceled
 import org.jetbrains.kotlin.load.java.JavaClassFinderImpl
@@ -50,6 +54,7 @@ internal object FirIdeSessionFactory {
         builtinTypes: BuiltinTypes,
         sessionsCache: MutableMap<ModuleSourceInfo, FirIdeSourcesSession>,
         isRootModule: Boolean,
+        languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
     ): FirIdeSourcesSession {
         sessionsCache[moduleInfo]?.let { return it }
         val scopeProvider = KotlinScopeProvider(::wrapScopeWithJvmMapped)
@@ -65,7 +70,7 @@ internal object FirIdeSessionFactory {
             val cache = ModuleFileCacheImpl(this)
             val firPhaseManager = IdeFirPhaseManager(FirLazyDeclarationResolver(firFileBuilder), cache, sessionInvalidator)
 
-            registerCommonComponents()
+            registerCommonComponents(languageVersionSettings)
             registerResolveComponents()
             registerIdeComponents()
 
@@ -112,6 +117,8 @@ internal object FirIdeSessionFactory {
                 )
             )
 
+            register(FirJvmTypeMapper::class, FirJvmTypeMapper(this))
+
             registerJavaSpecificResolveComponents()
             FirSessionFactory.FirSessionConfigurator(this).apply {
                 if (isRootModule) {
@@ -126,6 +133,7 @@ internal object FirIdeSessionFactory {
         project: Project,
         builtinsAndCloneableSession: FirIdeBuiltinsAndCloneableSession,
         builtinTypes: BuiltinTypes,
+        languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
     ): FirIdeLibrariesSession {
         checkCanceled()
         val searchScope = ModuleLibrariesSearchScope(moduleInfo.module)
@@ -137,7 +145,7 @@ internal object FirIdeSessionFactory {
 
         val kotlinClassFinder = VirtualFileFinderFactory.getInstance(project).create(searchScope)
         return FirIdeLibrariesSession(moduleInfo, project, searchScope, builtinTypes).apply {
-            registerCommonComponents()
+            registerCommonComponents(languageVersionSettings)
             registerJavaSpecificResolveComponents()
             registerIdeComponents()
 
@@ -167,12 +175,17 @@ internal object FirIdeSessionFactory {
                     }
                 )
             )
+            register(FirJvmTypeMapper::class, FirJvmTypeMapper(this))
         }
     }
 
-    fun createBuiltinsAndCloneableSession(project: Project, builtinTypes: BuiltinTypes): FirIdeBuiltinsAndCloneableSession {
+    fun createBuiltinsAndCloneableSession(
+        project: Project,
+        builtinTypes: BuiltinTypes,
+        languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT
+    ): FirIdeBuiltinsAndCloneableSession {
         return FirIdeBuiltinsAndCloneableSession(project, builtinTypes).apply {
-            registerCommonComponents()
+            registerCommonComponents(languageVersionSettings)
             registerIdeComponents()
 
             val kotlinScopeProvider = KotlinScopeProvider(::wrapScopeWithJvmMapped)
@@ -186,10 +199,11 @@ internal object FirIdeSessionFactory {
                     )
                 )
             )
+            register(FirJvmTypeMapper::class, FirJvmTypeMapper(this))
         }
     }
 
     private fun FirIdeSession.registerIdeComponents() {
         register(IdeSessionComponents::class, IdeSessionComponents.create(this))
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionProvider.kt
index aaed1a4d43b..34f3787df0f 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionProvider.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionProvider.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
 
 @Immutable
 class FirIdeSessionProvider internal constructor(
-    override val project: Project,
+    val project: Project,
     internal val rootModuleSession: FirIdeSourcesSession,
     val sessions: Map<ModuleSourceInfo, FirIdeSession>
 ) : FirSessionProvider {
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/FirElementFinder.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/FirElementFinder.kt
index 637414d7da4..a6f9191b187 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/FirElementFinder.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/FirElementFinder.kt
@@ -6,20 +6,31 @@
 package org.jetbrains.kotlin.idea.fir.low.level.api.util
 
 import org.jetbrains.kotlin.fir.FirElement
+import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
 import org.jetbrains.kotlin.psi.KtElement
 
 object FirElementFinder {
-    inline fun <reified E : FirElement> findElementIn(container: FirElement, crossinline predicate: (E) -> Boolean): E? {
+    inline fun <reified E : FirElement> findElementIn(
+        container: FirElement,
+        crossinline goInside: (E) -> Boolean = { true },
+        crossinline predicate: (E) -> Boolean,
+    ): E? {
         var result: E? = null
         container.accept(object : FirVisitorVoid() {
             override fun visitElement(element: FirElement) {
                 if (result != null) return
-                if (element is E && predicate(element)) {
-                    result = element
-                } else {
-                    element.acceptChildren(this)
+                when {
+                    element !is E || element is FirFile -> {
+                        element.acceptChildren(this)
+                    }
+                    predicate(element) -> {
+                        result = element
+                    }
+                    goInside(element) -> {
+                        element.acceptChildren(this)
+                    }
                 }
             }
         })
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt
index f6303cd96b9..ca1b4284318 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt
@@ -6,56 +6,114 @@
 package org.jetbrains.kotlin.idea.fir.low.level.api.util
 
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.FirTypeAlias
 import org.jetbrains.kotlin.fir.psi
+import org.jetbrains.kotlin.fir.realPsi
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
+import org.jetbrains.kotlin.idea.fir.low.level.api.api.InvalidFirElementTypeException
+import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.getNonLocalContainingOrThisDeclaration
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.FirFileBuilder
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
 import org.jetbrains.kotlin.idea.util.classIdIfNonLocal
+import org.jetbrains.kotlin.idea.util.getElementTextInContext
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 
 internal fun KtDeclaration.findSourceNonLocalFirDeclaration(
+    firFileBuilder: FirFileBuilder,
+    firSymbolProvider: FirSymbolProvider,
+    moduleFileCache: ModuleFileCache,
+    containerFirFile: FirFile? = null
+): FirDeclaration {
+    //TODO test what way faster
+    findSourceNonLocalFirDeclarationByProvider(firFileBuilder, firSymbolProvider, moduleFileCache, containerFirFile)?.let { return it }
+    findSourceOfNonLocalFirDeclarationByTraversingWholeTree(firFileBuilder, moduleFileCache, containerFirFile)?.let { return it }
+    error("No fir element was found for\n${getElementTextInContext()}")
+}
+
+internal fun KtDeclaration.findFirDeclarationForAnyFirSourceDeclaration(
     firFileBuilder: FirFileBuilder,
     firSymbolProvider: FirSymbolProvider,
     moduleFileCache: ModuleFileCache
 ): FirDeclaration {
-    require(!KtPsiUtil.isLocal(this))
-    return when {
+    val nonLocalDeclaration = getNonLocalContainingOrThisDeclaration()
+        ?.findSourceNonLocalFirDeclaration(firFileBuilder, firSymbolProvider, moduleFileCache)
+        ?: firFileBuilder.buildRawFirFileWithCaching(containingKtFile, moduleFileCache, lazyBodiesMode = true)
+    val originalDeclaration = originalDeclaration
+    val fir = FirElementFinder.findElementIn<FirDeclaration>(nonLocalDeclaration) { firDeclaration ->
+        firDeclaration.psi == this || firDeclaration.psi == originalDeclaration
+    }
+    return fir
+        ?: error("FirDeclaration was not found for\n${getElementTextInContext()}")
+}
+
+internal inline fun <reified F : FirDeclaration> KtDeclaration.findFirDeclarationForAnyFirSourceDeclarationOfType(
+    firFileBuilder: FirFileBuilder,
+    firSymbolProvider: FirSymbolProvider,
+    moduleFileCache: ModuleFileCache
+): FirDeclaration {
+    val fir = findFirDeclarationForAnyFirSourceDeclaration(firFileBuilder, firSymbolProvider, moduleFileCache)
+    if (fir !is F) throw InvalidFirElementTypeException(this, F::class, fir::class)
+    return fir
+}
+
+private fun KtDeclaration.findSourceOfNonLocalFirDeclarationByTraversingWholeTree(
+    firFileBuilder: FirFileBuilder,
+    moduleFileCache: ModuleFileCache,
+    containerFirFile: FirFile?,
+): FirDeclaration? {
+    val firFile = containerFirFile ?: firFileBuilder.buildRawFirFileWithCaching(containingKtFile, moduleFileCache, lazyBodiesMode = true)
+    val originalDeclaration = originalDeclaration
+    return FirElementFinder.findElementIn(firFile, goInside = { it is FirRegularClass }) { firDeclaration ->
+        firDeclaration.psi == this || firDeclaration.psi == originalDeclaration
+    }
+}
+
+private fun KtDeclaration.findSourceNonLocalFirDeclarationByProvider(
+    firFileBuilder: FirFileBuilder,
+    firSymbolProvider: FirSymbolProvider,
+    moduleFileCache: ModuleFileCache,
+    containerFirFile: FirFile?
+): FirDeclaration? {
+    val candidate = when {
         this is KtClassOrObject -> findFir(firSymbolProvider)
         this is KtNamedDeclaration && (this is KtProperty || this is KtNamedFunction) -> {
             val containerClass = containingClassOrObject
             val declarations = if (containerClass != null) {
                 val containerClassFir = containerClass.findFir(firSymbolProvider)
-                containerClassFir.declarations
+                containerClassFir?.declarations
             } else {
                 val ktFile = containingKtFile
-                val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, lazyBodiesMode = true)
+                val firFile = containerFirFile ?: firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, lazyBodiesMode = true)
                 firFile.declarations
             }
             val original = originalDeclaration
-            declarations.first { it.psi === this || it.psi == original }
+            declarations?.first { it.psi === this || it.psi == original }
         }
         this is KtConstructor<*> -> {
-            val containerClassFir = containingClassOrObject?.findFir(firSymbolProvider)
+            val containingClass = containingClassOrObject
                 ?: error("Container class should be not null for KtConstructor")
+            val containerClassFir = containingClass.findFir(firSymbolProvider) ?: return null
             containerClassFir.declarations.first { it.psi === this }
         }
         this is KtTypeAlias -> findFir(firSymbolProvider)
         else -> error("Invalid container $this::class")
     }
+    return candidate?.takeIf { it.realPsi == this }
 }
 
 val ORIGINAL_DECLARATION_KEY = com.intellij.openapi.util.Key<KtDeclaration>("ORIGINAL_DECLARATION_KEY")
-
 var KtDeclaration.originalDeclaration by UserDataProperty(ORIGINAL_DECLARATION_KEY)
 
+private val ORIGINAL_KT_FILE_KEY = com.intellij.openapi.util.Key<KtFile>("ORIGINAL_KT_FILE_KEY")
+var KtFile.originalKtFile by UserDataProperty(ORIGINAL_KT_FILE_KEY)
 
-private fun KtClassOrObject.findFir(firSymbolProvider: FirSymbolProvider): FirRegularClass {
-    val classId = classIdIfNonLocal()
-        ?: error("Container classId should not be null for non-local declaration")
+
+private fun KtClassOrObject.findFir(firSymbolProvider: FirSymbolProvider): FirRegularClass? {
+    val classId = classIdIfNonLocal() ?: return null
     return executeWithoutPCE {
         firSymbolProvider.getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass
             ?: error("Could not find class $classId")
@@ -68,4 +126,5 @@ private fun KtTypeAlias.findFir(firSymbolProvider: FirSymbolProvider): FirTypeAl
         firSymbolProvider.getClassLikeSymbolByFqName(typeAlias)?.fir as? FirTypeAlias
             ?: error("Could not find type alias $typeAlias")
     }
-}
\ No newline at end of file
+}
+
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/utils.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/utils.kt
index 9c3e12d5109..066e0e23cda 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/utils.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/utils.kt
@@ -8,10 +8,15 @@ package org.jetbrains.kotlin.idea.fir.low.level.api.util
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.progress.ProgressManager
 import org.jetbrains.kotlin.fir.FirElement
+import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder
+import org.jetbrains.kotlin.fir.psi
+import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
+import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.psi.KtFile
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.locks.ReentrantLock
+import java.util.concurrent.locks.Lock
 
 
 internal inline fun <T> executeOrReturnDefaultValueOnPCE(defaultValue: T, action: () -> T): T =
@@ -27,7 +32,7 @@ internal inline fun <T : Any> executeWithoutPCE(crossinline action: () -> T): T
     return result!!
 }
 
-internal inline fun <T : Any> ReentrantLock.lockWithPCECheck(lockingIntervalMs: Long, action: () -> T): T {
+internal inline fun <T : Any> Lock.lockWithPCECheck(lockingIntervalMs: Long, action: () -> T): T {
     var needToRun = true
     var result: T? = null
     while (needToRun) {
@@ -52,6 +57,16 @@ internal inline fun checkCanceled() {
 internal val FirElement.isErrorElement
     get() = this is FirDiagnosticHolder
 
+internal val FirDeclaration.ktDeclaration: KtDeclaration
+    get() {
+        val psi = psi
+            ?: error("PSI element was not found for${render()}")
+        return psi as KtDeclaration
+    }
+
+internal val FirDeclaration.containingKtFileIfAny: KtFile?
+    get() = psi?.containingFile as? KtFile
+
 
 internal fun IdeaModuleInfo.collectTransitiveDependenciesWithSelf(): List<IdeaModuleInfo> {
     val result = mutableSetOf<IdeaModuleInfo>()
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
index e1024fee384..5cff929d20e 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
@@ -27,7 +27,7 @@ FILE: delegates.kt
         }
     public final [IMPLICIT_TYPES_BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
         public get(): R|kotlin/Int| {
-            ^ D|/valueWithImplicitType|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
+            ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
         }
     public final [STATUS] var variableWithExplicitType: R|kotlin/Int|by LAZY_EXPRESSION
         public get(): <implicit> {
@@ -38,8 +38,8 @@ FILE: delegates.kt
         }
     public final [IMPLICIT_TYPES_BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
         public get(): R|kotlin/Int| {
-            ^ D|/variableWithImplicitType|.R|FakeOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
+            ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
         }
         public set(<set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-            D|/variableWithImplicitType|.R|FakeOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
+            D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleResolveTest.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleResolveTest.kt
index a9a6ed14cad..696a1cf2c59 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleResolveTest.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleResolveTest.kt
@@ -57,7 +57,7 @@ abstract class AbstractFirMultiModuleResolveTest : AbstractMultiModuleTest() {
 
     private fun createSession(module: Module, provider: FirProjectSessionProvider): FirJavaModuleBasedSession {
         val moduleInfo = module.productionSourceInfo()!!
-        return FirSessionFactory.createJavaModuleBasedSession(moduleInfo, provider, moduleInfo.contentScope())
+        return FirSessionFactory.createJavaModuleBasedSession(moduleInfo, provider, moduleInfo.contentScope(), project)
     }
 
     private fun createLibrarySession(moduleInfo: IdeaModuleInfo, provider: FirProjectSessionProvider): FirLibrarySession {
@@ -69,7 +69,7 @@ abstract class AbstractFirMultiModuleResolveTest : AbstractMultiModuleTest() {
         val firFilesPerSession = mutableMapOf<FirJavaModuleBasedSession, List<FirFile>>()
         val processorsPerSession = mutableMapOf<FirJavaModuleBasedSession, List<FirTransformerBasedResolveProcessor>>()
         val sessions = mutableListOf<FirJavaModuleBasedSession>()
-        val provider = FirProjectSessionProvider(project)
+        val provider = FirProjectSessionProvider()
         for (module in project.allModules().drop(1)) {
             val session = createSession(module, provider)
             sessions += session
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/FirFakeFileImpl.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/FirFakeFileImpl.kt
new file mode 100644
index 00000000000..81714e44270
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/FirFakeFileImpl.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.JavaPsiFacade
+import com.intellij.psi.PsiElement
+import com.intellij.psi.ResolveState
+import com.intellij.psi.scope.PsiScopeProcessor
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.asJava.classes.getOutermostClassOrObject
+import org.jetbrains.kotlin.asJava.elements.FakeFileForLightClass
+import org.jetbrains.kotlin.psi.KtClassOrObject
+
+class FirFakeFileImpl(private val classOrObject: KtClassOrObject, ktClass: KtLightClass) : FakeFileForLightClass(
+    classOrObject.containingKtFile,
+    { if (classOrObject.isTopLevel()) ktClass else FirLightClassForSymbol.create(getOutermostClassOrObject(classOrObject))!! },
+    { null }
+) {
+
+    override fun findReferenceAt(offset: Int) = ktFile.findReferenceAt(offset)
+
+    override fun processDeclarations(
+        processor: PsiScopeProcessor,
+        state: ResolveState,
+        lastParent: PsiElement?,
+        place: PsiElement
+    ): Boolean {
+        if (!super.processDeclarations(processor, state, lastParent, place)) return false
+
+        // We have to explicitly process package declarations if current file belongs to default package
+        // so that Java resolve can find classes located in that package
+        val packageName = packageName
+        if (packageName.isNotEmpty()) return true
+
+        val aPackage = JavaPsiFacade.getInstance(classOrObject.project).findPackage(packageName)
+        if (aPackage != null && !aPackage.processDeclarations(processor, state, null, place)) return false
+
+        return true
+    }
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/FirLightMemberImpl.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/FirLightMemberImpl.kt
new file mode 100644
index 00000000000..310e6580d60
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/FirLightMemberImpl.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiIdentifier
+import com.intellij.psi.PsiMember
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.javadoc.PsiDocComment
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.asJava.elements.KtLightElementBase
+import org.jetbrains.kotlin.asJava.elements.KtLightIdentifier
+import org.jetbrains.kotlin.asJava.elements.KtLightMember
+import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.psi.KtNamedDeclaration
+
+internal abstract class FirLightMemberImpl<T : PsiMember>(
+    override val lightMemberOrigin: LightMemberOrigin?,
+    private val containingClass: KtLightClass,
+) : KtLightElementBase(containingClass), PsiMember, KtLightMember<T> {
+
+    override val clsDelegate: T
+        get() = invalidAccess()
+
+    private val lightIdentifier by lazyPub { KtLightIdentifier(this, kotlinOrigin as? KtNamedDeclaration) }
+
+    override fun hasModifierProperty(name: String): Boolean = modifierList?.hasModifierProperty(name) ?: false
+
+    override fun toString(): String = "${this::class.java.simpleName}:$name"
+
+    override fun getContainingClass() = containingClass
+
+    override fun getNameIdentifier(): PsiIdentifier = lightIdentifier
+
+    override val kotlinOrigin: KtDeclaration? get() = lightMemberOrigin?.originalElement
+
+    override fun getDocComment(): PsiDocComment? = null //TODO()
+
+    override fun isDeprecated(): Boolean = false //TODO()
+
+    abstract override fun getName(): String
+
+    override fun isValid(): Boolean =
+        parent.isValid && lightMemberOrigin?.isValid() != false
+
+    override fun isEquivalentTo(another: PsiElement?): Boolean =
+        basicIsEquivalentTo(this, another as? PsiMethod)
+
+    abstract override fun hashCode(): Int
+
+    abstract override fun equals(other: Any?): Boolean
+}
\ No newline at end of file
diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/asJava/LightClassProviderFirImpl.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/LightClassProviderFirImpl.kt
similarity index 74%
rename from idea/idea-fir/src/org/jetbrains/kotlin/idea/asJava/LightClassProviderFirImpl.kt
rename to idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/LightClassProviderFirImpl.kt
index be1491eb978..80ba2d43f01 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/asJava/LightClassProviderFirImpl.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/LightClassProviderFirImpl.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.idea.asJava
 
 import com.intellij.psi.*
+import org.jetbrains.kotlin.asJava.*
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.psi.*
 
@@ -14,33 +15,26 @@ class LightClassProviderFirImpl : LightClassProvider {
         return null
     }
 
-    override fun getLightClassMethods(function: KtFunction): List<PsiMethod> {
-        return emptyList()
-    }
+    override fun getLightClassMethods(function: KtFunction): List<PsiMethod> =
+        LightClassUtil.getLightClassMethods(function)
 
-    override fun getLightClassParameterDeclarations(parameter: KtParameter): List<PsiNamedElement> {
-        return emptyList()
-    }
+    override fun getLightClassParameterDeclarations(parameter: KtParameter): List<PsiNamedElement> =
+        LightClassUtil.getLightClassPropertyMethods(parameter).allDeclarations
 
-    override fun getLightClassPropertyDeclarations(property: KtProperty): List<PsiNamedElement> {
-        return emptyList()
-    }
+    override fun getLightClassPropertyDeclarations(property: KtProperty): List<PsiNamedElement> =
+        LightClassUtil.getLightClassPropertyMethods(property).allDeclarations
 
-    override fun toLightClassWithBuiltinMapping(classOrObject: KtClassOrObject): PsiClass? {
-        return null
-    }
+    override fun toLightClassWithBuiltinMapping(classOrObject: KtClassOrObject): PsiClass? =
+        null
 
-    override fun toLightMethods(psiElement: PsiElement): List<PsiMethod> {
-        return emptyList()
-    }
+    override fun toLightMethods(psiElement: PsiElement): List<PsiMethod> =
+        psiElement.toLightMethods()
 
-    override fun toLightClass(classOrObject: KtClassOrObject): KtLightClass? {
-        return null
-    }
+    override fun toLightClass(classOrObject: KtClassOrObject): KtLightClass? =
+        classOrObject.toLightClass()
 
-    override fun toLightElements(ktElement: KtElement): List<PsiNamedElement> {
-        return emptyList()
-    }
+    override fun toLightElements(ktElement: KtElement): List<PsiNamedElement> =
+        ktElement.toLightElements()
 
     override fun createKtFakeLightClass(kotlinOrigin: KtClassOrObject): PsiClass? {
         return null
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirAnnotationParameterList.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirAnnotationParameterList.kt
new file mode 100644
index 00000000000..919b82aa1a3
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirAnnotationParameterList.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.impl.light.LightIdentifier
+import org.jetbrains.kotlin.asJava.classes.cannotModify
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.asJava.elements.KtLightElementBase
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedConstantValue
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSimpleConstantValue
+import org.jetbrains.kotlin.psi.KtElement
+
+internal class FirAnnotationParameterList(
+    parent: FirLightAbstractAnnotation,
+    private val annotationCall: KtAnnotationCall,
+) : KtLightElementBase(parent), PsiAnnotationParameterList {
+
+    private val _attributes: Array<PsiNameValuePair> by lazyPub {
+        annotationCall.arguments.map {
+            FirNameValuePairForAnnotationArgument(it, this)
+        }.toTypedArray()
+    }
+
+    override fun getAttributes(): Array<PsiNameValuePair> = _attributes
+
+    override val kotlinOrigin: KtElement? get() = null
+
+    //TODO: EQ GHC EQIV
+}
+
+private class FirNameValuePairForAnnotationArgument(
+    private val constantValue: KtNamedConstantValue,
+    parent: PsiElement
+) : KtLightElementBase(parent), PsiNameValuePair {
+
+    override val kotlinOrigin: KtElement? get() = null
+
+    private val _value by lazyPub {
+        (constantValue.expression as? KtSimpleConstantValue<*>)?.createPsiLiteral(this)
+    }
+
+    override fun setValue(p0: PsiAnnotationMemberValue) = cannotModify()
+
+    private val _nameIdentifier: PsiIdentifier by lazyPub {
+        LightIdentifier(parent.manager, constantValue.name)
+    }
+
+    override fun getNameIdentifier(): PsiIdentifier = _nameIdentifier
+
+    override fun getValue(): PsiAnnotationMemberValue? = _value
+
+    override fun getLiteralValue(): String? = (value as? PsiLiteralExpression)?.value?.toString()
+
+    override fun getName(): String = constantValue.name
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightAbstractAnnotation.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightAbstractAnnotation.kt
new file mode 100644
index 00000000000..453bbb0ad72
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightAbstractAnnotation.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.impl.PsiImplUtil
+import org.jetbrains.kotlin.asJava.classes.cannotModify
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.asJava.elements.*
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
+import org.jetbrains.kotlin.psi.*
+
+internal abstract class FirLightAbstractAnnotation(parent: PsiElement) :
+    KtLightElementBase(parent), PsiAnnotation, KtLightElement<KtCallElement, PsiAnnotation> {
+
+    override val clsDelegate: PsiAnnotation
+        get() = invalidAccess()
+
+    override fun getOwner() = parent as? PsiAnnotationOwner
+
+    private val KtExpression.nameReference: KtNameReferenceExpression?
+        get() = when (this) {
+            is KtConstructorCalleeExpression -> constructorReferenceExpression as? KtNameReferenceExpression
+            else -> this as? KtNameReferenceExpression
+        }
+
+    private val _nameReferenceElement: PsiJavaCodeReferenceElement by lazyPub {
+        val ktElement = kotlinOrigin?.navigationElement ?: this
+        val reference = (kotlinOrigin as? KtAnnotationEntry)?.typeReference?.reference
+            ?: (kotlinOrigin?.calleeExpression?.nameReference)?.references?.firstOrNull()
+
+        if (reference != null) FirLightPsiJavaCodeReferenceElementWithReference(ktElement, reference)
+        else FirLightPsiJavaCodeReferenceElementWithNoReference(ktElement)
+    }
+
+    override fun getNameReferenceElement(): PsiJavaCodeReferenceElement = _nameReferenceElement
+
+    private class FirAnnotationParameterList(parent: PsiAnnotation) : KtLightElementBase(parent), PsiAnnotationParameterList {
+        override val kotlinOrigin: KtElement? = null
+        override fun getAttributes(): Array<PsiNameValuePair> = emptyArray() //TODO()
+    }
+
+    private val annotationParameterList: PsiAnnotationParameterList = FirAnnotationParameterList(this)
+
+    override fun getParameterList(): PsiAnnotationParameterList = annotationParameterList
+
+    override fun delete() {
+        kotlinOrigin?.delete()
+    }
+
+    override fun toString() = "@$qualifiedName"
+
+    abstract override fun equals(other: Any?): Boolean
+
+    abstract override fun hashCode(): Int
+
+    override fun <T : PsiAnnotationMemberValue?> setDeclaredAttributeValue(attributeName: String?, value: T?) = cannotModify()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightAnnotationForAnnotationCall.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightAnnotationForAnnotationCall.kt
new file mode 100644
index 00000000000..19e5d90a6f0
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightAnnotationForAnnotationCall.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.impl.PsiImplUtil
+import com.intellij.util.IncorrectOperationException
+import org.jetbrains.kotlin.asJava.classes.*
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSimpleConstantValue
+import org.jetbrains.kotlin.psi.KtCallElement
+
+internal class FirLightAnnotationForAnnotationCall(
+    private val annotationCall: KtAnnotationCall,
+    parent: PsiElement,
+) : FirLightAbstractAnnotation(parent) {
+
+    override fun findAttributeValue(attributeName: String?): PsiAnnotationMemberValue? =
+        PsiImplUtil.findAttributeValue(this, attributeName)
+
+    override fun findDeclaredAttributeValue(attributeName: String?) =
+        PsiImplUtil.findDeclaredAttributeValue(this, attributeName)
+
+    private val _parameterList: PsiAnnotationParameterList by lazyPub {
+        FirAnnotationParameterList(this@FirLightAnnotationForAnnotationCall, annotationCall)
+    }
+
+    override fun getParameterList(): PsiAnnotationParameterList = _parameterList
+
+    override val kotlinOrigin: KtCallElement? = annotationCall.psi
+
+    override fun getQualifiedName(): String? = annotationCall.classId?.asSingleFqName()?.asString()
+
+    override fun getName(): String? = qualifiedName
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightAnnotationForAnnotationCall &&
+                        kotlinOrigin == other.kotlinOrigin &&
+                        annotationCall == other.annotationCall)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+
+    override fun isEquivalentTo(another: PsiElement?): Boolean =
+        basicIsEquivalentTo(this, another as? PsiAnnotation)
+}
+
+private fun escapeString(str: String): String = buildString {
+    str.forEach { char ->
+        val escaped = when (char) {
+            '\n' -> "\\n"
+            '\r' -> "\\r"
+            '\t' -> "\\t"
+            '\"' -> "\\\""
+            '\\' -> "\\\\"
+            else -> "$char"
+        }
+        append(escaped)
+    }
+}
+
+private fun KtSimpleConstantValue<*>.asStringForPsiLiteral(parent: PsiElement): String =
+    when (val value = this.constant) {
+        is String -> "\"${escapeString(value)}\""
+        is Long -> "${value}L"
+        is Float -> "${value}f"
+        else -> value?.toString() ?: "null"
+    }
+
+internal fun KtSimpleConstantValue<*>.createPsiLiteral(parent: PsiElement): PsiExpression? {
+    val asString = asStringForPsiLiteral(parent)
+    val instance = PsiElementFactory.getInstance(parent.project)
+    return try {
+        instance.createExpressionFromText(asString, parent)
+    } catch (_: IncorrectOperationException) {
+        null
+    }
+}
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightSimpleAnnotation.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightSimpleAnnotation.kt
new file mode 100644
index 00000000000..2f3d757b098
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/FirLightSimpleAnnotation.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiAnnotationMemberValue
+import com.intellij.psi.PsiElement
+import com.intellij.psi.impl.PsiImplUtil
+import org.jetbrains.kotlin.psi.KtCallElement
+
+internal class FirLightSimpleAnnotation(
+    private val fqName: String?,
+    parent: PsiElement
+) : FirLightAbstractAnnotation(parent) {
+    override val kotlinOrigin: KtCallElement? = null
+
+    override fun getQualifiedName(): String? = fqName
+
+    override fun getName(): String? = fqName
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightSimpleAnnotation && fqName == other.fqName && parent == other.parent)
+
+    override fun hashCode(): Int = fqName.hashCode()
+
+    override fun findAttributeValue(attributeName: String?): PsiAnnotationMemberValue? = null
+
+    override fun findDeclaredAttributeValue(attributeName: String?): PsiAnnotationMemberValue? = null
+}
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/annotationsUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/annotationsUtils.kt
new file mode 100644
index 00000000000..c27bf26a7c5
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/annotations/annotationsUtils.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.NotNull
+import org.jetbrains.annotations.Nullable
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.fir.FirSymbolOwner
+import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.expressions.*
+import org.jetbrains.kotlin.fir.references.FirNamedReference
+import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
+import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference
+import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
+import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirAnnotationCall
+import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.mapAnnotationParameters
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotatedSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSimpleConstantValue
+
+internal fun KtAnnotatedSymbol.hasJvmSyntheticAnnotation(annotationUseSiteTarget: AnnotationUseSiteTarget?): Boolean =
+    hasAnnotation("kotlin/jvm/JvmSynthetic", annotationUseSiteTarget)
+
+internal fun KtAnnotatedSymbol.getJvmNameFromAnnotation(annotationUseSiteTarget: AnnotationUseSiteTarget? = null): String? {
+    val annotation = annotations.firstOrNull {
+        val siteTarget = it.useSiteTarget
+        (siteTarget == null || siteTarget == annotationUseSiteTarget) &&
+                it.classId?.asString() == "kotlin/jvm/JvmName"
+    }
+
+    return annotation?.let {
+        (it.arguments.firstOrNull()?.expression as? KtSimpleConstantValue<*>)?.constant as? String
+    }
+}
+
+internal fun KtAnnotatedSymbol.isHiddenByDeprecation(annotationUseSiteTarget: AnnotationUseSiteTarget?): Boolean {
+
+    //TODO Move it to HL API
+    require(this is KtFirSymbol<*>)
+
+    return this.firRef.withFir(FirResolvePhase.TYPES) {
+        if (it !is FirAnnotatedDeclaration) return@withFir false
+
+        val deprecatedAnnotationCall = it.annotations.firstOrNull { annotationCall ->
+            val siteTarget = annotationCall.useSiteTarget
+            (siteTarget == null || siteTarget == annotationUseSiteTarget) &&
+                    annotationCall.classId?.asString() == "kotlin/Deprecated"
+        } ?: return@withFir false
+
+        val qualifiedExpression = mapAnnotationParameters(deprecatedAnnotationCall, it.session)["level"] as? FirQualifiedAccessExpression
+            ?: return@withFir false
+
+        val calleeReference = (qualifiedExpression.calleeReference as? FirNamedReference)?.name?.asString()
+
+        calleeReference == "HIDDEN"
+    }
+}
+
+
+internal fun KtAnnotatedSymbol.hasJvmFieldAnnotation(): Boolean =
+    hasAnnotation("kotlin/jvm/JvmField", null)
+
+internal fun KtAnnotatedSymbol.hasJvmOverloadsAnnotation(): Boolean =
+    hasAnnotation("kotlin/jvm/JvmOverloads", null)
+
+internal fun KtAnnotatedSymbol.hasJvmStaticAnnotation(): Boolean =
+    hasAnnotation("kotlin/jvm/JvmStatic", null)
+
+internal fun KtAnnotatedSymbol.hasInlineOnlyAnnotation(): Boolean =
+    hasAnnotation("kotlin/internal/InlineOnly", null)
+
+internal fun KtAnnotatedSymbol.hasAnnotation(classIdString: String, annotationUseSiteTarget: AnnotationUseSiteTarget?): Boolean =
+    annotations.any {
+        val siteTarget = it.useSiteTarget
+        (siteTarget == null || siteTarget == annotationUseSiteTarget) && it.classId?.asString() == classIdString
+    }
+
+internal fun KtAnnotatedSymbol.computeAnnotations(
+    parent: PsiElement,
+    nullability: NullabilityType,
+    annotationUseSiteTarget: AnnotationUseSiteTarget?
+): List<PsiAnnotation> {
+
+    if (nullability == NullabilityType.Unknown && annotations.isEmpty()) return emptyList()
+
+    val nullabilityAnnotation = when (nullability) {
+        NullabilityType.NotNull -> NotNull::class.java
+        NullabilityType.Nullable -> Nullable::class.java
+        else -> null
+    }?.let {
+        FirLightSimpleAnnotation(it.name, parent)
+    }
+
+    if (annotations.isEmpty()) {
+        return if (nullabilityAnnotation != null) listOf(nullabilityAnnotation) else emptyList()
+    }
+
+    val result = mutableListOf<PsiAnnotation>()
+    for (annotation in annotations) {
+
+        val siteTarget = annotation.useSiteTarget
+        if (siteTarget == null || siteTarget == annotationUseSiteTarget) {
+            result.add(FirLightAnnotationForAnnotationCall(annotation, parent))
+        }
+    }
+
+    if (nullabilityAnnotation != null) {
+        result.add(nullabilityAnnotation)
+    }
+
+    return result
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassBase.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassBase.kt
new file mode 100644
index 00000000000..a8aa43457fe
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassBase.kt
@@ -0,0 +1,267 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.navigation.ItemPresentation
+import com.intellij.navigation.ItemPresentationProviders
+import com.intellij.openapi.util.Pair
+import com.intellij.psi.*
+import com.intellij.psi.impl.PsiClassImplUtil
+import com.intellij.psi.impl.PsiImplUtil
+import com.intellij.psi.impl.light.LightElement
+import com.intellij.psi.impl.source.PsiExtensibleClass
+import com.intellij.psi.javadoc.PsiDocComment
+import com.intellij.psi.scope.PsiScopeProcessor
+import com.intellij.psi.util.PsiUtil
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
+import org.jetbrains.kotlin.asJava.classes.KotlinClassInnerStuffCache
+import org.jetbrains.kotlin.asJava.classes.KotlinClassInnerStuffCache.Companion.processDeclarationsInEnum
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_BASE
+import org.jetbrains.kotlin.asJava.elements.KtLightField
+import org.jetbrains.kotlin.asJava.elements.KtLightMethod
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.idea.KotlinLanguage
+
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotatedSymbol
+import java.util.*
+
+abstract class FirLightClassBase protected constructor(manager: PsiManager) : LightElement(manager, KotlinLanguage.INSTANCE), PsiClass,
+    KtLightClass, PsiExtensibleClass {
+
+    override val clsDelegate: PsiClass
+        get() = invalidAccess()
+
+    protected open val myInnersCache = KotlinClassInnerStuffCache(
+        myClass = this,
+        externalDependencies = listOf(KotlinModificationTrackerService.getInstance(manager.project).outOfBlockModificationTracker)
+    )
+
+    override fun getFields(): Array<PsiField> = myInnersCache.fields
+
+    override fun getMethods(): Array<PsiMethod> = myInnersCache.methods
+
+    override fun getConstructors(): Array<PsiMethod> = myInnersCache.constructors
+
+    override fun getInnerClasses(): Array<out PsiClass> = myInnersCache.innerClasses
+
+    override fun getAllFields(): Array<PsiField> = PsiClassImplUtil.getAllFields(this)
+
+    override fun getAllMethods(): Array<PsiMethod> = PsiClassImplUtil.getAllMethods(this)
+
+    override fun getAllInnerClasses(): Array<PsiClass> = PsiClassImplUtil.getAllInnerClasses(this)
+
+    override fun findFieldByName(name: String, checkBases: Boolean) =
+        myInnersCache.findFieldByName(name, checkBases)
+
+    override fun findMethodsByName(name: String, checkBases: Boolean): Array<PsiMethod> =
+        myInnersCache.findMethodsByName(name, checkBases)
+
+    override fun findInnerClassByName(name: String, checkBases: Boolean): PsiClass? =
+        myInnersCache.findInnerClassByName(name, checkBases)
+
+    override fun processDeclarations(
+        processor: PsiScopeProcessor, state: ResolveState, lastParent: PsiElement?, place: PsiElement
+    ): Boolean {
+
+        if (isEnum && !processDeclarationsInEnum(processor, state, myInnersCache)) return false
+
+        return PsiClassImplUtil.processDeclarationsInClass(
+            this,
+            processor,
+            state,
+            null,
+            lastParent,
+            place,
+            PsiUtil.getLanguageLevel(place),
+            false
+        )
+    }
+
+    override fun getText(): String = kotlinOrigin?.text ?: ""
+
+    override fun getLanguage(): KotlinLanguage = KotlinLanguage.INSTANCE
+
+    override fun getPresentation(): ItemPresentation? =
+        ItemPresentationProviders.getItemPresentation(this)
+
+    abstract override fun equals(other: Any?): Boolean
+
+    abstract override fun hashCode(): Int
+
+    override fun getContext(): PsiElement = parent
+
+    override fun isEquivalentTo(another: PsiElement?): Boolean =
+        PsiClassImplUtil.isClassEquivalentTo(this, another)
+
+    override fun getDocComment(): PsiDocComment? = null
+
+    override fun hasTypeParameters(): Boolean = PsiImplUtil.hasTypeParameters(this)
+
+    override fun getExtendsListTypes(): Array<PsiClassType?> =
+        PsiClassImplUtil.getExtendsListTypes(this)
+
+    override fun getImplementsListTypes(): Array<PsiClassType?> =
+        PsiClassImplUtil.getImplementsListTypes(this)
+
+    override fun findMethodBySignature(patternMethod: PsiMethod?, checkBases: Boolean): PsiMethod? =
+        patternMethod?.let { PsiClassImplUtil.findMethodBySignature(this, it, checkBases) }
+
+    override fun findMethodsBySignature(patternMethod: PsiMethod?, checkBases: Boolean): Array<PsiMethod?> =
+        patternMethod?.let { PsiClassImplUtil.findMethodsBySignature(this, it, checkBases) } ?: emptyArray()
+
+    override fun findMethodsAndTheirSubstitutorsByName(
+        @NonNls name: String?,
+        checkBases: Boolean
+    ): List<Pair<PsiMethod?, PsiSubstitutor?>?> =
+        PsiClassImplUtil.findMethodsAndTheirSubstitutorsByName(this, name, checkBases)
+
+    override fun getAllMethodsAndTheirSubstitutors(): List<Pair<PsiMethod?, PsiSubstitutor?>?> {
+        return PsiClassImplUtil.getAllWithSubstitutorsByMap(this, PsiClassImplUtil.MemberType.METHOD)
+    }
+
+    abstract override fun copy(): PsiElement
+
+    override fun accept(visitor: PsiElementVisitor) {
+        if (visitor is JavaElementVisitor) {
+            visitor.visitClass(this)
+        } else {
+            visitor.visitElement(this)
+        }
+    }
+
+    protected fun createMethods(declarations: Sequence<KtCallableSymbol>, isTopLevel: Boolean, result: MutableList<KtLightMethod>) {
+        var methodIndex = METHOD_INDEX_BASE
+        for (declaration in declarations) {
+
+            if (declaration is KtFunctionSymbol && declaration.isInline) continue
+
+            if (declaration is KtAnnotatedSymbol && declaration.hasJvmSyntheticAnnotation(annotationUseSiteTarget = null)) continue
+
+            if (declaration is KtAnnotatedSymbol && declaration.isHiddenByDeprecation(annotationUseSiteTarget = null)) continue
+
+            when (declaration) {
+                is KtFunctionSymbol -> {
+                    result.add(
+                        FirLightSimpleMethodForSymbol(
+                            functionSymbol = declaration,
+                            lightMemberOrigin = null,
+                            containingClass = this@FirLightClassBase,
+                            isTopLevel = isTopLevel,
+                            methodIndex = methodIndex++
+                        )
+                    )
+
+                    if (declaration.hasJvmOverloadsAnnotation()) {
+                        val skipMask = BitSet(declaration.valueParameters.size)
+
+                        for (i in declaration.valueParameters.size - 1 downTo 0) {
+
+                            if (!declaration.valueParameters[i].hasDefaultValue) continue
+
+                            skipMask.set(i)
+
+                            result.add(
+                                FirLightSimpleMethodForSymbol(
+                                    functionSymbol = declaration,
+                                    lightMemberOrigin = null,
+                                    containingClass = this@FirLightClassBase,
+                                    isTopLevel = isTopLevel,
+                                    methodIndex = methodIndex++,
+                                    argumentsSkipMask = skipMask
+                                )
+                            )
+                        }
+                    }
+                }
+                is KtConstructorSymbol -> {
+                    result.add(
+                        FirLightConstructorForSymbol(
+                            constructorSymbol = declaration,
+                            lightMemberOrigin = null,
+                            containingClass = this@FirLightClassBase,
+                            methodIndex++
+                        )
+                    )
+                }
+                is KtPropertySymbol -> {
+
+                    if (declaration.hasJvmFieldAnnotation()) continue
+
+                    val getter = declaration.getter?.takeIf {
+                        !declaration.hasJvmSyntheticAnnotation(AnnotationUseSiteTarget.PROPERTY_GETTER) &&
+                                !it.isInline &&
+                                !declaration.isHiddenByDeprecation(AnnotationUseSiteTarget.PROPERTY_GETTER)
+                    }
+
+                    if (getter != null) {
+                        result.add(
+                            FirLightAccessorMethodForSymbol(
+                                propertyAccessorSymbol = getter,
+                                containingPropertySymbol = declaration,
+                                lightMemberOrigin = null,
+                                containingClass = this@FirLightClassBase,
+                                isTopLevel = isTopLevel
+                            )
+                        )
+                    }
+
+                    val setter = declaration.setter?.takeIf {
+                        !declaration.hasJvmSyntheticAnnotation(AnnotationUseSiteTarget.PROPERTY_SETTER) &&
+                                !it.isInline &&
+                                !declaration.isHiddenByDeprecation(AnnotationUseSiteTarget.PROPERTY_GETTER)
+                    }
+
+                    if (setter != null) {
+                        result.add(
+                            FirLightAccessorMethodForSymbol(
+                                propertyAccessorSymbol = setter,
+                                containingPropertySymbol = declaration,
+                                lightMemberOrigin = null,
+                                containingClass = this@FirLightClassBase,
+                                isTopLevel = isTopLevel
+                            )
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    protected fun createFields(declarations: Sequence<KtCallableSymbol>, isTopLevel: Boolean, result: MutableList<KtLightField>) {
+        //TODO isHiddenByDeprecation
+        for (declaration in declarations) {
+            if (declaration !is KtPropertySymbol) continue
+
+            if (!declaration.hasBackingField) continue
+            if (declaration.hasJvmSyntheticAnnotation(AnnotationUseSiteTarget.FIELD)) continue
+            result.add(
+                FirLightFieldForPropertySymbol(
+                    propertySymbol = declaration,
+                    containingClass = this@FirLightClassBase,
+                    lightMemberOrigin = null,
+                    isTopLevel = isTopLevel
+                )
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassForFacade.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassForFacade.kt
new file mode 100644
index 00000000000..ffdd9561bbf
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassForFacade.kt
@@ -0,0 +1,273 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.openapi.util.Comparing
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.*
+import com.intellij.psi.impl.PsiSuperMethodImplUtil
+import com.intellij.psi.impl.light.LightEmptyImplementsList
+import com.intellij.psi.impl.light.LightModifierList
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.kotlin.asJava.classes.*
+import org.jetbrains.kotlin.asJava.elements.*
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
+import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
+import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.types.ConeNullability
+import org.jetbrains.kotlin.idea.KotlinLanguage
+import org.jetbrains.kotlin.idea.fir.low.level.api.api.LowLevelFirApiFacade
+import org.jetbrains.kotlin.idea.frontend.api.analyze
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
+import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.isPrivate
+import org.jetbrains.kotlin.util.collectionUtils.filterIsInstanceAnd
+import javax.swing.Icon
+
+class FirLightClassForFacade(
+    manager: PsiManager,
+    private val facadeClassFqName: FqName,
+    private val files: Collection<KtFile>
+) : FirLightClassBase(manager) {
+
+    override val clsDelegate: PsiClass get() = invalidAccess()
+
+    private val isMultiFileClass: Boolean by lazyPub {
+        files.size > 1 || files.any {
+            JvmFileClassUtil.findAnnotationEntryOnFileNoResolve(
+                file = it,
+                shortName = JvmFileClassUtil.JVM_MULTIFILE_CLASS_SHORT
+            ) != null
+        }
+    }
+
+    private val _modifierList: PsiModifierList by lazyPub {
+        if (isMultiFileClass)
+            return@lazyPub LightModifierList(manager, KotlinLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL)
+
+        val modifiers = setOf(PsiModifier.PUBLIC, PsiModifier.FINAL)
+
+//        val annotations = files.flatMap { file ->
+//            file.withFir<FirFile, List<PsiAnnotation>> {
+//                computeAnnotations(
+//                    parent = this@FirLightClassForFacade,
+//                    nullability = ConeNullability.UNKNOWN,
+//                    annotationUseSiteTarget = AnnotationUseSiteTarget.FILE
+//                )
+//            }
+//        }
+        val annotations = emptyList<PsiAnnotation>() //TODO
+
+        FirLightClassModifierList(this@FirLightClassForFacade, modifiers, annotations)
+    }
+
+    override fun getModifierList(): PsiModifierList = _modifierList
+
+    override fun getScope(): PsiElement? = parent
+
+    private fun loadMethodsFromFile(
+        file: KtFile,
+        result: MutableList<KtLightMethod>
+    ) {
+        //it.isHiddenByDeprecation(support)
+        val declarations = file.declarations
+            .filterIsInstance<KtNamedDeclaration>()
+            .filterNot { multiFileClass && it.isPrivate() }
+
+        if (declarations.isEmpty()) return
+
+        val symbols = analyze(file) {
+            declarations.mapNotNull {
+                it.getSymbol() as? KtCallableSymbol
+            }
+        }
+
+        createMethods(symbols.asSequence(), isTopLevel = true, result)
+    }
+
+    private val _ownMethods: List<KtLightMethod> by lazyPub {
+        val result = mutableListOf<KtLightMethod>()
+        for (file in files) {
+            loadMethodsFromFile(file, result)
+        }
+        result
+    }
+
+    private val multiFileClass: Boolean by lazyPub {
+        false //TODO
+//        files.any {
+//            it.withFir<FirFile, Boolean> {
+//                this.hasAnnotation(JvmFileClassUtil.JVM_MULTIFILE_CLASS.asString())
+//            }
+//        }
+    }
+
+    private fun loadFieldsFromFile(
+        file: KtFile,
+        result: MutableList<KtLightField>
+    ) {
+
+        //it.isHiddenByDeprecation(support)
+        val declarations = file.declarations
+            .filterIsInstance<KtNamedDeclaration>()
+            .filterNot { multiFileClass && it is FirProperty && it.isConst }
+
+        if (declarations.isEmpty()) return
+
+        val symbols = analyze(file) {
+            declarations.mapNotNull {
+                it.getSymbol() as? KtCallableSymbol
+            }
+        }
+
+        createFields(symbols.asSequence(), isTopLevel = true, result)
+    }
+
+    private val _ownFields: List<KtLightField> by lazyPub {
+        val result = mutableListOf<KtLightField>()
+        for (file in files) {
+            loadFieldsFromFile(file, result)
+        }
+        result
+    }
+
+    override fun getOwnFields() = _ownFields
+
+    override fun getOwnMethods() = _ownMethods
+
+    override fun copy(): FirLightClassForFacade =
+        FirLightClassForFacade(manager, facadeClassFqName, files)
+
+    private val firstFileInFacade by lazyPub { files.iterator().next() }
+
+    private val packageFqName: FqName =
+        facadeClassFqName.parent()
+
+    private val modifierList: PsiModifierList =
+        LightModifierList(manager, KotlinLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL)
+
+    private val implementsList: LightEmptyImplementsList =
+        LightEmptyImplementsList(manager)
+
+    private val packageClsFile = FakeFileForLightClass(
+        firstFileInFacade,
+        lightClass = { this },
+        stub = { null },
+        packageFqName = packageFqName
+    )
+
+    override fun getParent(): PsiElement = containingFile
+
+    override val kotlinOrigin: KtClassOrObject? get() = null
+
+    val fqName: FqName
+        get() = facadeClassFqName
+
+    override fun hasModifierProperty(@NonNls name: String) = modifierList.hasModifierProperty(name)
+
+    override fun getExtendsList(): PsiReferenceList? = null
+
+    override fun isDeprecated() = false
+
+    override fun isInterface() = false
+
+    override fun isAnnotationType() = false
+
+    override fun isEnum() = false
+
+    override fun getContainingClass(): PsiClass? = null
+
+    override fun getContainingFile() = packageClsFile
+
+    override fun hasTypeParameters() = false
+
+    override fun getTypeParameters(): Array<out PsiTypeParameter> = PsiTypeParameter.EMPTY_ARRAY
+
+    override fun getTypeParameterList(): PsiTypeParameterList? = null
+
+    override fun getImplementsList() = implementsList
+
+    override fun getInterfaces(): Array<out PsiClass> = PsiClass.EMPTY_ARRAY
+
+    override fun getInnerClasses(): Array<out PsiClass> = PsiClass.EMPTY_ARRAY
+
+    override fun getOwnInnerClasses(): List<PsiClass> = listOf()
+
+    override fun getAllInnerClasses(): Array<PsiClass> = PsiClass.EMPTY_ARRAY
+
+    override fun getInitializers(): Array<out PsiClassInitializer> = PsiClassInitializer.EMPTY_ARRAY
+
+    override fun findInnerClassByName(@NonNls name: String, checkBases: Boolean): PsiClass? = null
+
+    override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean = false
+
+    override fun getLBrace(): PsiElement? = null
+
+    override fun getRBrace(): PsiElement? = null
+
+    override fun getName(): String = facadeClassFqName.shortName().asString()
+
+    override fun setName(name: String): PsiElement? = cannotModify()
+
+    override fun getQualifiedName() = facadeClassFqName.asString()
+
+    override fun getNameIdentifier(): PsiIdentifier? = null
+
+    override fun isValid() = files.all { it.isValid && it.hasTopLevelCallables() && facadeClassFqName == it.javaFileFacadeFqName }
+
+    override fun getNavigationElement() = firstFileInFacade
+
+    override fun isEquivalentTo(another: PsiElement?): Boolean =
+        equals(another) || another is FirLightClassForFacade && Comparing.equal(another.qualifiedName, qualifiedName)
+
+    override fun getElementIcon(flags: Int): Icon? = throw UnsupportedOperationException("This should be done by JetIconProvider")
+
+    override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean {
+        return baseClass.qualifiedName == CommonClassNames.JAVA_LANG_OBJECT
+    }
+
+    override fun getSuperClass(): PsiClass? {
+        return JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_OBJECT, resolveScope)
+    }
+
+    override fun getSupers(): Array<PsiClass> =
+        superClass?.let { arrayOf(it) } ?: arrayOf()
+
+    override fun getSuperTypes(): Array<PsiClassType> =
+        arrayOf(PsiType.getJavaLangObject(manager, resolveScope))
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is FirLightClassForFacade) return false
+        if (this === other) return true
+
+        if (this.hashCode() != other.hashCode()) return false
+        if (manager != other.manager) return false
+        if (facadeClassFqName != other.facadeClassFqName) return false
+        return true
+    }
+
+    override fun hashCode() = facadeClassFqName.hashCode()
+
+    override fun toString() = "${KtLightClassForFacade::class.java.simpleName}:$facadeClassFqName"
+
+    override val originKind: LightClassOriginKind
+        get() = LightClassOriginKind.SOURCE
+
+    override fun getText() = firstFileInFacade.text ?: ""
+
+    override fun getTextRange(): TextRange = firstFileInFacade.textRange ?: TextRange.EMPTY_RANGE
+
+    override fun getTextOffset() = firstFileInFacade.textOffset
+
+    override fun getStartOffsetInParent() = firstFileInFacade.startOffsetInParent
+
+    override fun isWritable() = files.all { it.isWritable }
+
+    override fun getVisibleSignatures(): MutableCollection<HierarchicalMethodSignature> = PsiSuperMethodImplUtil.getVisibleSignatures(this)
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassForSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassForSymbol.kt
new file mode 100644
index 00000000000..fbac14f7c11
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/class/FirLightClassForSymbol.kt
@@ -0,0 +1,350 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.openapi.util.Comparing
+import com.intellij.psi.*
+import com.intellij.psi.impl.InheritanceImplUtil
+import com.intellij.psi.impl.PsiClassImplUtil
+import com.intellij.psi.impl.PsiSuperMethodImplUtil
+import com.intellij.psi.search.SearchScope
+import com.intellij.psi.stubs.IStubElementType
+import com.intellij.psi.stubs.StubElement
+import com.intellij.psi.util.CachedValueProvider
+import com.intellij.psi.util.CachedValuesManager
+import com.intellij.util.IncorrectOperationException
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
+import org.jetbrains.kotlin.asJava.classes.*
+import org.jetbrains.kotlin.asJava.elements.KtLightField
+import org.jetbrains.kotlin.asJava.elements.KtLightIdentifier
+import org.jetbrains.kotlin.asJava.elements.KtLightMethod
+import org.jetbrains.kotlin.fir.symbols.StandardClassIds
+import org.jetbrains.kotlin.idea.frontend.api.analyze
+import org.jetbrains.kotlin.idea.frontend.api.fir.analyzeWithSymbolAsContext
+import org.jetbrains.kotlin.idea.frontend.api.symbols.*
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
+import org.jetbrains.kotlin.idea.frontend.api.types.KtClassType
+import org.jetbrains.kotlin.idea.util.ifFalse
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.debugText.getDebugText
+import org.jetbrains.kotlin.psi.psiUtil.isObjectLiteral
+import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub
+import javax.swing.Icon
+import kotlin.collections.ArrayList
+
+class FirLightClassForSymbol(
+    private val classOrObjectSymbol: KtClassOrObjectSymbol,
+    manager: PsiManager
+) :
+    FirLightClassBase(manager),
+    StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
+
+    private val isTopLevel: Boolean = classOrObjectSymbol.symbolKind == KtSymbolKind.TOP_LEVEL
+
+    private val _modifierList: PsiModifierList? by lazyPub {
+
+        val modifiers = mutableSetOf(classOrObjectSymbol.computeVisibility(isTopLevel))
+        classOrObjectSymbol.computeSimpleModality()?.run {
+            modifiers.add(this)
+        }
+        if (!isTopLevel && !classOrObjectSymbol.isInner) {
+            modifiers.add(PsiModifier.STATIC)
+        }
+
+        val annotations = classOrObjectSymbol.computeAnnotations(
+            parent = this@FirLightClassForSymbol,
+            nullability = NullabilityType.Unknown,
+            annotationUseSiteTarget = null,
+        )
+
+        FirLightClassModifierList(this@FirLightClassForSymbol, modifiers, annotations)
+    }
+
+    override fun getModifierList(): PsiModifierList? = _modifierList
+    override fun getOwnFields(): List<KtLightField> = _ownFields
+    override fun getOwnMethods(): List<PsiMethod> = _ownMethods
+    override fun isDeprecated(): Boolean = false //TODO()
+    override fun getNameIdentifier(): KtLightIdentifier? = null //TODO()
+    override fun getExtendsList(): PsiReferenceList? = _extendsList
+    override fun getImplementsList(): PsiReferenceList? = _implementsList
+    override fun getTypeParameterList(): PsiTypeParameterList? = null //TODO()
+    override fun getTypeParameters(): Array<PsiTypeParameter> = emptyArray() //TODO()
+
+    override fun getOwnInnerClasses(): List<PsiClass> {
+        val result = ArrayList<PsiClass>()
+
+        // workaround for ClassInnerStuffCache not supporting classes with null names, see KT-13927
+        // inner classes with null names can't be searched for and can't be used from java anyway
+        // we can't prohibit creating light classes with null names either since they can contain members
+
+        analyzeWithSymbolAsContext(classOrObjectSymbol) {
+            classOrObjectSymbol.getDeclaredMemberScope().getAllSymbols().filterIsInstance<KtClassOrObjectSymbol>().mapTo(result) {
+                FirLightClassForSymbol(it, manager)
+            }
+        }
+
+        //TODO
+        //if (classOrObject.hasInterfaceDefaultImpls) {
+        //    result.add(KtLightClassForInterfaceDefaultImpls(classOrObject))
+        //}
+        return result
+    }
+
+    override fun getTextOffset(): Int = kotlinOrigin?.textOffset ?: 0
+    override fun getStartOffsetInParent(): Int = kotlinOrigin?.startOffsetInParent ?: 0
+    override fun isWritable() = kotlinOrigin?.isWritable ?: false
+    override val kotlinOrigin: KtClassOrObject? = classOrObjectSymbol.psi as? KtClassOrObject
+
+    private val _extendsList by lazyPub { createInheritanceList(forExtendsList = true) }
+    private val _implementsList by lazyPub { createInheritanceList(forExtendsList = false) }
+
+    private fun KtClassType.isTypeForInheritanceList(forExtendsList: Boolean): Boolean {
+
+        // Do not add redundant "extends java.lang.Object" anywhere
+        if (classId == StandardClassIds.Any) return false
+
+        // We don't have Enum among enums supertype in sources neither we do for decompiled class-files and light-classes
+        if (isEnum && classId == StandardClassIds.Enum) return false
+
+        // Interfaces have only extends lists
+        if (isInterface) return forExtendsList
+
+        val isInterface = (this.classSymbol as? KtClassOrObjectSymbol)?.classKind == KtClassKind.INTERFACE
+
+        return forExtendsList == !isInterface
+    }
+
+    private fun createInheritanceList(forExtendsList: Boolean): PsiReferenceList? {
+
+        val role = if (forExtendsList) PsiReferenceList.Role.EXTENDS_LIST else PsiReferenceList.Role.IMPLEMENTS_LIST
+
+        if (isAnnotationType) return KotlinLightReferenceListBuilder(manager, language, role)
+
+        val listBuilder = KotlinSuperTypeListBuilder(
+            kotlinOrigin = kotlinOrigin?.getSuperTypeList(),
+            manager = manager,
+            language = language,
+            role = role
+        )
+
+        //TODO Add support for kotlin.collections.
+        classOrObjectSymbol.superTypes.map { type ->
+            if (type is KtClassType && type.isTypeForInheritanceList(forExtendsList)) {
+                type.mapSupertype(this, kotlinCollectionAsIs = true)?.run {
+                    listBuilder.addReference(this)
+                }
+            }
+        }
+
+        return listBuilder
+    }
+
+    private val _ownMethods: List<KtLightMethod> by lazyPub {
+
+        val result = mutableListOf<KtLightMethod>()
+
+        analyzeWithSymbolAsContext(classOrObjectSymbol) {
+            //TODO filterNot { it.isHiddenByDeprecation(support) }
+            val callableSymbols = classOrObjectSymbol.getDeclaredMemberScope().getCallableSymbols()
+            val visibleDeclarations = callableSymbols.filterNot {
+                isInterface && it is KtFunctionSymbol && it.visibility == KtSymbolVisibility.PRIVATE
+            }
+
+            createMethods(visibleDeclarations, isTopLevel = false, result)
+        }
+
+        if (result.none { it.isConstructor }) {
+            classOrObjectSymbol.primaryConstructor?.let {
+                result.add(
+                    FirLightConstructorForSymbol(
+                        constructorSymbol = it,
+                        lightMemberOrigin = null,
+                        containingClass = this,
+                        methodIndex = METHOD_INDEX_FOR_DEFAULT_CTOR
+                    )
+                )
+            }
+        }
+
+        result
+    }
+
+    private val _ownFields: List<KtLightField> by lazyPub {
+
+        val result = mutableListOf<KtLightField>()
+
+        classOrObjectSymbol.companionObject?.run {
+            result.add(FirLightFieldForObjectSymbol(this, this@FirLightClassForSymbol, null))
+
+            if (!isInterface) {
+                analyzeWithSymbolAsContext(this) {
+                    getDeclaredMemberScope().getCallableSymbols()
+                        .filterIsInstance<KtPropertySymbol>()
+                        .filter { it.hasJvmFieldAnnotation() || it.isConst }
+                        .mapTo(result) {
+                            FirLightFieldForPropertySymbol(
+                                propertySymbol = it,
+                                containingClass = this@FirLightClassForSymbol,
+                                lightMemberOrigin = null,
+                                isTopLevel = false,
+                                forceStatic = true
+                            )
+                        }
+                }
+            }
+        }
+
+        val isNamedObject = classOrObjectSymbol.classKind == KtClassKind.OBJECT
+        if (isNamedObject && classOrObjectSymbol.symbolKind != KtSymbolKind.LOCAL) {
+            result.add(FirLightFieldForObjectSymbol(classOrObjectSymbol, this@FirLightClassForSymbol, null))
+        }
+
+        analyzeWithSymbolAsContext(classOrObjectSymbol) {
+            val callableSymbols = classOrObjectSymbol.getDeclaredMemberScope().getCallableSymbols()
+                .filterIsInstance<KtPropertySymbol>()
+                .applyIf(classOrObjectSymbol.classKind == KtClassKind.COMPANION_OBJECT) {
+                    filter { it.hasJvmFieldAnnotation() || it.isConst }
+                }
+            createFields(callableSymbols, isTopLevel = false, result)
+        }
+
+        result
+    }
+
+    private val _containingFile: PsiFile? by lazyPub {
+
+        val kotlinOrigin = kotlinOrigin ?: return@lazyPub null
+
+        val containingClass = isTopLevel.ifFalse { create(getOutermostClassOrObject(kotlinOrigin)) } ?: this
+
+        FirFakeFileImpl(kotlinOrigin, containingClass)
+    }
+
+    override fun getContainingFile(): PsiFile? = _containingFile
+
+    override fun getNavigationElement(): PsiElement = kotlinOrigin ?: this
+
+    override fun isEquivalentTo(another: PsiElement?): Boolean =
+        basicIsEquivalentTo(this, another) ||
+                another is PsiClass && qualifiedName != null && Comparing.equal(another.qualifiedName, qualifiedName)
+
+    override fun getElementIcon(flags: Int): Icon? =
+        throw UnsupportedOperationException("This should be done by JetIconProvider")
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightClassForSymbol && kotlinOrigin == other.kotlinOrigin && classOrObjectSymbol == other.classOrObjectSymbol)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+
+    override fun getName(): String = classOrObjectSymbol.name.asString()
+
+    override fun hasModifierProperty(@NonNls name: String): Boolean = modifierList?.hasModifierProperty(name) ?: false
+
+    override fun isInterface(): Boolean =
+        classOrObjectSymbol.classKind == KtClassKind.INTERFACE || classOrObjectSymbol.classKind == KtClassKind.ANNOTATION_CLASS
+
+    override fun isAnnotationType(): Boolean =
+        classOrObjectSymbol.classKind == KtClassKind.ANNOTATION_CLASS
+
+    override fun isEnum(): Boolean =
+        classOrObjectSymbol.classKind == KtClassKind.ENUM_CLASS
+
+    override fun hasTypeParameters(): Boolean =
+        classOrObjectSymbol is KtClass && classOrObjectSymbol.typeParameters.isNotEmpty()
+
+    override fun isValid(): Boolean = kotlinOrigin?.isValid ?: true
+
+    override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean =
+        InheritanceImplUtil.isInheritor(this, baseClass, checkDeep)
+
+    @Throws(IncorrectOperationException::class)
+    override fun setName(@NonNls name: String): PsiElement =
+        throw IncorrectOperationException()
+
+    override fun toString() =
+        "${this::class.java.simpleName}:${kotlinOrigin?.getDebugText()}"
+
+    override fun getUseScope(): SearchScope = kotlinOrigin?.useScope ?: TODO()
+    override fun getElementType(): IStubElementType<out StubElement<*>, *>? = kotlinOrigin?.elementType
+    override fun getStub(): KotlinClassOrObjectStub<out KtClassOrObject>? = kotlinOrigin?.stub
+
+    override val originKind: LightClassOriginKind
+        get() = LightClassOriginKind.SOURCE
+
+    override fun getQualifiedName() = kotlinOrigin?.fqName?.asString()
+
+    override fun getInterfaces(): Array<PsiClass> = PsiClassImplUtil.getInterfaces(this)
+    override fun getSuperClass(): PsiClass? = PsiClassImplUtil.getSuperClass(this)
+    override fun getSupers(): Array<PsiClass> = PsiClassImplUtil.getSupers(this)
+    override fun getSuperTypes(): Array<PsiClassType> = PsiClassImplUtil.getSuperTypes(this)
+    override fun getVisibleSignatures(): MutableCollection<HierarchicalMethodSignature> = PsiSuperMethodImplUtil.getVisibleSignatures(this)
+
+    override fun getRBrace(): PsiElement? = null
+    override fun getLBrace(): PsiElement? = null
+
+    override fun getInitializers(): Array<PsiClassInitializer> = emptyArray()
+
+    override fun getContainingClass(): PsiClass? {
+
+        val containingBody = kotlinOrigin?.parent as? KtClassBody
+        val containingClass = containingBody?.parent as? KtClassOrObject
+        containingClass?.let { return create(it) }
+
+        val containingBlock = kotlinOrigin?.parent as? KtBlockExpression
+//        val containingScript = containingBlock?.parent as? KtScript
+//        containingScript?.let { return KtLightClassForScript.create(it) }
+
+        return null
+    }
+
+    override fun getParent(): PsiElement? = containingClass ?: containingFile
+
+    override fun getScope(): PsiElement? = parent
+
+    override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean =
+        baseClass?.let { InheritanceImplUtil.isInheritorDeep(this, it, classToByPass) } ?: false
+
+    override fun copy(): FirLightClassForSymbol =
+        FirLightClassForSymbol(classOrObjectSymbol, manager)
+
+    companion object {
+        fun create(classOrObject: KtClassOrObject): FirLightClassForSymbol? =
+            CachedValuesManager.getCachedValue(classOrObject) {
+                CachedValueProvider.Result
+                    .create(
+                        createNoCache(classOrObject),
+                        KotlinModificationTrackerService.getInstance(classOrObject.project).outOfBlockModificationTracker
+                    )
+            }
+
+        fun createNoCache(classOrObject: KtClassOrObject): FirLightClassForSymbol? {
+            val containingFile = classOrObject.containingFile
+            if (containingFile is KtCodeFragment) {
+                // Avoid building light classes for code fragments
+                return null
+            }
+
+            if (classOrObject.shouldNotBeVisibleAsLightClass()) {
+                return null
+            }
+
+            return when {
+                classOrObject.isObjectLiteral() -> return null //TODO
+                classOrObject.safeIsLocal() -> return null //TODO
+                classOrObject.hasModifier(KtTokens.INLINE_KEYWORD) -> return null //TODO
+                else -> FirLightClassForSymbol(
+                    analyze(classOrObject) { classOrObject.getClassOrObjectSymbol() },
+                    manager = classOrObject.manager
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementBase.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementBase.kt
new file mode 100644
index 00000000000..7d0200d1d31
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementBase.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.scope.PsiScopeProcessor
+
+internal abstract class FirLightPsiJavaCodeReferenceElementBase(private val ktElement: PsiElement) :
+    PsiElement by ktElement,
+    PsiJavaCodeReferenceElement {
+
+    override fun multiResolve(incompleteCode: Boolean): Array<JavaResolveResult> = emptyArray()
+
+    override fun processVariants(processor: PsiScopeProcessor) { }
+
+    override fun advancedResolve(incompleteCode: Boolean): JavaResolveResult =
+        JavaResolveResult.EMPTY
+
+    override fun getQualifier(): PsiElement? = null
+
+    override fun getReferenceName(): String? = null
+
+    override fun getReferenceNameElement(): PsiElement? = null
+
+    override fun getParameterList(): PsiReferenceParameterList? = null
+
+    override fun getTypeParameters(): Array<PsiType> = emptyArray()
+
+    override fun isQualified(): Boolean = false
+
+    override fun getQualifiedName(): String? = null
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementWithNoReference.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementWithNoReference.kt
new file mode 100644
index 00000000000..59f9313d479
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementWithNoReference.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReference
+import com.intellij.util.IncorrectOperationException
+
+internal class FirLightPsiJavaCodeReferenceElementWithNoReference(private val ktElement: PsiElement):
+    FirLightPsiJavaCodeReferenceElementBase(ktElement),
+    PsiReference {
+
+    override fun getElement(): PsiElement = ktElement
+
+    override fun getRangeInElement(): TextRange = ktElement.textRange
+
+    override fun resolve(): PsiElement? = null
+
+    override fun getCanonicalText(): String = "<no-text>"
+
+    override fun handleElementRename(newElementName: String): PsiElement = element
+
+    @Throws(IncorrectOperationException::class)
+    override fun bindToElement(element: PsiElement): PsiElement =
+        throw IncorrectOperationException("can't rename FirLightPsiJavaCodeReferenceElementWithNoReference")
+
+    override fun isReferenceTo(element: PsiElement): Boolean = false
+
+    override fun isSoft(): Boolean = false
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementWithReference.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementWithReference.kt
new file mode 100644
index 00000000000..c04f5966860
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/codeReferences/FirLightPsiJavaCodeReferenceElementWithReference.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.*
+import com.intellij.psi.scope.PsiScopeProcessor
+import com.intellij.util.IncorrectOperationException
+
+internal class FirLightPsiJavaCodeReferenceElementWithReference(private val ktElement: PsiElement, reference: PsiReference):
+    FirLightPsiJavaCodeReferenceElementBase(ktElement),
+    PsiReference by reference {
+
+    override fun getElement(): PsiElement = ktElement
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightField.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightField.kt
new file mode 100644
index 00000000000..8768cfcec55
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightField.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.lang.Language
+import com.intellij.psi.*
+import com.intellij.psi.impl.ElementPresentationUtil
+import com.intellij.ui.IconManager
+import com.intellij.util.IncorrectOperationException
+import com.intellij.util.PlatformIcons
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.asJava.classes.cannotModify
+import org.jetbrains.kotlin.asJava.elements.KtLightField
+import org.jetbrains.kotlin.idea.KotlinLanguage
+import org.jetbrains.kotlin.psi.KtNamedDeclaration
+import javax.swing.Icon
+
+internal abstract class FirLightField protected constructor(
+    private val containingClass: KtLightClass,
+    lightMemberOrigin: LightMemberOrigin?,
+) : FirLightMemberImpl<PsiField>(lightMemberOrigin, containingClass), KtLightField {
+
+    override val clsDelegate: PsiField get() = invalidAccess()
+
+    override fun setInitializer(initializer: PsiExpression?) = cannotModify()
+
+    override fun isEquivalentTo(another: PsiElement?): Boolean =
+        basicIsEquivalentTo(this, another as? PsiField)
+
+    override fun getLanguage(): Language = KotlinLanguage.INSTANCE
+
+    override fun getParent() = containingClass
+    override fun getContainingClass() = containingClass
+    override fun getContainingFile(): PsiFile? = containingClass.containingFile
+    override fun hasInitializer(): Boolean = initializer !== null
+
+    override fun computeConstantValue(): Any? = null //TODO _constantInitializer?.value
+
+    override fun computeConstantValue(visitedVars: MutableSet<PsiVariable>?): Any? = computeConstantValue()
+
+    override fun setName(@NonNls name: String): PsiElement {
+        (kotlinOrigin as? KtNamedDeclaration)?.setName(name)
+        return this
+    }
+
+    override fun toString(): String = "KtLightField:$name"
+
+    override fun getTypeElement(): PsiTypeElement? = null
+
+    @Throws(IncorrectOperationException::class)
+    override fun normalizeDeclaration() {
+    }
+
+    override fun isVisibilitySupported(): Boolean = true
+
+    override fun getElementIcon(flags: Int): Icon? {
+        val baseIcon = IconManager.getInstance().createLayeredIcon(
+            this,
+            PlatformIcons.VARIABLE_ICON, ElementPresentationUtil.getFlags(
+                this,
+                false
+            )
+        )
+        return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon)
+    }
+
+    abstract override fun equals(other: Any?): Boolean
+
+    abstract override fun hashCode(): Int
+
+    override fun accept(visitor: PsiElementVisitor) {
+        if (visitor is JavaElementVisitor) {
+            visitor.visitField(this)
+        } else {
+            visitor.visitElement(this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightFieldForObjectSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightFieldForObjectSymbol.kt
new file mode 100644
index 00000000000..34a54f7eb55
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightFieldForObjectSymbol.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiExpression
+import com.intellij.psi.PsiModifier
+import com.intellij.psi.PsiModifierList
+import com.intellij.psi.PsiType
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassKind
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol
+import org.jetbrains.kotlin.psi.KtDeclaration
+
+internal class FirLightFieldForObjectSymbol(
+    private val objectSymbol: KtClassOrObjectSymbol,
+    containingClass: KtLightClass,
+    lightMemberOrigin: LightMemberOrigin?,
+) : FirLightField(containingClass, lightMemberOrigin) {
+
+    override val kotlinOrigin: KtDeclaration? = objectSymbol.psi as? KtDeclaration
+
+    private val _name = if (objectSymbol.classKind == KtClassKind.COMPANION_OBJECT) objectSymbol.name.asString() else "INSTANCE"
+    override fun getName(): String = _name
+
+    private val _modifierList: PsiModifierList by lazyPub {
+        val modifiers = setOf(objectSymbol.computeVisibility(isTopLevel = false), PsiModifier.STATIC, PsiModifier.FINAL)
+        val notNullAnnotation = FirLightSimpleAnnotation("org.jetbrains.annotations.NotNull", this)
+        FirLightClassModifierList(this, modifiers, listOf(notNullAnnotation))
+    }
+
+    override fun getModifierList(): PsiModifierList? = _modifierList
+
+    private val _type: PsiType by lazyPub {
+        objectSymbol.typeForClassSymbol(this@FirLightFieldForObjectSymbol)
+    }
+
+    override fun getType(): PsiType = _type
+
+    override fun getInitializer(): PsiExpression? = null //TODO
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightFieldForObjectSymbol &&
+                 kotlinOrigin == other.kotlinOrigin &&
+                 objectSymbol == other.objectSymbol)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightFieldForPropertySymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightFieldForPropertySymbol.kt
new file mode 100644
index 00000000000..10ca3eaac55
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/fields/FirLightFieldForPropertySymbol.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiExpression
+import com.intellij.psi.PsiModifier
+import com.intellij.psi.PsiModifierList
+import com.intellij.psi.PsiType
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertyGetterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol
+import org.jetbrains.kotlin.psi.KtDeclaration
+
+internal class FirLightFieldForPropertySymbol(
+    private val propertySymbol: KtPropertySymbol,
+    containingClass: FirLightClassBase,
+    lightMemberOrigin: LightMemberOrigin?,
+    isTopLevel: Boolean,
+    forceStatic: Boolean = false
+) : FirLightField(containingClass, lightMemberOrigin) {
+
+    override val kotlinOrigin: KtDeclaration? = propertySymbol.psi as? KtDeclaration
+
+    private val _returnedType: PsiType by lazyPub {
+        propertySymbol.type.asPsiType(
+            propertySymbol,
+            this@FirLightFieldForPropertySymbol,
+            FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE
+        )
+    }
+
+    override fun getType(): PsiType = _returnedType
+
+    private val _name = propertySymbol.name.asString()
+    override fun getName(): String = _name
+
+    private val _modifierList: PsiModifierList by lazyPub {
+
+        val modifiersFromSymbol = propertySymbol.computeModalityForMethod(isTopLevel = isTopLevel, isOverride = false)
+
+        val basicModifiers = modifiersFromSymbol.add(
+            what = PsiModifier.STATIC,
+            `if` = forceStatic
+        )
+
+        val isJvmField = propertySymbol.hasJvmFieldAnnotation()
+
+        val visibility =
+            if (isJvmField) propertySymbol.computeVisibility(isTopLevel = false) else PsiModifier.PRIVATE
+
+        val modifiersWithVisibility = basicModifiers + visibility
+
+        val modifiers = modifiersWithVisibility.add(
+            what = PsiModifier.FINAL,
+            `if` = !isJvmField || propertySymbol.isVal
+        )
+
+        val annotations = propertySymbol.computeAnnotations(
+            parent = this,
+            nullability = propertySymbol.type.getTypeNullability(propertySymbol, FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE),
+            annotationUseSiteTarget = AnnotationUseSiteTarget.FIELD,
+        )
+
+        FirLightClassModifierList(this, modifiers, annotations)
+    }
+
+    override fun getModifierList(): PsiModifierList? = _modifierList
+
+
+    override fun getInitializer(): PsiExpression? = null //TODO
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightFieldForPropertySymbol &&
+                        kotlinOrigin == other.kotlinOrigin &&
+                        propertySymbol == other.propertySymbol)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt
new file mode 100644
index 00000000000..48cb918721f
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.impl.cache.TypeInfo
+import com.intellij.psi.impl.compiled.ClsTypeElementImpl
+import com.intellij.psi.impl.compiled.SignatureParsing
+import com.intellij.psi.impl.compiled.StubBuildingVisitor
+import org.jetbrains.annotations.NotNull
+import org.jetbrains.kotlin.asJava.elements.KtLightElement
+import org.jetbrains.kotlin.asJava.elements.KtLightMember
+import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.analysis.cfa.FirReturnsImpliesAnalyzer.isSupertypeOf
+import org.jetbrains.kotlin.fir.backend.jvm.jvmTypeMapper
+import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.isPrimitiveNumberOrUnsignedNumberType
+import org.jetbrains.kotlin.fir.isPrimitiveType
+import org.jetbrains.kotlin.fir.symbols.StandardClassIds
+import org.jetbrains.kotlin.fir.typeCheckerContext
+import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
+import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
+import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirClassOrObjectSymbol
+import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol
+import org.jetbrains.kotlin.idea.frontend.api.fir.types.KtFirClassType
+import org.jetbrains.kotlin.idea.frontend.api.fir.types.KtFirType
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassLikeSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
+import org.jetbrains.kotlin.idea.frontend.api.types.*
+import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
+import org.jetbrains.kotlin.name.SpecialNames
+import org.jetbrains.kotlin.types.TypeUtils
+import org.jetbrains.kotlin.types.model.SimpleTypeMarker
+import org.jetbrains.kotlin.types.model.typeConstructor
+import org.jetbrains.kotlin.types.typeUtil.isTypeParameter
+import java.text.StringCharacterIterator
+
+internal fun <L : Any> L.invalidAccess(): Nothing =
+    error("Cls delegate shouldn't be accessed for fir light classes! Qualified name: ${javaClass.name}")
+
+
+private fun PsiElement.nonExistentType() = JavaPsiFacade.getElementFactory(project)
+    .createTypeFromText("error.NonExistentClass", this)
+
+internal fun KtTypedSymbol.asPsiType(parent: PsiElement, phase: FirResolvePhase): PsiType =
+    type.asPsiType(this, parent, phase)
+
+internal fun KtType.asPsiType(
+    context: KtSymbol,
+    parent: PsiElement,
+    phase: FirResolvePhase
+): PsiType {
+    require(this is KtFirType)
+    require(context is KtFirSymbol<*>)
+
+    val session = context.firRef.withFir(phase) { it.session }
+    return coneType.asPsiType(session, TypeMappingMode.DEFAULT, parent)
+}
+
+internal fun KtClassOrObjectSymbol.typeForClassSymbol(psiElement: PsiElement): PsiType {
+    require(this is KtFirClassOrObjectSymbol)
+    val (session, type) = firRef.withFir(FirResolvePhase.TYPES) { firClass ->
+        firClass.session to ConeClassLikeTypeImpl(
+            firClass.symbol.toLookupTag(),
+            firClass.typeParameters.map { ConeTypeParameterTypeImpl(it.symbol.toLookupTag(), isNullable = false) }.toTypedArray(),
+            isNullable = false
+        )
+    }
+    return type.asPsiType(session, TypeMappingMode.DEFAULT, psiElement)
+}
+
+private fun ConeKotlinType.asPsiType(
+    session: FirSession,
+    mode: TypeMappingMode,
+    psiContext: PsiElement,
+): PsiType {
+
+    if (this is ConeClassErrorType || this !is SimpleTypeMarker) return psiContext.nonExistentType()
+    if (this.typeArguments.any { it is ConeClassErrorType }) return psiContext.nonExistentType()
+    if (this is ConeClassLikeType) {
+        val classId = classId
+        if (classId != null && classId.shortClassName.asString() == SpecialNames.ANONYMOUS) return PsiType.NULL
+    }
+
+    val signatureWriter = BothSignatureWriter(BothSignatureWriter.Mode.SKIP_CHECKS)
+    //TODO Check thread safety
+    session.jvmTypeMapper.mapType(this, mode, signatureWriter)
+
+    val canonicalSignature = signatureWriter.toString()
+
+    if (canonicalSignature == "[L<error>;") return psiContext.nonExistentType()
+    val signature = StringCharacterIterator(canonicalSignature)
+    val javaType = SignatureParsing.parseTypeString(signature, StubBuildingVisitor.GUESSING_MAPPER)
+    val typeInfo = TypeInfo.fromString(javaType, false)
+    val typeText = TypeInfo.createTypeText(typeInfo) ?: return psiContext.nonExistentType()
+
+    val typeElement = ClsTypeElementImpl(psiContext, typeText, '\u0000')
+    return typeElement.type
+}
+
+private fun mapSupertype(psiContext: PsiElement, session: FirSession, supertype: ConeKotlinType, kotlinCollectionAsIs: Boolean = false) =
+    supertype.asPsiType(
+        session,
+        if (kotlinCollectionAsIs) TypeMappingMode.SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS else TypeMappingMode.SUPER_TYPE,
+        psiContext
+    ) as? PsiClassType
+
+internal fun KtClassType.mapSupertype(
+    psiContext: PsiElement,
+    kotlinCollectionAsIs: Boolean = false
+): PsiClassType? {
+    require(this is KtFirClassType)
+    val contextSymbol = this.classSymbol
+    require(contextSymbol is KtFirSymbol<*>)
+
+    val session = contextSymbol.firRef.withFir { it.session }
+
+    return mapSupertype(
+        psiContext,
+        session,
+        this.coneType,
+        kotlinCollectionAsIs,
+    )
+}
+
+internal enum class NullabilityType {
+    Nullable,
+    NotNull,
+    Unknown
+}
+
+internal val KtType.nullabilityType: NullabilityType
+    get() =
+        (this as? KtTypeWithNullability)?.let {
+            if (it.nullability == KtTypeNullability.NULLABLE) NullabilityType.Nullable else NullabilityType.NotNull
+        } ?: NullabilityType.Unknown
+
+
+internal fun FirMemberDeclaration.computeSimpleModality(): Set<String> {
+    require(this !is FirConstructor)
+
+    val modifier = when (modality) {
+        Modality.FINAL -> PsiModifier.FINAL
+        Modality.ABSTRACT -> PsiModifier.ABSTRACT
+        Modality.SEALED -> PsiModifier.ABSTRACT
+        else -> null
+    }
+
+    return modifier?.let { setOf(it) } ?: emptySet()
+}
+
+internal fun KtSymbolWithModality<*>.computeSimpleModality(): String? = when (modality) {
+    KtSymbolModality.SEALED -> PsiModifier.ABSTRACT
+    KtCommonSymbolModality.FINAL -> PsiModifier.FINAL
+    KtCommonSymbolModality.ABSTRACT -> PsiModifier.ABSTRACT
+    KtCommonSymbolModality.OPEN -> null
+    else -> throw NotImplementedError()
+}
+
+internal fun FirMemberDeclaration.computeModalityForMethod(isTopLevel: Boolean): Set<String> {
+    require(this !is FirConstructor)
+
+    val simpleModifier = computeSimpleModality()
+
+    val withNative = if (isExternal) simpleModifier + PsiModifier.NATIVE else simpleModifier
+    val withTopLevelStatic = if (isTopLevel) withNative + PsiModifier.STATIC else withNative
+
+    return withTopLevelStatic
+}
+
+internal fun KtSymbolWithModality<KtCommonSymbolModality>.computeModalityForMethod(isTopLevel: Boolean, isOverride: Boolean): Set<String> {
+    require(this !is KtClassLikeSymbol)
+
+    val modality = mutableSetOf<String>()
+
+    computeSimpleModality()?.run {
+        if (this != PsiModifier.FINAL || !isOverride) {
+            modality.add(this)
+        }
+    }
+
+    if (this is KtFunctionSymbol && isExternal) {
+        modality.add(PsiModifier.NATIVE)
+    }
+    if (isTopLevel) {
+        modality.add(PsiModifier.STATIC)
+    }
+
+    return modality
+}
+
+internal fun FirMemberDeclaration.computeVisibility(isTopLevel: Boolean): String {
+    return when (this.visibility) {
+        // Top-level private class has PACKAGE_LOCAL visibility in Java
+        // Nested private class has PRIVATE visibility
+        Visibilities.Private -> if (isTopLevel) PsiModifier.PACKAGE_LOCAL else PsiModifier.PRIVATE
+        Visibilities.Protected -> PsiModifier.PROTECTED
+        else -> PsiModifier.PUBLIC
+    }
+}
+
+internal fun KtSymbolWithVisibility.computeVisibility(isTopLevel: Boolean): String {
+    return when (this.visibility) {
+        // Top-level private class has PACKAGE_LOCAL visibility in Java
+        // Nested private class has PRIVATE visibility
+        KtSymbolVisibility.PRIVATE -> if (isTopLevel) PsiModifier.PACKAGE_LOCAL else PsiModifier.PRIVATE
+        KtSymbolVisibility.PROTECTED -> PsiModifier.PROTECTED
+        else -> PsiModifier.PUBLIC
+    }
+}
+
+internal fun basicIsEquivalentTo(`this`: PsiElement?, that: PsiElement?): Boolean {
+    if (`this` == null || that == null) return false
+    if (`this` == that) return true
+
+    if (`this` !is KtLightElement<*, *>) return false
+    if (that !is KtLightElement<*, *>) return false
+    if (`this`.kotlinOrigin?.isEquivalentTo(that.kotlinOrigin) == true) return true
+
+    val thisMemberOrigin = (`this` as? KtLightMember<*>)?.lightMemberOrigin ?: return false
+    if (thisMemberOrigin.isEquivalentTo(that)) return true
+
+    val thatMemberOrigin = (that as? KtLightMember<*>)?.lightMemberOrigin ?: return false
+    return thisMemberOrigin.isEquivalentTo(thatMemberOrigin)
+}
+
+internal fun KtType.getTypeNullability(context: KtSymbol, phase: FirResolvePhase): NullabilityType {
+
+    if (nullabilityType != NullabilityType.NotNull) return nullabilityType
+
+    if (isUnit) return NullabilityType.NotNull
+
+    require(this is KtFirType)
+    require(context is KtFirSymbol<*>)
+
+    if (coneType is ConeTypeParameterType) {
+//        TODO Make supertype checking
+//        val subtypeOfNullableSuperType = context.firRef.withFir(phase) {
+//            it.session.typeCheckerContext.nullableAnyType().isSupertypeOf(it.session.typeCheckerContext, coneType)
+//        }
+//        if (!subtypeOfNullableSuperType) return NullabilityType.NotNull
+
+        if (!coneType.isMarkedNullable) return NullabilityType.Unknown
+        return NullabilityType.NotNull
+    }
+
+    val coneType = coneType as? ConeClassLikeType ?: return NullabilityType.NotNull
+
+    if (!coneType.isPrimitiveType()) {
+        return nullabilityType
+    }
+
+    if (coneType is ConeClassErrorType) return NullabilityType.NotNull
+    if (coneType.typeArguments.any { it is ConeClassErrorType }) return NullabilityType.NotNull
+    if (coneType.classId?.shortClassName?.asString() == SpecialNames.ANONYMOUS) return NullabilityType.NotNull
+
+    val canonicalSignature = context.firRef.withFir(phase) {
+        it.session.jvmTypeMapper.mapType(coneType, TypeMappingMode.DEFAULT).descriptor
+    }
+
+    if (canonicalSignature == "[L<error>;") return NullabilityType.NotNull
+
+    val isNotPrimitiveType = canonicalSignature.startsWith("L") || canonicalSignature.startsWith("[")
+
+    return if (isNotPrimitiveType) NullabilityType.NotNull else NullabilityType.Unknown
+}
+
+internal fun <T> Set<T>.add(what: T, `if`: Boolean): Set<T> =
+    applyIf(`if`) { this + what }
+
+internal inline fun <T> T.applyIf(`if`: Boolean, body: T.() -> T): T =
+    if (`if`) body() else this
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightAccessorMethodForSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightAccessorMethodForSymbol.kt
new file mode 100644
index 00000000000..696ca996303
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightAccessorMethodForSymbol.kt
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.impl.light.LightParameterListBuilder
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_FOR_GETTER
+import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_FOR_SETTER
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertyAccessorSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertyGetterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySetterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol
+import org.jetbrains.kotlin.load.java.JvmAbi.getterName
+import org.jetbrains.kotlin.load.java.JvmAbi.setterName
+import org.jetbrains.kotlin.psi.KtDeclaration
+
+internal class FirLightAccessorMethodForSymbol(
+    private val propertyAccessorSymbol: KtPropertyAccessorSymbol,
+    containingPropertySymbol: KtPropertySymbol,
+    lightMemberOrigin: LightMemberOrigin?,
+    containingClass: FirLightClassBase,
+    isTopLevel: Boolean
+) : FirLightMethod(
+    lightMemberOrigin,
+    containingClass,
+    if (propertyAccessorSymbol is KtPropertyGetterSymbol) METHOD_INDEX_FOR_GETTER else METHOD_INDEX_FOR_SETTER
+) {
+    private fun String.abiName(firPropertyAccessor: KtPropertyAccessorSymbol) =
+        if (firPropertyAccessor is KtPropertyGetterSymbol) getterName(this)
+        else setterName(this)
+
+    //TODO add JvmName
+    private val _name: String by lazyPub {
+        containingPropertySymbol.name.identifier
+            .abiName(propertyAccessorSymbol)
+    }
+
+    override fun getName(): String = _name
+
+    override fun isVarArgs(): Boolean = false
+
+    override val kotlinOrigin: KtDeclaration? =
+        (propertyAccessorSymbol.psi ?: containingPropertySymbol.psi) as? KtDeclaration
+
+    private val _annotations: List<PsiAnnotation> by lazyPub {
+        val accessorSite =
+            if (propertyAccessorSymbol is KtPropertyGetterSymbol) AnnotationUseSiteTarget.PROPERTY_GETTER
+            else AnnotationUseSiteTarget.PROPERTY_SETTER
+        containingPropertySymbol.computeAnnotations(
+            parent = this,
+            nullability = NullabilityType.Unknown,
+            annotationUseSiteTarget = accessorSite,
+        )
+    }
+
+    private val _modifiers: Set<String> by lazyPub {
+
+        val isOverride = propertyAccessorSymbol.isOverride || containingPropertySymbol.isOverride
+        val modifiers = propertyAccessorSymbol.computeModalityForMethod(isTopLevel, isOverride) +
+                propertyAccessorSymbol.computeVisibility(isTopLevel)
+
+        val isJvmStatic =
+            _annotations.any { it.qualifiedName == "kotlin.jvm.JvmStatic" }
+
+        if (isJvmStatic) return@lazyPub modifiers + PsiModifier.STATIC
+
+        modifiers
+    }
+
+    private val _modifierList: PsiModifierList by lazyPub {
+        FirLightClassModifierList(this, _modifiers, _annotations)
+    }
+
+    override fun getModifierList(): PsiModifierList = _modifierList
+
+    override fun isConstructor(): Boolean = false
+
+    private val _returnedType: PsiType? by lazyPub {
+        if (propertyAccessorSymbol !is KtPropertyGetterSymbol) return@lazyPub PsiType.VOID
+        return@lazyPub containingPropertySymbol.type.asPsiType(
+            context = containingPropertySymbol,
+            parent = this@FirLightAccessorMethodForSymbol,
+            phase = FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE
+        )
+    }
+
+    override fun getReturnType(): PsiType? = _returnedType
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightAccessorMethodForSymbol &&
+                        kotlinOrigin == other.kotlinOrigin &&
+                        propertyAccessorSymbol == other.propertyAccessorSymbol)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+
+
+    private val _parametersList by lazyPub {
+        val builder = LightParameterListBuilder(manager, language)
+
+        FirLightParameterForReceiver.tryGet(containingPropertySymbol, this)?.let {
+            builder.addParameter(it)
+        }
+
+        val propertyParameter = (propertyAccessorSymbol as? KtPropertySetterSymbol)?.parameter
+
+        if (propertyParameter != null) {
+            builder.addParameter(
+                FirLightParameterForSymbol(
+                    parameterSymbol = propertyParameter,
+                    containingMethod = this@FirLightAccessorMethodForSymbol
+                )
+            )
+        }
+
+        builder
+    }
+
+    override fun getParameterList(): PsiParameterList = _parametersList
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightConstructorForSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightConstructorForSymbol.kt
new file mode 100644
index 00000000000..5a1eb452fe4
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightConstructorForSymbol.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiModifierList
+import com.intellij.psi.PsiType
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorSymbol
+
+internal class FirLightConstructorForSymbol(
+    private val constructorSymbol: KtConstructorSymbol,
+    lightMemberOrigin: LightMemberOrigin?,
+    containingClass: FirLightClassBase,
+    methodIndex: Int,
+) : FirLightMethodForSymbol(constructorSymbol, lightMemberOrigin, containingClass, methodIndex) {
+
+    private val _name: String? = containingClass.name
+
+    override fun getName(): String = _name ?: ""
+
+    override fun isConstructor(): Boolean = true
+
+    private val _annotations: List<PsiAnnotation> by lazyPub {
+        constructorSymbol.computeAnnotations(
+            parent = this,
+            nullability = NullabilityType.Unknown,
+            annotationUseSiteTarget = null,
+        )
+    }
+
+    private val _modifiers: Set<String> by lazyPub {
+        setOf(constructorSymbol.computeVisibility(isTopLevel = false))
+    }
+
+    private val _modifierList: PsiModifierList by lazyPub {
+        FirLightClassModifierList(this, _modifiers, _annotations)
+    }
+
+    override fun getModifierList(): PsiModifierList = _modifierList
+
+    override fun getReturnType(): PsiType? = null
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightConstructorForSymbol &&
+                 kotlinOrigin == other.kotlinOrigin &&
+                 constructorSymbol == other.constructorSymbol)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethod.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethod.kt
new file mode 100644
index 00000000000..a2ef3e0b305
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethod.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.impl.PsiImplUtil
+import com.intellij.psi.impl.PsiSuperMethodImplUtil
+import com.intellij.psi.util.MethodSignature
+import com.intellij.psi.util.MethodSignatureBackedByPsiMethod
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.KotlinLightReferenceListBuilder
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.asJava.classes.cannotModify
+import org.jetbrains.kotlin.asJava.elements.KtLightMethod
+
+internal abstract class FirLightMethod(
+    lightMemberOrigin: LightMemberOrigin?,
+    containingClass: KtLightClass,
+    private val methodIndex: Int
+) : FirLightMemberImpl<PsiMethod>(lightMemberOrigin, containingClass), KtLightMethod {
+
+    override fun getBody(): PsiCodeBlock? = null
+
+    override fun getReturnTypeElement(): PsiTypeElement? = null
+
+    override fun setName(p0: String): PsiElement = cannotModify()
+
+    override fun isVarArgs() = PsiImplUtil.isVarArgs(this)
+
+    override fun getHierarchicalMethodSignature() = PsiSuperMethodImplUtil.getHierarchicalMethodSignature(this)
+
+    override fun findSuperMethodSignaturesIncludingStatic(checkAccess: Boolean): List<MethodSignatureBackedByPsiMethod> =
+        PsiSuperMethodImplUtil.findSuperMethodSignaturesIncludingStatic(this, checkAccess)
+
+    override fun findDeepestSuperMethod() = PsiSuperMethodImplUtil.findDeepestSuperMethod(this)
+
+    override fun findDeepestSuperMethods(): Array<out PsiMethod> = PsiSuperMethodImplUtil.findDeepestSuperMethods(this)
+
+    override fun findSuperMethods(): Array<out PsiMethod> = PsiSuperMethodImplUtil.findSuperMethods(this)
+
+    override fun findSuperMethods(checkAccess: Boolean): Array<out PsiMethod> =
+        PsiSuperMethodImplUtil.findSuperMethods(this, checkAccess)
+
+    override fun findSuperMethods(parentClass: PsiClass?): Array<out PsiMethod> =
+        PsiSuperMethodImplUtil.findSuperMethods(this, parentClass)
+
+    override fun getSignature(substitutor: PsiSubstitutor): MethodSignature =
+        MethodSignatureBackedByPsiMethod.create(this, substitutor)
+
+    abstract override fun equals(other: Any?): Boolean
+
+    abstract override fun hashCode(): Int
+
+    override fun accept(visitor: PsiElementVisitor) {
+        if (visitor is JavaElementVisitor) {
+            visitor.visitMethod(this)
+        } else {
+            visitor.visitElement(this)
+        }
+    }
+
+    override val isMangled: Boolean = false
+
+    override fun getTypeParameters(): Array<PsiTypeParameter> = emptyArray() //TODO
+
+    override fun hasTypeParameters(): Boolean = false //TODO
+
+    override fun getTypeParameterList(): PsiTypeParameterList? = null //TODO
+
+    override fun getThrowsList(): PsiReferenceList =
+        KotlinLightReferenceListBuilder(manager, language, PsiReferenceList.Role.THROWS_LIST) //TODO()
+
+    override fun getDefaultValue(): PsiAnnotationMemberValue? = null //TODO()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethodForSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethodForSymbol.kt
new file mode 100644
index 00000000000..a47bbbc10a8
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethodForSymbol.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.impl.light.LightParameterListBuilder
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.KotlinLightReferenceListBuilder
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.asJava.elements.KotlinLightTypeParameterListBuilder
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionLikeSymbol
+import org.jetbrains.kotlin.psi.KtDeclaration
+import java.util.*
+
+internal abstract class FirLightMethodForSymbol(
+    private val functionSymbol: KtFunctionLikeSymbol,
+    lightMemberOrigin: LightMemberOrigin?,
+    containingClass: FirLightClassBase,
+    methodIndex: Int,
+    argumentsSkipMask: BitSet? = null
+) : FirLightMethod(
+    lightMemberOrigin,
+    containingClass,
+    methodIndex
+) {
+    private var _isVarArgs: Boolean = functionSymbol.valueParameters.any { it.isVararg }
+
+    override fun isVarArgs(): Boolean = _isVarArgs
+
+    private val _parametersList by lazyPub {
+        val builder = LightParameterListBuilder(manager, language)
+
+        FirLightParameterForReceiver.tryGet(functionSymbol, this)?.let {
+            builder.addParameter(it)
+        }
+
+        functionSymbol.valueParameters.mapIndexed { index, parameter ->
+            val needToSkip = argumentsSkipMask?.get(index) == true
+            if (!needToSkip) {
+                builder.addParameter(
+                    FirLightParameterForSymbol(
+                        parameterSymbol = parameter,
+                        containingMethod = this@FirLightMethodForSymbol
+                    )
+                )
+            }
+        }
+
+        builder
+    }
+
+    override fun getParameterList(): PsiParameterList = _parametersList
+
+    override val kotlinOrigin: KtDeclaration? = functionSymbol.psi as? KtDeclaration
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightSimpleMethodForSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightSimpleMethodForSymbol.kt
new file mode 100644
index 00000000000..99d6ab3a9a3
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightSimpleMethodForSymbol.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiModifier
+import com.intellij.psi.PsiModifierList
+import com.intellij.psi.PsiType
+import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol
+import org.jetbrains.kotlin.idea.frontend.api.types.isUnit
+import java.util.*
+
+internal class FirLightSimpleMethodForSymbol(
+    private val functionSymbol: KtFunctionSymbol,
+    lightMemberOrigin: LightMemberOrigin?,
+    containingClass: FirLightClassBase,
+    methodIndex: Int,
+    isTopLevel: Boolean,
+    argumentsSkipMask: BitSet? = null
+) : FirLightMethodForSymbol(
+    functionSymbol = functionSymbol,
+    lightMemberOrigin = lightMemberOrigin,
+    containingClass = containingClass,
+    methodIndex = methodIndex,
+    argumentsSkipMask = argumentsSkipMask
+) {
+
+    private val _name: String by lazyPub {
+        functionSymbol.getJvmNameFromAnnotation(null) ?: functionSymbol.name.asString()
+    }
+
+    override fun getName(): String = _name
+
+    private val _annotations: List<PsiAnnotation> by lazyPub {
+
+        val nullability = if (functionSymbol.type.isUnit) NullabilityType.Unknown else functionSymbol.type.getTypeNullability(
+            functionSymbol,
+            FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE
+        )
+
+        functionSymbol.computeAnnotations(
+            parent = this,
+            nullability = nullability,
+            annotationUseSiteTarget = null,
+        )
+    }
+
+    private val _modifiers: Set<String> by lazyPub {
+
+        if (functionSymbol.hasInlineOnlyAnnotation()) return@lazyPub setOf(PsiModifier.FINAL, PsiModifier.PRIVATE)
+
+        val modifiers = functionSymbol.computeModalityForMethod(isTopLevel = isTopLevel, functionSymbol.isOverride) +
+                functionSymbol.computeVisibility(isTopLevel = isTopLevel)
+
+        if (functionSymbol.hasJvmStaticAnnotation()) return@lazyPub modifiers + PsiModifier.STATIC
+
+        modifiers
+    }
+
+    private val _modifierList: PsiModifierList by lazyPub {
+        FirLightClassModifierList(this, _modifiers, _annotations)
+    }
+
+    override fun getModifierList(): PsiModifierList = _modifierList
+
+    override fun isConstructor(): Boolean = false
+
+    private val _returnedType: PsiType by lazyPub {
+        if (functionSymbol.type.isUnit) return@lazyPub PsiType.VOID
+        functionSymbol.asPsiType(this@FirLightSimpleMethodForSymbol, FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE)
+    }
+
+    override fun getReturnType(): PsiType = _returnedType
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightSimpleMethodForSymbol &&
+                        kotlinOrigin == other.kotlinOrigin &&
+                        functionSymbol == other.functionSymbol)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/modifierLists/FirLightClassModifierList.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/modifierLists/FirLightClassModifierList.kt
new file mode 100644
index 00000000000..92592d8c4a7
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/modifierLists/FirLightClassModifierList.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiModifierListOwner
+import org.jetbrains.kotlin.asJava.elements.KtLightAbstractAnnotation
+import org.jetbrains.kotlin.asJava.elements.KtLightElement
+import org.jetbrains.kotlin.psi.KtModifierListOwner
+
+internal class FirLightClassModifierList<T : KtLightElement<KtModifierListOwner, PsiModifierListOwner>>(
+    containingDeclaration: T,
+    private val modifiers: Set<String>,
+    private val annotations: List<PsiAnnotation>
+) : FirLightModifierList<T>(containingDeclaration) {
+    override fun hasModifierProperty(name: String): Boolean = name in modifiers
+
+    override val givenAnnotations: List<KtLightAbstractAnnotation>?
+        get() = invalidAccess()
+
+    override fun getAnnotations(): Array<out PsiAnnotation> = annotations.toTypedArray()
+    override fun findAnnotation(qualifiedName: String) = annotations.firstOrNull { it.qualifiedName == qualifiedName }
+
+    override fun equals(other: Any?): Boolean = this === other
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/modifierLists/FirLightModifierList.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/modifierLists/FirLightModifierList.kt
new file mode 100644
index 00000000000..f18ac6720db
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/modifierLists/FirLightModifierList.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiModifierList
+import com.intellij.psi.PsiModifierListOwner
+import com.intellij.util.IncorrectOperationException
+import org.jetbrains.kotlin.asJava.classes.cannotModify
+import org.jetbrains.kotlin.asJava.elements.*
+import org.jetbrains.kotlin.psi.KtModifierList
+import org.jetbrains.kotlin.psi.KtModifierListOwner
+
+internal abstract class FirLightModifierList<out T : KtLightElement<KtModifierListOwner, PsiModifierListOwner>>(
+    protected val owner: T
+) : KtLightElementBase(owner), PsiModifierList, KtLightElement<KtModifierList, PsiModifierListOwner> {
+
+    override val clsDelegate: PsiModifierListOwner
+        get() = invalidAccess()
+
+    override val kotlinOrigin: KtModifierList?
+        get() = owner.kotlinOrigin?.modifierList
+
+    override fun getParent() = owner
+
+    override fun hasExplicitModifier(name: String) = hasModifierProperty(name)
+
+    override fun setModifierProperty(name: String, value: Boolean) = cannotModify()
+    override fun checkSetModifierProperty(name: String, value: Boolean) = throw IncorrectOperationException()
+    override fun addAnnotation(qualifiedName: String): PsiAnnotation = cannotModify()
+
+    override fun getApplicableAnnotations(): Array<out PsiAnnotation> = annotations
+
+    override fun getAnnotations(): Array<out PsiAnnotation> = emptyArray() //TODO()
+    override fun findAnnotation(qualifiedName: String): PsiAnnotation? = null //TODO()
+
+    override fun isEquivalentTo(another: PsiElement?) =
+        another is FirLightModifierList<*> && owner == another.owner
+
+    override fun isWritable() = false
+
+    override fun toString() = "Light modifier list of $owner"
+
+    abstract override fun equals(other: Any?): Boolean
+
+    abstract override fun hashCode(): Int
+}
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameter.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameter.kt
new file mode 100644
index 00000000000..b674aea8b9b
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameter.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.navigation.NavigationItem
+import com.intellij.psi.*
+import com.intellij.psi.search.LocalSearchScope
+import com.intellij.psi.search.SearchScope
+import com.intellij.util.IncorrectOperationException
+import org.jetbrains.kotlin.asJava.elements.*
+import org.jetbrains.kotlin.psi.KtParameter
+
+internal abstract class FirLightParameter(containingDeclaration: FirLightMethod) : PsiVariable, NavigationItem,
+    KtLightElement<KtParameter, PsiParameter>, KtLightParameter, KtLightElementBase(containingDeclaration) {
+
+    override val clsDelegate: PsiParameter
+        get() = invalidAccess()
+
+    override val givenAnnotations: List<KtLightAbstractAnnotation>
+        get() = invalidAccess()
+
+    override fun getTypeElement(): PsiTypeElement? = null
+    override fun getInitializer(): PsiExpression? = null
+    override fun hasInitializer(): Boolean = false
+    override fun computeConstantValue(): Any? = null
+    override fun getNameIdentifier(): PsiIdentifier? = null
+
+    abstract override fun getName(): String
+
+    @Throws(IncorrectOperationException::class)
+    override fun normalizeDeclaration() {
+    }
+
+    override fun setName(p0: String): PsiElement = TODO() //cannotModify()
+
+    override val method: KtLightMethod = containingDeclaration
+
+    override fun getDeclarationScope(): KtLightMethod = method
+
+    override fun accept(visitor: PsiElementVisitor) {
+        if (visitor is JavaElementVisitor) {
+            visitor.visitParameter(this)
+        }
+    }
+
+    override fun toString(): String = "Fir Light Parameter $name"
+
+    override fun isEquivalentTo(another: PsiElement?): Boolean =
+        basicIsEquivalentTo(this, another as? PsiParameter)
+
+    override fun getNavigationElement(): PsiElement = kotlinOrigin ?: method.navigationElement
+
+    override fun getUseScope(): SearchScope = kotlinOrigin?.useScope ?: LocalSearchScope(this)
+
+    override fun isValid() = parent.isValid
+
+    abstract override fun getType(): PsiType
+
+    override fun getContainingFile(): PsiFile = method.containingFile
+
+    override fun getParent(): PsiElement = method.parameterList
+
+    abstract override fun equals(other: Any?): Boolean
+
+    abstract override fun hashCode(): Int
+
+    abstract override fun isVarArgs(): Boolean
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameterForReceiver.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameterForReceiver.kt
new file mode 100644
index 00000000000..fbb96c86c34
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameterForReceiver.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiModifierList
+import com.intellij.psi.PsiType
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.codegen.AsmUtil
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionLikeSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotatedSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtPossibleExtensionSymbol
+import org.jetbrains.kotlin.idea.frontend.api.types.KtType
+import org.jetbrains.kotlin.psi.KtParameter
+
+internal class FirLightParameterForReceiver private constructor(
+    private val annotatedSymbol: KtAnnotatedSymbol,
+    type: KtType,
+    methodName: String,
+    method: FirLightMethod
+) : FirLightParameter(method) {
+
+    companion object {
+        fun tryGet(
+            callableSymbol: KtCallableSymbol,
+            method: FirLightMethod
+        ): FirLightParameterForReceiver? {
+
+            if (callableSymbol !is KtNamedSymbol) return null
+            if (callableSymbol !is KtAnnotatedSymbol) return null
+            if (callableSymbol !is KtPossibleExtensionSymbol) return null
+
+            if (!callableSymbol.isExtension) return null
+            val receiverType = callableSymbol.receiverType ?: return null
+
+            return FirLightParameterForReceiver(
+                annotatedSymbol = callableSymbol,
+                type = receiverType,
+                methodName = callableSymbol.name.asString(),
+                method = method
+            )
+        }
+    }
+
+    private val _name: String by lazyPub {
+        AsmUtil.getLabeledThisName(methodName, AsmUtil.LABELED_THIS_PARAMETER, AsmUtil.RECEIVER_PARAMETER_NAME)
+    }
+
+    override fun getName(): String = _name
+
+    override fun isVarArgs() = false
+    override fun hasModifierProperty(name: String): Boolean = false //TODO()
+
+    override val kotlinOrigin: KtParameter? = null
+
+    private val _annotations: List<PsiAnnotation> by lazyPub {
+        annotatedSymbol.computeAnnotations(
+            parent = this,
+            nullability = type.getTypeNullability(annotatedSymbol, FirResolvePhase.TYPES),
+            annotationUseSiteTarget = AnnotationUseSiteTarget.RECEIVER,
+        )
+    }
+
+    override fun getModifierList(): PsiModifierList = _modifierList
+    private val _modifierList: PsiModifierList by lazyPub {
+        FirLightClassModifierList(this, emptySet(), _annotations)
+    }
+
+    private val _type: PsiType by lazyPub {
+        type.asPsiType(annotatedSymbol, method, FirResolvePhase.TYPES)
+    }
+
+    override fun getType(): PsiType = _type
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightParameterForReceiver &&
+                 kotlinOrigin == other.kotlinOrigin &&
+                 annotatedSymbol == other.annotatedSymbol)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+}
+
+
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameterForSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameterForSymbol.kt
new file mode 100644
index 00000000000..b5924e94336
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameterForSymbol.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.asJava
+
+import com.intellij.psi.*
+import org.jetbrains.kotlin.asJava.classes.lazyPub
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtParameterSymbol
+import org.jetbrains.kotlin.psi.KtParameter
+
+internal class FirLightParameterForSymbol(
+    private val parameterSymbol: KtParameterSymbol,
+    containingMethod: FirLightMethod
+) : FirLightParameter(containingMethod) {
+    private val _name: String = parameterSymbol.name.asString()
+    override fun getName(): String = _name
+
+    private val _isVarArgs: Boolean = parameterSymbol.isVararg
+    override fun isVarArgs() = _isVarArgs
+    override fun hasModifierProperty(name: String): Boolean =
+        modifierList.hasModifierProperty(name)
+
+    override val kotlinOrigin: KtParameter? = parameterSymbol.psi as? KtParameter
+
+    private val _annotations: List<PsiAnnotation> by lazyPub {
+        parameterSymbol.computeAnnotations(
+            parent = this,
+            nullability = parameterSymbol.type.getTypeNullability(parameterSymbol, FirResolvePhase.TYPES),
+            annotationUseSiteTarget = null,
+        )
+    }
+
+    override fun getModifierList(): PsiModifierList = _modifierList
+    private val _modifierList: PsiModifierList by lazyPub {
+        FirLightClassModifierList(this, emptySet(), _annotations)
+    }
+
+    private val _type by lazyPub {
+        val convertedType = parameterSymbol.asPsiType(this, FirResolvePhase.TYPES)
+
+        if (convertedType is PsiArrayType && parameterSymbol.isVararg) {
+            PsiEllipsisType(convertedType.componentType, convertedType.annotationProvider)
+        } else convertedType
+    }
+
+    override fun getType(): PsiType = _type
+
+    override fun equals(other: Any?): Boolean =
+        this === other ||
+                (other is FirLightParameterForSymbol &&
+                 kotlinOrigin == other.kotlinOrigin &&
+                 parameterSymbol == other.parameterSymbol)
+
+    override fun hashCode(): Int = kotlinOrigin.hashCode()
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/FirIdeDeserializedDeclarationSourceProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/FirIdeDeserializedDeclarationSourceProvider.kt
index ac148068fb7..f58e1bd7167 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/FirIdeDeserializedDeclarationSourceProvider.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/FirIdeDeserializedDeclarationSourceProvider.kt
@@ -8,10 +8,10 @@ package org.jetbrains.kotlin.idea.fir
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.psi
+import org.jetbrains.kotlin.fir.realPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSession
 import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
 import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex
@@ -52,7 +52,7 @@ object FirIdeDeserializedDeclarationSourceProvider {
                 .orEmpty()
         }
 
-        return function.unrollFakeOverrides().chooseCorrespondingPsi(candidates)
+        return function.unwrapFakeOverrides().chooseCorrespondingPsi(candidates)
     }
 
     private fun provideSourceForProperty(property: FirProperty, project: Project): PsiElement? {
@@ -90,7 +90,7 @@ object FirIdeDeserializedDeclarationSourceProvider {
         val containingKtClass = constructor.containingKtClass(project) ?: return null
         if (constructor.isPrimary) return containingKtClass.primaryConstructor
 
-        return constructor.unrollFakeOverrides().chooseCorrespondingPsi(containingKtClass.secondaryConstructors)
+        return constructor.unwrapFakeOverrides().chooseCorrespondingPsi(containingKtClass.secondaryConstructors)
     }
 
     private fun FirFunction<*>.chooseCorrespondingPsi(
@@ -116,7 +116,7 @@ object FirIdeDeserializedDeclarationSourceProvider {
     }
 
     private fun FirCallableDeclaration<*>.containingKtClass(project: Project): KtClassOrObject? =
-        unrollFakeOverrides().symbol.callableId.classId?.let { classByClassId(it, scope(project), project) }
+        unwrapFakeOverrides().containingClass()?.classId?.let { classByClassId(it, scope(project), project) }
 
     private fun classByClassId(classId: ClassId, scope: GlobalSearchScope, project: Project): KtClassOrObject? {
         val fqName = classId.asStringForUsingInIndexes().let { classIdMapping[it] ?: it }
@@ -140,7 +140,15 @@ object FirIdeDeserializedDeclarationSourceProvider {
 private fun KtElement.isCompiled(): Boolean = containingKtFile.isCompiled
 
 fun FirElement.findPsi(project: Project): PsiElement? =
-    psi ?: FirIdeDeserializedDeclarationSourceProvider.findPsi(this, project)
+    realPsi ?: FirIdeDeserializedDeclarationSourceProvider.findPsi(this, project)
 
 fun FirElement.findPsi(session: FirSession): PsiElement? =
-    findPsi((session as FirIdeSession).project)
\ No newline at end of file
+    findPsi((session as FirIdeSession).project)
+
+/**
+ * Finds [PsiElement] which will be used as go-to referenced element for [KtPsiReference]
+ * For data classes & enums generated members like `copy` `componentN`, `values` it will return corresponding enum/data class
+ * Otherwise, behaves the same way as [findPsi] returns exact PSI declaration corresponding to passed [FirDeclaration]
+ */
+fun FirDeclaration.findReferencePsi(): PsiElement? =
+    psi ?: FirIdeDeserializedDeclarationSourceProvider.findPsi(this, (session as FirIdeSession).project)
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/FirUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/FirUtils.kt
index f1037464305..2c8af72e351 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/FirUtils.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/FirUtils.kt
@@ -5,15 +5,12 @@
 
 package org.jetbrains.kotlin.idea.fir
 
-import org.jetbrains.kotlin.fir.FirSymbolOwner
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
-import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
 import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
 import org.jetbrains.kotlin.fir.references.FirReference
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
-import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
@@ -36,20 +33,3 @@ internal fun FirReference.getResolvedKtSymbolOfNameReference(builder: KtSymbolBy
     (getResolvedSymbolOfNameReference()?.fir as? FirDeclaration)?.let { firDeclaration ->
         builder.buildSymbol(firDeclaration)
     }
-
-internal inline fun <reified D> D.unrollFakeOverrides(): D where D : FirDeclaration, D : FirSymbolOwner<*> {
-    val symbol = symbol
-    if (symbol !is PossiblyFirFakeOverrideSymbol<*, *>) return this
-    if (!symbol.isFakeOrIntersectionOverride) return this
-    var current: FirBasedSymbol<*>? = symbol.overriddenSymbol
-    while (current is PossiblyFirFakeOverrideSymbol<*, *> && current.isFakeOrIntersectionOverride) {
-        current = current.overriddenSymbol
-    }
-    return current?.fir as D
-}
-
-private inline val FirBasedSymbol<*>.isFakeOrIntersectionOverride: Boolean
-    get() {
-        val origin = (fir as? FirDeclaration)?.origin ?: return false
-        return origin == FirDeclarationOrigin.SubstitutionOverride || origin == FirDeclarationOrigin.IntersectionOverride
-    }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt
index d2930fdca84..c75c3121c76 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.idea.frontend.api.fir
 
+import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.LowLevelFirApiFacade
@@ -22,7 +23,7 @@ import org.jetbrains.kotlin.psi.KtElement
 
 internal class KtFirAnalysisSession
 private constructor(
-    private val element: KtElement,
+    private val project: Project,
     val firResolveState: FirModuleResolveState,
     internal val firSymbolBuilder: KtSymbolByFirBuilder,
     token: ValidityToken,
@@ -32,8 +33,6 @@ private constructor(
         assertIsValid()
     }
 
-    private val project = element.project
-
     override val smartCastProvider: KtSmartCastProvider = KtFirSmartcastProvider(this, token)
     override val typeProvider: KtTypeProvider = KtFirTypeProvider(this, token)
     override val diagnosticProvider: KtDiagnosticProvider = KtFirDiagnosticProvider(this, token)
@@ -48,9 +47,9 @@ private constructor(
 
     override fun createContextDependentCopy(): KtAnalysisSession {
         check(!isContextSession) { "Cannot create context-dependent copy of KtAnalysis session from a context dependent one" }
-        val contextResolveState = LowLevelFirApiFacadeForCompletion.getResolveStateForCompletion(element, firResolveState)
+        val contextResolveState = LowLevelFirApiFacadeForCompletion.getResolveStateForCompletion(firResolveState)
         return KtFirAnalysisSession(
-            element,
+            project,
             contextResolveState,
             firSymbolBuilder.createReadOnlyCopy(contextResolveState),
             token,
@@ -62,7 +61,12 @@ private constructor(
         @Deprecated("Please use org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProviderKt.analyze")
         internal fun createForElement(element: KtElement): KtFirAnalysisSession {
             val firResolveState = LowLevelFirApiFacade.getResolveStateFor(element)
-            val project = element.project
+            return createAnalysisSessionByResolveState(firResolveState)
+        }
+
+        @Deprecated("Please use org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProviderKt.analyze")
+        internal fun createAnalysisSessionByResolveState(firResolveState: FirModuleResolveState): KtFirAnalysisSession {
+            val project = firResolveState.project
             val token = ReadActionConfinementValidityToken(project)
             val firSymbolBuilder = KtSymbolByFirBuilder(
                 firResolveState,
@@ -70,7 +74,7 @@ private constructor(
                 token
             )
             return KtFirAnalysisSession(
-                element,
+                project,
                 firResolveState,
                 firSymbolBuilder,
                 token,
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
index 5df3d1ae7d9..7474896a19b 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
@@ -11,6 +11,7 @@ import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.PsiModificationTracker
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
+import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.InvalidWayOfUsingAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProvider
@@ -19,7 +20,7 @@ import org.jetbrains.kotlin.psi.KtElement
 import java.util.concurrent.ConcurrentHashMap
 
 @OptIn(InvalidWayOfUsingAnalysisSession::class)
-class KtFirAnalysisSessionProvider(project: Project) : KtAnalysisSessionProvider() {
+internal class KtFirAnalysisSessionProvider(project: Project) : KtAnalysisSessionProvider() {
     private val analysisSessionByModuleInfoCache =
         CachedValuesManager.getManager(project).createCachedValue {
             CachedValueProvider.Result(
@@ -36,4 +37,9 @@ class KtFirAnalysisSessionProvider(project: Project) : KtAnalysisSessionProvider
             assertIsValid()
         }
     }
+
+    internal fun getAnalysisSessionByResolveState(firModuleResolveState: FirModuleResolveState): KtAnalysisSession =
+        analysisSessionByModuleInfoCache.value.getOrPut(firModuleResolveState.moduleInfo) {
+            KtFirAnalysisSession.createAnalysisSessionByResolveState(firModuleResolveState)
+        }
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt
index d83ad5edc2f..28d2d106bfb 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt
@@ -10,6 +10,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.getSymbolByLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/analysisSessionInternalUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/analysisSessionInternalUtils.kt
new file mode 100644
index 00000000000..ae07f0c2b7e
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/analysisSessionInternalUtils.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.frontend.api.fir
+
+import com.intellij.openapi.components.service
+import org.jetbrains.kotlin.idea.frontend.api.InvalidWayOfUsingAnalysisSession
+import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
+import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProvider
+import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
+
+@OptIn(InvalidWayOfUsingAnalysisSession::class)
+internal inline fun <R> analyzeWithSymbolAsContext(contextSymbol: KtSymbol, action: KtAnalysisSession.() -> R): R {
+    require(contextSymbol is KtFirSymbol<*>)
+    val resolveState = contextSymbol.firRef.resolveState
+    val analysisSessionProvider = resolveState.project.service<KtAnalysisSessionProvider>()
+    check(analysisSessionProvider is KtFirAnalysisSessionProvider)
+    val analysisSession = analysisSessionProvider.getAnalysisSessionByResolveState(resolveState)
+    return action(analysisSession)
+}
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCompletionCandidateChecker.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCompletionCandidateChecker.kt
index 3eb90d48d41..2f690c1e654 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCompletionCandidateChecker.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCompletionCandidateChecker.kt
@@ -60,7 +60,7 @@ internal class KtFirCompletionCandidateChecker(
 
     private inline fun <reified T : KtFirSymbol<F>, F : FirDeclaration, R> KtCallableSymbol.withResolvedFirOfType(
         noinline action: (F) -> R,
-    ): R? = this.safeAs<T>()?.firRef?.withFir(FirResolvePhase.BODY_RESOLVE, action)
+    ): R? = this.safeAs<T>()?.firRef?.withFirResolvedToBodyResolve(action)
 
     private fun checkExtension(
         candidateSymbol: FirCallableDeclaration<*>,
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt
index 2c7e9e29459..d5d1d4f26fe 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt
@@ -23,19 +23,25 @@ internal class KtFirSymbolContainingDeclarationProvider(
         if (symbol is KtPackageSymbol) return null
         if (symbol.symbolKind == KtSymbolKind.TOP_LEVEL) return null
         return when (symbol.origin) {
-            KtSymbolOrigin.SOURCE -> getContainingDeclarationForKotlinInSourceSymbol(symbol)
-            KtSymbolOrigin.LIBRARY -> getContainingDeclarationForLibrarySymbol(symbol)
-            KtSymbolOrigin.JAVA -> TODO()
+            KtSymbolOrigin.SOURCE, KtSymbolOrigin.SOURCE_MEMBER_GENERATED ->
+                getContainingDeclarationForKotlinInSourceSymbol(symbol)
+            KtSymbolOrigin.LIBRARY, KtSymbolOrigin.JAVA -> getContainingDeclarationForLibrarySymbol(symbol)
             KtSymbolOrigin.SAM_CONSTRUCTOR -> TODO()
         }
     }
 
     private fun getContainingDeclarationForKotlinInSourceSymbol(symbol: KtSymbolWithKind): KtSymbolWithKind = with(analysisSession) {
-        require(symbol.origin == KtSymbolOrigin.SOURCE)
+        require(symbol.origin == KtSymbolOrigin.SOURCE || symbol.origin == KtSymbolOrigin.SOURCE_MEMBER_GENERATED)
         val psi = symbol.psi ?: error("PSI should present for declaration built by Kotlin code")
         check(psi is KtDeclaration) { "PSI of kotlin declaration should be KtDeclaration" }
-        val containingDeclaration = psi.parentOfType<KtDeclaration>()
-            ?: error("Containing declaration should present for non-toplevel declaration")
+        val containingDeclaration = when (symbol.origin) {
+            KtSymbolOrigin.SOURCE -> psi.parentOfType()
+                ?: error("Containing declaration should present for non-toplevel declaration")
+            KtSymbolOrigin.SOURCE_MEMBER_GENERATED -> psi
+            else -> error("Unsupported declaration origin ${symbol.origin}")
+        }
+
+
         return with(analysisSession) {
             val containingSymbol = containingDeclaration.getSymbol()
             check(containingSymbol is KtSymbolWithKind)
@@ -44,7 +50,7 @@ internal class KtFirSymbolContainingDeclarationProvider(
     }
 
     private fun getContainingDeclarationForLibrarySymbol(symbol: KtSymbolWithKind): KtSymbolWithKind = with(analysisSession) {
-        require(symbol.origin == KtSymbolOrigin.LIBRARY)
+        require(symbol.origin == KtSymbolOrigin.LIBRARY || symbol.origin == KtSymbolOrigin.JAVA)
         check(symbol.symbolKind == KtSymbolKind.MEMBER)
 
         val containingClassId = when (symbol) {
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDelegatingScope.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDelegatingScope.kt
index 10e0e1a6005..5d92572bd84 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDelegatingScope.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDelegatingScope.kt
@@ -5,7 +5,8 @@
 
 package org.jetbrains.kotlin.idea.frontend.api.fir.scopes
 
-import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
+import org.jetbrains.kotlin.fir.isSubstitutionOverride
 import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
 import org.jetbrains.kotlin.fir.scopes.FirScope
 import org.jetbrains.kotlin.fir.scopes.processClassifiersByName
@@ -65,7 +66,7 @@ internal fun FirScope.getCallableSymbols(callableNames: Collection<Name>, builde
         }
         processPropertiesByName(name) { firSymbol ->
             val symbol = when {
-                firSymbol is FirPropertySymbol && firSymbol.isFakeOverride -> {
+                firSymbol is FirPropertySymbol && firSymbol.fir.isSubstitutionOverride -> {
                     builder.buildVariableSymbol(firSymbol.fir)
                 }
                 else -> builder.buildCallableSymbol(firSymbol.fir)
@@ -85,4 +86,4 @@ internal fun FirScope.getClassifierSymbols(classLikeNames: Collection<Name>, bui
             }
             yieldAll(classifierSymbols)
         }
-    }
\ No newline at end of file
+    }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnnotationCall.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnnotationCall.kt
new file mode 100644
index 00000000000..c092f0653f9
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnnotationCall.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
+
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.psi.KtCallElement
+
+class KtFirAnnotationCall(
+    override val classId: ClassId,
+    override val useSiteTarget: AnnotationUseSiteTarget?,
+    override val psi: KtCallElement?,
+    override val arguments: List<KtNamedConstantValue>
+) : KtAnnotationCall()
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirClassOrObjectSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirClassOrObjectSymbol.kt
index 519c94de50e..260aaf1ee64 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirClassOrObjectSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirClassOrObjectSymbol.kt
@@ -13,13 +13,17 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirClassOrObjectInLibrarySymbol
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.convertAnnotation
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.*
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolModality
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 
@@ -39,6 +43,27 @@ internal class KtFirClassOrObjectSymbol(
 
     override val modality: KtSymbolModality get() = getModality()
 
+    override val visibility: KtSymbolVisibility get() = getVisibility()
+
+    override val annotations: List<KtAnnotationCall> by firRef.withFirAndCache(FirResolvePhase.TYPES) {
+        convertAnnotation(it)
+    }
+
+    override val isInner: Boolean get() = firRef.withFir(FirResolvePhase.STATUS) { it.isInner }
+
+    override val companionObject: KtClassOrObjectSymbol? by firRef.withFirAndCache(FirResolvePhase.RAW_FIR) { fir ->
+        fir.companionObject?.let { builder.buildClassSymbol(it) }
+    }
+
+    override val superTypes: List<KtType> by firRef.withFirAndCache(FirResolvePhase.SUPER_TYPES) { fir ->
+        fir.superConeTypes.map {
+            builder.buildKtType(it)
+        }
+    }
+    override val primaryConstructor: KtConstructorSymbol? by firRef.withFirAndCache(FirResolvePhase.RAW_FIR) { fir ->
+        fir.getPrimaryConstructorIfAny()?.let { builder.buildConstructorSymbol(it) }
+    }
+
     override val typeParameters by firRef.withFirAndCache {
         fir.typeParameters.map { typeParameter ->
             builder.buildTypeParameterSymbol(typeParameter.symbol.fir)
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt
index c9e0d032593..85d45402697 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt
@@ -6,22 +6,27 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.FirConstructor
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
-import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirConstructorSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.convertAnnotation
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
-import org.jetbrains.kotlin.idea.frontend.api.symbols.*
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorParameterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.idea.frontend.api.withValidityAssertion
 import org.jetbrains.kotlin.name.ClassId
 
@@ -42,8 +47,14 @@ internal class KtFirConstructorSymbol(
         }
     }
 
+    override val visibility: KtSymbolVisibility get() = getVisibility()
+
+    override val annotations: List<KtAnnotationCall> by firRef.withFirAndCache(FirResolvePhase.TYPES) {
+        convertAnnotation(it)
+    }
+
     override val containingClassIdIfNonLocal: ClassId?
-        get() = firRef.withFir { fir -> fir.symbol.callableId.classId /* TODO check if local */ }
+        get() = firRef.withFir { fir -> fir.containingClass()?.classId /* TODO check if local */ }
 
     override val isPrimary: Boolean get() = firRef.withFir { it.isPrimary }
 
@@ -56,4 +67,4 @@ internal class KtFirConstructorSymbol(
             ?: error("ClassId should present for member declaration")
         return KtFirConstructorSymbolPointer(ownerClassId, isPrimary, firRef.withFir { it.createSignature() })
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt
index a0e7f05db5e..adb1a91d205 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt
@@ -13,8 +13,10 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.convertAnnotation
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.*
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
@@ -39,6 +41,10 @@ internal class KtFirConstructorValueParameterSymbol(
             }
         }
 
+    override val annotations: List<KtAnnotationCall> by firRef.withFirAndCache(FirResolvePhase.TYPES) {
+        convertAnnotation(it)
+    }
+
     override val constructorParameterKind: KtConstructorParameterSymbolKind
         get() = firRef.withFir { fir ->
             when {
@@ -50,6 +56,8 @@ internal class KtFirConstructorValueParameterSymbol(
 
     override val hasDefaultValue: Boolean get() = firRef.withFir { it.defaultValue != null }
 
+    override val isVararg: Boolean get() = firRef.withFir { it.isVararg }
+
     override fun createPointer(): KtSymbolPointer<KtConstructorParameterSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         TODO("Creating symbols for library constructor parameters is not supported yet")
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirEnumEntrySymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirEnumEntrySymbol.kt
index 3436bebd86a..981efd4e959 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirEnumEntrySymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirEnumEntrySymbol.kt
@@ -6,12 +6,12 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.FirEnumEntry
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
-import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirEnumEntrySymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtEnumEntrySymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 
@@ -35,10 +36,10 @@ internal class KtFirEnumEntrySymbol(
     override val type: KtType by firRef.withFirAndCache(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { fir -> builder.buildKtType(fir.returnTypeRef) }
 
     override val containingEnumClassIdIfNonLocal: ClassId?
-        get() = firRef.withFir { it.symbol.callableId.classId?.takeUnless { it.isLocal } }
+        get() = firRef.withFir { it.containingClass()?.classId?.takeUnless { it.isLocal } }
 
     override fun createPointer(): KtSymbolPointer<KtEnumEntrySymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         return KtFirEnumEntrySymbolPointer(containingEnumClassIdIfNonLocal!!, firRef.withFir { it.createSignature() })
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt
index 33e46f5be3e..eb8a8af7429 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt
@@ -6,22 +6,26 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
-import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirMemberFunctionSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.convertAnnotation
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
-import org.jetbrains.kotlin.idea.frontend.api.symbols.*
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
@@ -47,9 +51,16 @@ internal class KtFirFunctionSymbol(
         }
     }
 
+    override val annotations: List<KtAnnotationCall> by firRef.withFirAndCache(FirResolvePhase.TYPES) {
+        convertAnnotation(it)
+    }
+
     override val isSuspend: Boolean get() = firRef.withFir { it.isSuspend }
+    override val isOverride: Boolean get() = firRef.withFir { it.isOverride }
     override val receiverType: KtType? by firRef.withFirAndCache(FirResolvePhase.TYPES) { fir -> fir.receiverTypeRef?.let(builder::buildKtType) }
     override val isOperator: Boolean get() = firRef.withFir { it.isOperator }
+    override val isExternal: Boolean get() = firRef.withFir { it.isExternal }
+    override val isInline: Boolean get() = firRef.withFir { it.isInline }
     override val isExtension: Boolean get() = firRef.withFir { it.receiverTypeRef != null }
     override val callableIdIfNonLocal: FqName?
         get() = firRef.withFir { fir ->
@@ -59,18 +70,20 @@ internal class KtFirFunctionSymbol(
         get() = firRef.withFir { fir ->
             when {
                 fir.isLocal -> KtSymbolKind.LOCAL
-                fir.symbol.callableId.classId == null -> KtSymbolKind.TOP_LEVEL
+                fir.containingClass()?.classId == null -> KtSymbolKind.TOP_LEVEL
                 else -> KtSymbolKind.MEMBER
             }
         }
     override val modality: KtCommonSymbolModality get() = getModality()
 
+    override val visibility: KtSymbolVisibility get() = getVisibility()
+
     override fun createPointer(): KtSymbolPointer<KtFunctionSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         return when (symbolKind) {
             KtSymbolKind.TOP_LEVEL -> TODO("Creating symbol for top level fun is not supported yet")
             KtSymbolKind.MEMBER -> KtFirMemberFunctionSymbolPointer(
-                firRef.withFir { it.symbol.callableId.classId ?: error("ClassId should not be null for member function") },
+                firRef.withFir { it.containingClass()?.classId ?: error("ClassId should not be null for member function") },
                 firRef.withFir { it.createSignature() }
             )
             KtSymbolKind.NON_PROPERTY_PARAMETER -> error("KtFunction could not be a parameter")
@@ -79,4 +92,4 @@ internal class KtFirFunctionSymbol(
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionValueParameterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionValueParameterSymbol.kt
index ef48c72d736..b85dbee8886 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionValueParameterSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionValueParameterSymbol.kt
@@ -13,8 +13,10 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.convertAnnotation
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionParameterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.name.Name
@@ -34,6 +36,10 @@ internal class KtFirFunctionValueParameterSymbol(
 
     override val hasDefaultValue: Boolean get() = firRef.withFir { it.defaultValue != null }
 
+    override val annotations: List<KtAnnotationCall> by firRef.withFirAndCache(FirResolvePhase.TYPES) {
+        convertAnnotation(it)
+    }
+
     override fun createPointer(): KtSymbolPointer<KtFunctionParameterSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         TODO("Creating pointers for functions parameters from library is not supported yet")
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt
index 4237d7655c4..bcf8db8941e 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtJavaFieldSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -40,6 +41,8 @@ internal class KtFirJavaFieldSymbol(
 
     override val modality: KtCommonSymbolModality get() = getModality()
 
+    override val visibility: KtSymbolVisibility get() = getVisibility()
+
     override fun createPointer(): KtSymbolPointer<KtJavaFieldSymbol> {
         TODO("Creating pointers for java fields is not supported yet")
     }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt
index 991465072fb..bde81cb4585 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt
@@ -6,17 +6,19 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor
-import org.jetbrains.kotlin.fir.declarations.modality
+import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertyGetterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
@@ -35,8 +37,20 @@ internal class KtFirPropertyGetterSymbol(
     override val psi: PsiElement? by firRef.withFirAndCache { it.findPsi(fir.session) }
 
     override val isDefault: Boolean get() = firRef.withFir { it is FirDefaultPropertyAccessor }
-    override val type: KtType = firRef.withFir(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { builder.buildKtType(it.returnTypeRef) }
+    override val isInline: Boolean get() = firRef.withFir { it.isInline }
+    override val isOverride: Boolean get() = firRef.withFir { it.isOverride }
+
+    override val symbolKind: KtSymbolKind
+        get() = firRef.withFir { fir ->
+            when (fir.symbol.callableId.classId) {
+                null -> KtSymbolKind.TOP_LEVEL
+                else -> KtSymbolKind.MEMBER
+            }
+        }
+
+    override val type: KtType by firRef.withFirAndCache { builder.buildKtType(it.returnTypeRef) }
     override val modality: KtCommonSymbolModality get() = firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality() }
+    override val visibility: KtSymbolVisibility get() = firRef.withFir(FirResolvePhase.STATUS) { it.visibility.getSymbolVisibility() }
 
     override fun createPointer(): KtSymbolPointer<KtPropertyGetterSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt
index 1e50f3d0bd2..2391d3582c6 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt
@@ -6,10 +6,9 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor
-import org.jetbrains.kotlin.fir.declarations.modality
+import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
@@ -18,8 +17,11 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySetterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSetterParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 
 internal class KtFirPropertySetterSymbol(
     fir: FirPropertyAccessor,
@@ -35,11 +37,22 @@ internal class KtFirPropertySetterSymbol(
     override val psi: PsiElement? by firRef.withFirAndCache { it.findPsi(fir.session) }
 
     override val isDefault: Boolean get() = firRef.withFir { it is FirDefaultPropertyAccessor }
+    override val isInline: Boolean get() = firRef.withFir { it.isInline }
+    override val isOverride: Boolean get() = firRef.withFir { it.isOverride }
     override val modality: KtCommonSymbolModality get() = firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality() }
+    override val visibility: KtSymbolVisibility get() = firRef.withFir(FirResolvePhase.STATUS) { it.visibility.getSymbolVisibility() }
     override val parameter: KtSetterParameterSymbol by firRef.withFirAndCache { fir ->
         builder.buildFirSetterParameter(fir.valueParameters.single())
     }
 
+    override val symbolKind: KtSymbolKind
+        get() = firRef.withFir { fir ->
+            when (fir.symbol.callableId.classId) {
+                null -> KtSymbolKind.TOP_LEVEL
+                else -> KtSymbolKind.MEMBER
+            }
+        }
+
     override fun createPointer(): KtSymbolPointer<KtPropertySetterSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         TODO("Creating pointers for setters from library is not supported yet")
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySymbol.kt
index 179d1965f14..c9f93e7623a 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySymbol.kt
@@ -6,22 +6,27 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.fir.declarations.FirProperty
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.containingClass
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
-import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirMemberPropertySymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.convertAnnotation
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertyGetterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySetterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
@@ -43,30 +48,52 @@ internal class KtFirPropertySymbol(
     override val type: KtType by firRef.withFirAndCache(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { fir -> builder.buildKtType(fir.returnTypeRef) }
     override val receiverType: KtType? by firRef.withFirAndCache(FirResolvePhase.TYPES) { fir -> fir.receiverTypeRef?.let(builder::buildKtType) }
     override val isExtension: Boolean get() = firRef.withFir { it.receiverTypeRef != null }
+
     override val symbolKind: KtSymbolKind
         get() = firRef.withFir { fir ->
-            when (fir.symbol.callableId.classId) {
+            when (fir.containingClass()?.classId) {
                 null -> KtSymbolKind.TOP_LEVEL
                 else -> KtSymbolKind.MEMBER
             }
         }
     override val modality: KtCommonSymbolModality get() = getModality()
 
+    override val visibility: KtSymbolVisibility get() = getVisibility()
+
+
+    override val annotations: List<KtAnnotationCall> by firRef.withFirAndCache(FirResolvePhase.TYPES) {
+        convertAnnotation(it)
+    }
+
     override val callableIdIfNonLocal: FqName?
         get() = firRef.withFir { fir ->
             fir.symbol.callableId.takeUnless { fir.isLocal }?.asFqNameForDebugInfo()
         }
 
+    override val getter: KtPropertyGetterSymbol? by firRef.withFirAndCache(FirResolvePhase.RAW_FIR) { property ->
+        property.getter?.let { builder.buildPropertyAccessorSymbol(it) } as? KtPropertyGetterSymbol
+    }
+
+    override val setter: KtPropertySetterSymbol? by firRef.withFirAndCache(FirResolvePhase.RAW_FIR) { property ->
+        property.getter?.let { builder.buildPropertyAccessorSymbol(it) } as? KtPropertySetterSymbol
+    }
+
+    override val hasBackingField: Boolean get() = firRef.withFir { it.hasBackingField }
+
+    override val isConst: Boolean get() = firRef.withFir { it.isConst }
+
+    override val isOverride: Boolean get() = firRef.withFir { it.isOverride }
+
     override fun createPointer(): KtSymbolPointer<KtPropertySymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         return when (symbolKind) {
             KtSymbolKind.TOP_LEVEL -> TODO("Creating symbol for top level fun is not supported yet")
             KtSymbolKind.NON_PROPERTY_PARAMETER -> TODO("Creating symbol for top level parameters is not supported yet")
             KtSymbolKind.MEMBER -> KtFirMemberPropertySymbolPointer(
-                firRef.withFir { it.symbol.callableId.classId ?: error("ClassId should not be null for member property") },
+                firRef.withFir { it.containingClass()?.classId ?: error("ClassId should not be null for member property") },
                 firRef.withFir { it.createSignature() }
             )
             KtSymbolKind.LOCAL -> throw CanNotCreateSymbolPointerForLocalLibraryDeclarationException(name.asString())
         }
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSetterParameterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSetterParameterSymbol.kt
index c79b65009a4..9f87a37ef16 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSetterParameterSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSetterParameterSymbol.kt
@@ -13,8 +13,10 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.convertAnnotation
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSetterParameterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.name.Name
@@ -33,6 +35,12 @@ internal class KtFirSetterParameterSymbol(
 
     override val hasDefaultValue: Boolean get() = firRef.withFir { it.defaultValue != null }
 
+    override val isVararg: Boolean = false
+
+    override val annotations: List<KtAnnotationCall> by firRef.withFirAndCache(FirResolvePhase.TYPES) {
+        convertAnnotation(it)
+    }
+
     override fun createPointer(): KtSymbolPointer<KtSetterParameterSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         TODO("Creating pointers for functions parameters from library is not supported yet")
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt
index f08f9ef54ea..3b9ce680477 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt
@@ -5,11 +5,13 @@
 
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
+import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
+import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
+import org.jetbrains.kotlin.fir.originalIfFakeOverride
 import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRefWithValidityCheck
-import org.jetbrains.kotlin.idea.frontend.api.fir.utils.overriddenDeclaration
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolOrigin
 
@@ -21,16 +23,23 @@ internal interface KtFirSymbol<F : FirDeclaration> : KtSymbol, ValidityTokenOwne
 
 
 private tailrec fun FirDeclaration.ktSymbolOrigin(): KtSymbolOrigin = when (origin) {
-    FirDeclarationOrigin.Source -> KtSymbolOrigin.SOURCE
+    FirDeclarationOrigin.Source -> {
+        if (source?.kind == FirFakeSourceElementKind.DataClassGeneratedMembers
+            || source?.kind == FirFakeSourceElementKind.EnumGeneratedDeclaration
+        ) {
+            KtSymbolOrigin.SOURCE_MEMBER_GENERATED
+        } else KtSymbolOrigin.SOURCE
+    }
     FirDeclarationOrigin.Library -> KtSymbolOrigin.LIBRARY
     FirDeclarationOrigin.Java -> KtSymbolOrigin.JAVA
     FirDeclarationOrigin.SamConstructor -> KtSymbolOrigin.SAM_CONSTRUCTOR
     FirDeclarationOrigin.Enhancement -> KtSymbolOrigin.JAVA
     else -> {
-        val overridden = overriddenDeclaration ?: throw InvalidFirDeclarationOriginForSymbol(origin)
+        val overridden =
+            (this as? FirCallableDeclaration<*>)?.originalIfFakeOverride() ?: throw InvalidFirDeclarationOriginForSymbol(origin)
         overridden.ktSymbolOrigin()
     }
 }
 
 class InvalidFirDeclarationOriginForSymbol(origin: FirDeclarationOrigin) :
-    IllegalStateException("Invalid FirDeclarationOrigin  $origin")
\ No newline at end of file
+    IllegalStateException("Invalid FirDeclarationOrigin  $origin")
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt
index 68915ba85bf..5695ee6b838 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt
@@ -5,9 +5,11 @@
 
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
+import org.jetbrains.kotlin.idea.fir.low.level.api.api.LowLevelFirApiFacade
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFirOfType
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner
@@ -31,47 +33,70 @@ internal class KtFirSymbolProvider(
     private val firSymbolProvider by weakRef(firSymbolProvider)
 
     override fun getParameterSymbol(psi: KtParameter): KtParameterSymbol = withValidityAssertion {
-        firSymbolBuilder.buildParameterSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirValueParameter, KtParameterSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildParameterSymbol(it)
+        }
     }
 
     override fun getFunctionSymbol(psi: KtNamedFunction): KtFunctionSymbol = withValidityAssertion {
-        firSymbolBuilder.buildFunctionSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirSimpleFunction, KtFunctionSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildFunctionSymbol(it)
+        }
     }
 
     override fun getConstructorSymbol(psi: KtConstructor<*>): KtConstructorSymbol = withValidityAssertion {
-        firSymbolBuilder.buildConstructorSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirConstructor, KtConstructorSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildConstructorSymbol(it)
+        }
     }
 
     override fun getTypeParameterSymbol(psi: KtTypeParameter): KtTypeParameterSymbol = withValidityAssertion {
-        firSymbolBuilder.buildTypeParameterSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirTypeParameter, KtTypeParameterSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildTypeParameterSymbol(it)
+        }
     }
 
     override fun getTypeAliasSymbol(psi: KtTypeAlias): KtTypeAliasSymbol = withValidityAssertion {
-        firSymbolBuilder.buildTypeAliasSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirTypeAlias, KtTypeAliasSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildTypeAliasSymbol(it)
+        }
     }
 
     override fun getEnumEntrySymbol(psi: KtEnumEntry): KtEnumEntrySymbol = withValidityAssertion {
-        firSymbolBuilder.buildEnumEntrySymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirEnumEntry, KtEnumEntrySymbol>(psi, resolveState) {
+            firSymbolBuilder.buildEnumEntrySymbol(it)
+        }
     }
 
     override fun getAnonymousFunctionSymbol(psi: KtNamedFunction): KtAnonymousFunctionSymbol = withValidityAssertion {
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirSimpleFunction, KtFunctionSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildFunctionSymbol(it)
+        }
         firSymbolBuilder.buildAnonymousFunctionSymbol(psi.getOrBuildFirOfType(resolveState))
     }
 
     override fun getAnonymousFunctionSymbol(psi: KtLambdaExpression): KtAnonymousFunctionSymbol = withValidityAssertion {
-        firSymbolBuilder.buildAnonymousFunctionSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirAnonymousFunction, KtAnonymousFunctionSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildAnonymousFunctionSymbol(it)
+        }
     }
 
     override fun getVariableSymbol(psi: KtProperty): KtVariableSymbol = withValidityAssertion {
-        firSymbolBuilder.buildVariableSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirProperty, KtVariableSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildVariableSymbol(it)
+        }
     }
 
     override fun getClassOrObjectSymbol(psi: KtClassOrObject): KtClassOrObjectSymbol = withValidityAssertion {
-        firSymbolBuilder.buildClassSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirRegularClass, KtClassOrObjectSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildClassSymbol(it)
+        }
     }
 
     override fun getPropertyAccessorSymbol(psi: KtPropertyAccessor): KtPropertyAccessorSymbol = withValidityAssertion {
-        firSymbolBuilder.buildPropertyAccessorSymbol(psi.getOrBuildFirOfType(resolveState))
+        LowLevelFirApiFacade.withFirDeclarationOfType<FirPropertyAccessor, KtPropertyAccessorSymbol>(psi, resolveState) {
+            firSymbolBuilder.buildPropertyAccessorSymbol(it)
+        }
     }
 
     override fun getClassOrObjectSymbolByClassId(classId: ClassId): KtClassOrObjectSymbol? = withValidityAssertion {
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt
index d9644ea7b9e..0ae5bf6d811 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt
@@ -6,13 +6,16 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 
 import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
+import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
 import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.modality
-import org.jetbrains.kotlin.idea.frontend.api.symbols.*
+import org.jetbrains.kotlin.fir.declarations.visibility
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolModality
-import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
 
 internal inline fun <reified M : KtSymbolModality> Modality?.getSymbolModality(): M = when (this) {
     Modality.FINAL -> KtCommonSymbolModality.FINAL
@@ -23,4 +26,19 @@ internal inline fun <reified M : KtSymbolModality> Modality?.getSymbolModality()
 } as? M ?: error("Sealed modality can only be applied to class")
 
 internal inline fun <F : FirMemberDeclaration, reified M : KtSymbolModality> KtFirSymbol<F>.getModality() =
-    firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality<M>() }
\ No newline at end of file
+    firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality<M>() }
+
+
+internal fun Visibility?.getSymbolVisibility(): KtSymbolVisibility = when (this) {
+    Visibilities.Public -> KtSymbolVisibility.PUBLIC
+    Visibilities.Protected -> KtSymbolVisibility.PROTECTED
+    Visibilities.Private -> KtSymbolVisibility.PRIVATE
+    Visibilities.Internal -> KtSymbolVisibility.INTERNAL
+    Visibilities.Unknown -> KtSymbolVisibility.UNKNOWN
+    JavaVisibilities.PackageVisibility -> KtSymbolVisibility.UNKNOWN //TODO: Add Java visibilities
+    null -> error("Symbol visibility should not be null, looks like the fir symbol was not properly resolved")
+    else -> throw NotImplementedError("Unknown visibility $name")
+}
+
+internal fun <F : FirMemberDeclaration> KtFirSymbol<F>.getVisibility(): KtSymbolVisibility =
+    firRef.withFir(FirResolvePhase.STATUS) { it.visibility.getSymbolVisibility() }
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt
index 2932731e017..5bcb267cfae 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.idea.frontend.api.fir.types
 
+import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.fir.resolve.inference.isBuiltinFunctionalType
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
@@ -68,6 +69,7 @@ internal class KtFirClassType(
             firBuilder.buildTypeArgument(typeArgument)
         }
     }
+
     override val nullability: KtTypeNullability get() = withValidityAssertion { KtTypeNullability.create(coneType.isNullable) }
 
     override fun asString(): String = withValidityAssertion {
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/EnclosingDeclarationContext.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/EnclosingDeclarationContext.kt
index 2db0bab2634..4d190bfe2ea 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/EnclosingDeclarationContext.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/EnclosingDeclarationContext.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.utils
 import com.intellij.psi.util.parentsOfType
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
-import org.jetbrains.kotlin.idea.fir.low.level.api.api.LowLevelFirApiFacade
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.LowLevelFirApiFacadeForCompletion
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.originalDeclaration
 import org.jetbrains.kotlin.idea.util.getElementTextInContext
@@ -22,7 +21,7 @@ internal sealed class EnclosingDeclarationContext {
             if (fakeFunction != null) {
                 val originalFunction = originalFile.findDeclarationOfTypeAt<KtNamedFunction>(fakeFunction.textOffset)
                     ?: error("Cannot find original function matching to ${fakeFunction.getElementTextInContext()} in $originalFile")
-                fakeFunction.originalDeclaration = originalFunction
+                recordOriginalDeclaration(originalFunction, fakeFunction)
                 return FunctionContext(fakeFunction, originalFunction)
             }
 
@@ -30,13 +29,23 @@ internal sealed class EnclosingDeclarationContext {
             if (fakeProperty != null) {
                 val originalProperty = originalFile.findDeclarationOfTypeAt<KtProperty>(fakeProperty.textOffset)
                     ?: error("Cannot find original property matching to ${fakeProperty.getElementTextInContext()} in $originalFile")
-                fakeProperty.originalDeclaration = originalProperty
-
+                recordOriginalDeclaration(originalProperty, fakeProperty)
                 return PropertyContext(fakeProperty, originalProperty)
             }
 
             error("Cannot find enclosing declaration for ${positionInFakeFile.getElementTextInContext()}")
         }
+
+        private fun recordOriginalDeclaration(originalDeclaration: KtNamedDeclaration, fakeDeclaration: KtNamedDeclaration) {
+            require(!fakeDeclaration.isPhysical)
+            require(originalDeclaration.containingKtFile !== fakeDeclaration.containingKtFile)
+            val originalDeclrationParents = originalDeclaration.parentsOfType<KtDeclaration>().toList()
+            val fakeDeclarationParents = fakeDeclaration.parentsOfType<KtDeclaration>().toList()
+
+            originalDeclrationParents.zip(fakeDeclarationParents) { original, fake ->
+                fake.originalDeclaration = original
+            }
+        }
     }
 }
 
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt
index 6351619e08f..a32a49740b2 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt
@@ -18,14 +18,29 @@ internal class FirRefWithValidityCheck<D : FirDeclaration>(fir: D, resolveState:
     private val firWeakRef = WeakReference(fir)
     private val resolveStateWeakRef = WeakReference(resolveState)
 
-    inline fun <R> withFir(phase: FirResolvePhase = FirResolvePhase.RAW_FIR, action: (fir: D) -> R): R {
+    inline fun <R> withFir(phase: FirResolvePhase = FirResolvePhase.RAW_FIR, crossinline action: (fir: D) -> R): R {
         token.assertIsValid()
-        val fir = firWeakRef.get() ?: error("FirElement was garbage collected while analysis session is still valid")
+        val fir = firWeakRef.get()
+            ?: error("FirElement was garbage collected while analysis session is still valid")
         val resolveState =
             resolveStateWeakRef.get() ?: error("FirModuleResolveState was garbage collected while analysis session is still valid")
-        return action(LowLevelFirApiFacade.resolvedFirToPhase(fir, phase, resolveState))
+        LowLevelFirApiFacade.resolvedFirToPhase(fir, phase, resolveState)
+        return resolveState.withFirDeclaration(fir) { action(it) }
     }
 
+    inline fun <R> withFirResolvedToBodyResolve(action: (fir: D) -> R): R {
+        token.assertIsValid()
+        val fir = firWeakRef.get()
+            ?: error("FirElement was garbage collected while analysis session is still valid")
+        val resolveState =
+            resolveStateWeakRef.get() ?: error("FirModuleResolveState was garbage collected while analysis session is still valid")
+        LowLevelFirApiFacade.resolvedFirToPhase(fir, FirResolvePhase.BODY_RESOLVE, resolveState)
+        return action(resolveState.withFirDeclaration(fir) { it })
+    }
+
+    val resolveState
+        get() = resolveStateWeakRef.get() ?: error("FirModuleResolveState was garbage collected while analysis session is still valid")
+
     inline fun <R> withFirAndCache(phase: FirResolvePhase = FirResolvePhase.RAW_FIR, crossinline createValue: (fir: D) -> R) =
         ValidityAwareCachedValue(token) {
             withFir(phase) { fir -> createValue(fir) }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/firUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/firUtils.kt
index 3f3c7af4249..f1b09d782fc 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/firUtils.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/firUtils.kt
@@ -4,12 +4,77 @@
  */
 package org.jetbrains.kotlin.idea.frontend.api.fir.utils
 
+import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSymbolOwner
+import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirRegularClass
+import org.jetbrains.kotlin.fir.declarations.getPrimaryConstructorIfAny
+import org.jetbrains.kotlin.fir.expressions.*
+import org.jetbrains.kotlin.fir.psi
+import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
+import org.jetbrains.kotlin.fir.types.classId
+import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirAnnotationCall
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedConstantValue
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSimpleConstantValue
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtUnsupportedConstantValue
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.psi.KtCallElement
 
-internal inline val FirDeclaration.overriddenDeclaration: FirDeclaration?
-    get() {
-        val symbol = (this as? FirSymbolOwner<*>)?.symbol ?: return null
-        return (symbol as? FirCallableSymbol)?.overriddenSymbol?.fir as? FirDeclaration
-    }
\ No newline at end of file
+internal fun mapAnnotationParameters(annotationCall: FirAnnotationCall, session: FirSession): Map<String, FirExpression> {
+
+    val annotationCone = annotationCall.annotationTypeRef.coneType as? ConeClassLikeType ?: return emptyMap()
+
+    val annotationPrimaryCtor = (annotationCone.lookupTag.toSymbol(session)?.fir as? FirRegularClass)?.getPrimaryConstructorIfAny()
+    val annotationCtorParameterNames = annotationPrimaryCtor?.valueParameters?.map { it.name }
+
+    val resultSet = mutableMapOf<String, FirExpression>()
+
+    val namesSequence = annotationCtorParameterNames?.asSequence()?.iterator()
+
+    for (argument in annotationCall.argumentList.arguments.filterIsInstance<FirNamedArgumentExpression>()) {
+        resultSet[argument.name.asString()] = argument.expression
+    }
+
+    for (argument in annotationCall.argumentList.arguments) {
+        if (argument is FirNamedArgumentExpression) continue
+
+        while (namesSequence != null && namesSequence.hasNext()) {
+            val name = namesSequence.next().asString()
+            if (!resultSet.contains(name)) {
+                resultSet[name] = argument
+                break
+            }
+        }
+    }
+
+    return resultSet
+}
+
+private fun convertAnnotation(annotationCall: FirAnnotationCall, session: FirSession): KtFirAnnotationCall? {
+
+    val annotationCone = annotationCall.annotationTypeRef.coneType as? ConeClassLikeType ?: return null
+    val classId = annotationCone.classId ?: return null
+
+    fun FirExpression.convertConstantExpression() =
+        (this as? FirConstExpression<*>)?.value?.let { KtSimpleConstantValue(it) }
+            ?: KtUnsupportedConstantValue
+
+    val resultList = mapAnnotationParameters(annotationCall, session).map {
+        KtNamedConstantValue(it.key, it.value.convertConstantExpression())
+    }
+
+    return KtFirAnnotationCall(
+        classId = classId,
+        useSiteTarget = annotationCall.useSiteTarget,
+        psi = annotationCall.psi as? KtCallElement,
+        arguments = resultList
+    )
+}
+
+internal fun convertAnnotation(declaration: FirAnnotatedDeclaration) = declaration.annotations.mapNotNull {
+    convertAnnotation(it, declaration.session)
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/threadUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/threadUtils.kt
new file mode 100644
index 00000000000..0c770150482
--- /dev/null
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/threadUtils.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.frontend.api.fir.utils
+
+import com.intellij.openapi.application.ApplicationManager
+import org.jetbrains.kotlin.idea.frontend.api.HackToForceAllowRunningAnalyzeOnEDT
+import org.jetbrains.kotlin.idea.frontend.api.hackyAllowRunningOnEdt
+
+@HackToForceAllowRunningAnalyzeOnEDT
+internal inline fun <R> runInPossiblyEdtThread(action: () -> R): R = when {
+    !ApplicationManager.getApplication().isDispatchThread -> action()
+    else -> hackyAllowRunningOnEdt(action)
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReference.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReference.kt
index 33ae2dd216c..c3295cff669 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReference.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReference.kt
@@ -6,13 +6,18 @@
 package org.jetbrains.kotlin.idea.references
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.idea.fir.findReferencePsi
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtSymbolBasedReference
+import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 
 interface KtFirReference : KtReference, KtSymbolBasedReference {
     fun getResolvedToPsi(analysisSession: KtAnalysisSession): Collection<PsiElement> =
-        analysisSession.resolveToSymbols().mapNotNull(KtSymbol::psi)
+        analysisSession.resolveToSymbols().mapNotNull { symbol ->
+            (symbol as? KtFirSymbol<*>)?.firRef?.withFir { it.findReferencePsi() }
+                ?: symbol.psi
+        }
 
     override val resolver get() = KtFirReferenceResolver
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReferenceResolver.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReferenceResolver.kt
index 259d136adae..545c8ebbcbf 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReferenceResolver.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReferenceResolver.kt
@@ -5,32 +5,32 @@
 
 package org.jetbrains.kotlin.idea.references
 
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.diagnostic.ControlFlowException
-import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementResolveResult
 import com.intellij.psi.ResolveResult
 import com.intellij.psi.impl.source.resolve.ResolveCache
+import org.jetbrains.kotlin.idea.frontend.api.HackToForceAllowRunningAnalyzeOnEDT
 import org.jetbrains.kotlin.idea.frontend.api.analyze
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.runInPossiblyEdtThread
 import org.jetbrains.kotlin.idea.util.getElementTextInContext
 
 object KtFirReferenceResolver : ResolveCache.PolyVariantResolver<KtReference> {
     class KotlinResolveResult(element: PsiElement) : PsiElementResolveResult(element)
 
+    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
     override fun resolve(ref: KtReference, incompleteCode: Boolean): Array<ResolveResult> {
         check(ref is KtFirReference) { "reference should be FirKtReference, but was ${ref::class}" }
         check(ref is AbstractKtReference<*>) { "reference should be AbstractKtReference, but was ${ref::class}" }
-        if (ApplicationManager.getApplication().isDispatchThread) {
-            throw ProcessCanceledException()
+        return runInPossiblyEdtThread {
+            val resolveToPsiElements = try {
+                analyze(ref.expression) { ref.getResolvedToPsi(this) }
+            } catch (e: Throwable) {
+                if (e is ControlFlowException) throw e
+                throw KtReferenceResolveException(ref, e)
+            }
+            resolveToPsiElements.map { KotlinResolveResult(it) }.toTypedArray()
         }
-        val resolveToPsiElements = try {
-            analyze(ref.expression) { ref.getResolvedToPsi(this) }
-        } catch (e: Throwable) {
-            if (e is ControlFlowException) throw e
-            throw KtReferenceResolveException(ref, e)
-        }
-        return resolveToPsiElements.map { KotlinResolveResult(it) }.toTypedArray()
     }
 }
 
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
index e00c28a154f..e93df9254ae 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
@@ -2,9 +2,13 @@ class: kotlin/Int
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.and
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: and
@@ -14,11 +18,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: compareTo
@@ -28,11 +37,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: compareTo
@@ -42,11 +56,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: compareTo
@@ -56,11 +75,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: compareTo
@@ -70,11 +94,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: compareTo
@@ -84,11 +113,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: compareTo
@@ -98,11 +132,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.dec
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: dec
@@ -112,11 +151,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: div
@@ -126,11 +170,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: div
@@ -140,11 +189,16 @@ KtFirFunctionSymbol:
   type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: div
@@ -154,11 +208,16 @@ KtFirFunctionSymbol:
   type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: div
@@ -168,11 +227,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: div
@@ -182,11 +246,16 @@ KtFirFunctionSymbol:
   type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: div
@@ -196,11 +265,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.inc
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: inc
@@ -210,11 +284,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.inv
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: inv
@@ -224,11 +303,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: minus
@@ -238,11 +322,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: minus
@@ -252,11 +341,16 @@ KtFirFunctionSymbol:
   type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: minus
@@ -266,11 +360,16 @@ KtFirFunctionSymbol:
   type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: minus
@@ -280,11 +379,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: minus
@@ -294,11 +398,16 @@ KtFirFunctionSymbol:
   type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: minus
@@ -308,11 +417,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.or
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: or
@@ -322,11 +436,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: plus
@@ -336,11 +455,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: plus
@@ -350,11 +474,16 @@ KtFirFunctionSymbol:
   type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: plus
@@ -364,11 +493,16 @@ KtFirFunctionSymbol:
   type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: plus
@@ -378,11 +512,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: plus
@@ -392,11 +531,16 @@ KtFirFunctionSymbol:
   type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: plus
@@ -406,11 +550,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rangeTo
@@ -420,11 +569,16 @@ KtFirFunctionSymbol:
   type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rangeTo
@@ -434,11 +588,16 @@ KtFirFunctionSymbol:
   type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rangeTo
@@ -448,11 +607,16 @@ KtFirFunctionSymbol:
   type: kotlin/ranges/LongRange
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rangeTo
@@ -462,11 +626,16 @@ KtFirFunctionSymbol:
   type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rem
@@ -476,11 +645,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rem
@@ -490,11 +664,16 @@ KtFirFunctionSymbol:
   type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rem
@@ -504,11 +683,16 @@ KtFirFunctionSymbol:
   type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rem
@@ -518,11 +702,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rem
@@ -532,11 +721,16 @@ KtFirFunctionSymbol:
   type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: rem
@@ -546,11 +740,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.shl
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: shl
@@ -560,11 +759,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.shr
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: shr
@@ -574,11 +778,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: times
@@ -588,11 +797,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: times
@@ -602,11 +816,16 @@ KtFirFunctionSymbol:
   type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: times
@@ -616,11 +835,16 @@ KtFirFunctionSymbol:
   type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: times
@@ -630,11 +854,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: times
@@ -644,11 +873,16 @@ KtFirFunctionSymbol:
   type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: times
@@ -658,11 +892,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.toByte
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toByte
@@ -672,11 +911,16 @@ KtFirFunctionSymbol:
   type: kotlin/Byte
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.toChar
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toChar
@@ -686,11 +930,16 @@ KtFirFunctionSymbol:
   type: kotlin/Char
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.toDouble
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toDouble
@@ -700,11 +949,16 @@ KtFirFunctionSymbol:
   type: kotlin/Double
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.toFloat
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toFloat
@@ -714,11 +968,16 @@ KtFirFunctionSymbol:
   type: kotlin/Float
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.toInt
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toInt
@@ -728,11 +987,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.toLong
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toLong
@@ -742,11 +1006,16 @@ KtFirFunctionSymbol:
   type: kotlin/Long
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.toShort
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toShort
@@ -756,11 +1025,16 @@ KtFirFunctionSymbol:
   type: kotlin/Short
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.unaryMinus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: unaryMinus
@@ -770,11 +1044,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.unaryPlus
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: unaryPlus
@@ -784,11 +1063,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.ushr
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: ushr
@@ -798,11 +1082,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.xor
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: xor
@@ -812,11 +1101,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.equals
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: equals
@@ -826,11 +1120,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.hashCode
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: hashCode
@@ -840,11 +1139,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.Int.toString
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toString
@@ -854,12 +1158,19 @@ KtFirFunctionSymbol:
   type: kotlin/String
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: kotlin/Int.Companion
   classKind: COMPANION_OBJECT
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: Companion
   origin: LIBRARY
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: MEMBER
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
index fd743597584..1b99e0525de 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
@@ -2,9 +2,13 @@ class: kotlin/collections/MutableList
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.add
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: add
@@ -14,11 +18,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.add
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: add
@@ -28,11 +37,16 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(element)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.addAll
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: addAll
@@ -42,11 +56,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(elements)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.addAll
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: addAll
@@ -56,11 +75,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.clear
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: clear
@@ -70,11 +94,16 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.listIterator
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: listIterator
@@ -84,11 +113,16 @@ KtFirFunctionSymbol:
   type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.listIterator
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: listIterator
@@ -98,11 +132,16 @@ KtFirFunctionSymbol:
   type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.remove
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: remove
@@ -112,11 +151,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.removeAll
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: removeAll
@@ -126,11 +170,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.removeAt
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: removeAt
@@ -140,11 +189,16 @@ KtFirFunctionSymbol:
   type: E
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.retainAll
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: retainAll
@@ -154,11 +208,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.set
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: set
@@ -168,11 +227,16 @@ KtFirFunctionSymbol:
   type: E
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(element)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.subList
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: subList
@@ -182,11 +246,16 @@ KtFirFunctionSymbol:
   type: kotlin/collections/MutableList<E>
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(fromIndex), KtFirFunctionValueParameterSymbol(toIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.contains
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: contains
@@ -196,11 +265,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.containsAll
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: containsAll
@@ -210,11 +284,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.get
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: get
@@ -224,11 +303,16 @@ KtFirFunctionSymbol:
   type: E
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.indexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: indexOf
@@ -238,11 +322,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.isEmpty
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: isEmpty
@@ -252,11 +341,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.iterator
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: iterator
@@ -266,11 +360,16 @@ KtFirFunctionSymbol:
   type: kotlin/collections/MutableIterator<E>
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.lastIndexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: lastIndexOf
@@ -280,22 +379,34 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  visibility: PUBLIC
 
 KtFirPropertySymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.List.size
+  getter: null
+  hasBackingField: false
+  isConst: false
   isExtension: false
+  isOverride: false
   isVal: true
   modality: ABSTRACT
   name: size
   origin: LIBRARY
   receiverType: null
+  setter: null
   symbolKind: MEMBER
   type: kotlin/Int
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.equals
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: equals
@@ -305,11 +416,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.hashCode
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: hashCode
@@ -319,11 +435,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.toString
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toString
@@ -333,3 +454,4 @@ KtFirFunctionSymbol:
   type: kotlin/String
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
index e54f3b9808e..713d75f5d50 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
@@ -8,7 +8,8 @@ KtFirJavaFieldSymbol:
   name: value
   origin: JAVA
   symbolKind: MEMBER
-  type: ft<kotlin/CharArray, kotlin/CharArray?>!
+  type: ft<@FlexibleNullability kotlin/CharArray, kotlin/CharArray?>!
+  visibility: PRIVATE
 
 KtFirJavaFieldSymbol:
   callableIdIfNonLocal: java.lang.String.hash
@@ -18,11 +19,16 @@ KtFirJavaFieldSymbol:
   origin: JAVA
   symbolKind: MEMBER
   type: kotlin/Int
+  visibility: PRIVATE
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.hash32
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: hash32
@@ -32,6 +38,7 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: UNKNOWN
 
 KtFirJavaFieldSymbol:
   callableIdIfNonLocal: java.lang.String.hash32
@@ -41,11 +48,16 @@ KtFirJavaFieldSymbol:
   origin: JAVA
   symbolKind: MEMBER
   type: kotlin/Int
+  visibility: PRIVATE
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.length
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: length
@@ -55,22 +67,34 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirPropertySymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.CharSequence.length
+  getter: KtFirPropertyGetterSymbol(<getter>)
+  hasBackingField: true
+  isConst: false
   isExtension: false
+  isOverride: false
   isVal: true
   modality: ABSTRACT
   name: length
   origin: LIBRARY
   receiverType: null
+  setter: null
   symbolKind: MEMBER
   type: kotlin/Int
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.isEmpty
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: isEmpty
@@ -80,11 +104,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.charAt
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: charAt
@@ -94,11 +123,16 @@ KtFirFunctionSymbol:
   type: kotlin/Char
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.codePointAt
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: codePointAt
@@ -108,11 +142,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.codePointBefore
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: codePointBefore
@@ -122,11 +161,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.codePointCount
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: codePointCount
@@ -136,11 +180,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.offsetByCodePoints
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: offsetByCodePoints
@@ -150,11 +199,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(codePointOffset)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.getChars
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: getChars
@@ -164,11 +218,16 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
+  visibility: UNKNOWN
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.getChars
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: getChars
@@ -178,11 +237,16 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(srcBegin), KtFirFunctionValueParameterSymbol(srcEnd), KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [java/lang/Deprecated()]
   callableIdIfNonLocal: java.lang.String.getBytes
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: getBytes
@@ -192,11 +256,16 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(srcBegin), KtFirFunctionValueParameterSymbol(srcEnd), KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.getBytes
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: getBytes
@@ -206,11 +275,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/ByteArray
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(charsetName)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.getBytes
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: getBytes
@@ -220,11 +294,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/ByteArray
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(charset)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.getBytes
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: getBytes
@@ -234,11 +313,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/ByteArray
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.equals
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: equals
@@ -248,11 +332,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(anObject)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.contentEquals
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: contentEquals
@@ -262,11 +351,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(sb)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.contentEquals
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: contentEquals
@@ -276,11 +370,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(cs)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.equalsIgnoreCase
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: equalsIgnoreCase
@@ -290,11 +389,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(anotherString)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.compareTo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: compareTo
@@ -304,11 +408,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(anotherString)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.compareToIgnoreCase
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: compareToIgnoreCase
@@ -318,11 +427,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(str)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.regionMatches
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: regionMatches
@@ -332,11 +446,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(toffset), KtFirFunctionValueParameterSymbol(other), KtFirFunctionValueParameterSymbol(ooffset), KtFirFunctionValueParameterSymbol(len)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.regionMatches
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: regionMatches
@@ -346,11 +465,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(ignoreCase), KtFirFunctionValueParameterSymbol(toffset), KtFirFunctionValueParameterSymbol(other), KtFirFunctionValueParameterSymbol(ooffset), KtFirFunctionValueParameterSymbol(len)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.startsWith
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: startsWith
@@ -360,11 +484,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(prefix), KtFirFunctionValueParameterSymbol(toffset)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.startsWith
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: startsWith
@@ -374,11 +503,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(prefix)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.endsWith
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: endsWith
@@ -388,11 +522,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(suffix)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.hashCode
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: hashCode
@@ -402,11 +541,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.indexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: indexOf
@@ -416,11 +560,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(ch)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.indexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: indexOf
@@ -430,11 +579,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.indexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: indexOf
@@ -444,11 +598,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(str)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.indexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: indexOf
@@ -458,11 +617,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(str), KtFirFunctionValueParameterSymbol(fromIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.indexOfSupplementary
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: indexOfSupplementary
@@ -472,11 +636,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
+  visibility: PRIVATE
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.lastIndexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: lastIndexOf
@@ -486,11 +655,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(ch)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.lastIndexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: lastIndexOf
@@ -500,11 +674,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.lastIndexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: lastIndexOf
@@ -514,11 +693,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(str)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.lastIndexOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: lastIndexOf
@@ -528,11 +712,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(str), KtFirFunctionValueParameterSymbol(fromIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.lastIndexOfSupplementary
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: lastIndexOfSupplementary
@@ -542,11 +731,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
+  visibility: PRIVATE
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.substring
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: substring
@@ -556,11 +750,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.substring
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: substring
@@ -570,11 +769,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.subSequence
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: subSequence
@@ -584,11 +788,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/CharSequence
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.concat
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: concat
@@ -598,11 +807,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(str)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.replace
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: replace
@@ -612,11 +826,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(oldChar), KtFirFunctionValueParameterSymbol(newChar)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.replace
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: replace
@@ -626,11 +845,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(target), KtFirFunctionValueParameterSymbol(replacement)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.matches
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: matches
@@ -640,11 +864,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(regex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.contains
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: contains
@@ -654,11 +883,16 @@ KtFirFunctionSymbol:
   type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(s)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.replaceFirst
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: replaceFirst
@@ -668,11 +902,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(replacement)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.replaceAll
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: replaceAll
@@ -682,39 +921,54 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(replacement)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.split
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: split
   origin: JAVA
   receiverType: null
   symbolKind: MEMBER
-  type: ft<@EnhancedNullability kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>>
+  type: ft<@EnhancedNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, @EnhancedNullability kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>>
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(limit)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.split
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: split
   origin: JAVA
   receiverType: null
   symbolKind: MEMBER
-  type: ft<@EnhancedNullability kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>>
+  type: ft<@EnhancedNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, @EnhancedNullability kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>>
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(regex)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.toLowerCase
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toLowerCase
@@ -724,11 +978,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(locale)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.toLowerCase
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toLowerCase
@@ -738,11 +997,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.toUpperCase
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toUpperCase
@@ -752,11 +1016,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(locale)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.toUpperCase
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toUpperCase
@@ -766,11 +1035,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.trim
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: trim
@@ -780,25 +1054,35 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: java.lang.String.toString
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toString
   origin: JAVA
   receiverType: null
   symbolKind: MEMBER
-  type: kotlin/String
+  type: @FlexibleNullability kotlin/String
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.toCharArray
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: toCharArray
@@ -808,11 +1092,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/CharArray
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [org/jetbrains/annotations/NotNull()]
   callableIdIfNonLocal: java.lang.String.intern
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: OPEN
   name: intern
@@ -822,11 +1111,16 @@ KtFirFunctionSymbol:
   type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.CharSequence.get
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: get
@@ -836,12 +1130,19 @@ KtFirFunctionSymbol:
   type: kotlin/Char
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: java/lang/String.CaseInsensitiveComparator
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: OPEN
   name: CaseInsensitiveComparator
   origin: JAVA
+  primaryConstructor: null
+  superTypes: [kotlin/Any, java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/io/Serializable]
   symbolKind: MEMBER
   typeParameters: []
+  visibility: PRIVATE
diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt
index 342b11eeb73..224657cb944 100644
--- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt
+++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt
@@ -4,10 +4,16 @@ class: kotlin/Lazy
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: kotlin/Lazy
   classKind: INTERFACE
+  companionObject: null
+  isInner: false
   modality: ABSTRACT
   name: Lazy
   origin: LIBRARY
+  primaryConstructor: null
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(T)]
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt
index 770ae0b4770..d76cefbae29 100644
--- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt
+++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt
@@ -4,10 +4,16 @@ class: java.lang.String
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: java.lang.String
   classKind: CLASS
+  companionObject: null
+  isInner: true
   modality: FINAL
   name: String
   origin: JAVA
+  primaryConstructor: null
+  superTypes: [kotlin/Any, java/io/Serializable, kotlin/Comparable<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/CharSequence]
   symbolKind: MEMBER
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt
index e52e58a16a6..9ba31bfd9c9 100644
--- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt
+++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt
@@ -2,9 +2,13 @@ callable: kotlin/collections/List.get
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.List.get
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: true
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: get
@@ -14,3 +18,4 @@ KtFirFunctionSymbol:
   type: E
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt
index 03c1fadb285..a0568966067 100644
--- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt
+++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt
@@ -2,9 +2,13 @@ callable: kotlin/collections/List.listIterator
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.List.listIterator
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: listIterator
@@ -14,11 +18,16 @@ KtFirFunctionSymbol:
   type: kotlin/collections/ListIterator<E>
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.List.listIterator
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: ABSTRACT
   name: listIterator
@@ -28,3 +37,4 @@ KtFirFunctionSymbol:
   type: kotlin/collections/ListIterator<E>
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt
index 05c1b07eae4..83ba77170c4 100644
--- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt
+++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt
@@ -2,10 +2,16 @@ class: kotlin/collections/MutableMap.MutableEntry
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: kotlin/collections/MutableMap.MutableEntry
   classKind: INTERFACE
+  companionObject: null
+  isInner: false
   modality: ABSTRACT
   name: MutableEntry
   origin: LIBRARY
+  primaryConstructor: null
+  superTypes: [kotlin/collections/Map.Entry<K, V>]
   symbolKind: MEMBER
   typeParameters: [KtFirTypeParameterSymbol(K), KtFirTypeParameterSymbol(V)]
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/class.kt b/idea/idea-frontend-fir/testData/symbolPointer/class.kt
index 1fcbb434dca..2c3a1c397ad 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/class.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/class.kt
@@ -3,10 +3,16 @@ class A {
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: A
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: A
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt b/idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt
index 253e1f40c0d..9f3bef02003 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt
@@ -3,18 +3,26 @@ class A() {
 
 // SYMBOLS:
 KtFirConstructorSymbol:
+  annotations: []
   containingClassIdIfNonLocal: A
   isPrimary: true
   origin: SOURCE
   symbolKind: MEMBER
   type: A
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: A
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: A
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt b/idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt
index ae8438177f5..cbce77c71da 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt
@@ -1,18 +1,21 @@
 class A() {
-    constructor(x: Int): this()
-    constructor(y: Int, z: String) : this(y)
+  constructor(x: Int): this()
+  constructor(y: Int, z: String) : this(y)
 }
 
 // SYMBOLS:
 KtFirConstructorSymbol:
+  annotations: []
   containingClassIdIfNonLocal: A
   isPrimary: true
   origin: SOURCE
   symbolKind: MEMBER
   type: A
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionValueParameterSymbol:
+  annotations: []
   hasDefaultValue: false
   isVararg: false
   name: x
@@ -21,14 +24,17 @@ KtFirFunctionValueParameterSymbol:
   type: kotlin/Int
 
 KtFirConstructorSymbol:
+  annotations: []
   containingClassIdIfNonLocal: A
   isPrimary: false
   origin: SOURCE
   symbolKind: MEMBER
   type: A
   valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
+  visibility: PUBLIC
 
 KtFirFunctionValueParameterSymbol:
+  annotations: []
   hasDefaultValue: false
   isVararg: false
   name: y
@@ -37,6 +43,7 @@ KtFirFunctionValueParameterSymbol:
   type: kotlin/Int
 
 KtFirFunctionValueParameterSymbol:
+  annotations: []
   hasDefaultValue: false
   isVararg: false
   name: z
@@ -45,18 +52,26 @@ KtFirFunctionValueParameterSymbol:
   type: kotlin/String
 
 KtFirConstructorSymbol:
+  annotations: []
   containingClassIdIfNonLocal: A
   isPrimary: false
   origin: SOURCE
   symbolKind: MEMBER
   type: A
   valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
+  visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: A
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: A
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/enum.kt b/idea/idea-frontend-fir/testData/symbolPointer/enum.kt
index c1ed8e27410..b05ecb9d2cb 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/enum.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/enum.kt
@@ -1,5 +1,5 @@
 enum class X {
-    Y, Z;
+  Y, Z;
 }
 
 // SYMBOLS:
@@ -18,10 +18,16 @@ KtFirEnumEntrySymbol:
   type: X
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: X
   classKind: ENUM_CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: X
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Enum<X>]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt b/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt
index edb0a465cfd..bc8e6474996 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt
@@ -1,13 +1,17 @@
 class A {
-    fun x(): Int
-    fun y()
+  fun x(): Int
+  fun y()
 }
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: A.x
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: x
@@ -17,11 +21,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: A.y
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: y
@@ -31,12 +40,19 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: A
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: A
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
index 0df24252517..6418c1576db 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
@@ -1,42 +1,66 @@
 class A {
-    val x: Int = 10
-    val Int.y get() = this
+  val x: Int = 10
+  val Int.y get() = this
 }
 
 // SYMBOLS:
 KtFirPropertySymbol:
+  annotations: []
   callableIdIfNonLocal: A.x
+  getter: KtFirPropertyGetterSymbol(<getter>)
+  hasBackingField: true
+  isConst: false
   isExtension: false
+  isOverride: false
   isVal: true
   modality: FINAL
   name: x
   origin: SOURCE
   receiverType: null
+  setter: null
   symbolKind: MEMBER
   type: kotlin/Int
+  visibility: PUBLIC
 
 KtFirPropertyGetterSymbol:
   isDefault: false
+  isInline: false
+  isOverride: false
   modality: FINAL
   origin: SOURCE
-  type: kotlin/Int
+  symbolKind: TOP_LEVEL
+  type: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl cannot be cast to org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
+  visibility: PUBLIC
 
 KtFirPropertySymbol:
+  annotations: []
   callableIdIfNonLocal: A.y
+  getter: KtFirPropertyGetterSymbol(<getter>)
+  hasBackingField: false
+  isConst: false
   isExtension: true
+  isOverride: false
   isVal: true
   modality: FINAL
   name: y
   origin: SOURCE
   receiverType: kotlin/Int
+  setter: null
   symbolKind: MEMBER
   type: kotlin/Int
+  visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: A
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: A
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt b/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt
index 56042583d13..056966817f2 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt
@@ -3,9 +3,13 @@ fun y() {}
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: x
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: x
@@ -15,11 +19,16 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: y
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: y
@@ -29,3 +38,4 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
index 49b10a5735a..ba6449c3871 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
@@ -3,29 +3,47 @@ val Int.y get() = this
 
 // SYMBOLS:
 KtFirPropertySymbol:
+  annotations: []
   callableIdIfNonLocal: x
+  getter: KtFirPropertyGetterSymbol(<getter>)
+  hasBackingField: true
+  isConst: false
   isExtension: false
+  isOverride: false
   isVal: true
   modality: FINAL
   name: x
   origin: SOURCE
   receiverType: null
+  setter: null
   symbolKind: TOP_LEVEL
   type: kotlin/Int
+  visibility: PUBLIC
 
 KtFirPropertyGetterSymbol:
   isDefault: false
+  isInline: false
+  isOverride: false
   modality: FINAL
   origin: SOURCE
-  type: kotlin/Int
+  symbolKind: TOP_LEVEL
+  type: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl cannot be cast to org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
+  visibility: PUBLIC
 
 KtFirPropertySymbol:
+  annotations: []
   callableIdIfNonLocal: y
+  getter: KtFirPropertyGetterSymbol(<getter>)
+  hasBackingField: false
+  isConst: false
   isExtension: true
+  isOverride: false
   isVal: true
   modality: FINAL
   name: y
   origin: SOURCE
   receiverType: kotlin/Int
+  setter: null
   symbolKind: TOP_LEVEL
   type: kotlin/Int
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt b/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt
index b29b6fb78dc..cd05ea24379 100644
--- a/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt
+++ b/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt
@@ -2,9 +2,13 @@ callable: kotlin/collections/listOf
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: listOf
@@ -14,11 +18,16 @@ KtFirFunctionSymbol:
   type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: [kotlin/internal/InlineOnly()]
   callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
+  isExternal: false
+  isInline: true
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: listOf
@@ -28,11 +37,16 @@ KtFirFunctionSymbol:
   type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: listOf
@@ -42,3 +56,4 @@ KtFirFunctionSymbol:
   type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt b/idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt
index 5dfb2271dd2..dd99cc18b1a 100644
--- a/idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt
+++ b/idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt
@@ -2,10 +2,16 @@ class: kotlin/collections/Iterator
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: kotlin/collections/Iterator
   classKind: INTERFACE
+  companionObject: null
+  isInner: false
   modality: ABSTRACT
   name: Iterator
   origin: LIBRARY
+  primaryConstructor: null
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(T)]
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt b/idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt
index 64124fa9a2b..e0d6d9fe9a9 100644
--- a/idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt
+++ b/idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt
@@ -2,10 +2,16 @@ class: kotlin/io/FileWalkDirection
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: kotlin/io/FileWalkDirection
   classKind: ENUM_CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: FileWalkDirection
   origin: LIBRARY
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Enum<kotlin/io/FileWalkDirection>]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt
new file mode 100644
index 00000000000..22b530ff6d7
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt
@@ -0,0 +1,90 @@
+
+annotation class Anno(val param1: String, val param2: Int)
+
+@Anno(param1 = "param", 2)
+class X {
+    @Anno("funparam", 3)
+    fun x() {
+
+    }
+}
+
+// SYMBOLS:
+/*
+KtFirFunctionValueParameterSymbol:
+  annotations: []
+  hasDefaultValue: false
+  isVararg: false
+  name: param1
+  origin: SOURCE
+  symbolKind: NON_PROPERTY_PARAMETER
+  type: kotlin/String
+
+KtFirFunctionValueParameterSymbol:
+  annotations: []
+  hasDefaultValue: false
+  isVararg: false
+  name: param2
+  origin: SOURCE
+  symbolKind: NON_PROPERTY_PARAMETER
+  type: kotlin/Int
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: Anno
+  isPrimary: true
+  origin: SOURCE
+  symbolKind: MEMBER
+  type: Anno
+  valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
+  visibility: PUBLIC
+
+KtFirClassOrObjectSymbol:
+  annotations: []
+  classIdIfNonLocal: Anno
+  classKind: ANNOTATION_CLASS
+  companionObject: null
+  isInner: false
+  modality: FINAL
+  name: Anno
+  origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Annotation]
+  symbolKind: TOP_LEVEL
+  typeParameters: []
+  visibility: PUBLIC
+
+KtFirFunctionSymbol:
+  annotations: [Anno(param1 = funparam, param2 = 3)]
+  callableIdIfNonLocal: X.x
+  isExtension: false
+  isExternal: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isSuspend: false
+  modality: FINAL
+  name: x
+  origin: SOURCE
+  receiverType: null
+  symbolKind: MEMBER
+  type: kotlin/Unit
+  typeParameters: []
+  valueParameters: []
+  visibility: PUBLIC
+
+KtFirClassOrObjectSymbol:
+  annotations: [Anno(param1 = param, param2 = 2)]
+  classIdIfNonLocal: X
+  classKind: CLASS
+  companionObject: null
+  isInner: false
+  modality: FINAL
+  name: X
+  origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
+  symbolKind: TOP_LEVEL
+  typeParameters: []
+  visibility: PUBLIC
+*/
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/class.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/class.kt
index 96fdffbd6df..ea6fba4064a 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/class.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/class.kt
@@ -4,11 +4,17 @@ class A {
 // SYMBOLS:
 /*
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: A
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: A
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
 */
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
index dddb8eb6a6f..314f85d4084 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
@@ -6,20 +6,31 @@ class A {
 // SYMBOLS:
 /*
 KtFirPropertySymbol:
+  annotations: []
   callableIdIfNonLocal: A.a
+  getter: KtFirPropertyGetterSymbol(<getter>)
+  hasBackingField: true
+  isConst: false
   isExtension: false
+  isOverride: false
   isVal: true
   modality: FINAL
   name: a
   origin: SOURCE
   receiverType: null
+  setter: null
   symbolKind: MEMBER
   type: kotlin/Int
+  visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: A.x
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: x
@@ -29,13 +40,20 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: A
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: A
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
+  visibility: PUBLIC
 */
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt
index 0d51695e228..eb3c1af18fd 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt
@@ -12,11 +12,17 @@ KtFirTypeParameterSymbol:
   origin: SOURCE
 
 KtFirClassOrObjectSymbol:
+  annotations: []
   classIdIfNonLocal: A
   classKind: CLASS
+  companionObject: null
+  isInner: false
   modality: FINAL
   name: A
   origin: SOURCE
+  primaryConstructor: KtFirConstructorSymbol(<constructor>)
+  superTypes: [kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(T), KtFirTypeParameterSymbol(R)]
+  visibility: PUBLIC
 */
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt
index 026122d42e6..d9aaa3c8a13 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt
@@ -3,9 +3,13 @@ fun String.foo(): Int = 10
 // SYMBOLS:
 /*
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: foo
   isExtension: true
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: foo
@@ -15,4 +19,5 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 */
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt
index 9b6e794462a..fc02eb2f91b 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt
@@ -3,6 +3,7 @@ fun foo(x: Int) {}
 // SYMBOLS:
 /*
 KtFirFunctionValueParameterSymbol:
+  annotations: []
   hasDefaultValue: false
   isVararg: false
   name: x
@@ -11,9 +12,13 @@ KtFirFunctionValueParameterSymbol:
   type: kotlin/Int
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: foo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: foo
@@ -23,4 +28,5 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(x)]
+  visibility: PUBLIC
 */
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
index 09c83853fd4..356bdc81ee0 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
@@ -7,6 +7,7 @@ KtFirTypeParameterSymbol:
   origin: SOURCE
 
 KtFirFunctionValueParameterSymbol:
+  annotations: []
   hasDefaultValue: false
   isVararg: false
   name: x
@@ -15,9 +16,13 @@ KtFirFunctionValueParameterSymbol:
   type: X
 
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: foo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: foo
@@ -27,4 +32,5 @@ KtFirFunctionSymbol:
   type: kotlin/Unit
   typeParameters: [KtFirTypeParameterSymbol(X)]
   valueParameters: [KtFirFunctionValueParameterSymbol(x)]
+  visibility: PUBLIC
 */
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt
index 8fc39adec49..309f6d8c489 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt
@@ -3,9 +3,13 @@ fun foo(): Int = 10
 // SYMBOLS:
 /*
 KtFirFunctionSymbol:
+  annotations: []
   callableIdIfNonLocal: foo
   isExtension: false
+  isExternal: false
+  isInline: false
   isOperator: false
+  isOverride: false
   isSuspend: false
   modality: FINAL
   name: foo
@@ -15,4 +19,5 @@ KtFirFunctionSymbol:
   type: kotlin/Int
   typeParameters: []
   valueParameters: []
+  visibility: PUBLIC
 */
diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolsByPsiBuildingTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolsByPsiBuildingTestGenerated.java
index 46570b2309b..c9c56fa67b1 100644
--- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolsByPsiBuildingTestGenerated.java
+++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolsByPsiBuildingTestGenerated.java
@@ -28,6 +28,11 @@ public class SymbolsByPsiBuildingTestGenerated extends AbstractSymbolsByPsiBuild
         KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/idea-frontend-fir/testData/symbolsByPsi"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
+    @TestMetadata("annotations.kt")
+    public void testAnnotations() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt");
+    }
+
     @TestMetadata("class.kt")
     public void testClass() throws Exception {
         runTest("idea/idea-frontend-fir/testData/symbolsByPsi/class.kt");
diff --git a/idea/idea-frontend-independent/build.gradle.kts b/idea/idea-frontend-independent/build.gradle.kts
index 62f34e40882..4628368ba5b 100644
--- a/idea/idea-frontend-independent/build.gradle.kts
+++ b/idea/idea-frontend-independent/build.gradle.kts
@@ -19,14 +19,7 @@ dependencies {
     compileOnly(intellijCoreDep())
     compileOnly(intellijDep())
     compileOnly(project(":compiler:light-classes"))
-
-    Platform[191].orLower {
-        compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
-    }
-
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
-    }
+    compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
 }
 
 sourceSets {
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/AbstractKotlinBundleIndependent.kt.193 b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/AbstractKotlinBundleIndependent.kt.193
deleted file mode 100644
index 520bae7804c..00000000000
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/AbstractKotlinBundleIndependent.kt.193
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea
-
-import com.intellij.AbstractBundle
-
-abstract class AbstractKotlinBundleIndependent protected constructor(pathToBundle: String) : AbstractBundle(pathToBundle) {
-    protected fun String.withHtml(): String = "<html>$this</html>"
-}
\ No newline at end of file
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt
index 4a3936ccf04..148ca7913f1 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.idea.asJava.LightClassProvider.Companion.providedIsKtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.KotlinIconsIndependent.ACTUAL
 import org.jetbrains.kotlin.idea.KotlinIconsIndependent.EXPECT
-import org.jetbrains.kotlin.idea.search.ifTrue
+import org.jetbrains.kotlin.idea.util.ifTrue
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/asJava/LightClassProvider.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/asJava/LightClassProvider.kt
index 625bb04ff5c..9d7f6affab0 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/asJava/LightClassProvider.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/asJava/LightClassProvider.kt
@@ -8,15 +8,8 @@ package org.jetbrains.kotlin.idea.asJava
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.*
-import com.intellij.psi.impl.light.AbstractLightClass
-import com.intellij.psi.impl.light.LightMethod
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
-import org.jetbrains.kotlin.asJava.elements.KtLightElement
-import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport
-import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 
 interface LightClassProvider {
 
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt
index bfcd664d17c..26140a8ab08 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.idea.util.application.getServiceSafe
 /**
  * Tested in OutOfBlockModificationTestGenerated
  */
-// FIX ME WHEN BUNCH 193 REMOVED
 class KotlinCodeBlockModificationListener(project: Project) : KotlinCodeBlockModificationListenerCompat(project) {
 
     init {
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt.193 b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt.193
deleted file mode 100644
index 49e33e28d1d..00000000000
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt.193
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-
-package org.jetbrains.kotlin.idea.caches.trackers
-
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.SimpleModificationTracker
-import com.intellij.pom.tree.TreeAspect
-import org.jetbrains.kotlin.idea.KotlinLanguage
-
-/**
- * Tested in OutOfBlockModificationTestGenerated
- */
-// FIX ME WHEN BUNCH 193 REMOVED
-class KotlinCodeBlockModificationListener(
-    project: Project,
-    treeAspect: TreeAspect
-) : KotlinCodeBlockModificationListenerCompat(project) {
-
-    init {
-        init(
-            treeAspect,
-            incOCBCounter = { ktFile ->
-                kotlinOutOfCodeBlockTrackerImpl.incModificationCount()
-                perModuleOutOfCodeBlockTrackerUpdater.onKotlinPhysicalFileOutOfBlockChange(ktFile, true)
-            },
-            kotlinOutOfCodeBlockTrackerProducer = {
-                SimpleModificationTracker()
-            },
-            psiModificationTrackerListener = {
-                @Suppress("UnstableApiUsage")
-                val kotlinTrackerInternalIDECount =
-                    modificationTrackerImpl.forLanguage(KotlinLanguage.INSTANCE).modificationCount
-                if (kotlinModificationTracker == kotlinTrackerInternalIDECount) {
-                    // Some update that we are not sure is from Kotlin language, as Kotlin language tracker wasn't changed
-                    kotlinOutOfCodeBlockTrackerImpl.incModificationCount()
-                } else {
-                    kotlinModificationTracker = kotlinTrackerInternalIDECount
-                }
-
-                perModuleOutOfCodeBlockTrackerUpdater.onPsiModificationTrackerUpdate()
-            }
-        )
-    }
-
-    companion object {
-        fun getInstance(project: Project): KotlinCodeBlockModificationListener =
-            project.getComponent(KotlinCodeBlockModificationListener::class.java)
-    }
-}
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt
index 72d1f2efb7d..0521a023f2d 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt
@@ -41,7 +41,6 @@ val KOTLIN_CONSOLE_KEY = Key.create<Boolean>("kotlin.console")
 /**
  * Tested in OutOfBlockModificationTestGenerated
  */
-// FIX ME WHEN BUNCH 193 REMOVED
 abstract class KotlinCodeBlockModificationListenerCompat(protected val project: Project) : PsiTreeChangePreprocessor, Disposable {
     protected val modificationTrackerImpl: PsiModificationTrackerImpl =
         PsiModificationTracker.SERVICE.getInstance(project) as PsiModificationTrackerImpl
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypes.kt.193 b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypes.kt.193
deleted file mode 100644
index 466ab209ae5..00000000000
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypes.kt.193
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.findUsages
-
-import com.intellij.usages.impl.rules.UsageType
-import org.jetbrains.kotlin.idea.KotlinBundleIndependent
-
-object KotlinUsageTypes {
-
-    internal fun UsageTypeEnum.toUsageType(): UsageType = when (this) {
-        UsageTypeEnum.TYPE_CONSTRAINT -> TYPE_CONSTRAINT
-        UsageTypeEnum.VALUE_PARAMETER_TYPE -> VALUE_PARAMETER_TYPE
-        UsageTypeEnum.NON_LOCAL_PROPERTY_TYPE -> NON_LOCAL_PROPERTY_TYPE
-        UsageTypeEnum.FUNCTION_RETURN_TYPE -> FUNCTION_RETURN_TYPE
-        UsageTypeEnum.SUPER_TYPE -> SUPER_TYPE
-        UsageTypeEnum.IS -> IS
-        UsageTypeEnum.CLASS_OBJECT_ACCESS -> CLASS_OBJECT_ACCESS
-        UsageTypeEnum.COMPANION_OBJECT_ACCESS -> COMPANION_OBJECT_ACCESS
-        UsageTypeEnum.EXTENSION_RECEIVER_TYPE -> EXTENSION_RECEIVER_TYPE
-        UsageTypeEnum.SUPER_TYPE_QUALIFIER -> SUPER_TYPE_QUALIFIER
-        UsageTypeEnum.TYPE_ALIAS -> TYPE_ALIAS
-
-        UsageTypeEnum.FUNCTION_CALL -> FUNCTION_CALL
-        UsageTypeEnum.IMPLICIT_GET -> IMPLICIT_GET
-        UsageTypeEnum.IMPLICIT_SET -> IMPLICIT_SET
-        UsageTypeEnum.IMPLICIT_INVOKE -> IMPLICIT_INVOKE
-        UsageTypeEnum.IMPLICIT_ITERATION -> IMPLICIT_ITERATION
-        UsageTypeEnum.PROPERTY_DELEGATION -> PROPERTY_DELEGATION
-
-        UsageTypeEnum.RECEIVER -> RECEIVER
-        UsageTypeEnum.DELEGATE -> DELEGATE
-
-        UsageTypeEnum.PACKAGE_DIRECTIVE -> PACKAGE_DIRECTIVE
-        UsageTypeEnum.PACKAGE_MEMBER_ACCESS -> PACKAGE_MEMBER_ACCESS
-
-        UsageTypeEnum.CALLABLE_REFERENCE -> CALLABLE_REFERENCE
-
-        UsageTypeEnum.READ -> UsageType.READ
-        UsageTypeEnum.WRITE -> UsageType.WRITE
-        UsageTypeEnum.CLASS_IMPORT -> UsageType.CLASS_IMPORT
-        UsageTypeEnum.CLASS_LOCAL_VAR_DECLARATION -> UsageType.CLASS_LOCAL_VAR_DECLARATION
-        UsageTypeEnum.TYPE_PARAMETER -> UsageType.TYPE_PARAMETER
-        UsageTypeEnum.CLASS_CAST_TO -> UsageType.CLASS_CAST_TO
-        UsageTypeEnum.ANNOTATION -> UsageType.ANNOTATION
-        UsageTypeEnum.CLASS_NEW_OPERATOR -> UsageType.CLASS_NEW_OPERATOR
-        UsageTypeEnum.NAMED_ARGUMENT -> NAMED_ARGUMENT
-
-        UsageTypeEnum.USAGE_IN_STRING_LITERAL -> UsageType.LITERAL_USAGE
-    }
-
-    // types
-    val TYPE_CONSTRAINT = UsageType(KotlinBundleIndependent.message("find.usages.type.type.constraint"))
-    val VALUE_PARAMETER_TYPE = UsageType(KotlinBundleIndependent.message("find.usages.type.value.parameter.type"))
-    val NON_LOCAL_PROPERTY_TYPE = UsageType(KotlinBundleIndependent.message("find.usages.type.nonLocal.property.type"))
-    val FUNCTION_RETURN_TYPE = UsageType(KotlinBundleIndependent.message("find.usages.type.function.return.type"))
-    val SUPER_TYPE = UsageType(KotlinBundleIndependent.message("find.usages.type.superType"))
-    val IS = UsageType(KotlinBundleIndependent.message("find.usages.type.is"))
-    val CLASS_OBJECT_ACCESS = UsageType(KotlinBundleIndependent.message("find.usages.type.class.object"))
-    val COMPANION_OBJECT_ACCESS = UsageType(KotlinBundleIndependent.message("find.usages.type.companion.object"))
-    val EXTENSION_RECEIVER_TYPE = UsageType(KotlinBundleIndependent.message("find.usages.type.extension.receiver.type"))
-    val SUPER_TYPE_QUALIFIER = UsageType(KotlinBundleIndependent.message("find.usages.type.super.type.qualifier"))
-    val TYPE_ALIAS = UsageType(KotlinBundleIndependent.message("find.usages.type.type.alias"))
-
-    // functions
-    val FUNCTION_CALL = UsageType(KotlinBundleIndependent.message("find.usages.type.function.call"))
-    val IMPLICIT_GET = UsageType(KotlinBundleIndependent.message("find.usages.type.implicit.get"))
-    val IMPLICIT_SET = UsageType(KotlinBundleIndependent.message("find.usages.type.implicit.set"))
-    val IMPLICIT_INVOKE = UsageType(KotlinBundleIndependent.message("find.usages.type.implicit.invoke"))
-    val IMPLICIT_ITERATION = UsageType(KotlinBundleIndependent.message("find.usages.type.implicit.iteration"))
-    val PROPERTY_DELEGATION = UsageType(KotlinBundleIndependent.message("find.usages.type.property.delegation"))
-
-    // values
-    val RECEIVER = UsageType(KotlinBundleIndependent.message("find.usages.type.receiver"))
-    val DELEGATE = UsageType(KotlinBundleIndependent.message("find.usages.type.delegate"))
-
-    // packages
-    val PACKAGE_DIRECTIVE = UsageType(KotlinBundleIndependent.message("find.usages.type.packageDirective"))
-    val PACKAGE_MEMBER_ACCESS = UsageType(KotlinBundleIndependent.message("find.usages.type.packageMemberAccess"))
-
-    // common usage types
-    val CALLABLE_REFERENCE = UsageType(KotlinBundleIndependent.message("find.usages.type.callable.reference"))
-    val NAMED_ARGUMENT = UsageType(KotlinBundleIndependent.message("find.usages.type.named.argument"))
-}
\ No newline at end of file
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt
index 391313a0152..d0c56d4b75e 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt
@@ -24,6 +24,8 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiParameter
+import com.intellij.usageView.UsageInfo
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.findUsages.KotlinCallableFindUsagesOptions
 import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory
 import org.jetbrains.kotlin.idea.util.application.runReadAction
@@ -73,7 +75,11 @@ class DelegatingFindMemberUsagesHandler(
         return kotlinHandler.getFindUsagesOptions(dataContext)
     }
 
-    override fun processElementUsages(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Boolean {
+    override fun processElementUsages(
+        element: PsiElement,
+        processor: Processor<in UsageInfo>,
+        options: FindUsagesOptions
+    ): Boolean {
         val (handler, handlerOptions) = runReadAction { getHandlerAndOptions(element, options) } ?: return true
         return handler.processElementUsages(element, processor, handlerOptions!!)
     }
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
index c1e1a068a61..6febfcf4000 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
@@ -26,6 +26,7 @@ import com.intellij.psi.search.PsiElementProcessor
 import com.intellij.psi.search.PsiElementProcessorAdapter
 import com.intellij.psi.search.searches.MethodReferencesSearch
 import com.intellij.psi.search.searches.ReferencesSearch
+import com.intellij.usageView.UsageInfo
 import com.intellij.util.FilteredQuery
 import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.asJava.LightClassProvider.Companion.providedToLightClass
@@ -66,12 +67,16 @@ class KotlinFindClassUsagesHandler(
         )
     }
 
-    override fun createSearcher(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Searcher {
+    override fun createSearcher(
+        element: PsiElement,
+        processor: Processor<in UsageInfo>,
+        options: FindUsagesOptions
+    ): Searcher {
         return MySearcher(element, processor, options)
     }
 
     private class MySearcher(
-        element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions
+        element: PsiElement, processor: Processor<in UsageInfo>, options: FindUsagesOptions
     ) : Searcher(element, processor, options) {
 
         private val kotlinOptions = options as KotlinClassFindUsagesOptions
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
index 3aa8cf235df..51d0d6e4b27 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
@@ -27,6 +27,7 @@ import com.intellij.psi.PsiReference
 import com.intellij.psi.search.SearchScope
 import com.intellij.psi.search.searches.MethodReferencesSearch
 import com.intellij.psi.search.searches.ReferencesSearch
+import com.intellij.usageView.UsageInfo
 import com.intellij.util.*
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.idea.asJava.LightClassProvider.Companion.providedToLightMethods
@@ -101,7 +102,11 @@ abstract class KotlinFindMemberUsagesHandler<T : KtNamedDeclaration> protected c
         factory: KotlinFindUsagesHandlerFactory
     ) : KotlinFindMemberUsagesHandler<KtNamedDeclaration>(propertyDeclaration, elementsToSearch, factory) {
 
-        override fun processElementUsages(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Boolean {
+        override fun processElementUsages(
+            element: PsiElement,
+            processor: Processor<in UsageInfo>,
+            options: FindUsagesOptions
+        ): Boolean {
 
             if (ApplicationManager.getApplication().isUnitTestMode ||
                 !isPropertyOfDataClass ||
@@ -199,12 +204,16 @@ abstract class KotlinFindMemberUsagesHandler<T : KtNamedDeclaration> protected c
         }
     }
 
-    override fun createSearcher(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Searcher {
+    override fun createSearcher(
+        element: PsiElement,
+        processor: Processor<in UsageInfo>,
+        options: FindUsagesOptions
+    ): Searcher {
         return MySearcher(element, processor, options)
     }
 
     private inner class MySearcher(
-        element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions
+        element: PsiElement, processor: Processor<in UsageInfo>, options: FindUsagesOptions
     ) : Searcher(element, processor, options) {
 
         private val kotlinOptions = options as KotlinCallableFindUsagesOptions
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
index 48691589d79..c7c6a81658e 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
@@ -55,7 +55,11 @@ abstract class KotlinFindUsagesHandler<T : PsiElement>(
             elementsToSearch.toTypedArray()
     }
 
-    private fun searchTextOccurrences(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Boolean {
+    private fun searchTextOccurrences(
+        element: PsiElement,
+        processor: Processor<in UsageInfo>,
+        options: FindUsagesOptions
+    ): Boolean {
         if (!options.isSearchForTextOccurrences) return true
 
         val scope = options.searchScope
@@ -71,13 +75,17 @@ abstract class KotlinFindUsagesHandler<T : PsiElement>(
         return true
     }
 
-    override fun processElementUsages(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Boolean {
+    override fun processElementUsages(
+        element: PsiElement,
+        processor: Processor<in UsageInfo>,
+        options: FindUsagesOptions
+    ): Boolean {
         return searchReferences(element, processor, options, forHighlight = false) && searchTextOccurrences(element, processor, options)
     }
 
     private fun searchReferences(
         element: PsiElement,
-        processor: UsageInfoProcessor,
+        processor: Processor<in UsageInfo>,
         options: FindUsagesOptions,
         forHighlight: Boolean
     ): Boolean {
@@ -86,7 +94,11 @@ abstract class KotlinFindUsagesHandler<T : PsiElement>(
         return searcher.executeTasks()
     }
 
-    protected abstract fun createSearcher(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Searcher
+    protected abstract fun createSearcher(
+        element: PsiElement,
+        processor: Processor<in UsageInfo>,
+        options: FindUsagesOptions
+    ): Searcher
 
     override fun findReferencesToHighlight(target: PsiElement, searchScope: SearchScope): Collection<PsiReference> {
         val results = Collections.synchronizedList(arrayListOf<PsiReference>())
@@ -102,7 +114,11 @@ abstract class KotlinFindUsagesHandler<T : PsiElement>(
         return results
     }
 
-    protected abstract class Searcher(val element: PsiElement, val processor: UsageInfoProcessor, val options: FindUsagesOptions) {
+    protected abstract class Searcher(
+        val element: PsiElement,
+        val processor: Processor<in UsageInfo>,
+        val options: FindUsagesOptions
+    ) {
         private val tasks = ArrayList<() -> Boolean>()
 
         /**
@@ -128,7 +144,7 @@ abstract class KotlinFindUsagesHandler<T : PsiElement>(
     companion object {
         val LOG = Logger.getInstance(KotlinFindUsagesHandler::class.java)
 
-        internal fun processUsage(processor: UsageInfoProcessor, ref: PsiReference): Boolean =
+        internal fun processUsage(processor: Processor<in UsageInfo>, ref: PsiReference): Boolean =
             processor.processIfNotNull {
                 when {
                     ref is LightMemberReference -> KotlinReferencePreservingUsageInfo(ref)
@@ -137,16 +153,19 @@ abstract class KotlinFindUsagesHandler<T : PsiElement>(
                 }
             }
 
-        internal fun processUsage(processor: UsageInfoProcessor, element: PsiElement): Boolean =
+        internal fun processUsage(
+            processor: Processor<in UsageInfo>,
+            element: PsiElement
+        ): Boolean =
             processor.processIfNotNull { if (element.isValid) UsageInfo(element) else null }
 
-        private fun UsageInfoProcessor.processIfNotNull(callback: () -> UsageInfo?): Boolean {
+        private fun Processor<in UsageInfo>.processIfNotNull(callback: () -> UsageInfo?): Boolean {
             ProgressManager.checkCanceled()
             val usageInfo = runReadAction(callback)
             return if (usageInfo != null) process(usageInfo) else true
         }
 
-        internal fun createReferenceProcessor(usageInfoProcessor: UsageInfoProcessor): Processor<PsiReference> {
+        internal fun createReferenceProcessor(usageInfoProcessor: Processor<in UsageInfo>): Processor<PsiReference> {
             val uniqueProcessor = CommonProcessors.UniqueProcessor(usageInfoProcessor)
 
             return Processor { processUsage(uniqueProcessor, it) }
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt
index 73fe570dbcf..1a89b4df058 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt
@@ -21,6 +21,8 @@ import com.intellij.find.findUsages.FindUsagesOptions
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.searches.ReferencesSearch
+import com.intellij.usageView.UsageInfo
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory
 import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinTypeParameterFindUsagesDialog
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
@@ -37,7 +39,11 @@ class KotlinTypeParameterFindUsagesHandler(
         )
     }
 
-    override fun createSearcher(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Searcher {
+    override fun createSearcher(
+        element: PsiElement,
+        processor: Processor<in UsageInfo>,
+        options: FindUsagesOptions
+    ): Searcher {
         return object : Searcher(element, processor, options) {
             override fun buildTaskList(forHighlight: Boolean): Boolean {
                 addTask {
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt
deleted file mode 100644
index a8d8434f434..00000000000
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.findUsages.handlers
-
-import com.intellij.slicer.SliceUsage
-import com.intellij.usageView.UsageInfo
-import com.intellij.util.Processor
-
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias UsageInfoProcessor = Processor<in UsageInfo>
-typealias SliceUsageProcessor = Processor<in SliceUsage>
\ No newline at end of file
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt.193 b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt.193
deleted file mode 100644
index 7fbb5130f69..00000000000
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt.193
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.findUsages.handlers
-
-import com.intellij.slicer.SliceUsage
-import com.intellij.usageView.UsageInfo
-import com.intellij.util.Processor
-
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias UsageInfoProcessor = Processor<UsageInfo>
-typealias SliceUsageProcessor = Processor<SliceUsage>
\ No newline at end of file
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferenceScopeOptimizer.kt.193 b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferenceScopeOptimizer.kt.193
deleted file mode 100644
index 4a72c824f0a..00000000000
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferenceScopeOptimizer.kt.193
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.search.ideaExtensions
-
-import com.intellij.ide.highlighter.JavaFileType
-import com.intellij.psi.PsiElement
-import com.intellij.psi.impl.cache.CacheManager
-import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.psi.search.ScopeOptimizer
-import com.intellij.psi.search.SearchScope
-import com.intellij.psi.search.UsageSearchContext
-import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
-import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.kotlin.idea.search.excludeFileTypes
-import org.jetbrains.kotlin.psi.KtCallableDeclaration
-import org.jetbrains.kotlin.psi.KtFile
-
-class KotlinReferenceScopeOptimizer : ScopeOptimizer {
-    override fun getRestrictedUseScope(element: PsiElement): SearchScope? {
-        if (element is KtCallableDeclaration && element.parent is KtFile) {
-            return getRestrictedScopeForTopLevelCallable(element)
-        }
-        return null
-    }
-
-    private fun getRestrictedScopeForTopLevelCallable(callable: KtCallableDeclaration): GlobalSearchScope? {
-        val useScope = callable.useScope as? GlobalSearchScope ?: return null
-        val file = callable.parent as KtFile
-        val packageName = file.packageFqName.takeUnless { it.isRoot } ?: return null
-        val project = file.project
-        val cacheManager = CacheManager.SERVICE.getInstance(project)
-
-        val kotlinScope = GlobalSearchScope.getScopeRestrictedByFileTypes(useScope, KotlinFileType.INSTANCE)
-        val javaScope = GlobalSearchScope.getScopeRestrictedByFileTypes(useScope, JavaFileType.INSTANCE)
-        val restScope = useScope.excludeFileTypes(KotlinFileType.INSTANCE, JavaFileType.INSTANCE) as GlobalSearchScope
-
-        //TODO: use all components of package name?
-        val shortPackageName = packageName.shortName().identifier
-        val kotlinFiles = cacheManager.getVirtualFilesWithWord(shortPackageName, UsageSearchContext.IN_CODE, kotlinScope, true)
-
-        val javaFacadeName = file.javaFileFacadeFqName.shortName().identifier
-        val javaFiles = cacheManager.getVirtualFilesWithWord(javaFacadeName, UsageSearchContext.IN_CODE, javaScope, true)
-
-        return GlobalSearchScope.filesScope(project, (kotlinFiles + javaFiles).asList()).uniteWith(restScope)
-    }
-}
\ No newline at end of file
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
index 04e34bf8c5b..8730bc34631 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
@@ -48,6 +48,7 @@ import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOpt
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions.Companion.calculateEffectiveScope
 import org.jetbrains.kotlin.idea.search.usagesSearch.operators.OperatorReferenceSearcher
 import org.jetbrains.kotlin.idea.util.application.runReadAction
+import org.jetbrains.kotlin.idea.util.ifTrue
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
 import java.util.*
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/searchUtil.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/searchUtil.kt
index be92150fc07..651e6ad7e61 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/searchUtil.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/searchUtil.kt
@@ -148,8 +148,6 @@ fun findScriptsWithUsages(declaration: KtNamedDeclaration): List<KtFile> {
         .toList()
 }
 
-inline fun <T> Boolean.ifTrue(body: () -> T?): T? = if (this) body() else null
-
 data class ReceiverTypeSearcherInfo(
     val psiClass: PsiClass?,
     val containsTypeOrDerivedInside: ((KtDeclaration) -> Boolean)
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt
index 0ada1b9c1ba..4f794c0d68f 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt
@@ -18,12 +18,12 @@ import org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport.Companion.forc
 import org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport.Companion.getReceiverTypeSearcherInfo
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinRequestResultProcessor
-import org.jetbrains.kotlin.idea.search.ifTrue
 import org.jetbrains.kotlin.idea.search.restrictToKotlinSources
 import org.jetbrains.kotlin.idea.search.usagesSearch.ExpressionsOfTypeProcessor
 import org.jetbrains.kotlin.idea.search.usagesSearch.ExpressionsOfTypeProcessor.Companion.logPresentation
 import org.jetbrains.kotlin.idea.search.usagesSearch.ExpressionsOfTypeProcessor.Companion.testLog
 import org.jetbrains.kotlin.idea.util.application.runReadAction
+import org.jetbrains.kotlin.idea.util.ifTrue
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt.193 b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt.193
deleted file mode 100644
index 01f484152d8..00000000000
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt.193
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.util.application
-
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.command.CommandProcessor
-import com.intellij.openapi.components.ComponentManager
-import com.intellij.openapi.project.Project
-import org.jetbrains.annotations.Nls
-import com.intellij.openapi.project.DumbService
-import com.intellij.openapi.util.Condition
-
-fun <T> runReadAction(action: () -> T): T {
-    return ApplicationManager.getApplication().runReadAction<T>(action)
-}
-
-fun <T> runWriteAction(action: () -> T): T {
-    return ApplicationManager.getApplication().runWriteAction<T>(action)
-}
-
-fun Project.executeWriteCommand(@Nls name: String, command: () -> Unit) {
-    CommandProcessor.getInstance().executeCommand(this, { runWriteAction(command) }, name, null)
-}
-
-fun <T> Project.executeWriteCommand(@Nls name: String, groupId: Any? = null, command: () -> T): T {
-    return executeCommand<T>(name, groupId) { runWriteAction(command) }
-}
-
-fun <T> Project.executeCommand(@Nls name: String, groupId: Any? = null, command: () -> T): T {
-    @Suppress("UNCHECKED_CAST") var result: T = null as T
-    CommandProcessor.getInstance().executeCommand(this, { result = command() }, name, groupId)
-    @Suppress("USELESS_CAST")
-    return result as T
-}
-
-fun <T> runWithCancellationCheck(block: () -> T): T = block()
-
-inline fun executeOnPooledThread(crossinline action: () -> Unit) =
-    ApplicationManager.getApplication().executeOnPooledThread { action() }
-
-inline fun invokeLater(crossinline action: () -> Unit) =
-    ApplicationManager.getApplication().invokeLater { action() }
-
-inline fun invokeLater(expired: Condition<*>, crossinline action: () -> Unit) =
-    ApplicationManager.getApplication().invokeLater({ action() }, expired)
-
-inline fun isUnitTestMode(): Boolean = ApplicationManager.getApplication().isUnitTestMode
-
-inline fun <reified T : Any> ComponentManager.getServiceSafe(): T =
-    this.getService(T::class.java) ?: error("Unable to locate service ${T::class.java.name}")
-
-fun <T> Project.runReadActionInSmartMode(action: () -> T): T {
-    if (ApplicationManager.getApplication().isReadAccessAllowed) return action()
-    return DumbService.getInstance(this).runReadActionInSmartMode<T>(action)
-}
\ No newline at end of file
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/utilsIndependent.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/utilsIndependent.kt
new file mode 100644
index 00000000000..c32e3e8b67c
--- /dev/null
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/utilsIndependent.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.util
+
+inline fun <T> Boolean.ifTrue(body: () -> T?): T? = if (this) body() else null
+
+inline fun <T> Boolean.ifFalse(body: () -> T?): T? = if (!this) body() else null
\ No newline at end of file
diff --git a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.as41 b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.as41
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.as42 b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.as42
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts
index 3aa6bc3f859..1638c486c23 100644
--- a/idea/idea-gradle-native/build.gradle.kts
+++ b/idea/idea-gradle-native/build.gradle.kts
@@ -23,9 +23,7 @@ dependencies {
     testCompile(projectTests(":idea:idea-gradle"))
 
     compileOnly(intellijPluginDep("gradle"))
-    Platform[193].orHigher {
-        compileOnly(intellijPluginDep("gradle-java"))
-    }
+    compileOnly(intellijPluginDep("gradle-java"))
     compileOnly(intellijPluginDep("Groovy"))
     compileOnly(intellijDep())
 
@@ -36,11 +34,10 @@ dependencies {
     testCompileOnly(intellijPluginDep("Groovy"))
     testCompileOnly(intellijDep())
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 
     testRuntimeOnly(toolsJar())
+    testRuntimeOnly(project(":kotlin-gradle-statistics"))
     testRuntime(project(":kotlin-reflect"))
     testRuntime(project(":idea:idea-jvm"))
     testRuntime(project(":idea:idea-android"))
@@ -61,9 +58,7 @@ dependencies {
     testRuntime(intellijPluginDep("testng"))
     testRuntime(intellijPluginDep("properties"))
     testRuntime(intellijPluginDep("gradle"))
-    Platform[193].orHigher {
-        testRuntime(intellijPluginDep("gradle-java"))
-    }
+    testRuntime(intellijPluginDep("gradle-java"))
     testRuntime(intellijPluginDep("Groovy"))
     testRuntime(intellijPluginDep("coverage"))
     if (Ide.IJ()) {
diff --git a/idea/idea-gradle-tooling-api/build.gradle.kts b/idea/idea-gradle-tooling-api/build.gradle.kts
deleted file mode 100644
index 5be9ff03cf5..00000000000
--- a/idea/idea-gradle-tooling-api/build.gradle.kts
+++ /dev/null
@@ -1,26 +0,0 @@
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-jvmTarget = "1.6"
-
-// FIX ME WHEN BUNCH 193 REMOVED: this module is no longer needed since IDEA 2020.1
-Platform[193].orLower {
-    dependencies {
-        compileOnly(intellijPluginDep("gradle"))
-    }
-
-    sourceSets {
-        "main" { projectDefault() }
-        "test" { projectDefault() }
-    }
-
-    runtimeJar()
-
-    sourcesJar()
-
-    javadocJar()
-
-    apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts")
-}
-
diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorPosition.java.193 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorPosition.java.193
deleted file mode 100644
index d94fed03bd7..00000000000
--- a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorPosition.java.193
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gradle.tooling.model.kotlin.dsl;
-
-import org.gradle.api.Incubating;
-
-
-/**
- * Position in the editor.
- *
- * @since 6.0
- */
-@Incubating
-public interface EditorPosition {
-
-    int getLine();
-
-    int getColumn();
-}
diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReport.java.193 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReport.java.193
deleted file mode 100644
index b531d2a8646..00000000000
--- a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReport.java.193
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gradle.tooling.model.kotlin.dsl;
-
-import org.gradle.api.Incubating;
-
-/**
- * Report to the editor.
- *
- * @since 6.0
- */
-@Incubating
-public interface EditorReport {
-
-    EditorReportSeverity getSeverity();
-
-    String getMessage();
-
-    EditorPosition getPosition();
-}
diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReportSeverity.java.193 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReportSeverity.java.193
deleted file mode 100644
index 0e0997a14e6..00000000000
--- a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReportSeverity.java.193
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gradle.tooling.model.kotlin.dsl;
-
-
-import org.gradle.api.Incubating;
-
-/**
- * Severity of an editor report.
- *
- * @since 6.0
- */
-@Incubating
-public enum EditorReportSeverity {
-    WARNING,
-    ERROR
-}
diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslModelsParameters.java.193 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslModelsParameters.java.193
deleted file mode 100644
index 460f3b344ac..00000000000
--- a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslModelsParameters.java.193
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gradle.tooling.model.kotlin.dsl;
-
-import org.gradle.api.Incubating;
-
-
-/**
- * Parameters for Kotlin DSL models.
- *
- * @since 6.0
- */
-@Incubating
-public final class KotlinDslModelsParameters {
-
-    public static final String PREPARATION_TASK_NAME = "prepareKotlinBuildScriptModel";
-
-    public static final String CORRELATION_ID_GRADLE_PROPERTY_NAME = "org.gradle.kotlin.dsl.provider.cid";
-
-    public static final String PROVIDER_MODE_SYSTEM_PROPERTY_NAME = "org.gradle.kotlin.dsl.provider.mode";
-
-    public static final String CLASSPATH_MODE_SYSTEM_PROPERTY_VALUE = "classpath";
-
-    public static final String STRICT_CLASSPATH_MODE_SYSTEM_PROPERTY_VALUE = "strict-classpath";
-
-    public static final String CLASSPATH_MODE_SYSTEM_PROPERTY_DECLARATION = "-D" + PROVIDER_MODE_SYSTEM_PROPERTY_NAME + "=" + CLASSPATH_MODE_SYSTEM_PROPERTY_VALUE;
-
-    public static final String STRICT_CLASSPATH_MODE_SYSTEM_PROPERTY_DECLARATION = "-D" + PROVIDER_MODE_SYSTEM_PROPERTY_NAME + "=" + STRICT_CLASSPATH_MODE_SYSTEM_PROPERTY_VALUE;
-}
diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptModel.java.193 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptModel.java.193
deleted file mode 100644
index 17e1abfee9b..00000000000
--- a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptModel.java.193
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gradle.tooling.model.kotlin.dsl;
-
-import org.gradle.api.Incubating;
-
-import java.io.File;
-import java.util.List;
-
-
-/**
- * Model for a Kotlin DSL script.
- *
- * @since 6.0
- */
-@Incubating
-public interface KotlinDslScriptModel {
-
-    List<File> getClassPath();
-
-    List<File> getSourcePath();
-
-    List<String> getImplicitImports();
-
-    List<EditorReport> getEditorReports();
-
-    List<String> getExceptions();
-}
diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptsModel.java.193 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptsModel.java.193
deleted file mode 100644
index f444988ddb4..00000000000
--- a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptsModel.java.193
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gradle.tooling.model.kotlin.dsl;
-
-import org.gradle.api.Incubating;
-
-import java.io.File;
-import java.util.Map;
-
-
-/**
- * Editor model for a set of Kotlin DSL scripts.
- *
- * Can only be requested on the root project, the builder will throw otherwise.
- *
- * Requires the <code>prepareKotlinBuildScriptModel</code> task to be executed before building the model.
- * See {@link KotlinDslModelsParameters#PREPARATION_TASK_NAME}
- *
- * The set of scripts can be provided as a Gradle property named <code>org.gradle.kotlin.dsl.provider.scripts</code>,
- * as a list of absolute paths separated by <code>|</code>.
- * If none are provided, then the model is built for all the Kotlin DSL scripts known to belong to this build.
- * See {@link KotlinDslScriptsModel#SCRIPTS_GRADLE_PROPERTY_NAME}.
- *
- * The Gradle Kotlin DSL script provider must be running in "classpath" mode.
- * This is done by providing the system property <code>-Dorg.gradle.kotlin.dsl.provider.mode=classpath</code>.
- * See {@link KotlinDslModelsParameters#CLASSPATH_MODE_SYSTEM_PROPERTY_DECLARATION}.
- * In this mode, Gradle Kotlin DSL scripts compilation or evaluation failures will be ignored, collected and
- * exceptions will be returned in the built model.
- * Optionally, it can also be set in a strict mode by providing the system property value <code>-Dorg.gradle.kotlin.dsl.provider.mode=strict-classpath</code>.
- * See {@link KotlinDslModelsParameters#STRICT_CLASSPATH_MODE_SYSTEM_PROPERTY_DECLARATION}.
- *
- * Optionally, an identifier can be provided as a Gradle property named <code>org.gradle.kotlin.dsl.provider.cid</code>,
- * it can then be used to correlate Gradle and TAPI client log statements.
- * See {@link KotlinDslModelsParameters#CORRELATION_ID_GRADLE_PROPERTY_NAME}.
- *
- * @since 6.0
- */
-@Incubating
-public interface KotlinDslScriptsModel {
-
-    /**
-     * Gradle property name for the set of scripts to be queried for.
-     */
-    String SCRIPTS_GRADLE_PROPERTY_NAME = "org.gradle.tooling.model.kotlin.dsl.scripts";
-
-    /**
-     * Script models by file.
-     */
-    Map<File, KotlinDslScriptModel> getScriptModels();
-}
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index 8df45803a49..5220535504b 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -20,9 +20,7 @@ dependencies {
 
     compileOnly(intellijDep())
     compileOnly(intellijPluginDep("gradle"))
-    Platform[193].orHigher {
-        compileOnly(intellijPluginDep("gradle-java"))
-    }
+    compileOnly(intellijPluginDep("gradle-java"))
     compileOnly(intellijPluginDep("Groovy"))
     compileOnly(intellijPluginDep("junit"))
     compileOnly(intellijPluginDep("testng"))
@@ -30,19 +28,15 @@ dependencies {
 
     compileOnly(project(":kotlin-gradle-statistics"))
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
+    testCompileOnly(intellijPluginDep("java"))
+    testRuntimeOnly(intellijPluginDep("java"))
 
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":idea:idea-test-framework"))
 
     testCompile(intellijPluginDep("gradle"))
-    Platform[193].orHigher {
-        testCompile(intellijPluginDep("gradle-java"))
-    }
+    testCompile(intellijPluginDep("gradle-java"))
     testCompileOnly(intellijPluginDep("Groovy"))
     testCompileOnly(intellijDep())
 
@@ -71,9 +65,7 @@ dependencies {
     testRuntime(intellijPluginDep("testng"))
     testRuntime(intellijPluginDep("properties"))
     testRuntime(intellijPluginDep("gradle"))
-    Platform[193].orHigher {
-        testRuntime(intellijPluginDep("gradle-java"))
-    }
+    testRuntime(intellijPluginDep("gradle-java"))
     testRuntime(intellijPluginDep("Groovy"))
     testRuntime(intellijPluginDep("coverage"))
     if (Ide.IJ()) {
@@ -86,7 +78,7 @@ dependencies {
     testRuntime(intellijPluginDep("android"))
     testRuntime(intellijPluginDep("smali"))
 
-    if (Ide.AS41.orHigher()) {
+    if (Ide.AS41.orHigher() || Ide.IJ202.orHigher()) {
          testRuntime(intellijPluginDep("platform-images"))
     }
 
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt
index dff12e159aa..73addc122f5 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt
@@ -11,7 +11,6 @@ import com.intellij.openapi.externalSystem.model.project.ProjectData
 import org.gradle.tooling.model.idea.IdeaModule
 import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
 
-// FIX ME WHEN BUNCH 193 REMOVED
 abstract class AbstractProjectResolverExtensionCompat : AbstractProjectResolverExtension() {
     override fun createModule(gradleModule: IdeaModule, projectDataNode: DataNode<ProjectData>): DataNode<ModuleData>? {
         return super.createModule(gradleModule, projectDataNode)?.also {
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt.193
deleted file mode 100644
index ec55659d9e8..00000000000
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt.193
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.configuration
-
-import com.intellij.openapi.externalSystem.model.DataNode
-import com.intellij.openapi.externalSystem.model.project.ModuleData
-import com.intellij.openapi.externalSystem.model.project.ProjectData
-import org.gradle.tooling.model.idea.IdeaModule
-import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
-
-// FIX ME WHEN BUNCH 193 REMOVED
-abstract class AbstractProjectResolverExtensionCompat : AbstractProjectResolverExtension() {
-    override fun createModule(gradleModule: IdeaModule, projectDataNode: DataNode<ProjectData>): DataNode<ModuleData> {
-        return super.createModule(gradleModule, projectDataNode).also {
-            initializeModuleNode(gradleModule, it, projectDataNode)
-        }
-    }
-
-    // Inline after class remove
-    abstract fun initializeModuleNode(
-        gradleModule: IdeaModule,
-        moduleDataNode: DataNode<ModuleData>,
-        projectDataNode: DataNode<ProjectData>,
-    )
-}
\ No newline at end of file
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinNonJvmGutterConfigurator.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinNonJvmGutterConfigurator.kt.193
deleted file mode 100644
index fb61030e3d4..00000000000
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinNonJvmGutterConfigurator.kt.193
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.configuration
-
-import com.intellij.util.Consumer
-import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
-
-// TODO: Now IDEA can provide filter from gutters only for Test task (JVM tests)
-//  Need to create fake Test task to copy filters from it to custom non-JVM test task
-class KotlinNonJvmGutterConfigurator : AbstractProjectResolverExtension() {
-    override fun enhanceTaskProcessing(taskNames: MutableList<String>, jvmParametersSetup: String?, initScriptConsumer: Consumer<String>) {
-        initScriptConsumer.consume(
-            //language=Gradle
-            """
-            ({
-                if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("4.0")) {
-                    Class kotlinTestClass = null
-                    try {
-                         kotlinTestClass = Class.forName("org.jetbrains.kotlin.gradle.tasks.KotlinTest")
-                    } catch (ClassNotFoundException ex) {
-                        // ignore, class not available
-                    }
-                    
-                    if (kotlinTestClass != null) {
-                        gradle.afterProject { project ->
-                            // Test task should have some parameters
-                            // Create dummy task to consume outputs by Test task
-                            project.tasks.create("nonJvmTestIdeSupportDummy")
-                            
-                            // IDEA now process filter parameters only for Test tasks
-                            project.tasks.create('nonJvmTestIdeSupport', Test) {
-                                testClassesDirs = project.tasks["nonJvmTestIdeSupportDummy"].outputs.files
-                                classpath = project.tasks["nonJvmTestIdeSupportDummy"].outputs.files
-                            }
-                            
-                            project.afterEvaluate {
-                                project.tasks.withType(kotlinTestClass) { Task task ->
-                                    task.dependsOn('nonJvmTestIdeSupport')
-                                }
-                            }
-                        }
-                        
-                        gradle.taskGraph.beforeTask { Task task ->
-                            if (kotlinTestClass.isAssignableFrom(task.class)) {
-                                task.filter.includePatterns = task.project.tasks['nonJvmTestIdeSupport'].filter.includePatterns
-                            }
-                        }
-                    }
-                }
-            })()
-            """.trimIndent()
-        )
-    }
-}
\ No newline at end of file
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
index ac5fa767a3a..13f636896ee 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -25,16 +25,22 @@ import org.jetbrains.kotlin.gradle.KotlinCompilation
 import org.jetbrains.kotlin.gradle.KotlinModule
 import org.jetbrains.kotlin.gradle.KotlinPlatform
 import org.jetbrains.kotlin.gradle.KotlinSourceSet
+import org.jetbrains.kotlin.idea.configuration.KotlinSourceSetDataService.Companion.isRelevantFor
 import org.jetbrains.kotlin.idea.facet.*
 import org.jetbrains.kotlin.idea.inspections.gradle.findAll
 import org.jetbrains.kotlin.idea.inspections.gradle.findKotlinPluginVersion
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
 import org.jetbrains.kotlin.idea.roots.migrateNonJvmSourceFolders
 import org.jetbrains.kotlin.idea.roots.populateNonJvmSourceRootTypes
+import org.jetbrains.kotlin.platform.IdePlatformKind
+import org.jetbrains.kotlin.platform.SimplePlatform
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
 import org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind
+import org.jetbrains.kotlin.platform.js.JsPlatform
+import org.jetbrains.kotlin.platform.jvm.JvmPlatform
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.platform.konan.NativePlatform
 import org.jetbrains.kotlin.platform.konan.NativePlatforms
 import org.jetbrains.plugins.gradle.model.data.BuildScriptClasspathData
 import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
@@ -43,12 +49,30 @@ import org.jetbrains.plugins.gradle.util.GradleConstants
 class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetData, Void>() {
     override fun getTargetDataKey() = GradleSourceSetData.KEY
 
+    private fun getProjectPlatforms(toImport: MutableCollection<DataNode<GradleSourceSetData>>): List<KotlinPlatform> {
+        val platforms = HashSet<KotlinPlatform>()
+
+        for (nodeToImport in toImport) {
+            nodeToImport.kotlinSourceSet?.also {
+                platforms += it.actualPlatforms.platforms
+            }
+
+            if (nodeToImport.parent?.children?.any { it.key.dataType.contains("Android") } == true) {
+                platforms += KotlinPlatform.ANDROID
+            }
+        }
+
+        return platforms.toList()
+    }
+
     override fun postProcess(
         toImport: MutableCollection<DataNode<GradleSourceSetData>>,
         projectData: ProjectData?,
         project: Project,
         modelsProvider: IdeModifiableModelsProvider
     ) {
+        val projectPlatforms = getProjectPlatforms(toImport)
+
         for (nodeToImport in toImport) {
             val mainModuleData = ExternalSystemApiUtil.findParent(
                 nodeToImport,
@@ -65,7 +89,7 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
                 populateNonJvmSourceRootTypes(nodeToImport, ideModule)
             }
 
-            configureFacet(sourceSetData, kotlinSourceSet, mainModuleData, ideModule, modelsProvider)?.let { facet ->
+            configureFacet(sourceSetData, kotlinSourceSet, mainModuleData, ideModule, modelsProvider, projectPlatforms)?.let { facet ->
                 GradleProjectImportHandler.getInstances(project).forEach { it.importBySourceSet(facet, nodeToImport) }
             }
 
@@ -92,12 +116,59 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
                 else -> KotlinModuleKind.DEFAULT
             }
 
+        private fun SimplePlatform.isRelevantFor(projectPlatforms: List<KotlinPlatform>): Boolean {
+            val jvmPlatforms = listOf(KotlinPlatform.ANDROID, KotlinPlatform.JVM, KotlinPlatform.COMMON)
+            return when (this) {
+                is JvmPlatform -> projectPlatforms.intersect(jvmPlatforms).isNotEmpty()
+                is JsPlatform -> KotlinPlatform.JS in projectPlatforms
+                is NativePlatform -> KotlinPlatform.NATIVE in projectPlatforms
+                else -> true
+            }
+        }
+
+        private fun IdePlatformKind<*>.toSimplePlatforms(
+            moduleData: ModuleData,
+            isHmppModule: Boolean,
+            projectPlatforms: List<KotlinPlatform>
+        ): Collection<SimplePlatform> {
+            if (this is JvmIdePlatformKind) {
+                val jvmTarget = JvmTarget.fromString(moduleData.targetCompatibility ?: "") ?: JvmTarget.DEFAULT
+                return JvmPlatforms.jvmPlatformByTargetVersion(jvmTarget)
+            }
+
+            if (this is NativeIdePlatformKind) {
+                return NativePlatforms.nativePlatformByTargetNames(moduleData.konanTargets)
+            }
+
+            return if (isHmppModule) {
+                this.defaultPlatform.filter { it.isRelevantFor(projectPlatforms) }
+            } else {
+                this.defaultPlatform
+            }
+        }
+
         fun configureFacet(
             moduleData: ModuleData,
             kotlinSourceSet: KotlinSourceSetInfo,
             mainModuleNode: DataNode<ModuleData>,
             ideModule: Module,
             modelsProvider: IdeModifiableModelsProvider
+        ) = configureFacet(
+            moduleData,
+            kotlinSourceSet,
+            mainModuleNode,
+            ideModule,
+            modelsProvider,
+            enumValues<KotlinPlatform>().toList()
+        )
+
+        fun configureFacet(
+            moduleData: ModuleData,
+            kotlinSourceSet: KotlinSourceSetInfo,
+            mainModuleNode: DataNode<ModuleData>,
+            ideModule: Module,
+            modelsProvider: IdeModifiableModelsProvider,
+            projectPlatforms: List<KotlinPlatform>
         ): KotlinFacet? {
             val compilerVersion = mainModuleNode
                 .findAll(BuildScriptClasspathData.KEY)
@@ -107,16 +178,7 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
 
             val platformKinds = kotlinSourceSet.actualPlatforms.platforms //TODO(auskov): fix calculation of jvm target
                 .map { IdePlatformKindTooling.getTooling(it).kind }
-                .flatMap { platformKind ->
-                    when (platformKind) {
-                        is JvmIdePlatformKind -> {
-                            val jvmTarget = JvmTarget.fromString(moduleData.targetCompatibility ?: "") ?: JvmTarget.DEFAULT
-                            JvmPlatforms.jvmPlatformByTargetVersion(jvmTarget).componentPlatforms
-                        }
-                        is NativeIdePlatformKind -> NativePlatforms.nativePlatformByTargetNames(moduleData.konanTargets)
-                        else -> platformKind.defaultPlatform.componentPlatforms
-                    }
-                }
+                .flatMap { it.toSimplePlatforms(moduleData, mainModuleNode.isHmpp, projectPlatforms) }
                 .distinct()
                 .toSet()
 
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinGradleAppEnvProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinGradleAppEnvProvider.kt
index 87a14bfd183..a5b5bf6aa70 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinGradleAppEnvProvider.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinGradleAppEnvProvider.kt
@@ -19,6 +19,7 @@ import com.intellij.execution.util.ExecutionErrorDialog
 import com.intellij.execution.util.JavaParametersUtil
 import com.intellij.execution.util.ProgramParametersUtil
 import com.intellij.openapi.externalSystem.model.execution.ExternalSystemTaskExecutionSettings
+import com.intellij.openapi.externalSystem.model.project.ProjectData
 import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
@@ -102,7 +103,6 @@ class KotlinGradleAppEnvProvider : GradleExecutionEnvironmentProvider {
         val runnerAndConfigurationSettings = environment.runnerAndConfigurationSettings ?: return null
         val gradleRunConfiguration = runnerAndConfigurationSettings.configuration as ExternalSystemRunConfiguration
 
-        val gradlePath = GradleProjectResolverUtil.getGradlePath(module) ?: return null
         val sourceSetName = when {
             GradleConstants.GRADLE_SOURCE_SET_MODULE_TYPE_KEY == ExternalSystemApiUtil.getExternalModuleType(
                 module
@@ -112,8 +112,8 @@ class KotlinGradleAppEnvProvider : GradleExecutionEnvironmentProvider {
         } ?: return null
 
         val initScript = generateInitScript(
-            applicationConfiguration, project, module, params, gradlePath,
-            runAppTaskName, mainClass, javaExePath, sourceSetName, javaModuleName
+            applicationConfiguration, project, module, params, runAppTaskName,
+            mainClass, javaExePath, sourceSetName, javaModuleName
         )
         gradleRunConfiguration.putUserData<String>(GradleTaskManager.INIT_SCRIPT_KEY, initScript)
         gradleRunConfiguration.putUserData<String>(GradleTaskManager.INIT_SCRIPT_PREFIX_KEY, runAppTaskName)
@@ -145,9 +145,26 @@ class KotlinGradleAppEnvProvider : GradleExecutionEnvironmentProvider {
 
         private fun generateInitScript(
             applicationConfiguration: KotlinRunConfiguration, project: Project, module: Module,
-            params: JavaParameters, gradlePath: String, runAppTaskName: String, mainClass: PsiClass,
-            javaExePath: String, sourceSetName: String, javaModuleName: String?
-        ): String {
+            params: JavaParameters, runAppTaskName: String, mainClass: PsiClass, javaExePath: String,
+            sourceSetName: String, javaModuleName: String?
+        ): String? {
+            // Init script creates the run task only for the project matching 'applicationConfiguration'.
+            // To find the proper one we compare identifiers: the one provided by Gradle and the one we generate based on our project import
+            // data (external module data).
+
+            val extProjectPath = ExternalSystemApiUtil.getExternalProjectPath(module) ?: return null
+            val extProjectInfo = ExternalSystemUtil.getExternalProjectInfo(project, GradleConstants.SYSTEM_ID, extProjectPath) ?: return null
+            val extModuleData = GradleProjectResolverUtil.findModule(extProjectInfo.externalProjectStructure, extProjectPath) ?: return null
+
+            // Pair of 'project.rootProject.name' and 'project.path' is a unique project id in Gradle (including composite builds).
+            // So our one is built using the same principle.
+            val projectPath = extModuleData.data.id
+            val gradleProjectId = if (projectPath.startsWith(':')) { // shortening (is unique project id)
+                val rootProjectName = (extModuleData.parent?.data as? ProjectData)?.externalName ?: ""
+                rootProjectName + projectPath
+            } else {
+                projectPath // includes rootProject.name already
+            }
 
             val workingDir = ProgramParametersUtil.getWorkingDir(applicationConfiguration, project, module)?.let {
                 FileUtil.toSystemIndependentName(it)
@@ -160,7 +177,7 @@ class KotlinGradleAppEnvProvider : GradleExecutionEnvironmentProvider {
             @Suppress("UnnecessaryVariable")
 //      @Language("Groovy")
             val initScript = """
-    def gradlePath = '$gradlePath'
+    def gradleProjectId = '$gradleProjectId'
     def runAppTaskName = '$runAppTaskName'
     def mainClass = '${mainClass.qualifiedName}'
     def javaExePath = '$javaExePath'
@@ -170,7 +187,7 @@ class KotlinGradleAppEnvProvider : GradleExecutionEnvironmentProvider {
 
     allprojects {
         afterEvaluate { project ->
-            if (project.path == gradlePath) {
+            if (project.rootProject.name + project.path == gradleProjectId) {
                 def overwrite = project.tasks.findByName(runAppTaskName) != null
                 project.tasks.create(name: runAppTaskName, overwrite: overwrite, type: JavaExec) {
                     if (javaExePath) executable = javaExePath
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/AsyncFileChangeListenerHelper.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/AsyncFileChangeListenerHelper.kt.193
deleted file mode 100644
index 245705b0954..00000000000
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/AsyncFileChangeListenerHelper.kt.193
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.scripting.gradle
-
-import com.intellij.openapi.externalSystem.service.project.autoimport.AsyncFileChangeListenerBase
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.openapi.vfs.VirtualFileManager
-import com.intellij.openapi.vfs.newvfs.events.VFileEvent
-import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager
-
-fun addVfsListener(
-    watcher: GradleScriptListener,
-    buildRootsManager: GradleBuildRootsManager
-) {
-    VirtualFileManager.getInstance().addAsyncFileListener(
-        object : AsyncFileChangeListenerBase() {
-            var fileChangesProcessor = watcher.fileChangesProcessor
-
-            override fun isRelevant(path: String): Boolean {
-                return buildRootsManager.maybeAffectedGradleProjectFile(path)
-            }
-
-            override fun updateFile(file: VirtualFile, event: VFileEvent) {
-                fileChangesProcessor(event.path, file.timeStamp)
-            }
-
-            // do nothing
-            override fun prepareFileDeletion(file: VirtualFile) {}
-            override fun apply() {}
-            override fun reset() {
-                fileChangesProcessor = watcher.fileChangesProcessor
-            }
-        },
-        watcher.project
-    )
-}
\ No newline at end of file
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.193
deleted file mode 100644
index 3071a48483b..00000000000
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.193
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("UnstableApiUsage")
-
-package org.jetbrains.kotlin.idea.scripting.gradle
-
-import com.intellij.notification.*
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.ServiceManager
-import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder
-import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
-import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.Key
-import com.intellij.openapi.util.registry.Registry
-import com.intellij.openapi.vfs.VirtualFile
-import org.gradle.util.GradleVersion
-import org.jetbrains.kotlin.idea.KotlinIcons
-import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle
-import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRoot
-import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager
-import org.jetbrains.kotlin.idea.util.application.getServiceSafe
-import org.jetbrains.kotlin.psi.UserDataProperty
-import org.jetbrains.plugins.gradle.service.GradleInstallationManager
-import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
-import org.jetbrains.plugins.gradle.util.GradleConstants
-
-val scriptConfigurationsNeedToBeUpdatedBalloon
-    get() = Registry.`is`("kotlin.gradle.scripts.scriptConfigurationsNeedToBeUpdatedBalloon", false)
-
-fun runPartialGradleImportForAllRoots(project: Project) {
-    GradleBuildRootsManager.getInstance(project).getAllRoots().forEach { root ->
-        runPartialGradleImport(project, root)
-    }
-}
-
-fun runPartialGradleImport(project: Project, root: GradleBuildRoot) {
-    if (root.isImportingInProgress()) return
-
-    ExternalSystemUtil.refreshProject(
-        root.pathPrefix,
-        ImportSpecBuilder(project, GradleConstants.SYSTEM_ID)
-            .build()
-    )
-}
-
-fun configurationsAreMissingRequestNeeded() = KotlinIdeaGradleBundle.message("notification.wasNotImportedAfterCreation.193.text")
-fun getConfigurationsActionText() = KotlinIdeaGradleBundle.message("action.label.import.project")
-fun configurationsAreMissingRequestNeededHelp(): String? = null
-fun configurationsAreMissingAfterRequest(): String = KotlinIdeaGradleBundle.message("notification.notEvaluatedInLastImport.193.text")
-
-fun autoReloadScriptConfigurations(project: Project, root: GradleBuildRoot): Boolean {
-    return ExternalSystemApiUtil
-        .getSettings(project, GradleConstants.SYSTEM_ID)
-        .getLinkedProjectSettings(root.pathPrefix)
-        ?.isUseAutoImport ?: false
-}
-
-private const val kotlinDslNotificationGroupId = "Gradle Kotlin DSL Scripts"
-private var Project.notificationPanel: ScriptConfigurationChangedNotification?
-        by UserDataProperty<Project, ScriptConfigurationChangedNotification>(Key.create("load.script.configuration.panel"))
-
-fun scriptConfigurationsNeedToBeUpdated(project: Project, file: VirtualFile) {
-    if (!scriptConfigurationsNeedToBeUpdatedBalloon) return
-
-    val root = GradleBuildRootsManager.getInstance(project).getScriptInfo(file)?.buildRoot ?: return
-    if (autoReloadScriptConfigurations(project, root)) {
-        // import should be run automatically by Gradle plugin
-        return
-    }
-
-    val existingPanel = project.notificationPanel
-    if (existingPanel != null) {
-        return
-    }
-
-    val notificationGroup = NotificationGroup.findRegisteredGroup(kotlinDslNotificationGroupId)
-    if (notificationGroup == null) {
-        NotificationsConfiguration.getNotificationsConfiguration().register(
-            kotlinDslNotificationGroupId, NotificationDisplayType.STICKY_BALLOON, false
-        )
-    }
-
-    val notification = ScriptConfigurationChangedNotification(project)
-    project.notificationPanel = notification
-    notification.notify(project)
-}
-
-fun scriptConfigurationsAreUpToDate(project: Project): Boolean {
-    if (project.notificationPanel == null) return false
-    project.notificationPanel?.expire()
-    return true
-}
-
-private class ScriptConfigurationChangedNotification(val project: Project) :
-    Notification(
-        kotlinDslNotificationGroupId,
-        KotlinIcons.LOAD_SCRIPT_CONFIGURATION,
-        KotlinIdeaGradleBundle.message("notification.title.script.configuration.has.been.changed"),
-        null,
-        KotlinIdeaGradleBundle.message("notification.text.script.configuration.has.been.changed"),
-        NotificationType.INFORMATION,
-        null
-    ) {
-
-    init {
-        addAction(LoadConfigurationAction())
-        addAction(NotificationAction.createSimple(KotlinIdeaGradleBundle.message("action.label.enable.auto.import")) {
-            GradleBuildRootsManager.getInstance(project).getAllRoots().forEach { root ->
-                val projectSettings = getGradleProjectSettings(project).find { it.externalProjectPath == root.pathPrefix }
-                if (projectSettings != null) {
-                    projectSettings.isUseAutoImport = true
-                }
-                runPartialGradleImport(project, root)
-            }
-        })
-    }
-
-    override fun expire() {
-        super.expire()
-
-        project.notificationPanel = null
-    }
-
-    private class LoadConfigurationAction : AnAction(KotlinIdeaGradleBundle.message("action.label.import.project")) {
-        override fun actionPerformed(e: AnActionEvent) {
-            val project = e.project ?: return
-            runPartialGradleImportForAllRoots(project)
-        }
-    }
-}
-
-fun getGradleVersion(project: Project, settings: GradleProjectSettings): String {
-    // workaround for bug in settings.resolveGradleVersion().version (fixed in 201)
-    return GradleInstallationManager.getGradleVersion(
-        ServiceManager.getService(GradleInstallationManager::class.java)
-            .getGradleHome(project, settings.externalProjectPath)?.path
-    ) ?: GradleVersion.current().version
-}
\ No newline at end of file
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleKotlinScriptDefinitionWrapper.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleKotlinScriptDefinitionWrapper.kt.193
deleted file mode 100644
index c521e74cc0c..00000000000
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleKotlinScriptDefinitionWrapper.kt.193
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.scripting.gradle
-
-import org.jetbrains.kotlin.scripting.definitions.ScriptCompilationConfigurationFromDefinition
-import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
-import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate
-import kotlin.script.experimental.api.*
-import kotlin.script.experimental.host.ScriptingHostConfiguration
-
-class GradleKotlinScriptDefinitionWrapper(
-    hostConfiguration: ScriptingHostConfiguration,
-    legacyDefinition: KotlinScriptDefinitionFromAnnotatedTemplate,
-    gradleVersion: String,
-    defaultCompilerOptions: Iterable<String>
-) : ScriptDefinition.FromLegacy(hostConfiguration, legacyDefinition, defaultCompilerOptions) {
-    override val compilationConfiguration by lazy {
-        ScriptCompilationConfigurationFromDefinition(
-            hostConfiguration,
-            legacyDefinition
-        ).with {
-            ScriptCompilationConfiguration.ide.acceptedLocations.put(listOf(ScriptAcceptedLocation.Project))
-        }
-    }
-
-    override val canAutoReloadScriptConfigurationsBeSwitchedOff = !kotlinDslScriptsModelImportSupported(gradleVersion)
-    override val canDefinitionBeSwitchedOff: Boolean = false
-}
\ No newline at end of file
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
index 66e80bbf0dd..ad23a5c757c 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
@@ -12,6 +12,7 @@ import com.intellij.openapi.vfs.VfsUtil
 import org.gradle.tooling.model.kotlin.dsl.EditorReportSeverity
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
 import org.jetbrains.kotlin.gradle.BrokenKotlinDslScriptsModel
+import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle
 import org.jetbrains.kotlin.idea.scripting.gradle.getGradleScriptInputsStamp
 import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager
 import org.jetbrains.plugins.gradle.model.BuildScriptClasspathModel
@@ -72,7 +73,11 @@ fun processScriptModel(
                     it.failed = true
                 }
             }
-            handleError(project, errors)
+            throw IllegalStateException(
+                KotlinIdeaGradleBundle.message("title.kotlin.build.script")
+                        + ":\n"
+                        + errors.joinToString("\n") { it.text + "\n" + it.details }
+            )
         }
         errors.isEmpty()
     }
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt
deleted file mode 100644
index c67b594abe7..00000000000
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.scripting.gradle.importing
-
-import com.intellij.build.BuildContentManager
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle
-import org.jetbrains.kotlin.idea.util.application.invokeLater
-import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
-
-internal fun handleError(project: Project, errors: List<KotlinDslScriptModel.Message>) {
-    if (isUnitTestMode()) {
-        throw IllegalStateException(
-            KotlinIdeaGradleBundle.message("title.kotlin.build.script")
-                    + ":\n"
-                    + errors.joinToString("\n") { it.text + "\n" + it.details }
-        )
-    }
-    invokeLater(project.disposed) {
-        BuildContentManager.getInstance(project).orCreateToolWindow.activate(null, false, false)
-    }
-}
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt.193
deleted file mode 100644
index 732dbf3a34e..00000000000
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt.193
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.scripting.gradle.importing
-
-import com.intellij.build.BuildContentManager
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.idea.util.application.invokeLater
-import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle
-
-// FIX ME WHEN BUNCH 193 REMOVED
-internal fun handleError(project: Project, errors: List<KotlinDslScriptModel.Message>) {
-    throw IllegalStateException(
-        KotlinIdeaGradleBundle.message("title.kotlin.build.script")
-                + ":\n"
-                + errors.joinToString("\n") { it.text + "\n" + it.details }
-    )
-}
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.193
deleted file mode 100644
index eb3bb6ecc78..00000000000
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.193
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.scripting.gradle.importing
-
-import com.intellij.openapi.externalSystem.model.DataNode
-import com.intellij.openapi.externalSystem.model.project.ProjectData
-import org.gradle.tooling.model.idea.IdeaProject
-import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
-import org.jetbrains.kotlin.gradle.KotlinDslScriptAdditionalTask
-import org.jetbrains.kotlin.gradle.KotlinDslScriptModelProvider
-import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
-import org.jetbrains.plugins.gradle.model.Build
-import org.jetbrains.plugins.gradle.model.ClassSetImportModelProvider
-import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider
-
-class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() {
-    override fun requiresTaskRunning() = true
-
-    override fun getModelProvider() = KotlinDslScriptModelProvider()
-
-    override fun getProjectsLoadedModelProvider(): ProjectImportModelProvider? {
-        return ClassSetImportModelProvider(
-            emptySet(),
-            setOf(KotlinDslScriptAdditionalTask::class.java)
-        )
-    }
-
-    override fun populateProjectExtraModels(gradleProject: IdeaProject, ideProject: DataNode<ProjectData>) {
-        super.populateProjectExtraModels(gradleProject, ideProject)
-
-        populateBuildModels(resolverCtx.models.mainBuild, ideProject)
-
-        resolverCtx.models.includedBuilds.forEach { includedRoot ->
-            populateBuildModels(includedRoot, ideProject)
-        }
-    }
-
-    private fun populateBuildModels(
-        root: Build,
-        ideProject: DataNode<ProjectData>
-    ) {
-        root.projects.forEach {
-            if (it.projectIdentifier.projectPath == ":") {
-                if (kotlinDslScriptsModelImportSupported(resolverCtx.projectGradleVersion)) {
-                    resolverCtx.models.getModel(it, KotlinDslScriptsModel::class.java)?.let { model ->
-                        processScriptModel(resolverCtx, model, it.projectIdentifier.projectPath)
-                    }
-                }
-
-                saveGradleBuildEnvironment(resolverCtx)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
index 1a7c61887b4..b687dd75193 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
@@ -27,7 +27,7 @@ class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase(
 
     private fun importAndCheckHighlighting(testLineMarkers: Boolean = true, checkWarnings: Boolean = true) {
         val files = configureByFiles()
-        importProject()
+        importProject(skipIndexing = false)
         val project = myTestFixture.project
         checkFiles(
             files.filter { it.extension == "kt" || it.extension == "java" },
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
index ab678eedc6a..aff59ca338f 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
@@ -50,7 +50,7 @@ class ImportAndCheckNavigation : MasterPluginVersionGradleImportingTestCase() {
 
     private fun configureAndImportProject(): List<VirtualFile> {
         val files = configureByFiles()
-        importProject()
+        importProject(skipIndexing = false)
         return files
     }
 
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
index 6c00727a84d..8fc38ae0b0f 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
@@ -20,7 +20,7 @@ class KaptImportingTest : MultiplePluginVersionGradleImportingTestCase() {
         val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
         currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
         try {
-            super.importProject()
+            super.importProject(true)
         } finally {
             currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
         }
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
index 60fc3a13fe0..cdb0faf7a74 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.idea.util.rootManager
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
 import org.junit.Test
+import org.jetbrains.kotlin.idea.util.application.runReadAction
 
 class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
 
@@ -51,7 +52,9 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
     }
 
     private fun assertFileInModuleScope(file: VirtualFile, moduleName: String) {
-        assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file))
+        runReadAction {
+            assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file))
+        }
     }
 
     @Test
@@ -320,8 +323,9 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
         )
     }
 
-    @Test
-    @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
+
+    //BUNCH(203): @Test enable after updating platform (may require updating android gradle plugin in testdata)
+    @PluginTargetVersions(gradleVersion = "<6.0", pluginVersion = "1.4.10")
     fun testJsTestOutputFileInProjectWithAndroid() {
         configureByFiles()
         createProjectSubFile(
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
index e1b599ca285..0c4829039ee 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
@@ -368,7 +368,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
     @PluginTargetVersions(gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
     fun testTestTasks() {
         val files = configureByFiles()
-        importProject()
+        importProject(skipIndexing = true)
 
         checkProjectStructure(exhaustiveSourceSourceRootList = false) {
             module("project")
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt
index e68b3f5358f..e4e4bb1f4bc 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt
@@ -47,7 +47,7 @@ class PackagePrefixImportingTest : MultiplePluginVersionGradleImportingTestCase(
         val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
         currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
         try {
-            super.importProject()
+            super.importProject(true)
         } finally {
             currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
         }
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt
index 56a4649562a..74af4e4d036 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt
@@ -7,10 +7,13 @@ package org.jetbrains.kotlin.gradle
 
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.plugins.gradle.execution.test.runner.GradleTestRunConfigurationProducer
 
 fun MultiplePluginVersionGradleImportingTestCase.findTasksToRun(file: VirtualFile): List<String>? {
-    return GradleTestRunConfigurationProducer.findAllTestsTaskToRun(file, project)
-        .flatMap { it.tasks }
-        .sorted()
+    return runReadAction {
+        GradleTestRunConfigurationProducer.findAllTestsTaskToRun(file, project)
+            .flatMap { it.tasks }
+            .sorted()
+    }
 }
\ No newline at end of file
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.193 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.193
deleted file mode 100644
index 4907a01d921..00000000000
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.193
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package org.jetbrains.kotlin.idea.codeInsight.gradle;
-
-import com.google.common.collect.Multimap;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.util.io.StreamUtil;
-import com.intellij.testFramework.IdeaTestUtil;
-import com.intellij.util.containers.ContainerUtil;
-import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
-import org.gradle.tooling.BuildActionExecuter;
-import org.gradle.tooling.GradleConnector;
-import org.gradle.tooling.ProjectConnection;
-import org.gradle.tooling.internal.consumer.DefaultGradleConnector;
-import org.gradle.util.GradleVersion;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.plugins.gradle.model.ClassSetProjectImportModelProvider;
-import org.jetbrains.plugins.gradle.model.ExternalProject;
-import org.jetbrains.plugins.gradle.model.ProjectImportAction;
-import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper;
-import org.jetbrains.plugins.gradle.tooling.builder.ModelBuildScriptClasspathBuilderImpl;
-import org.jetbrains.plugins.gradle.util.GradleConstants;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeThat;
-
-// part of org.jetbrains.plugins.gradle.tooling.builder.AbstractModelBuilderTest
-@RunWith(value = Parameterized.class)
-public abstract class AbstractModelBuilderTest {
-
-    public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}, {"5.6.4"}, {"6.5.1"}};
-
-    private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]");
-
-    private static File ourTempDir;
-
-    @NotNull
-    private final String gradleVersion;
-    private File testDir;
-    private ProjectImportAction.AllModels allModels;
-
-    @Rule public TestName name = new TestName();
-    @Rule public VersionMatcherRule versionMatcherRule = new VersionMatcherRule();
-
-    public AbstractModelBuilderTest(@NotNull String gradleVersion) {
-        this.gradleVersion = gradleVersion;
-    }
-
-    @Parameterized.Parameters(name = "{index}: with Gradle-{0}")
-    public static Collection<Object[]> data() {
-        return Arrays.asList(SUPPORTED_GRADLE_VERSIONS);
-    }
-
-
-    @Before
-    public void setUp() throws Exception {
-        assumeThat(gradleVersion, versionMatcherRule.getMatcher());
-
-        ensureTempDirCreated();
-
-        String methodName = name.getMethodName();
-        Matcher m = TEST_METHOD_NAME_PATTERN.matcher(methodName);
-        if (m.matches()) {
-            methodName = m.group(1);
-        }
-
-        testDir = new File(ourTempDir, methodName);
-        FileUtil.ensureExists(testDir);
-
-        InputStream buildScriptStream = getClass().getResourceAsStream("/" + methodName + "/" + GradleConstants.DEFAULT_SCRIPT_NAME);
-        try {
-            FileUtil.writeToFile(
-                    new File(testDir, GradleConstants.DEFAULT_SCRIPT_NAME),
-                    FileUtil.loadTextAndClose(buildScriptStream)
-            );
-        }
-        finally {
-            StreamUtil.closeStream(buildScriptStream);
-        }
-
-        InputStream settingsStream = getClass().getResourceAsStream("/" + methodName + "/" + GradleConstants.SETTINGS_FILE_NAME);
-        try {
-            if (settingsStream != null) {
-                FileUtil.writeToFile(
-                        new File(testDir, GradleConstants.SETTINGS_FILE_NAME),
-                        FileUtil.loadTextAndClose(settingsStream)
-                );
-            }
-        }
-        finally {
-            StreamUtil.closeStream(settingsStream);
-        }
-
-        GradleConnector connector = GradleConnector.newConnector();
-
-        URI distributionUri = new DistributionLocator().getDistributionFor(GradleVersion.version(gradleVersion));
-        connector.useDistribution(distributionUri);
-        connector.forProjectDirectory(testDir);
-        int daemonMaxIdleTime = 10;
-        try {
-            daemonMaxIdleTime = Integer.parseInt(System.getProperty("gradleDaemonMaxIdleTime", "10"));
-        }
-        catch (NumberFormatException ignore) {
-        }
-
-        ((DefaultGradleConnector) connector).daemonMaxIdleTime(daemonMaxIdleTime, TimeUnit.SECONDS);
-        ProjectConnection connection = connector.connect();
-
-        try {
-            ProjectImportAction projectImportAction = new ProjectImportAction(false);
-            projectImportAction.addProjectImportModelProvider(new ClassSetProjectImportModelProvider(getModels()));
-            BuildActionExecuter<ProjectImportAction.AllModels> buildActionExecutor = connection.action(projectImportAction);
-            File initScript = GradleExecutionHelper.generateInitScript(false, getToolingExtensionClasses());
-            assertNotNull(initScript);
-            String jdkHome = IdeaTestUtil.requireRealJdkHome();
-            buildActionExecutor.setJavaHome(new File(jdkHome));
-            buildActionExecutor.setJvmArguments("-Xmx128m", "-XX:MaxPermSize=64m");
-            buildActionExecutor
-                    .withArguments("--info", "--recompile-scripts", GradleConstants.INIT_SCRIPT_CMD_OPTION, initScript.getAbsolutePath());
-            allModels = buildActionExecutor.run();
-            assertNotNull(allModels);
-        }
-        finally {
-            connection.close();
-        }
-    }
-
-    @NotNull
-    private static Set<Class> getToolingExtensionClasses() {
-        Set<Class> classes = ContainerUtil.<Class>set(
-                ExternalProject.class,
-                // gradle-tooling-extension-api jar
-                ProjectImportAction.class,
-                // gradle-tooling-extension-impl jar
-                ModelBuildScriptClasspathBuilderImpl.class,
-                Multimap.class,
-                ShortTypeHandling.class
-        );
-
-        ContainerUtil.addAllNotNull(classes, doGetToolingExtensionClasses());
-        return classes;
-    }
-
-    @NotNull
-    private static Set<Class> doGetToolingExtensionClasses() {
-        return Collections.emptySet();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (testDir != null) {
-            FileUtil.delete(testDir);
-        }
-    }
-
-    protected abstract Set<Class> getModels();
-
-
-    private static void ensureTempDirCreated() throws IOException {
-        if (ourTempDir != null) return;
-
-        ourTempDir = new File(FileUtil.getTempDirectory(), "gradleTests");
-        FileUtil.delete(ourTempDir);
-        FileUtil.ensureExists(ourTempDir);
-    }
-
-    public static class DistributionLocator {
-        private static final String RELEASE_REPOSITORY_ENV = "GRADLE_RELEASE_REPOSITORY";
-        private static final String SNAPSHOT_REPOSITORY_ENV = "GRADLE_SNAPSHOT_REPOSITORY";
-        private static final String GRADLE_RELEASE_REPO = "https://services.gradle.org/distributions";
-        private static final String GRADLE_SNAPSHOT_REPO = "https://services.gradle.org/distributions-snapshots";
-
-        @NotNull private final String myReleaseRepoUrl;
-        @NotNull private final String mySnapshotRepoUrl;
-
-        public DistributionLocator() {
-            this(DistributionLocator.getRepoUrl(false), DistributionLocator.getRepoUrl(true));
-        }
-
-        public DistributionLocator(@NotNull String releaseRepoUrl, @NotNull String snapshotRepoUrl) {
-            myReleaseRepoUrl = releaseRepoUrl;
-            mySnapshotRepoUrl = snapshotRepoUrl;
-        }
-
-        @NotNull
-        public URI getDistributionFor(@NotNull GradleVersion version) throws URISyntaxException {
-            return getDistribution(getDistributionRepository(version), version, "gradle", "bin");
-        }
-
-        @NotNull
-        private String getDistributionRepository(@NotNull GradleVersion version) {
-            return version.isSnapshot() ? mySnapshotRepoUrl : myReleaseRepoUrl;
-        }
-
-        private static URI getDistribution(
-                @NotNull String repositoryUrl,
-                @NotNull GradleVersion version,
-                @NotNull String archiveName,
-                @NotNull String archiveClassifier
-        ) throws URISyntaxException {
-            return new URI(String.format("%s/%s-%s-%s.zip", repositoryUrl, archiveName, version.getVersion(), archiveClassifier));
-        }
-
-        @NotNull
-        public static String getRepoUrl(boolean isSnapshotUrl) {
-            String envRepoUrl = System.getenv(isSnapshotUrl ? SNAPSHOT_REPOSITORY_ENV : RELEASE_REPOSITORY_ENV);
-            if (envRepoUrl != null) return envRepoUrl;
-
-            return isSnapshotUrl ? GRADLE_SNAPSHOT_REPO : GRADLE_RELEASE_REPO;
-        }
-    }
-}
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java
index 841c1a18a05..bef9bc03852 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java
@@ -449,13 +449,28 @@ public abstract class ExternalSystemImportingTestCase extends ExternalSystemTest
         return getRootManager(moduleName).getContentEntries();
     }
 
-    protected void importProject(@NonNls String config) throws IOException {
+    protected void importProject(@NonNls String config, Boolean skipIndexing) throws IOException {
         createProjectConfig(config);
-        importProject();
+        importProject(skipIndexing);
     }
 
-    protected void importProject() {
-        doImportProject();
+    protected void importProject(Boolean skipIndexing) {
+        String indexingPropertyName = "idea.skip.indices.initialization";
+        String previousIndexingState = System.getProperty(indexingPropertyName);
+        try {
+            if (skipIndexing != null) {
+                System.setProperty(indexingPropertyName, skipIndexing.toString());
+            }
+            doImportProject();
+        } finally {
+            if (skipIndexing != null) {
+                if (previousIndexingState == null) {
+                    System.clearProperty(indexingPropertyName);
+                } else {
+                    System.setProperty(indexingPropertyName, previousIndexingState);
+                }
+            }
+        }
     }
 
     public boolean ensureIsNotGradleProxyObject(
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
index 782d63e146f..e8b9c11099b 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
@@ -889,7 +889,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
         try {
             currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
-            super.importProject()
+            super.importProject(true)
         } finally {
             currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
         }
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.193 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.193
deleted file mode 100644
index 1657a32ac09..00000000000
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.193
+++ /dev/null
@@ -1,987 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.codeInsight.gradle
-
-import com.intellij.openapi.application.Result
-import com.intellij.openapi.application.WriteAction
-import com.intellij.openapi.application.runReadAction
-import com.intellij.openapi.projectRoots.JavaSdk
-import com.intellij.openapi.roots.LibraryOrderEntry
-import com.intellij.openapi.roots.ModuleRootManager
-import com.intellij.openapi.roots.OrderRootType
-import com.intellij.openapi.roots.ProjectRootManager
-import com.intellij.openapi.roots.impl.libraries.LibraryEx
-import junit.framework.TestCase
-import org.jetbrains.jps.model.java.JavaResourceRootType
-import org.jetbrains.jps.model.java.JavaSourceRootType
-import org.jetbrains.jps.model.module.JpsModuleSourceRootType
-import org.jetbrains.kotlin.caches.resolve.KotlinCacheService
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
-import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo
-import org.jetbrains.kotlin.idea.caches.project.testSourceInfo
-import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder
-import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinStatus
-import org.jetbrains.kotlin.idea.configuration.ModuleSourceRootMap
-import org.jetbrains.kotlin.idea.configuration.allConfigurators
-import org.jetbrains.kotlin.idea.facet.KotlinFacet
-import org.jetbrains.kotlin.idea.framework.CommonLibraryKind
-import org.jetbrains.kotlin.idea.framework.JSLibraryKind
-import org.jetbrains.kotlin.idea.framework.KotlinSdkType
-import org.jetbrains.kotlin.idea.project.languageVersionSettings
-import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
-import org.jetbrains.kotlin.idea.util.projectStructure.allModules
-import org.jetbrains.kotlin.idea.util.projectStructure.sdk
-import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.platform.js.JsPlatforms
-import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
-import org.jetbrains.kotlin.platform.js.isJs
-import org.jetbrains.kotlin.platform.isCommon
-import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
-import org.junit.*
-import java.util.*
-
-internal fun GradleImportingTestCase.facetSettings(moduleName: String) = KotlinFacet.get(getModule(moduleName))!!.configuration.settings
-
-internal val GradleImportingTestCase.facetSettings: KotlinFacetSettings
-    get() = facetSettings("project_main")
-
-internal val GradleImportingTestCase.testFacetSettings: KotlinFacetSettings
-    get() = facetSettings("project_test")
-
-internal fun GradleImportingTestCase.getSourceRootInfos(moduleName: String): List<Pair<String, JpsModuleSourceRootType<*>>> {
-    return ModuleRootManager.getInstance(getModule(moduleName)).contentEntries.flatMap {
-        it.sourceFolders.map { it.url.replace(projectPath, "") to it.rootType }
-    }
-}
-
-class GradleFacetImportTest : GradleImportingTestCase() {
-
-    private fun assertSameKotlinSdks(vararg moduleNames: String) {
-        val sdks = moduleNames.map { getModule(it).sdk!! }
-        val refSdk = sdks.firstOrNull() ?: return
-        Assert.assertTrue(refSdk.sdkType is KotlinSdkType)
-        Assert.assertTrue(sdks.all { it === refSdk })
-    }
-
-    @Test
-    fun testJvmImport() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
-            Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
-            Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals(
-                "-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
-                compilerSettings!!.additionalArguments
-            )
-        }
-        with(testFacetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.0", apiLevel!!.versionString)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
-            Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
-            Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals(
-                "-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
-                compilerSettings!!.additionalArguments
-            )
-        }
-
-        assertAllModulesConfigured()
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/java" to JavaSourceRootType.SOURCE,
-                "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
-                "file:///src/main/resources" to JavaResourceRootType.RESOURCE
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testJvmImportWithPlugin() {
-        configureByFiles()
-        importProject()
-
-        assertAllModulesConfigured()
-    }
-
-    @Test
-    fun testJvmImport_1_1_2() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
-            Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals(
-                "-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
-                compilerSettings!!.additionalArguments
-            )
-        }
-        with(testFacetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.0", apiLevel!!.versionString)
-            Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
-            Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals(
-                "-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
-                compilerSettings!!.additionalArguments
-            )
-        }
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/java" to JavaSourceRootType.SOURCE,
-                "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
-                "file:///src/main/resources" to JavaResourceRootType.RESOURCE
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testJvmImportWithCustomSourceSets() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings("project_myMain")) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
-            Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals(
-                "-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
-                compilerSettings!!.additionalArguments
-            )
-        }
-        with(facetSettings("project_myTest")) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.0", apiLevel!!.versionString)
-            Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
-            Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals(
-                "-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
-                compilerSettings!!.additionalArguments
-            )
-        }
-
-        assertAllModulesConfigured()
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/java" to JavaSourceRootType.SOURCE,
-                "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
-                "file:///src/main/resources" to JavaResourceRootType.RESOURCE
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testJvmImportWithCustomSourceSets_1_1_2() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings("project_myMain")) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
-            Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals(
-                "-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
-                compilerSettings!!.additionalArguments
-            )
-        }
-        with(facetSettings("project_myTest")) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.0", apiLevel!!.versionString)
-            Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
-            Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals(
-                "-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
-                compilerSettings!!.additionalArguments
-            )
-        }
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/java" to JavaSourceRootType.SOURCE,
-                "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
-                "file:///src/main/resources" to JavaResourceRootType.RESOURCE
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testCoroutineImportByOptions() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals(LanguageFeature.State.ENABLED, coroutineSupport)
-        }
-    }
-
-    @Test
-    fun testCoroutineImportByProperties() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals(LanguageFeature.State.ENABLED, coroutineSupport)
-        }
-    }
-
-    @Test
-    fun testJsImport() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
-            Assert.assertTrue(targetPlatform.isJs())
-            with(compilerArguments as K2JSCompilerArguments) {
-                Assert.assertEquals(true, sourceMap)
-                Assert.assertEquals("plain", moduleKind)
-            }
-            Assert.assertEquals(
-                "-main callMain",
-                compilerSettings!!.additionalArguments
-            )
-        }
-
-        with(testFacetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.0", apiLevel!!.versionString)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
-            Assert.assertTrue(targetPlatform.isJs())
-            with(compilerArguments as K2JSCompilerArguments) {
-                Assert.assertEquals(false, sourceMap)
-                Assert.assertEquals("umd", moduleKind)
-            }
-            Assert.assertEquals(
-                "-main callTest",
-                compilerSettings!!.additionalArguments
-            )
-        }
-
-        val rootManager = ModuleRootManager.getInstance(getModule("project_main"))
-        val stdlib = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().single { it.libraryName?.contains("js") ?: false }.library
-        assertEquals(JSLibraryKind, (stdlib as LibraryEx).kind)
-        assertTrue(stdlib.getFiles(OrderRootType.CLASSES).isNotEmpty())
-
-        assertSameKotlinSdks("project_main", "project_test")
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/kotlin" to SourceKotlinRootType,
-                "file:///src/main/resources" to ResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/kotlin" to TestSourceKotlinRootType,
-                "file:///src/test/resources" to TestResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_test")
-        )
-
-        assertAllModulesConfigured()
-    }
-
-    @Test
-    fun testJsImportTransitive() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertTrue(targetPlatform.isJs())
-        }
-
-        val rootManager = ModuleRootManager.getInstance(getModule("project_main"))
-        val stdlib = rootManager.orderEntries
-            .filterIsInstance<LibraryOrderEntry>()
-            .map { it.library as LibraryEx }
-            .first { "kotlin-stdlib-js" in it.name!! }
-        assertEquals(JSLibraryKind, stdlib.kind)
-
-        assertAllModulesConfigured()
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/kotlin" to SourceKotlinRootType,
-                "file:///src/main/resources" to ResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/kotlin" to TestSourceKotlinRootType,
-                "file:///src/test/resources" to TestResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testJsImportWithCustomSourceSets() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings("project_myMain")) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertTrue(targetPlatform.isJs())
-            with(compilerArguments as K2JSCompilerArguments) {
-                Assert.assertEquals(true, sourceMap)
-                Assert.assertEquals("plain", moduleKind)
-            }
-            Assert.assertEquals(
-                "-main callMain",
-                compilerSettings!!.additionalArguments
-            )
-        }
-
-        with(facetSettings("project_myTest")) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.0", apiLevel!!.versionString)
-            Assert.assertTrue(targetPlatform.isJs())
-            with(compilerArguments as K2JSCompilerArguments) {
-                Assert.assertEquals(false, sourceMap)
-                Assert.assertEquals("umd", moduleKind)
-            }
-            Assert.assertEquals(
-                "-main callTest",
-                compilerSettings!!.additionalArguments
-            )
-        }
-
-        assertAllModulesConfigured()
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/kotlin" to SourceKotlinRootType,
-                "file:///src/main/resources" to ResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/kotlin" to TestSourceKotlinRootType,
-                "file:///src/test/resources" to TestResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testDetectOldJsStdlib() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertTrue(targetPlatform.isJs())
-        }
-    }
-
-    @Test
-    fun testJvmImportByPlatformPlugin() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
-        }
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/java" to JavaSourceRootType.SOURCE,
-                "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
-                "file:///src/main/resources" to JavaResourceRootType.RESOURCE
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testJsImportByPlatformPlugin() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertTrue(targetPlatform.isJs())
-        }
-
-        val rootManager = ModuleRootManager.getInstance(getModule("project_main"))
-        val libraries = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().mapNotNull { it.library as LibraryEx }
-        assertEquals(JSLibraryKind, libraries.single { it.name?.contains("kotlin-stdlib-js") == true }.kind)
-        assertEquals(CommonLibraryKind, libraries.single { it.name?.contains("kotlin-stdlib-common") == true }.kind)
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/kotlin" to SourceKotlinRootType,
-                "file:///src/main/resources" to ResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/kotlin" to TestSourceKotlinRootType,
-                "file:///src/test/resources" to TestResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    @TargetVersions("4.9")
-    fun testCommonImportByPlatformPlugin() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
-            Assert.assertEquals("1.1", apiLevel!!.versionString)
-            Assert.assertTrue(targetPlatform.isCommon())
-        }
-
-        val rootManager = ModuleRootManager.getInstance(getModule("project_main"))
-        val stdlib = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().single().library
-        assertEquals(CommonLibraryKind, (stdlib as LibraryEx).kind)
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/java" to SourceKotlinRootType,
-                "file:///src/main/kotlin" to SourceKotlinRootType,
-                "file:///src/main/resources" to ResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/java" to TestSourceKotlinRootType,
-                "file:///src/test/kotlin" to TestSourceKotlinRootType,
-                "file:///src/test/resources" to TestResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testJvmImportByKotlinPlugin() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
-        }
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/java" to JavaSourceRootType.SOURCE,
-                "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
-                "file:///src/main/resources" to JavaResourceRootType.RESOURCE
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
-                "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testJsImportByKotlin2JsPlugin() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-            Assert.assertTrue(targetPlatform.isJs())
-        }
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/kotlin" to SourceKotlinRootType,
-                "file:///src/main/resources" to ResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/kotlin" to TestSourceKotlinRootType,
-                "file:///src/test/resources" to TestResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testArgumentEscaping() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals(
-                listOf("-Xallow-no-source-files", "-Xbuild-file=module with spaces"),
-                compilerSettings!!.additionalArgumentsAsList
-            )
-        }
-    }
-
-    @Test
-    fun testNoPluginsInAdditionalArgs() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals(
-                "-version",
-                compilerSettings!!.additionalArguments
-            )
-            Assert.assertEquals(
-                listOf(
-                    "plugin:org.jetbrains.kotlin.allopen:annotation=org.springframework.stereotype.Component",
-                    "plugin:org.jetbrains.kotlin.allopen:annotation=org.springframework.transaction.annotation.Transactional",
-                    "plugin:org.jetbrains.kotlin.allopen:annotation=org.springframework.scheduling.annotation.Async",
-                    "plugin:org.jetbrains.kotlin.allopen:annotation=org.springframework.cache.annotation.Cacheable",
-                    "plugin:org.jetbrains.kotlin.allopen:annotation=org.springframework.boot.test.context.SpringBootTest",
-                    "plugin:org.jetbrains.kotlin.allopen:annotation=org.springframework.validation.annotation.Validated"
-                ),
-                compilerArguments!!.pluginOptions!!.toList()
-            )
-        }
-    }
-
-    @Test
-    fun testNoArgInvokeInitializers() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals(
-                "-version",
-                compilerSettings!!.additionalArguments
-            )
-            Assert.assertEquals(
-                listOf(
-                    "plugin:org.jetbrains.kotlin.noarg:annotation=NoArg",
-                    "plugin:org.jetbrains.kotlin.noarg:invokeInitializers=true"
-                ),
-                compilerArguments!!.pluginOptions!!.toList()
-            )
-        }
-    }
-
-    @Test
-    fun testAndroidGradleJsDetection() {
-        configureByFiles()
-        createProjectSubFile(
-            "local.properties", """
-            sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
-        """
-        )
-        importProject()
-
-        with(facetSettings("js-module")) {
-            Assert.assertTrue(targetPlatform.isJs())
-        }
-
-        val rootManager = ModuleRootManager.getInstance(getModule("js-module"))
-        val stdlib = rootManager
-            .orderEntries
-            .filterIsInstance<LibraryOrderEntry>()
-            .first { it.libraryName?.startsWith("Gradle: kotlin-stdlib-js-") ?: false }
-            .library!!
-        assertTrue(stdlib.getFiles(OrderRootType.CLASSES).isNotEmpty())
-        assertEquals(JSLibraryKind, (stdlib as LibraryEx).kind)
-    }
-
-    @Test
-    fun testKotlinAndroidPluginDetection() {
-        configureByFiles()
-        createProjectSubFile(
-            "local.properties", """
-            sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
-        """
-        )
-        importProject()
-
-        val kotlinFacet = KotlinFacet.get(getModule("project"))!!
-    }
-
-    @Test
-    fun testNoFacetInModuleWithoutKotlinPlugin() {
-        configureByFiles()
-
-        importProject()
-
-        Assert.assertNotNull(KotlinFacet.get(getModule("gr01_main")))
-        Assert.assertNotNull(KotlinFacet.get(getModule("gr01_test")))
-        Assert.assertNull(KotlinFacet.get(getModule("m1_main")))
-        Assert.assertNull(KotlinFacet.get(getModule("m1_test")))
-    }
-
-    @Test
-    fun testClasspathWithDependenciesImport() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("tmp.jar", (compilerArguments as K2JVMCompilerArguments).classpath)
-        }
-    }
-
-    @Test
-    fun testDependenciesClasspathImport() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals(null, (compilerArguments as K2JVMCompilerArguments).classpath)
-        }
-    }
-
-    @Test
-    fun testJDKImport() {
-        object : WriteAction<Unit>() {
-            override fun run(result: Result<Unit>) {
-                val jdk = JavaSdk.getInstance().createJdk("myJDK", "my/path/to/jdk")
-                getProjectJdkTableSafe().addJdk(jdk)
-            }
-        }.execute()
-
-        try {
-            configureByFiles()
-            importProject()
-
-            val moduleSDK = ModuleRootManager.getInstance(getModule("project_main")).sdk!!
-            Assert.assertTrue(moduleSDK.sdkType is JavaSdk)
-            Assert.assertEquals("myJDK", moduleSDK.name)
-            Assert.assertEquals("my/path/to/jdk", moduleSDK.homePath)
-        } finally {
-            object : WriteAction<Unit>() {
-                override fun run(result: Result<Unit>) {
-                    val jdkTable = getProjectJdkTableSafe()
-                    jdkTable.removeJdk(jdkTable.findJdk("myJDK")!!)
-                }
-            }.execute()
-        }
-    }
-
-    @Test
-    fun testImplementsDependency() {
-        configureByFiles()
-        importProject()
-
-        Assert.assertEquals(listOf("MultiTest_main"), facetSettings("MultiTest-jvm_main").implementedModuleNames)
-        Assert.assertEquals(listOf("MultiTest_test"), facetSettings("MultiTest-jvm_test").implementedModuleNames)
-        Assert.assertEquals(listOf("MultiTest_main"), facetSettings("MultiTest-js_main").implementedModuleNames)
-        Assert.assertEquals(listOf("MultiTest_test"), facetSettings("MultiTest-js_test").implementedModuleNames)
-    }
-
-    @Test
-    fun testImplementsDependencyWithCustomSourceSets() {
-        configureByFiles()
-
-        importProject()
-
-        Assert.assertEquals(listOf("MultiTest_myMain"), facetSettings("MultiTest-jvm_myMain").implementedModuleNames)
-        Assert.assertEquals(listOf("MultiTest_myTest"), facetSettings("MultiTest-jvm_myTest").implementedModuleNames)
-        Assert.assertEquals(listOf("MultiTest_myMain"), facetSettings("MultiTest-js_myMain").implementedModuleNames)
-        Assert.assertEquals(listOf("MultiTest_myTest"), facetSettings("MultiTest-js_myTest").implementedModuleNames)
-    }
-
-    @Test
-    fun testAPIVersionExceedingLanguageVersion() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-        }
-
-        assertAllModulesConfigured()
-    }
-
-    @Test
-    fun testIgnoreProjectLanguageAndAPIVersion() {
-        KotlinCommonCompilerArgumentsHolder.getInstance(myProject).update {
-            languageVersion = "1.0"
-            apiVersion = "1.0"
-        }
-
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.3", apiLevel!!.versionString)
-        }
-
-        assertAllModulesConfigured()
-    }
-
-    @Test
-    fun testCommonArgumentsImport() {
-        configureByFiles()
-        importProject()
-
-        with(facetSettings) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
-            Assert.assertEquals("1.0", apiLevel!!.versionString)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
-            Assert.assertTrue(targetPlatform.isCommon())
-            Assert.assertEquals("my/classpath", (compilerArguments as K2MetadataCompilerArguments).classpath)
-            Assert.assertEquals("my/destination", (compilerArguments as K2MetadataCompilerArguments).destination)
-        }
-
-        with(facetSettings("project_test")) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
-            Assert.assertEquals("1.0", apiLevel!!.versionString)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
-            Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
-            Assert.assertTrue(targetPlatform.isCommon())
-            Assert.assertEquals("my/test/classpath", (compilerArguments as K2MetadataCompilerArguments).classpath)
-            Assert.assertEquals("my/test/destination", (compilerArguments as K2MetadataCompilerArguments).destination)
-        }
-
-        val rootManager = ModuleRootManager.getInstance(getModule("project_main"))
-        val stdlib = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().single().library
-        assertEquals(CommonLibraryKind, (stdlib as LibraryEx).kind)
-
-        assertSameKotlinSdks("project_main", "project_test")
-
-        Assert.assertEquals(
-            listOf(
-                "file:///src/main/java" to SourceKotlinRootType,
-                "file:///src/main/kotlin" to SourceKotlinRootType,
-                "file:///src/main/resources" to ResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_main")
-        )
-        Assert.assertEquals(
-            listOf(
-                "file:///src/test/java" to TestSourceKotlinRootType,
-                "file:///src/test/kotlin" to TestSourceKotlinRootType,
-                "file:///src/test/resources" to TestResourceKotlinRootType
-            ),
-            getSourceRootInfos("project_test")
-        )
-    }
-
-    @Test
-    fun testInternalArgumentsFacetImporting() {
-        configureByFiles()
-        importProject()
-
-        // Version is indeed 1.3
-        Assert.assertEquals(LanguageVersion.KOTLIN_1_3, facetSettings.languageLevel)
-
-        // We haven't lost internal argument during importing to facet
-        Assert.assertEquals("-Xallow-no-source-files -XXLanguage:+InlineClasses", facetSettings.compilerSettings?.additionalArguments)
-
-        // Inline classes are enabled even though LV = 1.3
-        Assert.assertEquals(
-            LanguageFeature.State.ENABLED,
-            getModule("project_main").languageVersionSettings.getFeatureSupport(LanguageFeature.InlineClasses)
-        )
-
-        assertAllModulesConfigured()
-    }
-
-    @Test
-    fun testStableModuleNameWhileUsingGradleJS() {
-        configureByFiles()
-        importProject()
-
-        checkStableModuleName("project_main", "project", JsPlatforms.defaultJsPlatform, isProduction = true)
-        // Note "_test" suffix: this is current behavior of K2JS Compiler
-        checkStableModuleName("project_test", "project_test", JsPlatforms.defaultJsPlatform, isProduction = false)
-
-        assertAllModulesConfigured()
-    }
-
-    @Test
-    fun testStableModuleNameWhileUsingGradleJVM() {
-        configureByFiles()
-        importProject()
-
-        checkStableModuleName("project_main", "project", JvmPlatforms.unspecifiedJvmPlatform, isProduction = true)
-        checkStableModuleName("project_test", "project", JvmPlatforms.unspecifiedJvmPlatform, isProduction = false)
-
-        assertAllModulesConfigured()
-    }
-
-    @Test
-    fun testNoFriendPathsAreShown() {
-        configureByFiles()
-        importProject()
-
-        Assert.assertEquals(
-            "-Xallow-no-source-files",
-            testFacetSettings.compilerSettings!!.additionalArguments
-        )
-
-        assertAllModulesConfigured()
-    }
-
-    @Test
-    fun testSharedLanguageVersion() {
-        configureByFiles()
-
-        val holder = KotlinCommonCompilerArgumentsHolder.getInstance(myProject)
-
-        holder.update { languageVersion = "1.1" }
-
-        importProject()
-
-        TestCase.assertEquals("1.3", holder.settings.languageVersion)
-    }
-
-    @Test
-    fun testNonSharedLanguageVersion() {
-        configureByFiles()
-        val holder = KotlinCommonCompilerArgumentsHolder.getInstance(myProject)
-
-        holder.update { languageVersion = "1.1" }
-
-        importProject()
-
-        TestCase.assertEquals("1.1", holder.settings.languageVersion)
-    }
-
-    @Test
-    fun testImportCompilerArgumentsWithInvalidDependencies() {
-        configureByFiles()
-        importProject()
-        with(facetSettings("project_main")) {
-            Assert.assertEquals("1.8", (mergedCompilerArguments as K2JVMCompilerArguments).jvmTarget)
-        }
-
-    }
-
-    private fun checkStableModuleName(projectName: String, expectedName: String, platform: TargetPlatform, isProduction: Boolean) {
-        val module = getModule(projectName)
-        val moduleInfo = if (isProduction) module.productionSourceInfo() else module.testSourceInfo()
-
-        val resolutionFacade = KotlinCacheService.getInstance(myProject).getResolutionFacadeByModuleInfo(moduleInfo!!, platform)!!
-        val moduleDescriptor = resolutionFacade.moduleDescriptor
-
-        Assert.assertEquals("<$expectedName>", moduleDescriptor.stableName?.asString())
-    }
-
-    private fun assertAllModulesConfigured() {
-        runReadAction {
-            for (moduleGroup in ModuleSourceRootMap(myProject).groupByBaseModules(myProject.allModules())) {
-                val configurator = allConfigurators().find {
-                    it.getStatus(moduleGroup) == ConfigureKotlinStatus.CAN_BE_CONFIGURED
-                }
-                Assert.assertNull("Configurator $configurator tells that ${moduleGroup.baseModule} can be configured", configurator)
-            }
-        }
-    }
-
-    override fun importProject() {
-        val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
-        try {
-            currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
-            super.importProject()
-        } finally {
-            currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
-        }
-    }
-
-    override fun testDataDirName(): String {
-        return "gradleFacetImportTest"
-    }
-}
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
index 4179d76989f..9de10e2d445 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
@@ -54,6 +54,7 @@ import org.gradle.wrapper.GradleWrapperMain
 import org.gradle.wrapper.PathAssembler
 import org.intellij.lang.annotations.Language
 import org.jetbrains.annotations.NonNls
+import org.jetbrains.kotlin.idea.test.GradleProcessOutputInterceptor
 import org.jetbrains.kotlin.idea.test.KotlinSdkCreationChecker
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
@@ -162,6 +163,8 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
             "${jvmHeapArgsByGradleVersion(gradleVersion)} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${System.getProperty("user.dir")}"
 
         sdkCreationChecker = KotlinSdkCreationChecker()
+
+        GradleProcessOutputInterceptor.install(testRootDisposable)
     }
 
     override fun tearDown() {
@@ -216,12 +219,16 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
     override fun getExternalSystemConfigFileName(): String = "build.gradle"
 
     @Throws(IOException::class)
-    protected open fun importProjectUsingSingeModulePerGradleProject(config: String? = null) {
+    protected open fun importProjectUsingSingeModulePerGradleProject(config: String? = null, skipIndexing: Boolean? = null) {
         currentExternalProjectSettings.isResolveModulePerSourceSet = false
-        importProject(config)
+        importProject(config, skipIndexing)
     }
 
-    override fun importProject() {
+    open fun importProject() {
+        importProject(skipIndexing = null)
+    }
+
+    override fun importProject(skipIndexing: Boolean?) {
         ExternalSystemApiUtil.subscribe(
             myProject,
             GradleConstants.SYSTEM_ID,
@@ -233,14 +240,40 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
                     }
                 }
             })
-        super.importProject()
+        super.importProject(skipIndexing)
     }
 
     @Throws(IOException::class)
-    override fun importProject(@NonNls @Language("Groovy") config: String?) {
+    override fun importProject(@NonNls @Language("Groovy") config: String?, skipIndexing: Boolean?) {
         var config = config
         config = injectRepo(config)
-        super.importProject(config)
+        super.importProject(config, skipIndexing)
+    }
+
+    override fun handleImportFailure(errorMessage: String, errorDetails: String?) {
+        val gradleOutput = GradleProcessOutputInterceptor.getInstance()?.getOutput().orEmpty()
+
+        // Typically Gradle error message consists of a line with the description of the error followed by
+        // a multi-line stacktrace. The idea is to cut off the stacktrace if it is already contained in
+        // the intercepted Gradle process output to avoid unnecessary verbosity.
+        val compactErrorMessage = when (val indexOfNewLine = errorMessage.indexOf('\n')) {
+            -1 -> errorMessage
+            else -> {
+                val compactErrorMessage = errorMessage.substring(0, indexOfNewLine)
+                val theRest = errorMessage.substring(indexOfNewLine + 1)
+                if (theRest in gradleOutput) compactErrorMessage else errorMessage
+            }
+        }
+
+        val failureMessage = buildString {
+            append("Gradle import failed: ").append(compactErrorMessage).append('\n')
+            if (!errorDetails.isNullOrBlank()) append("Error details: ").append(errorDetails).append('\n')
+            append("Gradle process output (BEGIN):\n")
+            append(gradleOutput)
+            if (!gradleOutput.endsWith('\n')) append('\n')
+            append("Gradle process output (END)")
+        }
+        fail(failureMessage)
     }
 
     protected open fun injectRepo(@NonNls @Language("Groovy") config: String?): String {
@@ -356,9 +389,9 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
         }.toList()
     }
 
-    protected fun importProjectFromTestData(): List<VirtualFile> {
+    protected fun importProjectFromTestData(skipIndexing: Boolean? = null): List<VirtualFile> {
         val files = configureByFiles()
-        importProject()
+        importProject(skipIndexing)
         return files
     }
 
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt
index 035d7e80126..91b3b527316 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt
@@ -42,6 +42,10 @@ class GradleKtsImportTest : GradleImportingTestCase() {
         return "gradleKtsImportTest"
     }
 
+    override fun importProject() {
+        importProject(true)
+    }
+
     @Test
     @TargetVersions("6.0.1+")
     fun testEmpty() {
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
index 182753c8d96..91648ea9aa2 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
@@ -35,6 +35,10 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes
         )
     }
 
+    override fun importProject() {
+        super.importProject(skipIndexing = true)
+    }
+
     @JvmField
     @Parameterized.Parameter(1)
     var gradleKotlinPluginVersionType: String = MINIMAL_SUPPORTED_VERSION
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/KotlinDslScriptModelTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/KotlinDslScriptModelTest.kt
index 391e78261cb..3c72817f359 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/KotlinDslScriptModelTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/KotlinDslScriptModelTest.kt
@@ -10,27 +10,24 @@ import org.gradle.internal.exceptions.LocationAwareException
 import org.gradle.internal.resource.UriTextResource
 import org.jetbrains.kotlin.idea.scripting.gradle.importing.parsePositionFromException
 import org.junit.Test
-import java.io.File
-import java.io.PrintWriter
-import java.io.StringWriter
-import java.lang.RuntimeException
+import kotlin.io.path.*
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
 class KotlinDslScriptModelTest {
+    @OptIn(ExperimentalPathApi::class)
     @Test
     fun testExceptionPositionParsing() {
-        val file = File(createTempDir("kotlinDslTest"), "build.gradle.kts")
+        val file = createTempDirectory("kotlinDslTest") / "build.gradle.kts"
         val line = 10
 
-        val mockScriptSource = TextResourceScriptSource(UriTextResource("build file", file))
+        val mockScriptSource = TextResourceScriptSource(UriTextResource("build file", file.toFile()))
         val mockException = LocationAwareException(RuntimeException(), mockScriptSource, line)
-        val stringWriter = StringWriter()
-        mockException.printStackTrace(PrintWriter(stringWriter))
-
-        val fromException = parsePositionFromException(stringWriter.toString())
+        val fromException = parsePositionFromException(mockException.stackTraceToString())
         assertNotNull(fromException, "Position should be parsed")
-        assertEquals(fromException.first, file.absolutePath, "Wrong file name parsed")
+        assertEquals(fromException.first, file.toAbsolutePath().toString(), "Wrong file name parsed")
         assertEquals(fromException.second.line, line, "Wrong line number parsed")
+
+        file.parent.deleteExisting()
     }
 }
\ No newline at end of file
diff --git a/idea/idea-j2k/build.gradle.kts b/idea/idea-j2k/build.gradle.kts
index 44389d0adcb..7919398d1a5 100644
--- a/idea/idea-j2k/build.gradle.kts
+++ b/idea/idea-j2k/build.gradle.kts
@@ -8,10 +8,7 @@ dependencies {
     compile(project(":idea:idea-core"))
 
     compileOnly(intellijDep())
-    
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 }
 
 sourceSets {
diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts
index 6b0eef2a320..dbe59d4276c 100644
--- a/idea/idea-jvm/build.gradle.kts
+++ b/idea/idea-jvm/build.gradle.kts
@@ -14,9 +14,7 @@ dependencies {
     compileOnly(intellijDep())
     compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 
     compileOnly(intellijPluginDep("junit"))
     compileOnly(intellijPluginDep("testng"))
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/actions/ShowKotlinBytecodeAction.kt.193 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/actions/ShowKotlinBytecodeAction.kt.193
deleted file mode 100644
index bf588f63d1b..00000000000
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/actions/ShowKotlinBytecodeAction.kt.193
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.actions
-
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.wm.ToolWindowAnchor
-import com.intellij.openapi.wm.ToolWindowManager
-import com.intellij.ui.content.ContentFactory
-import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.kotlin.idea.KotlinIcons
-import org.jetbrains.kotlin.idea.internal.KotlinBytecodeToolWindow
-
-class ShowKotlinBytecodeAction : AnAction() {
-    override fun actionPerformed(e: AnActionEvent) {
-        val project = e.project ?: return
-        val toolWindowManager = ToolWindowManager.getInstance(project)
-        var toolWindow = toolWindowManager.getToolWindow(TOOLWINDOW_ID)
-        if (toolWindow == null) {
-            toolWindow = toolWindowManager.registerToolWindow(TOOLWINDOW_ID, false, ToolWindowAnchor.RIGHT)
-            toolWindow.icon = KotlinIcons.SMALL_LOGO_13
-
-            val contentManager = toolWindow.contentManager
-            val contentFactory = ContentFactory.SERVICE.getInstance()
-            contentManager.addContent(contentFactory.createContent(KotlinBytecodeToolWindow(project, toolWindow), "", false))
-        }
-        toolWindow.activate(null)
-    }
-
-    override fun update(e: AnActionEvent) {
-        val file = e.getData(CommonDataKeys.PSI_FILE)
-        e.presentation.isEnabled = e.project != null && file?.fileType == KotlinFileType.INSTANCE
-    }
-
-    companion object {
-        const val TOOLWINDOW_ID = "Kotlin Bytecode"
-    }
-}
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt
index 628a64df85b..dcfd2cdc5a6 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt
@@ -283,7 +283,7 @@ class KotlinBytecodeToolWindow(private val myProject: Project, private val toolW
 
         fun compileSingleFile(
             ktFile: KtFile,
-            configuration: CompilerConfiguration
+            initialConfiguration: CompilerConfiguration
         ): GenerationState? {
             val platform = ktFile.platform
             if (!platform.isCommon() && !platform.isJvm()) return null
@@ -294,6 +294,10 @@ class KotlinBytecodeToolWindow(private val myProject: Project, private val toolW
 
             val bindingContextForFile = resolutionFacade.analyzeWithAllCompilerChecks(listOf(ktFile)).bindingContext
 
+            val configuration = initialConfiguration.copy().apply {
+                put(JVMConfigurationKeys.DO_NOT_CLEAR_BINDING_CONTEXT, true)
+            }
+
             val (bindingContext, toProcess) = DebuggerUtils.analyzeInlinedFunctions(
                 resolutionFacade, ktFile, configuration.getBoolean(CommonConfigurationKeys.DISABLE_INLINE),
                 bindingContextForFile
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt
index bf42629965a..97eabb8cf55 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -16,9 +16,12 @@ import org.jetbrains.kotlin.idea.framework.CommonLibraryKind
 import org.jetbrains.kotlin.idea.framework.CommonStandardLibraryDescription
 import org.jetbrains.kotlin.idea.framework.getCommonRuntimeLibraryVersion
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
+import org.jetbrains.kotlin.idea.platform.isCompatibleWith
 import org.jetbrains.kotlin.idea.platform.tooling
 import org.jetbrains.kotlin.idea.project.platform
 import org.jetbrains.kotlin.idea.util.module
+import org.jetbrains.kotlin.platform.SimplePlatform
+import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.idePlatformKind
 import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
 import org.jetbrains.kotlin.platform.impl.isCommon
@@ -45,9 +48,14 @@ object CommonIdePlatformKindTooling : IdePlatformKindTooling() {
         return ::getCommonRuntimeLibraryVersion
     }
 
-    override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
-        val icons = getInstances()
+    private fun getRelevantToolings(platform: TargetPlatform?): List<IdePlatformKindTooling> {
+        return getInstances()
             .filter { it != this }
+            .filter { platform == null || it.kind.isCompatibleWith(platform) }
+    }
+
+    override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
+        val icons = getRelevantToolings(declaration.module?.platform)
             .mapNotNull { it.getTestIcon(declaration, descriptor) }
             .distinct()
 
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JvmIdePlatformKindTooling.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JvmIdePlatformKindTooling.kt
index c935abfe00f..1ac5dc0efaa 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JvmIdePlatformKindTooling.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JvmIdePlatformKindTooling.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -9,6 +9,8 @@ import com.intellij.codeInsight.TestFrameworks
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.libraries.Library
 import com.intellij.openapi.roots.libraries.PersistentLibraryKind
+import com.intellij.psi.PsiMethod
+import com.intellij.testIntegration.TestFramework
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.asJava.toLightMethods
@@ -19,6 +21,7 @@ import org.jetbrains.kotlin.idea.framework.JavaRuntimeDetectionUtil
 import org.jetbrains.kotlin.idea.framework.JavaRuntimeLibraryDescription
 import org.jetbrains.kotlin.idea.highlighter.KotlinTestRunLineMarkerContributor.Companion.getTestStateIcon
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
+import org.jetbrains.kotlin.idea.platform.isKotlinTestDeclaration
 import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFunction
@@ -51,28 +54,41 @@ class JvmIdePlatformKindTooling : IdePlatformKindTooling() {
     }
 
     override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
-        val (url, framework) = when (declaration) {
+        val (urls, framework) = when (declaration) {
             is KtClassOrObject -> {
                 val lightClass = declaration.toLightClass() ?: return null
-                val framework = TestFrameworks.detectFramework(lightClass) ?: return null
-                if (!framework.isTestClass(lightClass)) return null
-                val qualifiedName = lightClass.qualifiedName ?: return null
-
-                "java:suite://$qualifiedName" to framework
+                val framework = TestFrameworks.detectFramework(lightClass)
+                if (framework?.isTestClass(lightClass) == false) {
+                    return null
+                }
+                listOf("java:suite://${lightClass.qualifiedName}") to framework
             }
 
             is KtNamedFunction -> {
                 val lightMethod = declaration.toLightMethods().firstOrNull() ?: return null
                 val lightClass = lightMethod.containingClass as? KtLightClass ?: return null
-                val framework = TestFrameworks.detectFramework(lightClass) ?: return null
-                if (!framework.isTestMethod(lightMethod, /*checkAbstract = */ false)) return null
-
-                "java:test://${lightClass.qualifiedName}/${lightMethod.name}" to framework
+                val framework = TestFrameworks.detectFramework(lightClass)
+                if (framework?.isTestMethod(lightMethod, false) == false) {
+                    return null
+                }
+                listOf(
+                    "java:test://${lightClass.qualifiedName}/${lightMethod.name}",
+                    "java:test://${lightClass.qualifiedName}.${lightMethod.name}"
+                ) to framework
             }
 
             else -> return null
         }
-        return getTestStateIcon(url, declaration.project, strict = false) ?: framework.icon
+
+        if (framework != null) {
+            return getTestStateIcon(urls, declaration.project, strict = false, framework.icon)
+        }
+
+        if (!descriptor.isKotlinTestDeclaration()) {
+            return null
+        }
+
+        return getTestStateIcon(urls, declaration.project, strict = false)
     }
 
     override fun acceptsAsEntryPoint(function: KtFunction) = true
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
index a14cd675231..e9fb97eebc7 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -11,6 +11,16 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.highlighter.KotlinTestRunLineMarkerContributor.Companion.getTestStateIcon
 import org.jetbrains.kotlin.idea.util.string.joinWithEscape
 import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.platform.IdePlatformKind
+import org.jetbrains.kotlin.platform.TargetPlatform
+import org.jetbrains.kotlin.platform.has
+import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
+import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
+import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
+import org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind
+import org.jetbrains.kotlin.platform.js.JsPlatform
+import org.jetbrains.kotlin.platform.jvm.JvmPlatform
+import org.jetbrains.kotlin.platform.konan.NativePlatform
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 import org.jetbrains.kotlin.psi.KtNamedFunction
@@ -43,10 +53,8 @@ fun getGenericTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationD
 
     val prefix = if (testName != null) "test://" else "suite://"
     val url = prefix + locations.joinWithEscape('.')
-    val javaUrl = "java:$url"
 
-    val project = declaration.project
-    return getTestStateIcon(javaUrl, project, strict = true) ?: getTestStateIcon(url, project, strict = false)
+    return getTestStateIcon(listOf("java:$url", url), declaration.project, strict = false)
 }
 
 private tailrec fun DeclarationDescriptor.isIgnored(): Boolean {
@@ -69,4 +77,14 @@ fun DeclarationDescriptor.isKotlinTestDeclaration(): Boolean {
 
     val classDescriptor = this as? ClassDescriptorWithResolutionScopes ?: return false
     return classDescriptor.declaredCallableMembers.any { it.isKotlinTestDeclaration() }
+}
+
+internal fun IdePlatformKind<*>.isCompatibleWith(platform: TargetPlatform): Boolean {
+    return when (this) {
+        is JvmIdePlatformKind -> platform.has(JvmPlatform::class)
+        is NativeIdePlatformKind -> platform.has(NativePlatform::class)
+        is JsIdePlatformKind -> platform.has(JsPlatform::class)
+        is CommonIdePlatformKind -> true
+        else -> false
+    }
 }
\ No newline at end of file
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt
index 94d70135030..af13689ee9d 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt
@@ -16,7 +16,6 @@ import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Computable
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.util.concurrency.NonUrgentExecutor
 import org.jetbrains.kotlin.codegen.ClassBuilderFactories
 import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
 import org.jetbrains.kotlin.codegen.filterClassFiles
@@ -56,41 +55,43 @@ class KtScratchExecutionSession(
         if (!executor.checkForErrors(psiFile, expressions)) return
 
         val project = file.project
-        ReadAction.nonBlocking {
-                when (val result = KtScratchSourceFileProcessor().process(expressions)) {
-                    is KtScratchSourceFileProcessor.Result.Error -> return@nonBlocking executor.errorOccurs(result.message, isFatal = true)
-                    is KtScratchSourceFileProcessor.Result.OK -> {
-                        LOG.printDebugMessage("After processing by KtScratchSourceFileProcessor:\n ${result.code}")
+        when (val result = runReadAction { KtScratchSourceFileProcessor().process(expressions) }) {
+            is KtScratchSourceFileProcessor.Result.Error -> return executor.errorOccurs(result.message, isFatal = true)
+            is KtScratchSourceFileProcessor.Result.OK -> {
+                LOG.printDebugMessage("After processing by KtScratchSourceFileProcessor:\n ${result.code}")
 
-                        object : Task.Backgroundable(psiFile.project, KotlinJvmBundle.message("running.kotlin.scratch"), true) {
-                            override fun run(indicator: ProgressIndicator) {
-                                backgroundProcessIndicator = indicator
+                object : Task.Backgroundable(psiFile.project, KotlinJvmBundle.message("running.kotlin.scratch"), true) {
+                    override fun run(indicator: ProgressIndicator) {
+                        backgroundProcessIndicator = indicator
 
-                                val modifiedScratchSourceFile = runReadAction {
-                                    KtPsiFactory(psiFile.project).createFileWithLightClassSupport("tmp.kt", result.code, psiFile)
-                                }
-
-                                try {
-                                    runCommandLine(project, modifiedScratchSourceFile, expressions, psiFile, result, indicator, callback)
-                                } catch (e: Throwable) {
-                                    if (e is ControlFlowException) throw e
-
-                                    LOG.printDebugMessage(result.code)
-                                    executor.errorOccurs(
-                                        e.message ?: KotlinJvmBundle.message("couldn.t.compile.0", psiFile.name),
-                                        e,
-                                        isFatal = true
-                                    )
-                                }
+                        ReadAction.nonBlocking {
+                            val modifiedScratchSourceFile = runReadAction {
+                                KtPsiFactory(psiFile.project).createFileWithLightClassSupport("tmp.kt", result.code, psiFile)
                             }
-                        }.queue()
+
+                            try {
+                                runCommandLine(project, modifiedScratchSourceFile, expressions, psiFile, result, indicator, callback)
+                            } catch (e: Throwable) {
+                                if (e is ControlFlowException) throw e
+
+                                LOG.printDebugMessage(result.code)
+                                executor.errorOccurs(
+                                    e.message ?: KotlinJvmBundle.message("couldn.t.compile.0", psiFile.name),
+                                    e,
+                                    isFatal = true
+                                )
+                            }
+                        }
+                            .inSmartMode(project)
+                            .wrapProgress(indicator)
+                            .withDocumentsCommitted(project)
+                            .executeSynchronously()
                     }
-                }
+                }.queue()
             }
-            .inSmartMode(project)
-            .expireWith(project)
-            .withDocumentsCommitted(project)
-            .submit(NonUrgentExecutor.getInstance())
+        }
+
+
     }
 
     private fun runCommandLine(
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt.193 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt.193
deleted file mode 100644
index 5c0dd47c0cc..00000000000
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt.193
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.scratch.output
-
-import com.intellij.execution.filters.OpenFileHyperlinkInfo
-import com.intellij.execution.impl.ConsoleViewImpl
-import com.intellij.execution.runners.ExecutionUtil
-import com.intellij.execution.ui.ConsoleViewContentType
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.TransactionGuard
-import com.intellij.openapi.command.WriteCommandAction
-import com.intellij.openapi.editor.ex.EditorEx
-import com.intellij.openapi.fileTypes.PlainTextFileType
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.Disposer
-import com.intellij.openapi.wm.ToolWindow
-import com.intellij.openapi.wm.ToolWindowAnchor
-import com.intellij.openapi.wm.ToolWindowFactory
-import com.intellij.openapi.wm.ToolWindowManager
-import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.idea.scratch.ScratchExpression
-import org.jetbrains.kotlin.idea.scratch.ScratchFile
-import org.jetbrains.kotlin.psi.KtPsiFactory
-
-/**
- * Method to retrieve shared instance of scratches ToolWindow output handler.
- *
- * [releaseToolWindowHandler] must be called for every output handler received from this method.
- *
- * Can be called from EDT only.
- *
- * @return new toolWindow output handler if one does not exist, otherwise returns the existing one. When application in test mode,
- * returns [TestOutputHandler].
- */
-fun requestToolWindowHandler(): ScratchOutputHandler {
-    return if (ApplicationManager.getApplication().isUnitTestMode) {
-        TestOutputHandler
-    } else {
-        ScratchToolWindowHandlerKeeper.requestOutputHandler()
-    }
-}
-
-/**
- * Should be called once with the output handler received from the [requestToolWindowHandler] call.
- *
- * When release is called for every request, the output handler is actually disposed.
- *
- * When application in test mode, does nothing.
- *
- * Can be called from EDT only.
- */
-fun releaseToolWindowHandler(scratchOutputHandler: ScratchOutputHandler) {
-    if (!ApplicationManager.getApplication().isUnitTestMode) {
-        ScratchToolWindowHandlerKeeper.releaseOutputHandler(scratchOutputHandler)
-    }
-}
-
-/**
- * Implements logic of shared pointer for the toolWindow output handler.
- *
- * Not thread safe! Can be used only from the EDT.
- */
-private object ScratchToolWindowHandlerKeeper {
-    private var toolWindowHandler: ScratchOutputHandler? = null
-    private var toolWindowDisposable = Disposer.newDisposable()
-    private var counter = 0
-
-    fun requestOutputHandler(): ScratchOutputHandler {
-        if (counter == 0) {
-            toolWindowHandler = ToolWindowScratchOutputHandler(toolWindowDisposable)
-        }
-
-        counter += 1
-        return toolWindowHandler!!
-    }
-
-    fun releaseOutputHandler(scratchOutputHandler: ScratchOutputHandler) {
-        require(counter > 0) { "Counter is $counter, nothing to release!" }
-        require(toolWindowHandler === scratchOutputHandler) { "$scratchOutputHandler differs from stored $toolWindowHandler" }
-
-        counter -= 1
-        if (counter == 0) {
-            Disposer.dispose(toolWindowDisposable)
-            toolWindowDisposable = Disposer.newDisposable()
-            toolWindowHandler = null
-        }
-    }
-}
-
-private class ToolWindowScratchOutputHandler(private val parentDisposable: Disposable) : ScratchOutputHandlerAdapter() {
-
-    override fun handle(file: ScratchFile, expression: ScratchExpression, output: ScratchOutput) {
-        printToConsole(file) {
-            val psiFile = file.getPsiFile()
-            if (psiFile != null) {
-                printHyperlink(
-                    getLineInfo(psiFile, expression),
-                    OpenFileHyperlinkInfo(
-                        project,
-                        psiFile.virtualFile,
-                        expression.lineStart,
-                    ),
-                )
-                print(" ", ConsoleViewContentType.NORMAL_OUTPUT)
-            }
-            print(output.text, output.type.convert())
-        }
-    }
-
-    override fun error(file: ScratchFile, message: String) {
-        printToConsole(file) {
-            print(message, ConsoleViewContentType.ERROR_OUTPUT)
-        }
-    }
-
-    private fun printToConsole(file: ScratchFile, print: ConsoleViewImpl.() -> Unit) {
-        ApplicationManager.getApplication().invokeLater {
-            val project = file.project.takeIf { !it.isDisposed } ?: return@invokeLater
-
-            val toolWindow = getToolWindow(project) ?: createToolWindow(file)
-
-            val contents = toolWindow.contentManager.contents
-            for (content in contents) {
-                val component = content.component
-                if (component is ConsoleViewImpl) {
-                    component.print()
-                    component.print("\n", ConsoleViewContentType.NORMAL_OUTPUT)
-                }
-            }
-
-            toolWindow.setAvailable(true, null)
-
-            if (!file.options.isInteractiveMode) {
-                toolWindow.show(null)
-            }
-
-            toolWindow.icon = ExecutionUtil.getLiveIndicator(scratchIcon())
-        }
-    }
-
-    override fun clear(file: ScratchFile) {
-        ApplicationManager.getApplication().invokeLater {
-            val toolWindow = getToolWindow(file.project) ?: return@invokeLater
-            val contents = toolWindow.contentManager.contents
-            for (content in contents) {
-                val component = content.component
-                if (component is ConsoleViewImpl) {
-                    component.clear()
-                }
-            }
-
-            if (!file.options.isInteractiveMode) {
-                toolWindow.hide(null)
-            }
-
-            toolWindow.icon = scratchIcon()
-        }
-    }
-
-    private fun ScratchOutputType.convert() = when (this) {
-        ScratchOutputType.OUTPUT -> ConsoleViewContentType.SYSTEM_OUTPUT
-        ScratchOutputType.RESULT -> ConsoleViewContentType.NORMAL_OUTPUT
-        ScratchOutputType.ERROR -> ConsoleViewContentType.ERROR_OUTPUT
-    }
-
-    private fun getToolWindow(project: Project): ToolWindow? {
-        val toolWindowManager = ToolWindowManager.getInstance(project)
-        return toolWindowManager.getToolWindow(ScratchToolWindowFactory.ID)
-    }
-
-    private fun createToolWindow(file: ScratchFile): ToolWindow {
-        val project = file.project
-        val toolWindowManager = ToolWindowManager.getInstance(project)
-        toolWindowManager.registerToolWindow(ScratchToolWindowFactory.ID, true, ToolWindowAnchor.BOTTOM)
-        val window = toolWindowManager.getToolWindow(ScratchToolWindowFactory.ID)
-        ScratchToolWindowFactory().createToolWindowContent(project, window)
-
-        Disposer.register(
-            parentDisposable,
-            Disposable {
-                toolWindowManager.unregisterToolWindow(ScratchToolWindowFactory.ID)
-            },
-        )
-
-        return window
-    }
-}
-
-private fun scratchIcon() = PlainTextFileType.INSTANCE.icon
-
-private fun getLineInfo(psiFile: PsiFile, expression: ScratchExpression) =
-    "${psiFile.name}:${expression.lineStart + 1}"
-
-private class ScratchToolWindowFactory : ToolWindowFactory {
-    companion object {
-        const val ID = "Scratch Output"
-    }
-
-    override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-        val consoleView = ConsoleViewImpl(project, true)
-        toolWindow.isToHideOnEmptyContent = true
-        toolWindow.icon = scratchIcon()
-        toolWindow.hide(null)
-
-        val contentManager = toolWindow.contentManager
-        val content = contentManager.factory.createContent(consoleView.component, null, false)
-        contentManager.addContent(content)
-        val editor = consoleView.editor
-        if (editor is EditorEx) {
-            editor.isRendererMode = true
-        }
-
-        Disposer.register(project, consoleView)
-    }
-}
-
-private object TestOutputHandler : ScratchOutputHandlerAdapter() {
-    private val errors = arrayListOf<String>()
-    private val inlays = arrayListOf<Pair<ScratchExpression, String>>()
-
-    override fun handle(file: ScratchFile, expression: ScratchExpression, output: ScratchOutput) {
-        inlays.add(expression to output.text)
-    }
-
-    override fun error(file: ScratchFile, message: String) {
-        errors.add(message)
-    }
-
-    override fun onFinish(file: ScratchFile) {
-        TransactionGuard.submitTransaction(
-            file.project,
-            Runnable {
-                val psiFile = file.getPsiFile()
-                    ?: error(
-                        "PsiFile cannot be found for scratch to render inlays in tests:\n" +
-                                "project.isDisposed = ${file.project.isDisposed}\n" +
-                                "inlays = ${inlays.joinToString { it.second }}\n" +
-                                "errors = ${errors.joinToString()}",
-                    )
-
-                if (inlays.isNotEmpty()) {
-                    testPrint(
-                        psiFile,
-                        inlays.map { (expression, text) ->
-                            "/** ${getLineInfo(psiFile, expression)} $text */"
-                        },
-                    )
-                    inlays.clear()
-                }
-
-                if (errors.isNotEmpty()) {
-                    testPrint(psiFile, listOf(errors.joinToString(prefix = "/** ", postfix = " */")))
-                    errors.clear()
-                }
-            },
-        )
-    }
-
-    private fun testPrint(file: PsiFile, comments: List<String>) {
-        WriteCommandAction.runWriteCommandAction(file.project) {
-            for (comment in comments) {
-                file.addAfter(
-                    KtPsiFactory(file.project).createComment(comment),
-                    file.lastChild,
-                )
-            }
-        }
-    }
-}
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/TextEditorWithPreview.java.193 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/TextEditorWithPreview.java.193
deleted file mode 100644
index 43aae0cf629..00000000000
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/TextEditorWithPreview.java.193
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.scratch.ui;
-
-
-import com.intellij.codeHighlighting.BackgroundEditorHighlighter;
-import com.intellij.icons.AllIcons;
-import com.intellij.ide.structureView.StructureViewBuilder;
-import com.intellij.ide.util.PropertiesComponent;
-import com.intellij.openapi.Disposable;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.editor.ex.EditorGutterComponentEx;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.UserDataHolderBase;
-import com.intellij.openapi.wm.IdeFocusManager;
-import com.intellij.ui.JBSplitter;
-import com.intellij.util.ui.JBUI;
-import com.intellij.util.ui.UIUtil;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.KotlinJvmBundle;
-
-import javax.swing.*;
-import java.awt.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Two panel editor with three states: Editor, Preview and Editor with Preview.
- * Based on SplitFileEditor by Valentin Fondaratov
- * <p/>
- * <b>NOTE:</b> This class is a copy of {@link com.intellij.openapi.fileEditor.TextEditorWithPreview} from the most recent intellij-community
- * repository. We cannot use bundled version of this class because it doesn't yet have customization methods
- * (namely {@link TextEditorWithPreview#createLeftToolbarActionGroup()}).
- * <p/>
- * {@link SplitEditorToolbar} is also copied from the platform.
- * <p/>
- * This class also may have some minimal customizations to allow tracking when its layout have been changed. In the future we hope to
- * remove this copied class entirely and to use the bundled version.
- */
-public class TextEditorWithPreview extends UserDataHolderBase implements FileEditor {
-    protected final TextEditor myEditor;
-    protected final FileEditor myPreview;
-    @NotNull
-    private final MyListenersMultimap myListenersGenerator = new MyListenersMultimap();
-    private Layout myLayout;
-    private JComponent myComponent;
-    private SplitEditorToolbar myToolbarWrapper;
-    private final String myName;
-
-    public TextEditorWithPreview(@NotNull TextEditor editor, @NotNull FileEditor preview, @NotNull String editorName) {
-        myEditor = editor;
-        myPreview = preview;
-        myName = editorName;
-    }
-
-    public TextEditorWithPreview(@NotNull TextEditor editor, @NotNull FileEditor preview) {
-        this(editor, preview, "TextEditorWithPreview");
-    }
-
-    @Nullable
-    @Override
-    public BackgroundEditorHighlighter getBackgroundHighlighter() {
-        return myEditor.getBackgroundHighlighter();
-    }
-
-    @Nullable
-    @Override
-    public FileEditorLocation getCurrentLocation() {
-        return myEditor.getCurrentLocation();
-    }
-
-    @Nullable
-    @Override
-    public StructureViewBuilder getStructureViewBuilder() {
-        return myEditor.getStructureViewBuilder();
-    }
-
-    @Override
-    public void dispose() {
-        Disposer.dispose(myEditor);
-        Disposer.dispose(myPreview);
-    }
-
-    @Override
-    public void selectNotify() {
-        myEditor.selectNotify();
-        myPreview.selectNotify();
-    }
-
-    @Override
-    public void deselectNotify() {
-        myEditor.deselectNotify();
-        myPreview.deselectNotify();
-    }
-
-    @NotNull
-    @Override
-    public JComponent getComponent() {
-        if (myComponent == null) {
-            final JBSplitter splitter = new JBSplitter(false, 0.5f, 0.15f, 0.85f);
-            splitter.setSplitterProportionKey(getSplitterProportionKey());
-            splitter.setFirstComponent(myEditor.getComponent());
-            splitter.setSecondComponent(myPreview.getComponent());
-            splitter.setDividerWidth(3);
-
-            myToolbarWrapper = createMarkdownToolbarWrapper(splitter);
-            Disposer.register(this, myToolbarWrapper);
-
-            if (myLayout == null) {
-                String lastUsed = PropertiesComponent.getInstance().getValue(getLayoutPropertyName());
-                setLayout(Layout.fromName(lastUsed, Layout.SHOW_EDITOR_AND_PREVIEW));
-            }
-            adjustEditorsVisibility();
-
-            myComponent = JBUI.Panels.simplePanel(splitter).addToTop(myToolbarWrapper);
-        }
-        return myComponent;
-    }
-
-    @NotNull
-    private SplitEditorToolbar createMarkdownToolbarWrapper (@NotNull JComponent targetComponentForActions) {
-        final ActionToolbar leftToolbar = createToolbar();
-        if (leftToolbar != null) {
-            leftToolbar.setTargetComponent(targetComponentForActions);
-            leftToolbar.setReservePlaceAutoPopupIcon(false);
-        }
-
-        final ActionToolbar rightToolbar = createRightToolbar();
-        rightToolbar.setTargetComponent(targetComponentForActions);
-        rightToolbar.setReservePlaceAutoPopupIcon(false);
-
-        return new SplitEditorToolbar(leftToolbar, rightToolbar);
-    }
-
-    @Override
-    public void setState(@NotNull FileEditorState state) {
-        if (state instanceof MyFileEditorState) {
-            final MyFileEditorState compositeState = (MyFileEditorState)state;
-            if (compositeState.getFirstState() != null) {
-                myEditor.setState(compositeState.getFirstState());
-            }
-            if (compositeState.getSecondState() != null) {
-                myPreview.setState(compositeState.getSecondState());
-            }
-            if (compositeState.getSplitLayout() != null) {
-                setLayout(compositeState.getSplitLayout());
-                invalidateLayout();
-            }
-        }
-    }
-
-    private void adjustEditorsVisibility() {
-        myEditor.getComponent().setVisible(myLayout == Layout.SHOW_EDITOR || myLayout == Layout.SHOW_EDITOR_AND_PREVIEW);
-        myPreview.getComponent().setVisible(myLayout == Layout.SHOW_PREVIEW || myLayout == Layout.SHOW_EDITOR_AND_PREVIEW);
-    }
-
-    private void invalidateLayout() {
-        adjustEditorsVisibility();
-        myToolbarWrapper.refresh();
-        myComponent.repaint();
-
-        final JComponent focusComponent = getPreferredFocusedComponent();
-        if (focusComponent != null) {
-            IdeFocusManager.findInstanceByComponent(focusComponent).requestFocus(focusComponent, true);
-        }
-    }
-
-    @NotNull
-    protected String getSplitterProportionKey() {
-        return "TextEditorWithPreview.SplitterProportionKey";
-    }
-
-    @Nullable
-    @Override
-    public JComponent getPreferredFocusedComponent() {
-        switch (myLayout) {
-            case SHOW_EDITOR_AND_PREVIEW:
-            case SHOW_EDITOR:
-                return myEditor.getPreferredFocusedComponent();
-            case SHOW_PREVIEW:
-                return myPreview.getPreferredFocusedComponent();
-            default:
-                throw new IllegalStateException(myLayout.myName);
-        }
-    }
-
-    @NotNull
-    @Override
-    public String getName() {
-        return myName;
-    }
-
-    @NotNull
-    @Override
-    public FileEditorState getState(@NotNull FileEditorStateLevel level) {
-        return new MyFileEditorState(myLayout, myEditor.getState(level), myPreview.getState(level));
-    }
-
-    @Override
-    public void addPropertyChangeListener(@NotNull PropertyChangeListener listener) {
-        myEditor.addPropertyChangeListener(listener);
-        myPreview.addPropertyChangeListener(listener);
-
-        final DoublingEventListenerDelegate delegate = myListenersGenerator.addListenerAndGetDelegate(listener);
-        myEditor.addPropertyChangeListener(delegate);
-        myPreview.addPropertyChangeListener(delegate);
-    }
-
-    @Override
-    public void removePropertyChangeListener(@NotNull PropertyChangeListener listener) {
-        myEditor.removePropertyChangeListener(listener);
-        myPreview.removePropertyChangeListener(listener);
-
-        final DoublingEventListenerDelegate delegate = myListenersGenerator.removeListenerAndGetDelegate(listener);
-        if (delegate != null) {
-            myEditor.removePropertyChangeListener(delegate);
-            myPreview.removePropertyChangeListener(delegate);
-        }
-    }
-
-    @NotNull
-    public TextEditor getTextEditor() {
-        return myEditor;
-    }
-
-    public Layout getLayout() {
-        return myLayout;
-    }
-
-    protected void setLayout(@NotNull Layout layout) {
-        myLayout = layout;
-    }
-
-    static class MyFileEditorState implements FileEditorState {
-        private final Layout mySplitLayout;
-        private final FileEditorState myFirstState;
-        private final FileEditorState mySecondState;
-
-        MyFileEditorState(Layout layout, FileEditorState firstState, FileEditorState secondState) {
-            mySplitLayout = layout;
-            myFirstState = firstState;
-            mySecondState = secondState;
-        }
-
-        @Nullable
-        public Layout getSplitLayout() {
-            return mySplitLayout;
-        }
-
-        @Nullable
-        public FileEditorState getFirstState() {
-            return myFirstState;
-        }
-
-        @Nullable
-        public FileEditorState getSecondState() {
-            return mySecondState;
-        }
-
-        @Override
-        public boolean canBeMergedWith(FileEditorState otherState, FileEditorStateLevel level) {
-            return otherState instanceof MyFileEditorState
-                   && (myFirstState == null || myFirstState.canBeMergedWith(((MyFileEditorState)otherState).myFirstState, level))
-                   && (mySecondState == null || mySecondState.canBeMergedWith(((MyFileEditorState)otherState).mySecondState, level));
-        }
-    }
-
-    @Override
-    public boolean isModified() {
-        return myEditor.isModified() || myPreview.isModified();
-    }
-
-    @Override
-    public boolean isValid() {
-        return myEditor.isValid() && myPreview.isValid();
-    }
-
-    private class DoublingEventListenerDelegate implements PropertyChangeListener {
-        @NotNull
-        private final PropertyChangeListener myDelegate;
-
-        private DoublingEventListenerDelegate(@NotNull PropertyChangeListener delegate) {
-            myDelegate = delegate;
-        }
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            myDelegate.propertyChange(
-                    new PropertyChangeEvent(TextEditorWithPreview.this, evt.getPropertyName(), evt.getOldValue(), evt.getNewValue()));
-        }
-    }
-
-    private class MyListenersMultimap {
-        private final Map<PropertyChangeListener, Pair<Integer, DoublingEventListenerDelegate>> myMap = new HashMap<>();
-
-        @NotNull
-        public DoublingEventListenerDelegate addListenerAndGetDelegate(@NotNull PropertyChangeListener listener) {
-            if (!myMap.containsKey(listener)) {
-                myMap.put(listener, Pair.create(1, new DoublingEventListenerDelegate(listener)));
-            }
-            else {
-                final Pair<Integer, DoublingEventListenerDelegate> oldPair = myMap.get(listener);
-                myMap.put(listener, Pair.create(oldPair.getFirst() + 1, oldPair.getSecond()));
-            }
-
-            return myMap.get(listener).getSecond();
-        }
-
-        @Nullable
-        public DoublingEventListenerDelegate removeListenerAndGetDelegate(@NotNull PropertyChangeListener listener) {
-            final Pair<Integer, DoublingEventListenerDelegate> oldPair = myMap.get(listener);
-            if (oldPair == null) {
-                return null;
-            }
-
-            if (oldPair.getFirst() == 1) {
-                myMap.remove(listener);
-            }
-            else {
-                myMap.put(listener, Pair.create(oldPair.getFirst() - 1, oldPair.getSecond()));
-            }
-            return oldPair.getSecond();
-        }
-    }
-
-    @Nullable
-    protected ActionToolbar createToolbar() {
-        ActionGroup actionGroup = createLeftToolbarActionGroup();
-        if (actionGroup != null) {
-            return ActionManager.getInstance().createActionToolbar("TextEditorWithPreview", actionGroup, true);
-        }
-        else {
-            return null;
-        }
-    }
-
-    @Nullable
-    protected ActionGroup createLeftToolbarActionGroup() {
-        return null;
-    }
-
-    @NotNull
-    private ActionToolbar createRightToolbar() {
-        final ActionGroup viewActions = createViewActionGroup();
-        final ActionGroup group = createRightToolbarActionGroup();
-        final ActionGroup rightToolbarActions = group == null
-                                                ? viewActions
-                                                : new DefaultActionGroup(group, Separator.create(), viewActions);
-        return ActionManager.getInstance().createActionToolbar("TextEditorWithPreview", rightToolbarActions, true);
-    }
-
-    @NotNull
-    protected ActionGroup createViewActionGroup() {
-        return new DefaultActionGroup(
-                getShowEditorAction(),
-                getShowEditorAndPreviewAction(),
-                getShowPreviewAction()
-        );
-    }
-
-    @Nullable
-    protected ActionGroup createRightToolbarActionGroup() {
-        return null;
-    }
-
-    @NotNull
-    protected ToggleAction getShowEditorAction() {
-        return new ChangeViewModeAction(Layout.SHOW_EDITOR);
-    }
-
-    @NotNull
-    protected ToggleAction getShowPreviewAction() {
-        return new ChangeViewModeAction(Layout.SHOW_PREVIEW);
-    }
-
-    @NotNull
-    protected ToggleAction getShowEditorAndPreviewAction() {
-        return new ChangeViewModeAction(Layout.SHOW_EDITOR_AND_PREVIEW);
-    }
-
-    public enum Layout {
-        SHOW_EDITOR(KotlinJvmBundle.message("editor.editor.only"), AllIcons.General.LayoutEditorOnly),
-        SHOW_PREVIEW(KotlinJvmBundle.message("editor.preview.only"), AllIcons.General.LayoutPreviewOnly),
-        SHOW_EDITOR_AND_PREVIEW(KotlinJvmBundle.message("editor.editor.and.preview"), AllIcons.General.LayoutEditorPreview);
-
-        private final String myName;
-        private final Icon myIcon;
-
-        Layout(String name, Icon icon) {
-            myName = name;
-            myIcon = icon;
-        }
-
-        public static Layout fromName(String name, Layout defaultValue) {
-            for (Layout layout : Layout.values()) {
-                if (layout.myName.equals(name)) {
-                    return layout;
-                }
-            }
-            return defaultValue;
-        }
-
-        public String getName() {
-            return myName;
-        }
-
-        public Icon getIcon() {
-            return myIcon;
-        }
-    }
-
-    private class ChangeViewModeAction extends ToggleAction implements DumbAware {
-        private final Layout myActionLayout;
-
-        ChangeViewModeAction(Layout layout) {
-            super(layout.getName(), layout.getName(), layout.getIcon());
-            myActionLayout = layout;
-        }
-
-        @Override
-        public boolean isSelected(@NotNull AnActionEvent e) {
-            return myLayout == myActionLayout;
-        }
-
-        @Override
-        public void setSelected(@NotNull AnActionEvent e, boolean state) {
-            if (state) {
-                setLayout(myActionLayout);
-                PropertiesComponent.getInstance().setValue(getLayoutPropertyName(), myLayout.myName, Layout.SHOW_EDITOR_AND_PREVIEW.myName);
-                adjustEditorsVisibility();
-            }
-        }
-    }
-
-    @NotNull
-    private String getLayoutPropertyName() {
-        return myName + "Layout";
-    }
-}
-
-class SplitEditorToolbar extends JPanel implements Disposable {
-
-    private final ActionToolbar myRightToolbar;
-
-    public SplitEditorToolbar(@Nullable ActionToolbar leftToolbar, @NotNull ActionToolbar rightToolbar) {
-        super(new GridBagLayout());
-        myRightToolbar = rightToolbar;
-
-        if (leftToolbar != null) {
-            add(leftToolbar.getComponent());
-        }
-
-        final JPanel centerPanel = new JPanel(new BorderLayout());
-        add(centerPanel, new GridBagConstraints(2, 0, 1, 1, 1.0, 1.0,
-                                                GridBagConstraints.CENTER, GridBagConstraints.BOTH, JBUI.emptyInsets(), 0, 0));
-
-        add(myRightToolbar.getComponent());
-
-        setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIUtil.CONTRAST_BORDER_COLOR));
-
-        if (leftToolbar != null) leftToolbar.updateActionsImmediately();
-        rightToolbar.updateActionsImmediately();
-    }
-
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public void addGutterToTrack(@NotNull EditorGutterComponentEx gutterComponentEx) {}
-
-    public void refresh() {
-        myRightToolbar.updateActionsImmediately();
-    }
-
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    @Override
-    public void dispose() {}
-}
\ No newline at end of file
diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
index ee5a24012ca..39b6c0a974b 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.liveTemplates;
 
 import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider;
 
-// FIX ME WHEN BUNCH 193 REMOVED
 public class KotlinLiveTemplatesProvider implements DefaultLiveTemplatesProvider {
     @Override
     public String[] getDefaultLiveTemplateFiles() {
diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
index 24faeb6e628..d89a18dbac9 100644
--- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
+++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
@@ -28,7 +28,7 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() {
     override fun setUp() {
         super.setUp()
         myFixture.testDataPath = File(TEST_DATA_BASE_PATH).path + File.separator
-        setTemplateTestingCompat(module.project, testRootDisposable)
+        TemplateManagerImpl.setTemplateTesting(testRootDisposable)
     }
 
     fun testSout() {
diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt
deleted file mode 100644
index d7f1fa72b74..00000000000
--- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.liveTemplates
-
-import com.intellij.codeInsight.template.impl.TemplateManagerImpl
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.project.Project
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun setTemplateTestingCompat(project: Project, disposable: Disposable) {
-    TemplateManagerImpl.setTemplateTesting(disposable)
-}
\ No newline at end of file
diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.193 b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.193
deleted file mode 100644
index 1f4d2a86180..00000000000
--- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.193
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.liveTemplates
-
-import com.intellij.codeInsight.template.impl.TemplateManagerImpl
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.project.Project
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun setTemplateTestingCompat(project: Project, disposable: Disposable) {
-    TemplateManagerImpl.setTemplateTesting(project, disposable)
-}
\ No newline at end of file
diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts
index 7b0e1cb7509..29e0e161a14 100644
--- a/idea/idea-maven/build.gradle.kts
+++ b/idea/idea-maven/build.gradle.kts
@@ -18,13 +18,11 @@ dependencies {
     compile(project(":idea:idea-jps-common"))
 
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntimeOnly(intellijPluginDep("java"))
-        testRuntimeOnly(intellijPluginDep("java-ide-customization"))
-    }
-    
+    compileOnly(intellijPluginDep("java"))
+    testCompileOnly(intellijPluginDep("java"))
+    testRuntimeOnly(intellijPluginDep("java"))
+    testRuntimeOnly(intellijPluginDep("java-ide-customization"))
+
     excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
 
     excludeInAndroidStudio(rootProject) {
diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts
index d37c6fba238..bca2715dd92 100644
--- a/idea/idea-native/build.gradle.kts
+++ b/idea/idea-native/build.gradle.kts
@@ -12,9 +12,7 @@ dependencies {
     compile(project(":native:frontend.native"))
 
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 
     testCompileOnly(intellijDep())
     testRuntimeOnly(intellijDep())
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKindTooling.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKindTooling.kt
index 69663a9ac61..6a9f07bb4db 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKindTooling.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKindTooling.kt
@@ -1,33 +1,40 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.ide.konan
 
+import com.intellij.execution.TestStateStorage
 import com.intellij.execution.actions.RunConfigurationProducer
+import com.intellij.icons.AllIcons
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.libraries.DummyLibraryProperties
 import com.intellij.openapi.roots.libraries.Library
 import com.intellij.openapi.roots.libraries.PersistentLibraryKind
 import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription
-import com.intellij.psi.util.parentOfType
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.asJava.toLightClass
+import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.gradle.KotlinPlatform
 import org.jetbrains.kotlin.idea.caches.project.isTestModule
 import org.jetbrains.kotlin.idea.facet.externalSystemNativeMainRunTasks
 import org.jetbrains.kotlin.idea.framework.KotlinLibraryKind
+import org.jetbrains.kotlin.idea.highlighter.KotlinTestRunLineMarkerContributor.Companion.getTestStateIcon
 import org.jetbrains.kotlin.idea.isMainFunction
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
-import org.jetbrains.kotlin.idea.platform.getGenericTestIcon
+import org.jetbrains.kotlin.idea.platform.isKotlinTestDeclaration
 import org.jetbrains.kotlin.idea.util.module
 import org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.konan.NativePlatforms
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import javax.swing.Icon
 
 class NativeIdePlatformKindTooling : IdePlatformKindTooling() {
@@ -45,19 +52,28 @@ class NativeIdePlatformKindTooling : IdePlatformKindTooling() {
     override fun getLibraryVersionProvider(project: Project): (Library) -> String? = { null }
 
     override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
-        return getGenericTestIcon(declaration, descriptor) {
-            val availableRunConfigurations = RunConfigurationProducer
-                .getProducers(declaration.project)
-                .asSequence()
-                .filterIsInstance<KotlinNativeRunConfigurationProvider>()
-                .filter { it.isForTests }
+        if (!descriptor.isKotlinTestDeclaration()) return null
 
-            if (availableRunConfigurations.firstOrNull() == null) {
-                return@getGenericTestIcon null
+        val moduleName = descriptor.module.stableName?.asString() ?: ""
+        val targetName = moduleName.substringAfterLast(".").removeSuffix("Test>")
+
+        val urls = when (declaration) {
+            is KtClassOrObject -> {
+                val lightClass = declaration.toLightClass() ?: return null
+                listOf("java:suite://${lightClass.qualifiedName}")
             }
 
-            return@getGenericTestIcon emptyList()
+            is KtNamedFunction -> {
+                val lightMethod = declaration.toLightMethods().firstOrNull() ?: return null
+                val lightClass = lightMethod.containingClass as? KtLightClass ?: return null
+                val baseName = "java:test://${lightClass.qualifiedName}.${lightMethod.name}"
+                listOf("$baseName[${targetName}X64]", "$baseName[$targetName]", baseName)
+            }
+
+            else -> return null
         }
+
+        return getTestStateIcon(urls, declaration.project, strict = false)
     }
 
     override fun acceptsAsEntryPoint(function: KtFunction): Boolean {
diff --git a/idea/idea-new-project-wizard/build.gradle.kts b/idea/idea-new-project-wizard/build.gradle.kts
index 27dce10a09c..c8b97951cd1 100644
--- a/idea/idea-new-project-wizard/build.gradle.kts
+++ b/idea/idea-new-project-wizard/build.gradle.kts
@@ -13,9 +13,7 @@ dependencies {
     compileOnly(intellijCoreDep())
     compileOnly(intellijDep())
     compileOnly(intellijPluginDep("gradle"))
-    Platform[193].orHigher {
-        compileOnly(intellijPluginDep("gradle-java"))
-    }
+    compileOnly(intellijPluginDep("gradle-java"))
 
     testImplementation(projectTests(":idea"))
     testImplementation(project(":libraries:tools:new-project-wizard:new-project-wizard-cli"))
diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.193 b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.193
deleted file mode 100644
index 6d485c9908c..00000000000
--- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.193
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.tools.projectWizard.wizard.service
-
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.tools.projectWizard.core.Reader
-import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult
-import org.jetbrains.kotlin.tools.projectWizard.core.UNIT_SUCCESS
-import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWizardService
-import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.ModuleIR
-import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType
-import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.isGradle
-import org.jetbrains.plugins.gradle.service.project.open.linkAndRefreshGradleProject
-import java.nio.file.Path
-
-class IdeaGradleWizardService(private val project: Project) : ProjectImportingWizardService,
-    IdeaWizardService {
-    override fun isSuitableFor(buildSystemType: BuildSystemType): Boolean =
-        buildSystemType.isGradle
-
-    override fun importProject(
-        reader: Reader,
-        path: Path,
-        modulesIrs: List<ModuleIR>,
-        buildSystem: BuildSystemType
-    ): TaskResult<Unit> {
-        withGradleWrapperEnabled {
-            linkAndRefreshGradleProject(path.toString(), project)
-        }
-        return UNIT_SUCCESS
-    }
-
-    private fun withGradleWrapperEnabled(action: () -> Unit) {
-        val oldGradleDistributionType = System.getProperty("idea.gradle.distributionType")
-        System.setProperty("idea.gradle.distributionType", "WRAPPED")
-        try {
-            action()
-        } finally {
-            if (oldGradleDistributionType != null) {
-                System.setProperty("idea.gradle.distributionType", oldGradleDistributionType)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.193 b/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.193
deleted file mode 100644
index 296417b6c85..00000000000
--- a/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.193
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.console
-
-import com.intellij.execution.ExecutionManager
-import com.intellij.execution.Executor
-import com.intellij.execution.ui.RunContentDescriptor
-import com.intellij.openapi.compiler.CompilerManager
-import com.intellij.openapi.module.Module
-import com.intellij.openapi.project.Project
-import com.intellij.task.ProjectTaskContext
-import com.intellij.task.ProjectTaskManager
-import com.intellij.task.ProjectTaskNotification
-import com.intellij.task.ProjectTaskResult
-
-class ConsoleCompilerHelper(
-    private val project: Project,
-    private val module: Module,
-    private val executor: Executor,
-    private val contentDescriptor: RunContentDescriptor
-) {
-
-    fun moduleIsUpToDate(): Boolean {
-        val compilerManager = CompilerManager.getInstance(project)
-        val compilerScope = compilerManager.createModuleCompileScope(module, true)
-        return compilerManager.isUpToDate(compilerScope)
-    }
-
-    fun compileModule() {
-        if (ExecutionManager.getInstance(project).contentManager.removeRunContent(executor, contentDescriptor)) {
-            ProjectTaskManager.getInstance(project).build(module).onSuccess { executionResult ->
-                if (!module.isDisposed) {
-                    KotlinConsoleKeeper.getInstance(project).run(module, previousCompilationFailed = executionResult.hasErrors())
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts
index 4525af69b9f..b33b5546e5c 100644
--- a/idea/idea-test-framework/build.gradle.kts
+++ b/idea/idea-test-framework/build.gradle.kts
@@ -15,9 +15,7 @@ dependencies {
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(commonDep("junit:junit"))
     testCompileOnly(intellijDep())
-    Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java"))
-    }
+    testCompileOnly(intellijPluginDep("java"))
 }
 
 sourceSets {
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/GradleProcessOutputInterceptor.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/GradleProcessOutputInterceptor.kt
similarity index 95%
rename from idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/GradleProcessOutputInterceptor.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/GradleProcessOutputInterceptor.kt
index 1158e4d1282..63cc01831a2 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/GradleProcessOutputInterceptor.kt
+++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/GradleProcessOutputInterceptor.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.testFramework
+package org.jetbrains.kotlin.idea.test
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId
@@ -12,7 +12,6 @@ import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotifica
 import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationListener.EP_NAME as EP
 import com.intellij.testFramework.ExtensionTestUtil.maskExtensions
 import org.jetbrains.kotlin.idea.framework.GRADLE_SYSTEM_ID
-import org.jetbrains.kotlin.idea.perf.util.gradleMessage
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import java.lang.Exception
 import kotlin.test.assertNull
@@ -49,7 +48,6 @@ private class GradleProcessOutputInterceptorImpl : GradleProcessOutputIntercepto
 
     override fun onTaskOutput(id: ExternalSystemTaskId, text: String, stdOut: Boolean) {
         if (id.projectSystemId == GRADLE_SYSTEM_ID && text.isNotEmpty()) {
-            gradleMessage { text }
             buffer.append(text)
         }
     }
diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt
index dd15cba1275..7a30408b6e9 100644
--- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt
+++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt
@@ -9,7 +9,7 @@ import com.intellij.ide.startup.impl.StartupManagerImpl
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupManager
 
-// FIX ME WHEN BUNCH 193 REMOVED
+// FIX ME WHEN BUNCH 201 REMOVED
 fun runPostStartupActivitiesOnce(project: Project) {
     (StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivitiesRegisteredDynamically()
 }
\ No newline at end of file
diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.193 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.193
deleted file mode 100644
index b2f030b178d..00000000000
--- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.193
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.test
-
-import com.intellij.ide.startup.impl.StartupManagerImpl
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupManager
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun runPostStartupActivitiesOnce(project: Project) {
-    (StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities()
-}
\ No newline at end of file
diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.202 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.202
index 16f71df5d32..546cf746145 100644
--- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.202
+++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.202
@@ -7,6 +7,5 @@ package org.jetbrains.kotlin.idea.test
 
 import com.intellij.openapi.project.Project
 
-// FIX ME WHEN BUNCH 193 REMOVED
 fun runPostStartupActivitiesOnce(project: Project) {
 }
diff --git a/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts
index e78067d314c..65cdde8e928 100644
--- a/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts
+++ b/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts
@@ -14,9 +14,7 @@ dependencies {
     compileOnly(toolsJarApi())
     compileOnly(intellijDep())
     
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 
     compileOnly(intellijPluginDep("stream-debugger"))
 
diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts
index e5482a06df3..cb2a956c476 100644
--- a/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts
+++ b/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts
@@ -10,9 +10,7 @@ dependencies {
     compileOnly(toolsJarApi())
     compileOnly(intellijDep())
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/coroutineStackFrameItems.kt.193 b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/coroutineStackFrameItems.kt.193
deleted file mode 100644
index e7796e3b3cf..00000000000
--- a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/coroutineStackFrameItems.kt.193
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.debugger.coroutine.data
-
-import com.intellij.debugger.engine.DebugProcessImpl
-import com.intellij.debugger.engine.JVMStackFrameInfoProvider
-import com.intellij.debugger.engine.evaluation.EvaluationContextImpl
-import com.intellij.debugger.jdi.StackFrameProxyImpl
-import com.intellij.debugger.memory.utils.StackFrameItem
-import com.intellij.xdebugger.frame.XCompositeNode
-import com.intellij.xdebugger.frame.XNamedValue
-import com.intellij.xdebugger.frame.XStackFrame
-import com.intellij.xdebugger.frame.XValueChildrenList
-import com.sun.jdi.Location
-import org.jetbrains.kotlin.idea.debugger.*
-import org.jetbrains.kotlin.idea.debugger.coroutine.KotlinDebuggerCoroutinesBundle
-import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.LocationStackFrameProxyImpl
-import org.jetbrains.kotlin.idea.debugger.coroutine.util.findPosition
-import org.jetbrains.kotlin.idea.debugger.coroutine.util.isFilteredInvokeSuspend
-import org.jetbrains.kotlin.idea.debugger.coroutine.util.logger
-import org.jetbrains.kotlin.idea.debugger.stackFrame.KotlinStackFrame
-
-/**
- * Creation frame of coroutine either in RUNNING or SUSPENDED state.
- */
-class CreationCoroutineStackFrameItem(
-    val stackTraceElement: StackTraceElement,
-    location: Location,
-    val first: Boolean
-) : CoroutineStackFrameItem(location, emptyList()) {
-
-    override fun createFrame(debugProcess: DebugProcessImpl): CoroutineGeneratedFrame? {
-        return debugProcess.invokeInManagerThread {
-            val frame = debugProcess.findFirstFrame() ?: return@invokeInManagerThread null
-            val locationFrame = LocationStackFrameProxyImpl(location, frame)
-            val position = location.findPosition(debugProcess.project)
-            CreationCoroutineStackFrame(debugProcess, this, first)
-        }
-    }
-}
-
-/**
- * Restored frame in SUSPENDED coroutine, not attached to any thread.
- */
-class SuspendCoroutineStackFrameItem(
-    val stackTraceElement: StackTraceElement,
-    location: Location,
-    spilledVariables: List<XNamedValue> = emptyList()
-) : CoroutineStackFrameItem(location, spilledVariables)
-
-/**
- * Restored from memory dump
- */
-class DefaultCoroutineStackFrameItem(location: Location, spilledVariables: List<XNamedValue>) :
-    CoroutineStackFrameItem(location, spilledVariables) {
-
-    override fun createFrame(debugProcess: DebugProcessImpl): CoroutineGeneratedFrame? {
-        return debugProcess.invokeInManagerThread {
-            val frame = debugProcess.findFirstFrame() ?: return@invokeInManagerThread null
-            val locationStackFrameProxyImpl = LocationStackFrameProxyImpl(location, frame)
-            val position = location.findPosition(debugProcess.project) ?: return@invokeInManagerThread null
-            CoroutineStackFrame(debugProcess, this)
-        }
-    }
-}
-
-/**
- * Original frame appeared before resumeWith call.
- *
- * Sequence is the following
- *
- * - KotlinStackFrame
- * - invokeSuspend(KotlinStackFrame) -|
- *                                    | replaced with CoroutinePreflightStackFrame
- * - resumeWith(KotlinStackFrame) ----|
- * - Kotlin/JavaStackFrame -> PreCoroutineStackFrameItem : CoroutinePreflightStackFrame.threadPreCoroutineFrames
- *
- */
-open class RunningCoroutineStackFrameItem(
-    val frame: StackFrameProxyImpl,
-    spilledVariables: List<XNamedValue> = emptyList()
-) : CoroutineStackFrameItem(frame.location(), spilledVariables), FrameProvider {
-    override fun createFrame(debugProcess: DebugProcessImpl): CoroutineGeneratedFrame? {
-        return debugProcess.invokeInManagerThread {
-            CoroutineStackFrame(debugProcess, this)
-        }
-    }
-
-    override fun provideFrame(debugProcess: DebugProcessImpl): XStackFrame? =
-        debugProcess.invokeInManagerThread { KotlinStackFrame(frame) }
-}
-
-sealed class CoroutineStackFrameItem(val location: Location, val spilledVariables: List<XNamedValue>) :
-    StackFrameItem(location, spilledVariables) {
-    val log by logger
-
-    override fun createFrame(debugProcess: DebugProcessImpl): CoroutineGeneratedFrame? {
-        return debugProcess.invokeInManagerThread {
-            CoroutineStackFrame(debugProcess, this)
-        }
-    }
-
-    fun uniqueId() =
-        location.safeSourceName() + ":" + location.safeMethod().toString() + ":" +
-                location.safeLineNumber() + ":" + location.safeKotlinPreferredLineNumber()
-}
-
-interface FrameProvider {
-    fun provideFrame(debugProcess: DebugProcessImpl): XStackFrame?
-}
-
-fun DebugProcessImpl.findFirstFrame(): StackFrameProxyImpl? =
-    suspendManager.pausedContext.thread?.forceFrames()?.firstOrNull()
-
-/**
- * Coroutine exit frame represented by a stack frames
- * invokeSuspend():-1
- * resumeWith()
- *
- */
-class CoroutinePreflightFrame(
-    val coroutineInfoData: CoroutineInfoData,
-    private val frame: StackFrameProxyImpl,
-    val threadPreCoroutineFrames: List<StackFrameProxyImpl>,
-    val mode: SuspendExitMode
-) : KotlinStackFrame(frame), JVMStackFrameInfoProvider {
-
-    override fun superBuildVariables(evaluationContext: EvaluationContextImpl, children: XValueChildrenList) {
-        super.superBuildVariables(evaluationContext, children)
-        val topRestoredFrame = coroutineInfoData.stackTrace.firstOrNull()
-        if (topRestoredFrame != null && topRestoredFrame.location.isFilteredInvokeSuspend()) {
-            val firstFrameVariables: List<XNamedValue> = topRestoredFrame.spilledVariables
-            children.let {
-                val varNames = (0 until children.size()).map { children.getName(it) }.toSet()
-                firstFrameVariables.forEach {
-                    if (!varNames.contains(it.name))
-                        children.add(it)
-                }
-            }
-        }
-    }
-
-    override fun isInLibraryContent() = false
-
-    override fun isSynthetic() = false
-}
-
-class CreationCoroutineStackFrame(debugProcess: DebugProcessImpl, item: CoroutineStackFrameItem, val first: Boolean) : CoroutineStackFrame(debugProcess, item) {
-    override fun getCaptionAboveOf() = KotlinDebuggerCoroutinesBundle.message("coroutine.dump.creation.trace")
-
-    override fun hasSeparatorAbove(): Boolean =
-        first
-}
-
-open class CoroutineStackFrame(val debugProcess: DebugProcessImpl, val item: CoroutineStackFrameItem) :
-    StackFrameItem.CapturedStackFrame(debugProcess, item) {
-
-    override fun computeChildren(node: XCompositeNode) {
-        if (item is FrameProvider)
-            item.provideFrame(debugProcess)?.computeChildren(node)
-        else
-            super.computeChildren(node)
-    }
-
-    override fun getCaptionAboveOf() = "CoroutineExit"
-
-    override fun hasSeparatorAbove(): Boolean =
-        false
-}
-
-typealias CoroutineGeneratedFrame = StackFrameItem.CapturedStackFrame
\ No newline at end of file
diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts
index bd8d836bafa..19204e47edf 100644
--- a/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts
+++ b/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts
@@ -11,9 +11,7 @@ dependencies {
     compile(project(":idea:jvm-debugger:jvm-debugger-util"))
 
     compileOnly(toolsJarApi())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 
     compileOnly(intellijDep())
 
diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt
index fc30b211325..4aea9e05a7a 100644
--- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt
+++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt
@@ -189,6 +189,9 @@ private object DebugLabelModuleDescriptor : DeclarationDescriptorImpl(Annotation
     override val expectedByModules: List<ModuleDescriptor>
         get() = emptyList()
 
+    override val allExpectedByModules: Set<ModuleDescriptor>
+        get() = emptySet()
+
     override fun <T> getCapability(capability: ModuleCapability<T>): T? = null
 
     override val isValid: Boolean
diff --git a/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts
index 000cc3c6d66..f0d26ef04c4 100644
--- a/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts
+++ b/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts
@@ -9,9 +9,7 @@ dependencies {
 
     compileOnly(toolsJarApi())
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 
     compileOnly(intellijPluginDep("stream-debugger"))
 
diff --git a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts
index fc716e444b7..98ef6deb2b5 100644
--- a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts
+++ b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts
@@ -20,10 +20,8 @@ dependencies {
 
     testCompile(intellijPluginDep("stream-debugger"))
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "aether-dependency-resolver") }
-        testRuntime(intellijPluginDep("java"))
-    }
+    testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "aether-dependency-resolver") }
+    testRuntime(intellijPluginDep("java"))
 
     testRuntime(project(":nj2k:nj2k-services")) { isTransitive = false }
     testRuntime(project(":idea:idea-jvm"))
diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/multipleBreakpoints/thisLabels.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/multipleBreakpoints/thisLabels.out
index ad8f802e606..ca185b30c13 100644
--- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/multipleBreakpoints/thisLabels.out
+++ b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/multipleBreakpoints/thisLabels.out
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 LineBreakpoint created at thisLabels.kt:6
 LineBreakpoint created at thisLabels.kt:8
 LineBreakpoint created at thisLabels.kt:10
diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/hideSyntheticThis.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/hideSyntheticThis.out
index 89d9f50e199..84aa939489b 100644
--- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/hideSyntheticThis.out
+++ b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/hideSyntheticThis.out
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 LineBreakpoint created at hideSyntheticThis.kt:6
 Run Java
 Connected to the target VM
diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/lambdaAsValueArgument.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/lambdaAsValueArgument.out
index a57e681d931..009f1b04456 100644
--- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/lambdaAsValueArgument.out
+++ b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/lambdaAsValueArgument.out
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 LineBreakpoint created at lambdaAsValueArgument.kt:19
 Run Java
 Connected to the target VM
diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/stepIntoMultiFileFacade.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/stepIntoMultiFileFacade.out
index aaefedd5698..24744a9d50e 100644
--- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/stepIntoMultiFileFacade.out
+++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/stepIntoMultiFileFacade.out
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 LineBreakpoint created at stepIntoMultiFileFacade.kt:6
 Run Java
 Connected to the target VM
diff --git a/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts
index a81fb8454a5..e6d4a59ae9f 100644
--- a/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts
+++ b/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts
@@ -13,9 +13,7 @@ dependencies {
 
     compileOnly(toolsJarApi())
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 
     compileOnly(intellijDep())
 
diff --git a/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt b/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt
index 46ad86a15f7..9642a20a218 100644
--- a/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt
+++ b/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt
@@ -342,7 +342,8 @@ abstract class FileRankingCalculator(private val checkClassFqName: Boolean = tru
             bindingContext,
             ClassBuilderMode.LIGHT_CLASSES,
             "debugger",
-            KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT // TODO use proper LanguageVersionSettings
+            KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT, // TODO use proper LanguageVersionSettings
+            useOldInlineClassesManglingScheme = false
         )
     }
 
diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts
index f716b85ac90..60b4dd929f4 100644
--- a/idea/kotlin-gradle-tooling/build.gradle.kts
+++ b/idea/kotlin-gradle-tooling/build.gradle.kts
@@ -12,9 +12,6 @@ dependencies {
 
     compileOnly(intellijPluginDep("gradle"))
     compileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") }
-    Platform[193].orLower {
-        compile(project(":idea:idea-gradle-tooling-api"))
-    }
 }
 
 sourceSets {
diff --git a/idea/performanceTests/build.gradle.kts b/idea/performanceTests/build.gradle.kts
index 4d528ad9c7d..991f17e8399 100644
--- a/idea/performanceTests/build.gradle.kts
+++ b/idea/performanceTests/build.gradle.kts
@@ -22,9 +22,6 @@ dependencies {
     testRuntimeOnly(project(":nj2k:nj2k-services"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":idea:kotlin-gradle-tooling"))
-    Platform[193].orLower {
-        testRuntimeOnly(project(":idea:idea-gradle-tooling-api"))
-    }
     testRuntimeOnly(project(":kotlin-gradle-statistics"))
 
     testImplementation(intellijPluginDep("gradle"))
@@ -38,23 +35,16 @@ dependencies {
     testImplementation(commonDep("junit:junit"))
     testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.+")
     testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.+")
+    testImplementation("khttp:khttp:1.0.0")
 
+    testCompileOnly(intellijPluginDep("java"))
+    testRuntimeOnly(intellijPluginDep("java"))
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
-
-    Platform[193].orHigher {
-        testImplementation(intellijPluginDep("gradle-java"))
-        testRuntimeOnly(intellijPluginDep("gradle-java"))
-    }
+    testImplementation(intellijPluginDep("gradle-java"))
+    testRuntimeOnly(intellijPluginDep("gradle-java"))
 
     testCompileOnly(intellijDep())
     testCompileOnly(project(":nj2k"))
-    Platform[193].orLower {
-        testCompileOnly(project(":idea:idea-gradle-tooling-api"))
-    }
     testCompileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") }
 }
 
@@ -147,5 +137,14 @@ projectTest(taskName = "wholeProjectsPerformanceTest") {
     }
 }
 
+task("aggregateResults", JavaExec::class) {
+    dependsOn(":idea:performanceTests:performanceTest")
+
+    main = "org.jetbrains.kotlin.idea.perf.util.AggregateResultsKt"
+    classpath = sourceSets["test"].runtimeClasspath
+    workingDir = rootDir
+    args(listOf(File(rootDir, "build")))
+}
+
 
 testsJar()
\ No newline at end of file
diff --git a/idea/performanceTests/resources/TestData addImport geomMean - vega.js b/idea/performanceTests/resources/TestData addImport geomMean - vega.js
new file mode 100644
index 00000000000..a63012f014f
--- /dev/null
+++ b/idea/performanceTests/resources/TestData addImport geomMean - vega.js	
@@ -0,0 +1,408 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+{
+  "note": "May https://vega.github.io/vega/docs/ be with you",
+  "$schema": "https://vega.github.io/schema/vega/v4.3.0.json",
+  "description": "TestData addImport geomMean",
+  "title": "TestData addImport geomMean",
+  "width": 800,
+  "height": 500,
+  "padding": 5,
+  "autosize": {"type": "pad", "resize": true},
+  "signals": [
+    {
+      "name": "clear",
+      "value": true,
+      "on": [
+        {"events": "mouseup[!event.item]", "update": "true", "force": true}
+      ]
+    },
+    {
+      "name": "shift",
+      "value": false,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "update": "event.shiftKey",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "clicked",
+      "value": null,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "comment": "note: here `datum` is `selected` data set",
+          "update": "{value: datum.value}",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "brush",
+      "value": 0,
+      "on": [
+        {"events": {"signal": "clear"}, "update": "clear ? [0, 0] : brush"},
+        {"events": "@xaxis:mousedown", "update": "[x(), x()]"},
+        {
+          "events": "[@xaxis:mousedown, window:mouseup] > window:mousemove!",
+          "update": "[brush[0], clamp(x(), 0, width)]"
+        },
+        {
+          "events": {"signal": "delta"},
+          "update": "clampRange([anchor[0] + delta, anchor[1] + delta], 0, width)"
+        }
+      ]
+    },
+    {
+      "name": "anchor",
+      "value": null,
+      "on": [{"events": "@brush:mousedown", "update": "slice(brush)"}]
+    },
+    {
+      "name": "xdown",
+      "value": 0,
+      "on": [{"events": "@brush:mousedown", "update": "x()"}]
+    },
+    {
+      "name": "delta",
+      "value": 0,
+      "on": [
+        {
+          "events": "[@brush:mousedown, window:mouseup] > window:mousemove!",
+          "update": "x() - xdown"
+        }
+      ]
+    },
+    {
+      "name": "domain",
+      "on": [
+        {
+          "events": {"signal": "brush"},
+          "update": "span(brush) ? invert('x', brush) : null"
+        }
+      ]
+    },
+    {"name": "timestamp", "value": true, "bind": {"input": "checkbox"}}
+  ],
+  "data": [
+    {
+      "name": "table",
+      "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
+      "_values": {
+        "comment": "same as `TestData highlight - vega.js`"
+      },
+      "url": {
+        //"comment": "source index pattern",
+        "index": "kotlin_ide_benchmarks*",
+        //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
+        //"comment": "it uses Kibana specific %timefilter% for time frame selection",
+        "body": {
+          "size": 0,
+          "query": {
+            "bool": {
+              "must": [
+                {"exists": {"field": "synthetic"}},
+                {
+                  "bool": {
+                    "must_not": [
+                       {"exists": {"field": "warmUp"}}
+                     ]
+                   }
+                },
+                {"term": {"benchmark.keyword": "add-import"}},
+                {"term": {"name.keyword": "geomMean"}},
+                {"range": {"buildTimestamp": {"%timefilter%": true}}}
+              ]
+            }
+          },
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 500,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "format": {"property": "aggregations"},
+      "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
+      "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
+      "transform": [
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["metricName", "name", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
+        {
+          "type": "formula",
+          "as": "timestamp",
+          "expr": "timeFormat(toDate(datum.buildTimestamp), '%Y-%m-%d %H:%M')"
+        },
+        {
+          "comment": "create `url` value that points to TC build",
+          "type": "formula",
+          "as": "url",
+          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
+      ]
+    },
+    {
+      "name": "selected",
+      "on": [
+        {"trigger": "clear", "remove": true},
+        {"trigger": "!shift", "remove": true},
+        {"trigger": "!shift && clicked", "insert": "clicked"},
+        {"trigger": "shift && clicked", "toggle": "clicked"}
+      ]
+    }
+  ],
+  "axes": [
+    {
+      "scale": "x",
+      "grid": true,
+      "domain": false,
+      "orient": "bottom",
+      "labelAngle": -20,
+      "labelAlign": "right",
+      "title": {"signal": "timestamp ? 'timestamp' : 'buildId'"},
+      "titlePadding": 10,
+      "tickCount": 5,
+      "encode": {
+        "labels": {
+          "interactive": true,
+          "update": {"tooltip": {"signal": "datum.label"}}
+        }
+      }
+    },
+    {
+      "scale": "y",
+      "grid": true,
+      "domain": false,
+      "orient": "left",
+      "titlePadding": 10,
+      "title": "ms",
+      "titleAnchor": "end",
+      "titleAngle": 0
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "point",
+      "range": "width",
+      "domain": {"data": "table", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}}
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricValue"}
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category",
+      "domain": {"data": "table", "field": "metricName"}
+    },
+    {
+      "name": "size",
+      "type": "linear",
+      "round": true,
+      "nice": false,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricError"},
+      "range": [1, 100]
+    }
+  ],
+  "legends": [
+    {
+      "title": "Cases",
+      "stroke": "color",
+      "strokeColor": "#ccc",
+      "padding": 8,
+      "cornerRadius": 4,
+      "symbolLimit": 50,
+      "encode": {
+        "symbols": {
+          "name": "legendSymbol",
+          "interactive": true,
+          "update": {
+            "fill": {"value": "transparent"},
+            "strokeWidth": {"value": 2},
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 0.7
+              },
+              {"value": 0.15}
+            ],
+            "size": {"value": 64}
+          }
+        },
+        "labels": {
+          "name": "legendLabel",
+          "interactive": true,
+          "update": {
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 1
+              },
+              {"value": 0.25}
+            ]
+          }
+        }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "facet": {"name": "series", "data": "table", "groupby": "metricName"}
+      },
+      "marks": [
+        {
+          "type": "line",
+          "from": {"data": "series"},
+          "encode": {
+            "hover": {"opacity": {"value": 1}, "strokeWidth": {"value": 4}},
+            "update": {
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 2},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 0.7
+                },
+                {"value": 0.15}
+              ],
+              "stroke": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "scale": "color",
+                  "field": "metricName"
+                },
+                {"value": "#ccc"}
+              ]
+            }
+          }
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "fill": {"value": "#B00"},
+              "size": [{ "test": "datum.hasError", "value": 250 }, {"value": 0}],
+              "shape": {"value": "cross"},
+              "angle": {"value": 45},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain))  && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 1
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "tooltip": {
+                "signal": "datum.metricName + ': ' + datum.metricValue + ' ms'"
+              },
+              "href": {"field": "url"},
+              "cursor": {"value": "pointer"},
+              "size": {"scale": "size", "field": "metricError"},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "fill": {"scale": "color", "field": "metricName"}
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 2
+        }
+      ]
+    }
+  ]
+}
diff --git a/idea/performanceTests/resources/TestData completion geomMean - vega.js b/idea/performanceTests/resources/TestData completion geomMean - vega.js
index ace4400a200..4fc261a47a2 100644
--- a/idea/performanceTests/resources/TestData completion geomMean - vega.js	
+++ b/idea/performanceTests/resources/TestData completion geomMean - vega.js	
@@ -95,98 +95,33 @@
       "name": "table",
       "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
       "_values": {
-       "hits" : {
-         "hits" : [
-           {
-             "_source" : {
-               "buildTimestamp" : "2020-10-14T15:12:14+0000",
-               "buildId" : 90615916,
-               "metrics" : [
-                 {
-                   "hasError" : true
-                 }
-               ],
-               "geomMean" : 157,
-               "benchmark" : "completion-basic"
-             }
-           },
-           {
-             "_source" : {
-               "buildTimestamp" : "2020-10-14T13:15:31+0000",
-               "buildId" : 90615916,
-               "geomMean" : 80,
-               "benchmark" : "completion-basic-charFilter"
-             }
-           },
-           {
-             "_source" : {
-               "buildTimestamp" : "2020-10-14T10:53:52+0000",
-               "buildId" : 90597868,
-               "geomMean" : 160,
-               "benchmark" : "completion-basic"
-             }
-           },
-           {
-             "_source" : {
-               "buildTimestamp" : "2020-10-14T08:57:05+0000",
-               "buildId" : 90597868,
-               "geomMean" : 79,
-               "benchmark" : "completion-basic-charFilter"
-             }
-           },
-           {
-             "_source" : {
-               "buildTimestamp" : "2020-10-14T03:04:10+0000",
-               "buildId" : 90570192,
-               "geomMean" : 79,
-               "benchmark" : "completion-basic-charFilter"
-             }
-           },
-           {
-             "_source" : {
-               "buildTimestamp" : "2020-10-14T03:04:09+0000",
-               "buildId" : 90570192,
-               "geomMean" : 60,
-               "benchmark" : "completion-basic"
-             }
-           },
-           {
-             "_source" : {
-               "buildTimestamp" : "2020-10-14T00:42:58+0000",
-               "buildId" : 90546466,
-               "geomMean" : 158,
-               "benchmark" : "completion-basic"
-             }
-           }
-         ]
-       }
-     },
-
+        "comment": "same as `TestData highlight - vega.js`"
+      },
       "url": {
         //"comment": "source index pattern",
         "index": "kotlin_ide_benchmarks*",
         //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
         //"comment": "it uses Kibana specific %timefilter% for time frame selection",
         "body": {
-          "size": 1000,
+          "size": 0,
           "query": {
             "bool": {
               "must": [
                 {"range": {"buildTimestamp": {"%timefilter%": true}}},
+                {
+                  "bool": {
+                    "should": [
+                       {"exists": {"field": "synthetic"}},
+                       {"term": {"name.keyword": "geomMean"}}
+                     ]
+                   }
+                },
                 {
                   "bool": {
                     "should": [
                       {"term": {"benchmark.keyword": "completion-basic"}},
-                      {
-                        "term": {
-                          "benchmark.keyword": "completion-basic-charFilter"
-                        }
-                      },
-                      {
-                        "term": {
-                          "benchmark.keyword": "completion-basic-keyword"
-                        }
-                      },
+                      {"term": {"benchmark.keyword": "completion-basic-charFilter"}},
+                      {"term": {"benchmark.keyword": "completion-basic-keyword"}},
                       {"term": {"benchmark.keyword": "completion-incremental"}},
                       {"term": {"benchmark.keyword": "completion-smart"}}
                     ]
@@ -195,56 +130,78 @@
               ]
             }
           },
-          "_source": ["buildId", "benchmark", "buildTimestamp", "metrics.hasError", "geomMean"],
-          "sort": [{"buildTimestamp": {"order": "asc"}}]
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 500,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       },
-      "format": {"property": "hits.hits"},
+      "format": {"property": "aggregations"},
       "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
       "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
       "transform": [
-        {"type": "collect","sort": {"field": "_source.buildTimestamp"}},
-        {
-          "comment": "make alias: _source.buildId -> buildId",
-          "type": "formula",
-          "as": "buildId",
-          "expr": "datum._source.buildId"
-        },
-        {
-          "comment": "make alias: _source.benchmark -> metricName",
-          "type": "formula",
-          "as": "metricName",
-          "expr": "datum._source.benchmark"
-        },
-        {
-          "comment": "make alias: _source.geomMean -> metricValue",
-          "type": "formula",
-          "as": "metricValue",
-          "expr": "datum._source.geomMean"
-        },
-        {
-          "comment": "define metricError",
-          "type": "formula",
-          "as": "metricError",
-          "expr": "1"
-        },
-        {
-          "comment": "make alias: _source.metrics[0].hasError -> hasError",
-          "type": "formula",
-          "as": "hasError",
-          "expr": "datum._source.metrics ? datum._source.metrics[0].hasError : false"
-        },
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["metricName", "name", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
         {
           "type": "formula",
           "as": "timestamp",
-          "expr": "timeFormat(toDate(datum._source.buildTimestamp), '%Y-%m-%d %H:%M')"
+          "expr": "timeFormat(toDate(datum.buildTimestamp), '%Y-%m-%d %H:%M')"
         },
         {
           "comment": "create `url` value that points to TC build",
           "type": "formula",
           "as": "url",
-          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum._source.buildId"
-        }
+          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
       ]
     },
     {
diff --git a/idea/performanceTests/resources/TestData highlight - vega.js b/idea/performanceTests/resources/TestData highlight - vega.js
index bebf4299011..9781d7eaaee 100644
--- a/idea/performanceTests/resources/TestData highlight - vega.js	
+++ b/idea/performanceTests/resources/TestData highlight - vega.js	
@@ -95,64 +95,95 @@
       "name": "table",
       "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
       "_values": {
-        "hits" : {
-          "hits" : [
-            {
-              "_source" : {
-                "buildId" : 87834896,
-                "buildTimestamp" : "2020-09-21T21:00:31+0000",
-                "metrics" : [
-                  {"metricName" : "NonNullAssertion", "metricValue" : 31, "metricError" : 1 },
-                  {"metricName" : "PropertiesWithPropertyDeclarations", "metricValue" : 191, "metricError" : 4 }
-                ],
-                "benchmark" : "highlight"
+        "aggregations" : {
+          "benchmark" : {
+            "doc_count_error_upper_bound" : 0,
+            "sum_other_doc_count" : 0,
+            "buckets" : [
+              {
+                "key" : "highlight",
+                "doc_count" : 1034,
+                "name" : {
+                  "doc_count_error_upper_bound" : 0,
+                  "sum_other_doc_count" : 0,
+                  "buckets" : [
+                    {
+                      "key" : "Annotations",
+                      "doc_count" : 23,
+                      "values" : {
+                        "buckets" : [
+                          {
+                            "key_as_string" : "2020-11-02T09:00:00.000Z",
+                            "key" : 1604307600000,
+                            "doc_count" : 3,
+                            "avgError" : {
+                              "value" : 1.0
+                            },
+                            "avgValue" : {
+                              "value" : 129.0
+                            },
+                            "buildId" : {
+                              "doc_count_error_upper_bound" : 0,
+                              "sum_other_doc_count" : 1,
+                              "buckets" : [
+                                {
+                                  "key" : 93277596,
+                                  "doc_count" : 2
+                                }
+                              ]
+                            }
+                          },
+                          {
+                            "key_as_string" : "2020-11-02T21:00:00.000Z",
+                            "key" : 1604350800000,
+                            "doc_count" : 3,
+                            "avgError" : {
+                              "value" : 1.0
+                            },
+                            "avgValue" : {
+                              "value" : 41.0
+                            },
+                            "buildId" : {
+                              "doc_count_error_upper_bound" : 0,
+                              "sum_other_doc_count" : 2,
+                              "buckets" : [
+                                {
+                                  "key" : 93400366,
+                                  "doc_count" : 1
+                                }
+                              ]
+                            }
+                          },
+                          {
+                            "key_as_string" : "2020-11-03T09:00:00.000Z",
+                            "key" : 1604394000000,
+                            "doc_count" : 2,
+                            "avgError" : {
+                              "value" : 1.5
+                            },
+                            "avgValue" : {
+                              "value" : 42.0
+                            },
+                            "buildId" : {
+                              "doc_count_error_upper_bound" : 0,
+                              "sum_other_doc_count" : 1,
+                              "buckets" : [
+                                {
+                                  "key" : 93507855,
+                                  "doc_count" : 1
+                                }
+                              ]
+                            }
+                          }
+                        ],
+                        "interval" : "12h"
+                      }
+                    }
+                  ]
+                }
               }
-            },
-            {
-              "_source" : {
-                "buildId" : 87783396,
-                "buildTimestamp" : "2020-09-21T12:34:19+0000",
-                "metrics" : [
-                  {"metricName" : "NonNullAssertion", "metricValue" : 32, "metricError" : 1 },
-                  {"metricName" : "PropertiesWithPropertyDeclarations", "metricValue" : 189, "metricError" : 4 }
-                ],
-                "benchmark" : "highlight"
-              }
-            },
-            {
-              "_source" : {
-                "buildId" : 87809918,
-                "buildTimestamp" : "2020-09-21T16:47:11+0000",
-                "metrics" : [
-                  {"metricName" : "NonNullAssertion", "metricValue" : 30, "metricError" : 1 },
-                  {"metricName" : "PropertiesWithPropertyDeclarations", "metricValue" : 188, "metricError" : 4 }
-                ],
-                "benchmark" : "highlight"
-              }
-            },
-            {
-              "_source" : {
-                "buildId" : 87905203,
-                "buildTimestamp" : "2020-09-22T13:23:44+0000",
-                "metrics" : [
-                  {"metricName" : "NonNullAssertion", "metricValue" : 30, "metricError" : 1 },
-                  {"metricName" : "PropertiesWithPropertyDeclarations", "metricValue" : 180, "metricError" : 4 }
-                ],
-                "benchmark" : "highlight"
-              }
-            },
-            {
-              "_source" : {
-                "buildId" : 87894638,
-                "buildTimestamp" : "2020-09-22T09:12:16+0000",
-                "metrics" : [
-                  {"metricName" : "NonNullAssertion", "metricValue" : 32, "metricError" : 1 },
-                  {"metricName" : "PropertiesWithPropertyDeclarations", "metricValue" : 193, "metricError" : 4 }
-                ],
-                "benchmark" : "highlight"
-              }
-            }
-          ]
+            ]
+          }
         }
       },
       "url": {
@@ -161,45 +192,83 @@
         //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
         //"comment": "it uses Kibana specific %timefilter% for time frame selection",
         "body": {
-          "size": 1000,
+          "size": 0,
           "query": {
             "bool": {
               "must": [
+                {
+                  "bool": {
+                    "must_not": [
+                       {"exists": {"field": "warmUp"}},
+                       {"exists": {"field": "synthetic"}}
+                     ]
+                   }
+                },
                 {"term": {"benchmark.keyword": "highlight"}},
                 {"range": {"buildTimestamp": {"%timefilter%": true}}}
               ]
             }
           },
-          "_source": [
-            "buildId",
-            "benchmark",
-            "buildTimestamp",
-            "metrics.hasError",
-            "metrics.metricName",
-            "metrics.metricValue",
-            "metrics.metricError"
-          ],
-          "sort": [{"buildTimestamp": {"order": "asc"}}]
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 500,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       },
-      "format": {"property": "hits.hits"},
+      "format": {"property": "aggregations"},
       "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
       "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
       "transform": [
-        {"type": "collect","sort": {"field": "_source.buildTimestamp"}},
-        {"type": "flatten", "fields": ["_source.metrics"], "as": ["metrics"]},
-        {
-          "type": "project",
-          "fields": [
-            "_source.buildId",
-            "_source.buildTimestamp",
-            "metrics.hasError",
-            "metrics.metricName",
-            "metrics.metricValue",
-            "metrics.metricError"
-          ],
-          "as": ["buildId", "buildTimestamp", "hasError", "metricName", "metricValue", "metricError"]
-        },
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["benchmark", "metricName", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
         {
           "type": "formula",
           "as": "timestamp",
@@ -210,7 +279,8 @@
           "type": "formula",
           "as": "url",
           "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
-        }
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
       ]
     },
     {
diff --git a/idea/performanceTests/resources/TestData highlight geomMean - vega.js b/idea/performanceTests/resources/TestData highlight geomMean - vega.js
new file mode 100644
index 00000000000..85eea8f1943
--- /dev/null
+++ b/idea/performanceTests/resources/TestData highlight geomMean - vega.js	
@@ -0,0 +1,408 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+{
+  "note": "May https://vega.github.io/vega/docs/ be with you",
+  "$schema": "https://vega.github.io/schema/vega/v4.3.0.json",
+  "description": "TestData highlight geomMean",
+  "title": "TestData highlight geomMean",
+  "width": 800,
+  "height": 500,
+  "padding": 5,
+  "autosize": {"type": "pad", "resize": true},
+  "signals": [
+    {
+      "name": "clear",
+      "value": true,
+      "on": [
+        {"events": "mouseup[!event.item]", "update": "true", "force": true}
+      ]
+    },
+    {
+      "name": "shift",
+      "value": false,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "update": "event.shiftKey",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "clicked",
+      "value": null,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "comment": "note: here `datum` is `selected` data set",
+          "update": "{value: datum.value}",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "brush",
+      "value": 0,
+      "on": [
+        {"events": {"signal": "clear"}, "update": "clear ? [0, 0] : brush"},
+        {"events": "@xaxis:mousedown", "update": "[x(), x()]"},
+        {
+          "events": "[@xaxis:mousedown, window:mouseup] > window:mousemove!",
+          "update": "[brush[0], clamp(x(), 0, width)]"
+        },
+        {
+          "events": {"signal": "delta"},
+          "update": "clampRange([anchor[0] + delta, anchor[1] + delta], 0, width)"
+        }
+      ]
+    },
+    {
+      "name": "anchor",
+      "value": null,
+      "on": [{"events": "@brush:mousedown", "update": "slice(brush)"}]
+    },
+    {
+      "name": "xdown",
+      "value": 0,
+      "on": [{"events": "@brush:mousedown", "update": "x()"}]
+    },
+    {
+      "name": "delta",
+      "value": 0,
+      "on": [
+        {
+          "events": "[@brush:mousedown, window:mouseup] > window:mousemove!",
+          "update": "x() - xdown"
+        }
+      ]
+    },
+    {
+      "name": "domain",
+      "on": [
+        {
+          "events": {"signal": "brush"},
+          "update": "span(brush) ? invert('x', brush) : null"
+        }
+      ]
+    },
+    {"name": "timestamp", "value": true, "bind": {"input": "checkbox"}}
+  ],
+  "data": [
+    {
+      "name": "table",
+      "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
+      "_values": {
+        "comment": "same as `TestData highlight - vega.js`"
+      },
+      "url": {
+        //"comment": "source index pattern",
+        "index": "kotlin_ide_benchmarks*",
+        //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
+        //"comment": "it uses Kibana specific %timefilter% for time frame selection",
+        "body": {
+          "size": 0,
+          "query": {
+            "bool": {
+              "must": [
+                {"exists": {"field": "synthetic"}},
+                {
+                  "bool": {
+                    "must_not": [
+                       {"exists": {"field": "warmUp"}}
+                     ]
+                   }
+                },
+                {"term": {"benchmark.keyword": "highlight"}},
+                {"term": {"name.keyword": "geomMean"}},
+                {"range": {"buildTimestamp": {"%timefilter%": true}}}
+              ]
+            }
+          },
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 500,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "format": {"property": "aggregations"},
+      "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
+      "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
+      "transform": [
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["metricName", "name", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
+        {
+          "type": "formula",
+          "as": "timestamp",
+          "expr": "timeFormat(toDate(datum.buildTimestamp), '%Y-%m-%d %H:%M')"
+        },
+        {
+          "comment": "create `url` value that points to TC build",
+          "type": "formula",
+          "as": "url",
+          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
+      ]
+    },
+    {
+      "name": "selected",
+      "on": [
+        {"trigger": "clear", "remove": true},
+        {"trigger": "!shift", "remove": true},
+        {"trigger": "!shift && clicked", "insert": "clicked"},
+        {"trigger": "shift && clicked", "toggle": "clicked"}
+      ]
+    }
+  ],
+  "axes": [
+    {
+      "scale": "x",
+      "grid": true,
+      "domain": false,
+      "orient": "bottom",
+      "labelAngle": -20,
+      "labelAlign": "right",
+      "title": {"signal": "timestamp ? 'timestamp' : 'buildId'"},
+      "titlePadding": 10,
+      "tickCount": 5,
+      "encode": {
+        "labels": {
+          "interactive": true,
+          "update": {"tooltip": {"signal": "datum.label"}}
+        }
+      }
+    },
+    {
+      "scale": "y",
+      "grid": true,
+      "domain": false,
+      "orient": "left",
+      "titlePadding": 10,
+      "title": "ms",
+      "titleAnchor": "end",
+      "titleAngle": 0
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "point",
+      "range": "width",
+      "domain": {"data": "table", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}}
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricValue"}
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category",
+      "domain": {"data": "table", "field": "metricName"}
+    },
+    {
+      "name": "size",
+      "type": "linear",
+      "round": true,
+      "nice": false,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricError"},
+      "range": [1, 100]
+    }
+  ],
+  "legends": [
+    {
+      "title": "Cases",
+      "stroke": "color",
+      "strokeColor": "#ccc",
+      "padding": 8,
+      "cornerRadius": 4,
+      "symbolLimit": 50,
+      "encode": {
+        "symbols": {
+          "name": "legendSymbol",
+          "interactive": true,
+          "update": {
+            "fill": {"value": "transparent"},
+            "strokeWidth": {"value": 2},
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 0.7
+              },
+              {"value": 0.15}
+            ],
+            "size": {"value": 64}
+          }
+        },
+        "labels": {
+          "name": "legendLabel",
+          "interactive": true,
+          "update": {
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 1
+              },
+              {"value": 0.25}
+            ]
+          }
+        }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "facet": {"name": "series", "data": "table", "groupby": "metricName"}
+      },
+      "marks": [
+        {
+          "type": "line",
+          "from": {"data": "series"},
+          "encode": {
+            "hover": {"opacity": {"value": 1}, "strokeWidth": {"value": 4}},
+            "update": {
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 2},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 0.7
+                },
+                {"value": 0.15}
+              ],
+              "stroke": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "scale": "color",
+                  "field": "metricName"
+                },
+                {"value": "#ccc"}
+              ]
+            }
+          }
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "fill": {"value": "#B00"},
+              "size": [{ "test": "datum.hasError", "value": 250 }, {"value": 0}],
+              "shape": {"value": "cross"},
+              "angle": {"value": 45},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain))  && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 1
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "tooltip": {
+                "signal": "datum.metricName + ': ' + datum.metricValue + ' ms'"
+              },
+              "href": {"field": "url"},
+              "cursor": {"value": "pointer"},
+              "size": {"scale": "size", "field": "metricError"},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "fill": {"scale": "color", "field": "metricName"}
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 2
+        }
+      ]
+    }
+  ]
+}
diff --git a/idea/performanceTests/resources/TestData geomMean - vega.js b/idea/performanceTests/resources/TestData highlight warmup - vega.js
similarity index 75%
rename from idea/performanceTests/resources/TestData geomMean - vega.js
rename to idea/performanceTests/resources/TestData highlight warmup - vega.js
index bfccad8fcf8..5677963a538 100644
--- a/idea/performanceTests/resources/TestData geomMean - vega.js	
+++ b/idea/performanceTests/resources/TestData highlight warmup - vega.js	
@@ -6,10 +6,10 @@
 {
   "note": "May https://vega.github.io/vega/docs/ be with you",
   "$schema": "https://vega.github.io/schema/vega/v4.3.0.json",
-  "description": "TestData geomMean",
-  "title": "TestData geomMean",
+  "description": "TestData highlight - warmUp",
+  "title": "TestData highlight - warmUp",
   "width": 800,
-  "height": 500,
+  "height": 400,
   "padding": 5,
   "autosize": {"type": "pad", "resize": true},
   "signals": [
@@ -95,25 +95,7 @@
       "name": "table",
       "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
       "_values": {
-          "hits" : {
-            "hits" : [
-              {
-                "_source" : {"buildId" : 87834896, "buildTimestamp" : "2020-09-21T21:00:31+0000", "geomMean" : 37, "benchmark" : "highlight"}
-              },
-              {
-                "_source" : {"buildId" : 87783396, "buildTimestamp" : "2020-09-21T12:34:19+0000", "geomMean" : 37, "benchmark" : "highlight"}
-              },
-              {
-                "_source" : {"buildId" : 87809918, "buildTimestamp" : "2020-09-21T16:47:11+0000", "geomMean" : 37, "benchmark" : "highlight"}
-              },
-              {
-                "_source" : {"buildId" : 87905203, "buildTimestamp" : "2020-09-22T13:23:44+0000", "geomMean" : 37, "benchmark" : "highlight"}
-              },
-              {
-                "_source" : {"buildId" : 87894638, "buildTimestamp" : "2020-09-22T09:12:16+0000", "geomMean" : 37, "benchmark" : "highlight"}
-              }
-            ]
-          }
+        "comment": "same as `TestData highlight - vega.js`"
       },
       "url": {
         //"comment": "source index pattern",
@@ -121,65 +103,95 @@
         //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
         //"comment": "it uses Kibana specific %timefilter% for time frame selection",
         "body": {
-          "size": 1000,
+          "size": 0,
           "query": {
             "bool": {
               "must": [
+                {
+                  "bool": {
+                    "must_not": [
+                       {"exists": {"field": "synthetic"}}
+                     ]
+                   }
+                },
+                {"exists": {"field": "warmUp"}},
                 {"term": {"benchmark.keyword": "highlight"}},
                 {"range": {"buildTimestamp": {"%timefilter%": true}}}
               ]
             }
           },
-          "_source": ["buildId", "benchmark", "buildTimestamp", "metrics.hasError", "geomMean"],
-          "sort": [{"buildTimestamp": {"order": "asc"}}]
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 50,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       },
-      "format": {"property": "hits.hits"},
+      "format": {"property": "aggregations"},
       "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
       "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
       "transform": [
-        {"type": "collect","sort": {"field": "_source.buildTimestamp"}},
-        {
-          "comment": "make alias: _source.buildId -> buildId",
-          "type": "formula",
-          "as": "buildId",
-          "expr": "datum._source.buildId"
-        },
-        {
-          "comment": "make alias: _source.benchmark -> metricName",
-          "type": "formula",
-          "as": "metricName",
-          "expr": "datum._source.benchmark"
-        },
-        {
-          "comment": "make alias: _source.geomMean -> metricValue",
-          "type": "formula",
-          "as": "metricValue",
-          "expr": "datum._source.geomMean"
-        },
-        {
-          "comment": "define metricError",
-          "type": "formula",
-          "as": "metricError",
-          "expr": "1"
-        },
-        {
-          "comment": "make alias: _source.metrics[0].hasError -> hasError",
-          "type": "formula",
-          "as": "hasError",
-          "expr": "datum._source.metrics ? datum._source.metrics[0].hasError : false"
-        },
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["benchmark", "metricName", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
         {
           "type": "formula",
           "as": "timestamp",
-          "expr": "timeFormat(toDate(datum._source.buildTimestamp), '%Y-%m-%d %H:%M')"
+          "expr": "timeFormat(toDate(datum.buildTimestamp), '%Y-%m-%d %H:%M')"
         },
         {
           "comment": "create `url` value that points to TC build",
           "type": "formula",
           "as": "url",
-          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum._source.buildId"
-        }
+          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
       ]
     },
     {
diff --git a/idea/performanceTests/resources/TestData j2k geomMean - vega.js b/idea/performanceTests/resources/TestData j2k geomMean - vega.js
new file mode 100644
index 00000000000..d9a37c2a458
--- /dev/null
+++ b/idea/performanceTests/resources/TestData j2k geomMean - vega.js	
@@ -0,0 +1,415 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+{
+  "note": "May https://vega.github.io/vega/docs/ be with you",
+  "$schema": "https://vega.github.io/schema/vega/v4.3.0.json",
+  "description": "TestData j2k geomMean",
+  "title": "TestData j2k geomMean",
+  "width": 800,
+  "height": 500,
+  "padding": 5,
+  "autosize": {"type": "pad", "resize": true},
+  "signals": [
+    {
+      "name": "clear",
+      "value": true,
+      "on": [
+        {"events": "mouseup[!event.item]", "update": "true", "force": true}
+      ]
+    },
+    {
+      "name": "shift",
+      "value": false,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "update": "event.shiftKey",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "clicked",
+      "value": null,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "comment": "note: here `datum` is `selected` data set",
+          "update": "{value: datum.value}",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "brush",
+      "value": 0,
+      "on": [
+        {"events": {"signal": "clear"}, "update": "clear ? [0, 0] : brush"},
+        {"events": "@xaxis:mousedown", "update": "[x(), x()]"},
+        {
+          "events": "[@xaxis:mousedown, window:mouseup] > window:mousemove!",
+          "update": "[brush[0], clamp(x(), 0, width)]"
+        },
+        {
+          "events": {"signal": "delta"},
+          "update": "clampRange([anchor[0] + delta, anchor[1] + delta], 0, width)"
+        }
+      ]
+    },
+    {
+      "name": "anchor",
+      "value": null,
+      "on": [{"events": "@brush:mousedown", "update": "slice(brush)"}]
+    },
+    {
+      "name": "xdown",
+      "value": 0,
+      "on": [{"events": "@brush:mousedown", "update": "x()"}]
+    },
+    {
+      "name": "delta",
+      "value": 0,
+      "on": [
+        {
+          "events": "[@brush:mousedown, window:mouseup] > window:mousemove!",
+          "update": "x() - xdown"
+        }
+      ]
+    },
+    {
+      "name": "domain",
+      "on": [
+        {
+          "events": {"signal": "brush"},
+          "update": "span(brush) ? invert('x', brush) : null"
+        }
+      ]
+    },
+    {"name": "timestamp", "value": true, "bind": {"input": "checkbox"}}
+  ],
+  "data": [
+    {
+      "name": "table",
+      "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
+      "_values": {
+        "comment": "same as `TestData highlight - vega.js`"
+      },
+      "url": {
+        //"comment": "source index pattern",
+        "index": "kotlin_ide_benchmarks*",
+        //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
+        //"comment": "it uses Kibana specific %timefilter% for time frame selection",
+        "body": {
+          "size": 0,
+          "query": {
+            "bool": {
+              "must": [
+                {"exists": {"field": "synthetic"}},
+                {
+                  "bool": {
+                    "must_not": [
+                       {"exists": {"field": "warmUp"}}
+                     ]
+                   }
+                },
+                {
+                  "bool": {
+                    "should": [
+                      {"term": {"benchmark.keyword": "old j2k"}},
+                      {"term": {"benchmark.keyword": "new j2k"}},
+                    ]
+                  }
+                }
+                {"term": {"name.keyword": "geomMean"}},
+                {"range": {"buildTimestamp": {"%timefilter%": true}}}
+              ]
+            }
+          },
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 500,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "format": {"property": "aggregations"},
+      "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
+      "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
+      "transform": [
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["metricName", "name", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
+        {
+          "type": "formula",
+          "as": "timestamp",
+          "expr": "timeFormat(toDate(datum.buildTimestamp), '%Y-%m-%d %H:%M')"
+        },
+        {
+          "comment": "create `url` value that points to TC build",
+          "type": "formula",
+          "as": "url",
+          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
+      ]
+    },
+    {
+      "name": "selected",
+      "on": [
+        {"trigger": "clear", "remove": true},
+        {"trigger": "!shift", "remove": true},
+        {"trigger": "!shift && clicked", "insert": "clicked"},
+        {"trigger": "shift && clicked", "toggle": "clicked"}
+      ]
+    }
+  ],
+  "axes": [
+    {
+      "scale": "x",
+      "grid": true,
+      "domain": false,
+      "orient": "bottom",
+      "labelAngle": -20,
+      "labelAlign": "right",
+      "title": {"signal": "timestamp ? 'timestamp' : 'buildId'"},
+      "titlePadding": 10,
+      "tickCount": 5,
+      "encode": {
+        "labels": {
+          "interactive": true,
+          "update": {"tooltip": {"signal": "datum.label"}}
+        }
+      }
+    },
+    {
+      "scale": "y",
+      "grid": true,
+      "domain": false,
+      "orient": "left",
+      "titlePadding": 10,
+      "title": "ms",
+      "titleAnchor": "end",
+      "titleAngle": 0
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "point",
+      "range": "width",
+      "domain": {"data": "table", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}}
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricValue"}
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category",
+      "domain": {"data": "table", "field": "metricName"}
+    },
+    {
+      "name": "size",
+      "type": "linear",
+      "round": true,
+      "nice": false,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricError"},
+      "range": [1, 100]
+    }
+  ],
+  "legends": [
+    {
+      "title": "Cases",
+      "stroke": "color",
+      "strokeColor": "#ccc",
+      "padding": 8,
+      "cornerRadius": 4,
+      "symbolLimit": 50,
+      "encode": {
+        "symbols": {
+          "name": "legendSymbol",
+          "interactive": true,
+          "update": {
+            "fill": {"value": "transparent"},
+            "strokeWidth": {"value": 2},
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 0.7
+              },
+              {"value": 0.15}
+            ],
+            "size": {"value": 64}
+          }
+        },
+        "labels": {
+          "name": "legendLabel",
+          "interactive": true,
+          "update": {
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 1
+              },
+              {"value": 0.25}
+            ]
+          }
+        }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "facet": {"name": "series", "data": "table", "groupby": "metricName"}
+      },
+      "marks": [
+        {
+          "type": "line",
+          "from": {"data": "series"},
+          "encode": {
+            "hover": {"opacity": {"value": 1}, "strokeWidth": {"value": 4}},
+            "update": {
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 2},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 0.7
+                },
+                {"value": 0.15}
+              ],
+              "stroke": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "scale": "color",
+                  "field": "metricName"
+                },
+                {"value": "#ccc"}
+              ]
+            }
+          }
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "fill": {"value": "#B00"},
+              "size": [{ "test": "datum.hasError", "value": 250 }, {"value": 0}],
+              "shape": {"value": "cross"},
+              "angle": {"value": 45},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain))  && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 1
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "tooltip": {
+                "signal": "datum.metricName + ': ' + datum.metricValue + ' ms'"
+              },
+              "href": {"field": "url"},
+              "cursor": {"value": "pointer"},
+              "size": {"scale": "size", "field": "metricError"},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "fill": {"scale": "color", "field": "metricName"}
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 2
+        }
+      ]
+    }
+  ]
+}
diff --git a/idea/performanceTests/resources/The Kotlin sources highlight - vega.js b/idea/performanceTests/resources/The Kotlin sources highlight - vega.js
new file mode 100644
index 00000000000..a1602a20106
--- /dev/null
+++ b/idea/performanceTests/resources/The Kotlin sources highlight - vega.js	
@@ -0,0 +1,423 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+{
+  "note": "May https://vega.github.io/vega/docs/ be with you",
+  "$schema": "https://vega.github.io/schema/vega/v4.3.0.json",
+  "description": "The Kotlin sources: highlight",
+  "title": "The Kotlin sources: highlight",
+  "width": 800,
+  "height": 500,
+  "padding": 5,
+  "autosize": {"type": "pad", "resize": true},
+  "signals": [
+    {
+      "name": "clear",
+      "value": true,
+      "on": [
+        {"events": "mouseup[!event.item]", "update": "true", "force": true}
+      ]
+    },
+    {
+      "name": "shift",
+      "value": false,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "update": "event.shiftKey",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "clicked",
+      "value": null,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "comment": "note: here `datum` is `selected` data set",
+          "update": "{value: datum.value}",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "brush",
+      "value": 0,
+      "on": [
+        {"events": {"signal": "clear"}, "update": "clear ? [0, 0] : brush"},
+        {"events": "@xaxis:mousedown", "update": "[x(), x()]"},
+        {
+          "events": "[@xaxis:mousedown, window:mouseup] > window:mousemove!",
+          "update": "[brush[0], clamp(x(), 0, width)]"
+        },
+        {
+          "events": {"signal": "delta"},
+          "update": "clampRange([anchor[0] + delta, anchor[1] + delta], 0, width)"
+        }
+      ]
+    },
+    {
+      "name": "anchor",
+      "value": null,
+      "on": [{"events": "@brush:mousedown", "update": "slice(brush)"}]
+    },
+    {
+      "name": "xdown",
+      "value": 0,
+      "on": [{"events": "@brush:mousedown", "update": "x()"}]
+    },
+    {
+      "name": "delta",
+      "value": 0,
+      "on": [
+        {
+          "events": "[@brush:mousedown, window:mouseup] > window:mousemove!",
+          "update": "x() - xdown"
+        }
+      ]
+    },
+    {
+      "name": "domain",
+      "on": [
+        {
+          "events": {"signal": "brush"},
+          "update": "span(brush) ? invert('x', brush) : null"
+        }
+      ]
+    },
+    {"name": "timestamp", "value": true, "bind": {"input": "checkbox"}}
+  ],
+  "data": [
+    {
+      "name": "table",
+      "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
+      "_values": {
+        "comment": "same as `TestData highlight - vega.js`"
+      },
+      "url": {
+        //"comment": "source index pattern",
+        "index": "kotlin_ide_benchmarks*",
+        //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
+        //"comment": "it uses Kibana specific %timefilter% for time frame selection",
+        "body": {
+          "size": 0,
+          "query": {
+            "bool": {
+              "must": [
+                {"range": {"buildTimestamp": {"%timefilter%": true}}},
+                    {
+                      "bool": {
+                        "must_not": [
+                           {"exists": {"field": "synthetic"}},
+                           {"term": {"name.keyword": "open project kotlin"}}
+                         ]
+                       }
+                    },
+                    {
+                      "bool": {
+                        "should": [
+                          {"term": {"benchmark.keyword": "kotlin project"}}
+                        ]
+                      }
+                    }],
+                  "filter": [
+                    {"prefix": {"name": {"value": "highlighting"}}}
+                  ],
+                  "must_not": [
+                    {"prefix": {
+                      "name.keyword": {
+                        "value": "highlighting empty profile"
+                      }
+                    }}
+                ]
+              }
+            },
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 500,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+            "format": {"property": "aggregations"},
+      "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
+      "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
+      "transform": [
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["benchmark", "metricName", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
+        {
+          "type": "formula",
+          "as": "timestamp",
+          "expr": "timeFormat(toDate(datum.buildTimestamp), '%Y-%m-%d %H:%M')"
+        },
+        {
+          "comment": "create `url` value that points to TC build",
+          "type": "formula",
+          "as": "url",
+          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
+      ]
+
+    },
+    {
+      "name": "selected",
+      "on": [
+        {"trigger": "clear", "remove": true},
+        {"trigger": "!shift", "remove": true},
+        {"trigger": "!shift && clicked", "insert": "clicked"},
+        {"trigger": "shift && clicked", "toggle": "clicked"}
+      ]
+    }
+  ],
+  "axes": [
+    {
+      "scale": "x",
+      "grid": true,
+      "domain": false,
+      "orient": "bottom",
+      "labelAngle": -20,
+      "labelAlign": "right",
+      "title": {"signal": "timestamp ? 'timestamp' : 'buildId'"},
+      "titlePadding": 10,
+      "tickCount": 5,
+      "encode": {
+        "labels": {
+          "interactive": true,
+          "update": {"tooltip": {"signal": "datum.label"}}
+        }
+      }
+    },
+    {
+      "scale": "y",
+      "grid": true,
+      "domain": false,
+      "orient": "left",
+      "titlePadding": 10,
+      "title": "ms",
+      "titleAnchor": "end",
+      "titleAngle": 0
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "point",
+      "range": "width",
+      "domain": {"data": "table", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}}
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricValue"}
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category",
+      "domain": {"data": "table", "field": "metricName"}
+    },
+    {
+      "name": "size",
+      "type": "linear",
+      "round": true,
+      "nice": false,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricError"},
+      "range": [0, 100]
+    }
+  ],
+  "legends": [
+    {
+      "title": "Cases",
+      "stroke": "color",
+      "strokeColor": "#ccc",
+      "padding": 8,
+      "cornerRadius": 4,
+      "symbolLimit": 50,
+      "encode": {
+        "symbols": {
+          "name": "legendSymbol",
+          "interactive": true,
+          "update": {
+            "fill": {"value": "transparent"},
+            "strokeWidth": {"value": 2},
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 0.7
+              },
+              {"value": 0.15}
+            ],
+            "size": {"value": 64}
+          }
+        },
+        "labels": {
+          "name": "legendLabel",
+          "interactive": true,
+          "update": {
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 1
+              },
+              {"value": 0.25}
+            ]
+          }
+        }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "facet": {"name": "series", "data": "table", "groupby": "metricName"}
+      },
+      "marks": [
+        {
+          "type": "line",
+          "from": {"data": "series"},
+          "encode": {
+            "hover": {"opacity": {"value": 1}, "strokeWidth": {"value": 4}},
+            "update": {
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 2},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 0.7
+                },
+                {"value": 0.15}
+              ],
+              "stroke": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "scale": "color",
+                  "field": "metricName"
+                },
+                {"value": "#ccc"}
+              ]
+            }
+          }
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "fill": {"value": "#B00"},
+              "size": [{ "test": "datum.hasError", "value": 250 }, {"value": 0}],
+              "shape": {"value": "cross"},
+              "angle": {"value": 45},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain))  && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 1
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "tooltip": {
+                "signal": "datum.metricName + ': ' + datum.metricValue + ' ms'"
+              },
+              "href": {"field": "url"},
+              "cursor": {"value": "pointer"},
+              "size": {"scale": "size", "field": "metricError"},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "fill": {"scale": "color", "field": "metricName"}
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 2
+        }
+      ]
+    }
+  ]
+}
diff --git a/idea/performanceTests/resources/The Kotlin sources highlight build.gradle.kts - vega.js b/idea/performanceTests/resources/The Kotlin sources highlight build.gradle.kts - vega.js
new file mode 100644
index 00000000000..fd1a6038d95
--- /dev/null
+++ b/idea/performanceTests/resources/The Kotlin sources highlight build.gradle.kts - vega.js	
@@ -0,0 +1,414 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+{
+  "note": "May https://vega.github.io/vega/docs/ be with you",
+  "$schema": "https://vega.github.io/schema/vega/v4.3.0.json",
+  "description": "The Kotlin sources: highlight build.gradle.kts",
+  "title": "The Kotlin sources: highlight build.gradle.kts",
+  "width": 800,
+  "height": 500,
+  "padding": 5,
+  "autosize": {"type": "pad", "resize": true},
+  "signals": [
+    {
+      "name": "clear",
+      "value": true,
+      "on": [
+        {"events": "mouseup[!event.item]", "update": "true", "force": true}
+      ]
+    },
+    {
+      "name": "shift",
+      "value": false,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "update": "event.shiftKey",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "clicked",
+      "value": null,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "comment": "note: here `datum` is `selected` data set",
+          "update": "{value: datum.value}",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "brush",
+      "value": 0,
+      "on": [
+        {"events": {"signal": "clear"}, "update": "clear ? [0, 0] : brush"},
+        {"events": "@xaxis:mousedown", "update": "[x(), x()]"},
+        {
+          "events": "[@xaxis:mousedown, window:mouseup] > window:mousemove!",
+          "update": "[brush[0], clamp(x(), 0, width)]"
+        },
+        {
+          "events": {"signal": "delta"},
+          "update": "clampRange([anchor[0] + delta, anchor[1] + delta], 0, width)"
+        }
+      ]
+    },
+    {
+      "name": "anchor",
+      "value": null,
+      "on": [{"events": "@brush:mousedown", "update": "slice(brush)"}]
+    },
+    {
+      "name": "xdown",
+      "value": 0,
+      "on": [{"events": "@brush:mousedown", "update": "x()"}]
+    },
+    {
+      "name": "delta",
+      "value": 0,
+      "on": [
+        {
+          "events": "[@brush:mousedown, window:mouseup] > window:mousemove!",
+          "update": "x() - xdown"
+        }
+      ]
+    },
+    {
+      "name": "domain",
+      "on": [
+        {
+          "events": {"signal": "brush"},
+          "update": "span(brush) ? invert('x', brush) : null"
+        }
+      ]
+    },
+    {"name": "timestamp", "value": true, "bind": {"input": "checkbox"}}
+  ],
+  "data": [
+    {
+      "name": "table",
+      "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
+      "_values": {
+        "comment": "same as `TestData highlight - vega.js`"
+      },
+      "url": {
+        //"comment": "source index pattern",
+        "index": "kotlin_ide_benchmarks*",
+        //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
+        //"comment": "it uses Kibana specific %timefilter% for time frame selection",
+        "body": {
+          "size": 0,
+          "query": {
+            "bool": {
+              "must": [
+                {"range": {"buildTimestamp": {"%timefilter%": true}}},
+                {
+                  "bool": {
+                    "must_not": [
+                       {"exists": {"field": "synthetic"}},
+                       {"term": {"name.keyword": "open project kotlin"}}
+                     ]
+                   }
+                },
+                {
+                  "bool": {
+                    "should": [
+                      {"term": {"benchmark.keyword": "kotlin gradle.kts"}}
+                    ]
+                  }
+                }
+              ]
+            }
+          },
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 500,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+            "format": {"property": "aggregations"},
+      "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
+      "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
+      "transform": [
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["benchmark", "metricName", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
+        {
+          "type": "formula",
+          "as": "timestamp",
+          "expr": "timeFormat(toDate(datum.buildTimestamp), '%Y-%m-%d %H:%M')"
+        },
+        {
+          "comment": "create `url` value that points to TC build",
+          "type": "formula",
+          "as": "url",
+          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
+      ]
+
+    },
+    {
+      "name": "selected",
+      "on": [
+        {"trigger": "clear", "remove": true},
+        {"trigger": "!shift", "remove": true},
+        {"trigger": "!shift && clicked", "insert": "clicked"},
+        {"trigger": "shift && clicked", "toggle": "clicked"}
+      ]
+    }
+  ],
+  "axes": [
+    {
+      "scale": "x",
+      "grid": true,
+      "domain": false,
+      "orient": "bottom",
+      "labelAngle": -20,
+      "labelAlign": "right",
+      "title": {"signal": "timestamp ? 'timestamp' : 'buildId'"},
+      "titlePadding": 10,
+      "tickCount": 5,
+      "encode": {
+        "labels": {
+          "interactive": true,
+          "update": {"tooltip": {"signal": "datum.label"}}
+        }
+      }
+    },
+    {
+      "scale": "y",
+      "grid": true,
+      "domain": false,
+      "orient": "left",
+      "titlePadding": 10,
+      "title": "ms",
+      "titleAnchor": "end",
+      "titleAngle": 0
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "point",
+      "range": "width",
+      "domain": {"data": "table", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}}
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricValue"}
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category",
+      "domain": {"data": "table", "field": "metricName"}
+    },
+    {
+      "name": "size",
+      "type": "linear",
+      "round": true,
+      "nice": false,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricError"},
+      "range": [0, 100]
+    }
+  ],
+  "legends": [
+    {
+      "title": "Cases",
+      "stroke": "color",
+      "strokeColor": "#ccc",
+      "padding": 8,
+      "cornerRadius": 4,
+      "symbolLimit": 50,
+      "encode": {
+        "symbols": {
+          "name": "legendSymbol",
+          "interactive": true,
+          "update": {
+            "fill": {"value": "transparent"},
+            "strokeWidth": {"value": 2},
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 0.7
+              },
+              {"value": 0.15}
+            ],
+            "size": {"value": 64}
+          }
+        },
+        "labels": {
+          "name": "legendLabel",
+          "interactive": true,
+          "update": {
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 1
+              },
+              {"value": 0.25}
+            ]
+          }
+        }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "facet": {"name": "series", "data": "table", "groupby": "metricName"}
+      },
+      "marks": [
+        {
+          "type": "line",
+          "from": {"data": "series"},
+          "encode": {
+            "hover": {"opacity": {"value": 1}, "strokeWidth": {"value": 4}},
+            "update": {
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 2},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 0.7
+                },
+                {"value": 0.15}
+              ],
+              "stroke": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "scale": "color",
+                  "field": "metricName"
+                },
+                {"value": "#ccc"}
+              ]
+            }
+          }
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "fill": {"value": "#B00"},
+              "size": [{ "test": "datum.hasError", "value": 250 }, {"value": 0}],
+              "shape": {"value": "cross"},
+              "angle": {"value": 45},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain))  && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 1
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "tooltip": {
+                "signal": "datum.metricName + ': ' + datum.metricValue + ' ms'"
+              },
+              "href": {"field": "url"},
+              "cursor": {"value": "pointer"},
+              "size": {"scale": "size", "field": "metricError"},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "fill": {"scale": "color", "field": "metricName"}
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 2
+        }
+      ]
+    }
+  ]
+}
diff --git a/idea/performanceTests/resources/The Kotlin sources highlight empty profile - vega.js b/idea/performanceTests/resources/The Kotlin sources highlight empty profile - vega.js
new file mode 100644
index 00000000000..688e6191395
--- /dev/null
+++ b/idea/performanceTests/resources/The Kotlin sources highlight empty profile - vega.js	
@@ -0,0 +1,410 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+{
+  "note": "May https://vega.github.io/vega/docs/ be with you",
+  "$schema": "https://vega.github.io/schema/vega/v4.3.0.json",
+  "description": "The Kotlin sources: highlight empty profile",
+  "title": "The Kotlin sources: highlight empty profile",
+  "width": 800,
+  "height": 500,
+  "padding": 5,
+  "autosize": {"type": "pad", "resize": true},
+  "signals": [
+    {
+      "name": "clear",
+      "value": true,
+      "on": [
+        {"events": "mouseup[!event.item]", "update": "true", "force": true}
+      ]
+    },
+    {
+      "name": "shift",
+      "value": false,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "update": "event.shiftKey",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "clicked",
+      "value": null,
+      "on": [
+        {
+          "events": "@legendSymbol:click, @legendLabel:click",
+          "comment": "note: here `datum` is `selected` data set",
+          "update": "{value: datum.value}",
+          "force": true
+        }
+      ]
+    },
+    {
+      "name": "brush",
+      "value": 0,
+      "on": [
+        {"events": {"signal": "clear"}, "update": "clear ? [0, 0] : brush"},
+        {"events": "@xaxis:mousedown", "update": "[x(), x()]"},
+        {
+          "events": "[@xaxis:mousedown, window:mouseup] > window:mousemove!",
+          "update": "[brush[0], clamp(x(), 0, width)]"
+        },
+        {
+          "events": {"signal": "delta"},
+          "update": "clampRange([anchor[0] + delta, anchor[1] + delta], 0, width)"
+        }
+      ]
+    },
+    {
+      "name": "anchor",
+      "value": null,
+      "on": [{"events": "@brush:mousedown", "update": "slice(brush)"}]
+    },
+    {
+      "name": "xdown",
+      "value": 0,
+      "on": [{"events": "@brush:mousedown", "update": "x()"}]
+    },
+    {
+      "name": "delta",
+      "value": 0,
+      "on": [
+        {
+          "events": "[@brush:mousedown, window:mouseup] > window:mousemove!",
+          "update": "x() - xdown"
+        }
+      ]
+    },
+    {
+      "name": "domain",
+      "on": [
+        {
+          "events": {"signal": "brush"},
+          "update": "span(brush) ? invert('x', brush) : null"
+        }
+      ]
+    },
+    {"name": "timestamp", "value": true, "bind": {"input": "checkbox"}}
+  ],
+  "data": [
+    {
+      "name": "table",
+      "comment": "To test chart in VEGA editor https://vega.github.io/editor/#/ change `_values` to `values` and rename `url` property",
+      "_values": {
+        "comment": "same as `TestData highlight - vega.js`"
+      },
+      "url": {
+        //"comment": "source index pattern",
+        "index": "kotlin_ide_benchmarks*",
+        //"comment": "it's a body of ES _search query to check query place it into `POST /kotlin_ide_benchmarks*/_search`",
+        //"comment": "it uses Kibana specific %timefilter% for time frame selection",
+        "body": {
+          "size": 0,
+          "query": {
+            "bool": {
+              "must": [
+                {"range": {"buildTimestamp": {"%timefilter%": true}}},
+                {"prefix": {"name.keyword": {"value": "highlighting empty profile"}}},
+                {
+                  "bool": {
+                    "must_not": [
+                       {"exists": {"field": "synthetic"}},
+                       {"term": {"name.keyword": "open project kotlin"}}
+                     ]
+                   }
+                },
+                {
+                  "bool": {"should": [{"term": {"benchmark.keyword": "kotlin project"}}]}
+                }]
+              }
+            },
+          "aggs": {
+            "benchmark": {
+              "terms": {
+                "field": "benchmark.keyword",
+                "size": 500
+              },
+              "aggs": {
+                "name": {
+                  "terms": {
+                    "field": "name.keyword",
+                    "size": 500
+                  },
+                  "aggs": {
+                    "values": {
+                      "auto_date_histogram": {
+                          "buckets": 500,
+                          "field": "buildTimestamp",
+                          "minimum_interval": "hour"
+                      },
+                      "aggs": {
+                        "buildId": {
+                          "terms": {
+                            "size": 1,
+                            "field": "buildId"
+                          }
+                        },
+                        "avgValue":{
+                          "avg": {
+                            "field": "metricValue"
+                          }
+                        },
+                        "avgError":{
+                          "avg": {
+                            "field": "metricError"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+            "format": {"property": "aggregations"},
+      "comment": "we need to have follow data: \"buildId\", \"metricName\", \"metricValue\" and \"metricError\"",
+      "comment": "so it has to be array of {\"buildId\": \"...\", \"metricName\": \"...\", \"metricValue\": ..., \"metricError\": ...}",
+      "transform": [
+        {"type": "project", "fields": ["benchmark"]},
+        {"type": "flatten", "fields": ["benchmark.buckets"], "as": ["benchmark_buckets"]},
+        {"type": "project", "fields": ["benchmark_buckets.key", "benchmark_buckets.name"], "as": ["benchmark", "benchmark_buckets_name"]},
+        {"type": "flatten", "fields": ["benchmark_buckets_name.buckets"], "as": ["name_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name_buckets.key", "name_buckets.values"], "as": ["benchmark", "name", "name_values"]},
+        {"type": "flatten", "fields": ["name_values.buckets"], "as": ["name_values_buckets"]},
+        {"type": "project", "fields": ["benchmark", "name", "name_values_buckets.key", "name_values_buckets.key_as_string", "name_values_buckets.avgError", "name_values_buckets.avgValue", "name_values_buckets.buildId.buckets"], "as": ["benchmark", "metricName", "buildTimestamp", "timestamp_value", "avgError", "avgValue", "buildId_buckets"]},
+        {"type": "formula", "as": "metricError", "expr": "datum.avgError.value"},
+        {"type": "formula", "as": "metricValue", "expr": "datum.avgValue.value"},
+        {"type": "flatten", "fields": ["buildId_buckets"], "as": ["buildId_values"]},
+        {"type": "formula", "as": "buildId", "expr": "datum.buildId_values.key"},
+        {
+          "type": "formula",
+          "as": "timestamp",
+          "expr": "timeFormat(toDate(datum.buildTimestamp), '%Y-%m-%d %H:%M')"
+        },
+        {
+          "comment": "create `url` value that points to TC build",
+          "type": "formula",
+          "as": "url",
+          "expr": "'https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_Benchmarks_PluginPerformanceTests_IdeaPluginPerformanceTests/' + datum.buildId"
+        },
+        {"type": "collect","sort": {"field": "timestamp"}}
+      ]
+
+    },
+    {
+      "name": "selected",
+      "on": [
+        {"trigger": "clear", "remove": true},
+        {"trigger": "!shift", "remove": true},
+        {"trigger": "!shift && clicked", "insert": "clicked"},
+        {"trigger": "shift && clicked", "toggle": "clicked"}
+      ]
+    }
+  ],
+  "axes": [
+    {
+      "scale": "x",
+      "grid": true,
+      "domain": false,
+      "orient": "bottom",
+      "labelAngle": -20,
+      "labelAlign": "right",
+      "title": {"signal": "timestamp ? 'timestamp' : 'buildId'"},
+      "titlePadding": 10,
+      "tickCount": 5,
+      "encode": {
+        "labels": {
+          "interactive": true,
+          "update": {"tooltip": {"signal": "datum.label"}}
+        }
+      }
+    },
+    {
+      "scale": "y",
+      "grid": true,
+      "domain": false,
+      "orient": "left",
+      "titlePadding": 10,
+      "title": "ms",
+      "titleAnchor": "end",
+      "titleAngle": 0
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "point",
+      "range": "width",
+      "domain": {"data": "table", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}}
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricValue"}
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category",
+      "domain": {"data": "table", "field": "metricName"}
+    },
+    {
+      "name": "size",
+      "type": "linear",
+      "round": true,
+      "nice": false,
+      "zero": true,
+      "domain": {"data": "table", "field": "metricError"},
+      "range": [0, 100]
+    }
+  ],
+  "legends": [
+    {
+      "title": "Cases",
+      "stroke": "color",
+      "strokeColor": "#ccc",
+      "padding": 8,
+      "cornerRadius": 4,
+      "symbolLimit": 50,
+      "encode": {
+        "symbols": {
+          "name": "legendSymbol",
+          "interactive": true,
+          "update": {
+            "fill": {"value": "transparent"},
+            "strokeWidth": {"value": 2},
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 0.7
+              },
+              {"value": 0.15}
+            ],
+            "size": {"value": 64}
+          }
+        },
+        "labels": {
+          "name": "legendLabel",
+          "interactive": true,
+          "update": {
+            "opacity": [
+              {
+                "comment": "here `datum` is `selected` data set",
+                "test": "!length(data('selected')) || indata('selected', 'value', datum.value)",
+                "value": 1
+              },
+              {"value": 0.25}
+            ]
+          }
+        }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "facet": {"name": "series", "data": "table", "groupby": "metricName"}
+      },
+      "marks": [
+        {
+          "type": "line",
+          "from": {"data": "series"},
+          "encode": {
+            "hover": {"opacity": {"value": 1}, "strokeWidth": {"value": 4}},
+            "update": {
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 2},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 0.7
+                },
+                {"value": 0.15}
+              ],
+              "stroke": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "scale": "color",
+                  "field": "metricName"
+                },
+                {"value": "#ccc"}
+              ]
+            }
+          }
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "fill": {"value": "#B00"},
+              "size": [{ "test": "datum.hasError", "value": 250 }, {"value": 0}],
+              "shape": {"value": "cross"},
+              "angle": {"value": 45},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain))  && datum.hasError && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 1
+        },
+        {
+          "type": "symbol",
+          "from": {"data": "series"},
+          "encode": {
+            "enter": {
+              "tooltip": {
+                "signal": "datum.metricName + ': ' + datum.metricValue + ' ms'"
+              },
+              "href": {"field": "url"},
+              "cursor": {"value": "pointer"},
+              "size": {"scale": "size", "field": "metricError"},
+              "x": {"scale": "x", "field": {"signal": "timestamp ? 'timestamp' : 'buildId'"}},
+              "y": {"scale": "y", "field": "metricValue"},
+              "strokeWidth": {"value": 1},
+              "fill": {"scale": "color", "field": "metricName"}
+            },
+            "update": {
+              "opacity": [
+                {
+                  "test": "(!domain || inrange(datum.buildId, domain)) && (!length(data('selected')) || indata('selected', 'value', datum.metricName))",
+                  "value": 1
+                },
+                {"value": 0.15}
+              ]
+            }
+          },
+          "zindex": 2
+        }
+      ]
+    }
+  ]
+}
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionHandlerTests.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionHandlerTests.kt
index 24e4d2aeed2..6a0c52c4070 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionHandlerTests.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionHandlerTests.kt
@@ -52,8 +52,7 @@ abstract class AbstractPerformanceCompletionHandlerTests(
     override fun tearDown() {
         commitAllDocuments()
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { statsMap.values.forEach(Stats::flush) }
+            ThrowableRunnable { super.tearDown() }
         ).run()
     }
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionIncrementalResolveTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionIncrementalResolveTest.kt
index ea2d39b6c49..bc3a3694516 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionIncrementalResolveTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionIncrementalResolveTest.kt
@@ -51,8 +51,7 @@ abstract class AbstractPerformanceCompletionIncrementalResolveTest : KotlinLight
     override fun tearDown() {
         commitAllDocuments()
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { stats.flush() }
+            ThrowableRunnable { super.tearDown() }
         ).run()
     }
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceHighlightingTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceHighlightingTest.kt
index b884798ea76..11c297ccb0b 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceHighlightingTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceHighlightingTest.kt
@@ -42,8 +42,7 @@ abstract class AbstractPerformanceHighlightingTest : KotlinLightCodeInsightFixtu
     override fun tearDown() {
         commitAllDocuments()
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { stats.flush() }
+            ThrowableRunnable { super.tearDown() }
         ).run()
     }
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceImportTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceImportTest.kt
index 298b5913e8e..02872ca0fa7 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceImportTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceImportTest.kt
@@ -34,8 +34,7 @@ abstract class AbstractPerformanceImportTest : KotlinLightCodeInsightFixtureTest
 
     override fun tearDown() {
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { stats().flush() }
+            ThrowableRunnable { super.tearDown() }
         ).run()
     }
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceJavaToKotlinCopyPasteConversionTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceJavaToKotlinCopyPasteConversionTest.kt
index b1842bceb58..ec74c425b6e 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceJavaToKotlinCopyPasteConversionTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceJavaToKotlinCopyPasteConversionTest.kt
@@ -46,8 +46,7 @@ abstract class AbstractPerformanceJavaToKotlinCopyPasteConversionTest(private va
 
     override fun tearDown() {
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { stats.forEach(Stats::flush) }
+            ThrowableRunnable { super.tearDown() }
         ).run()
 
     }
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceLiteralKotlinToKotlinCopyPasteTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceLiteralKotlinToKotlinCopyPasteTest.kt
index a3ab7d07df4..7959f0b9806 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceLiteralKotlinToKotlinCopyPasteTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceLiteralKotlinToKotlinCopyPasteTest.kt
@@ -44,8 +44,7 @@ abstract class AbstractPerformanceLiteralKotlinToKotlinCopyPasteTest : AbstractC
 
     override fun tearDown() {
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { stats.flush() }
+            ThrowableRunnable { super.tearDown() }
         ).run()
     }
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt
index 7fa84667cf3..8ae91f075bd 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.initDefaultPro
 import org.jetbrains.kotlin.idea.perf.util.logMessage
 import org.jetbrains.kotlin.idea.test.invalidateLibraryCache
 import org.jetbrains.kotlin.idea.testFramework.*
-import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager
 import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.cleanupCaches
 import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.close
 import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.isAKotlinScriptFile
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceTypingIndentationTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceTypingIndentationTest.kt
index 558f1e28421..b32d4116e92 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceTypingIndentationTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceTypingIndentationTest.kt
@@ -29,8 +29,7 @@ abstract class AbstractPerformanceTypingIndentationTest : KotlinLightCodeInsight
 
     override fun tearDown() {
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { stats.flush() }
+            ThrowableRunnable { super.tearDown() }
         ).run()
     }
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt
index 0045ab909d6..e89114cbcb2 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt
@@ -54,8 +54,7 @@ class PerformanceProjectsTest : AbstractPerformanceProjectsTest() {
 
     override fun tearDown() {
         RunAll(
-            ThrowableRunnable { super.tearDown() },
-            ThrowableRunnable { hwStats.flush() }
+            ThrowableRunnable { super.tearDown() }
         ).run()
     }
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/Stats.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/Stats.kt
index 05f5bdb0f65..01d9dda1b44 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/Stats.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/Stats.kt
@@ -49,7 +49,7 @@ class Stats(
 
         metricChildren.add(
             Metric(
-                "", metricValue = calcMean.mean.toLong(),
+                "_value", metricValue = calcMean.mean.toLong(),
                 hasError = hasError,
                 metricError = calcMean.stdDev.toLong(),
                 rawMetrics = rawMetricChildren
@@ -158,6 +158,8 @@ class Stats(
         } else {
             block()
         }
+
+        flush()
     }
 
     private fun convertStatInfoIntoMetrics(
@@ -165,6 +167,7 @@ class Stats(
         statInfoArray: Array<StatInfos>,
         printOnlyErrors: Boolean = false,
         metricChildren: MutableList<Metric>,
+        warmUp: Boolean = false,
         attemptFn: (Int) -> String = { attempt -> "#$attempt" }
     ) {
         for (statInfoIndex in statInfoArray.withIndex()) {
@@ -191,7 +194,15 @@ class Stats(
                         }
                     }
                 }
-                metricChildren.add(Metric(attemptString, metricValue = durationMs, metrics = childrenMetrics))
+                metricChildren.add(
+                    Metric(
+                        metricName = attemptString,
+                        index = attempt,
+                        warmUp = if (warmUp) true else null,
+                        metricValue = durationMs,
+                        metrics = childrenMetrics
+                    )
+                )
             }
         }
     }
@@ -200,7 +211,7 @@ class Stats(
         prefix: String,
         warmUpStatInfosArray: Array<StatInfos>,
         metricChildren: MutableList<Metric>
-    ) = convertStatInfoIntoMetrics(prefix, warmUpStatInfosArray, metricChildren = metricChildren) { attempt -> "warm-up #$attempt" }
+    ) = convertStatInfoIntoMetrics(prefix, warmUpStatInfosArray, warmUp = true, metricChildren = metricChildren) { attempt -> "warm-up #$attempt" }
 
     fun processTimings(
         prefix: String,
@@ -224,6 +235,7 @@ class Stats(
                 phaseData.testName,
                 printOnlyErrors = true,
                 statInfoArray = warmUpStatInfosArray,
+                warmUp = true,
                 metricChildren = metricChildren
             ) { attempt -> "warm-up #$attempt" }
         }
@@ -308,7 +320,7 @@ class Stats(
         phaseName: String,
         profilerConfig: ProfilerConfig
     ): PhaseProfiler {
-        profilerConfig.name = "$testName${if (phaseName.isEmpty()) "" else "-"+phaseName}"
+        profilerConfig.name = "$testName${if (phaseName.isEmpty()) "" else "-$phaseName"}"
         profilerConfig.path = pathToResource("profile/${plainname(name)}")
         val profilerHandler = if (profilerConfig.enabled && !profilerConfig.warmup)
             ProfilerHandler.getInstance(profilerConfig)
@@ -336,7 +348,7 @@ class Stats(
         flush()
     }
 
-    fun flush() {
+    private fun flush() {
         val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
         simpleDateFormat.timeZone = TimeZone.getTimeZone("UTC")
 //        properties["buildTimestamp"] = simpleDateFormat.format(Date())
@@ -347,6 +359,7 @@ class Stats(
         var buildId: Int? = null
         var agentName: String? = null
         var buildBranch: String? = null
+        var commit: String? = null
 
         System.getenv("TEAMCITY_BUILD_PROPERTIES_FILE")?.let { teamcityConfig ->
             val buildProperties = Properties()
@@ -355,6 +368,7 @@ class Stats(
             buildId = buildProperties["teamcity.build.id"]?.toString()?.toInt()
             agentName = buildProperties["agent.name"]?.toString()
             buildBranch = buildProperties["teamcity.build.branch"]?.toString()
+            commit = buildProperties["build.vcs.number"]?.toString()
         }
 
         if (perfTestRawDataMs.isNotEmpty()) {
@@ -367,6 +381,7 @@ class Stats(
                 val benchmark = Benchmark(
                     agentName = agentName,
                     buildBranch = buildBranch,
+                    commit = commit,
                     buildId = buildId,
                     benchmark = name,
                     name = it.metricName,
@@ -376,31 +391,8 @@ class Stats(
                     metrics = it.metrics ?: emptyList()
                 )
 
-                if (benchmark.name == "ParameterNameAndType - TypeParameter") {
-                    println(benchmark)
-                }
-
                 benchmark.writeJson()
-
-                with(
-                    Benchmark(
-                        agentName = agentName,
-                        buildBranch = buildBranch,
-                        buildId = buildId,
-                        benchmark = name,
-                        synthetic = true,
-                        name = "geomMean",
-                        buildTimestamp = simpleDateFormat.format(Date())
-                    )
-                ) {
-                    loadJson()
-                    merge(benchmark)
-
-                    if (benchmark.name == "ParameterNameAndType - TypeParameter") {
-                        println(this)
-                    }
-                    writeJson()
-                }
+                ESUploader.upload(benchmark)
             }
         } finally {
             metric = null
@@ -415,7 +407,7 @@ class Stats(
         const val WARM_UP = "warm-up"
         const val GEOM_MEAN = "geomMean"
 
-        internal val extraMetricNames = setOf("", GEOM_MEAN, "mean", "stdDev")
+        internal val extraMetricNames = setOf("", "_value", GEOM_MEAN, "mean", "stdDev")
 
         inline fun runAndMeasure(note: String, block: () -> Unit) {
             val openProjectMillis = measureTimeMillis {
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt
index 556bea9c8b3..1566f37840c 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt
@@ -26,10 +26,10 @@ import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.impl.search.IndexPatternBuilder
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry
 import com.intellij.psi.xml.XmlFileNSInfoProvider
+import com.intellij.testFramework.TestApplicationManager
 import com.intellij.xml.XmlSchemaProvider
 import org.jetbrains.kotlin.idea.framework.KotlinSdkType
 import org.jetbrains.kotlin.idea.perf.util.TeamCity
-import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager
 import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
 import java.io.File
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/ESUploader.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/ESUploader.kt
new file mode 100644
index 00000000000..fb5b24055f6
--- /dev/null
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/ESUploader.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.perf.util
+
+import khttp.structures.authorization.BasicAuthorization
+import java.io.FileInputStream
+import java.util.*
+
+object ESUploader {
+    var host: String? = null
+    var username: String? = null
+    var password: String? = null
+
+    var indexName = "kotlin_ide_benchmarks"
+
+    init {
+        host = System.getenv("es.hostname")
+        username = System.getenv("es.username")
+        password = System.getenv("es.password")
+        logMessage { "initialized es details $username @ $host" }
+    }
+
+    fun upload(benchmark: Benchmark) {
+        if (host == null) {
+            logMessage { "ES host is not specified, ${benchmark.id()} would not be uploaded" }
+            return
+        }
+
+        val url = "$host/$indexName/_doc/${benchmark.id()}"
+        val auth = if (username != null && password != null) {
+            BasicAuthorization(username!!, password!!)
+        } else {
+            null
+        }
+        val json = kotlinJsonMapper.writeValueAsString(benchmark)
+
+        val response = khttp.put(
+            url = url,
+            auth = auth,
+            headers = mapOf("Content-Type" to "application/json"),
+            data = json
+        )
+        logMessage { "${response.statusCode} -> ${response.jsonObject}" }
+        if (response.statusCode != 200 && response.statusCode != 201) {
+            throw IllegalStateException("Error code ${response.statusCode} -> ${response.text}")
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
index aaeb3296092..569259addc5 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
@@ -13,6 +13,7 @@ import java.util.ArrayList
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class Benchmark(
+    val version: Int = 4,
     @set:JsonProperty("agentName")
     var agentName: String?,
     @set:JsonProperty("benchmark")
@@ -21,10 +22,16 @@ data class Benchmark(
     var name: String? = null,
     @set:JsonProperty("synthetic")
     var synthetic: Boolean? = null,
+    @set:JsonProperty("index")
+    var index: Int? = null,
+    @set:JsonProperty("warmUp")
+    var warmUp: Boolean? = null,
     @set:JsonProperty("buildTimestamp")
     var buildTimestamp: String,
     @set:JsonProperty("buildBranch")
     var buildBranch: String?,
+    @set:JsonProperty("commit")
+    var commit: String? = null,
     @set:JsonProperty("buildId")
     var buildId: Int?,
     @set:JsonProperty("metricValue")
@@ -41,18 +48,16 @@ data class Benchmark(
         hasError = if (metrics.any { it.ifHasError() == true }) true else null
     }
 
-    fun resetValue() {
-        buildId = null
-        metricValue = null
-        metricError = null
-        buildBranch = null
-        metrics.forEach { it.resetValue() }
-    }
+    private fun String?.escapeName() = this?.replace(Regex("[^A-Za-z0-9]"), "")
 
-    private fun String?.escapeName() = this?.replace(Regex("[^A-Za-z0-9_]"), "_")
-
-    fun fileName(): String =
-        listOfNotNull(benchmark?.escapeName(), name?.escapeName(), buildId?.toString()).joinToString(separator = "_")
+    fun id(): String =
+        listOfNotNull(
+            benchmark?.escapeName(),
+            name?.escapeName(),
+            buildId?.toString(),
+            warmUp?.let { "warmUp" } ?: null,
+            index?.toString()
+        ).joinToString(separator = "_")
 
     fun cleanUp() {
         metrics?.forEach { it.cleanUp() }
@@ -86,6 +91,10 @@ data class Benchmark(
 data class Metric(
     @set:JsonProperty("metricName")
     var metricName: String,
+    @set:JsonProperty("index")
+    var index: Int? = null,
+    @set:JsonProperty("warmUp")
+    var warmUp: Boolean? = null,
     @set:JsonProperty("legacyName")
     var legacyName: String? = null,
     @set:JsonProperty("metricValue")
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/StatsOutput.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/StatsOutput.kt
index 1fa25a6d5db..a3efa8d535b 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/StatsOutput.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/StatsOutput.kt
@@ -62,7 +62,7 @@ internal val kotlinJsonMapper = jacksonObjectMapper()
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
     .configure(SerializationFeature.INDENT_OUTPUT, true)
 
-internal fun Benchmark.statsFile() = statsFile(fileName(), "json")
+internal fun Benchmark.statsFile() = statsFile(id(), "json")
 
 internal fun Benchmark.writeJson() {
     val json = kotlinJsonMapper.writeValueAsString(this)
@@ -74,6 +74,8 @@ internal fun Benchmark.writeJson() {
     }
 }
 
+internal fun File.loadBenchmark(): Benchmark = kotlinJsonMapper.readValue(this, object : TypeReference<Benchmark>() {})
+
 internal fun Benchmark.loadJson() {
     val statsFile = statsFile()
     if (statsFile.exists()) {
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/aggregateResults.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/aggregateResults.kt
new file mode 100644
index 00000000000..7a23ee84d26
--- /dev/null
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/aggregateResults.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.perf.util
+
+import java.io.File
+import java.util.*
+
+fun main(args: Array<String>) {
+    val argFile = File(args[0])
+    val groupBy = argFile.listFiles()
+        .filter { it.length() > 0 && it.name.startsWith("stats-") && it.extension == "json" }
+        .groupBy { it.name.replace("stats-", "").split("_")[0] }
+
+    groupBy.forEach { (k, v) ->
+        if (v.isEmpty()) return@forEach
+
+        val benchmarks = v.map { it.loadBenchmark() }
+
+        benchmarks.forEach { benchmark ->
+            benchmark.metrics.firstOrNull { it.metricName == "" }?.let { metric ->
+                metric.rawMetrics?.firstOrNull { it.warmUp == true && it.index == 0 }?.let {
+                    val warmUpBenchmark = Benchmark(
+                        agentName = benchmark.agentName,
+                        buildBranch = benchmark.buildBranch,
+                        commit = benchmark.commit,
+                        buildId = benchmark.buildId,
+                        benchmark = benchmark.benchmark,
+                        name = benchmark.name,
+                        warmUp = it.warmUp,
+                        index = it.index,
+                        hasError = it.hasError,
+                        buildTimestamp = benchmark.buildTimestamp,
+                        metricValue = it.metricValue,
+                        metricError = it.metricError,
+                        metrics = it.metrics ?: emptyList()
+                    )
+                    warmUpBenchmark.writeJson()
+                    ESUploader.upload(warmUpBenchmark)
+                }
+            }
+        }
+
+        // build geom mean benchmark
+        val first = v.first()
+        val loadBenchmark = first.loadBenchmark()
+        val geomMeanBenchmark = Benchmark(
+            agentName = loadBenchmark.agentName,
+            buildBranch = loadBenchmark.buildBranch,
+            commit = loadBenchmark.commit,
+            buildId = loadBenchmark.buildId,
+            benchmark = loadBenchmark.benchmark,
+            synthetic = true,
+            name = "geomMean",
+            buildTimestamp = loadBenchmark.buildTimestamp
+        )
+
+        benchmarks
+            .filter { it.synthetic != true && it.warmUp != true }
+            .forEach { geomMeanBenchmark.merge(it) }
+        geomMeanBenchmark.writeJson()
+        ESUploader.upload(geomMeanBenchmark)
+    }
+}
\ No newline at end of file
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/heapDumper.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/heapDumper.kt
index 25a166c9fa2..002f8e24b06 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/heapDumper.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/heapDumper.kt
@@ -7,15 +7,16 @@ package org.jetbrains.kotlin.idea.perf.util
 
 import com.intellij.openapi.util.io.FileUtilRt
 import com.sun.management.HotSpotDiagnosticMXBean
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
 import java.lang.management.ManagementFactory
+import java.nio.file.Files
+import java.nio.file.Path
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
+import kotlin.io.path.*
 
+@OptIn(ExperimentalPathApi::class)
 object HeapDumper {
     private const val HOTSPOT_BEAN_NAME = "com.sun.management:type=HotSpotDiagnostic"
 
@@ -30,15 +31,15 @@ object HeapDumper {
     fun dumpHeap(fileNamePrefix: String, live: Boolean = true) {
         val format = SimpleDateFormat("yyyyMMdd-HHmmss")
         val timestamp = format.format(Date())
-        val tempFile = File.createTempFile(fileNamePrefix, ".hprof")
-        tempFile.delete()
+        val tempFile = createTempFile(fileNamePrefix, ".hprof")
+        tempFile.deleteIfExists()
         val fileName = "build/$fileNamePrefix-$timestamp.hprof.zip"
         logMessage { "Dumping a heap into $tempFile ..." }
         try {
             hotspotMBean.dumpHeap(tempFile.toString(), live)
             logMessage { "Heap dump is $tempFile ready." }
 
-            zipFile(tempFile, File(fileName))
+            zipFile(tempFile, Path(fileName))
 
             val testName = "Heap dump $timestamp"
             TeamCity.test(testName) {
@@ -50,9 +51,9 @@ object HeapDumper {
         }
     }
 
-    private fun zipFile(srcFile: File, targetFile: File) {
-        FileInputStream(srcFile).use { fis ->
-            ZipOutputStream(FileOutputStream(targetFile)).use { os ->
+    private fun zipFile(srcFile: Path, targetFile: Path) {
+        srcFile.inputStream().use { fis ->
+            ZipOutputStream(targetFile.outputStream()).use { os ->
                 os.putNextEntry(ZipEntry(srcFile.name))
                 FileUtilRt.copy(fis, os)
                 os.closeEntry()
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt
index af10f214ae7..10b3fd86792 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt
@@ -40,9 +40,9 @@ import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.enableAllInspe
 import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.enableInspections
 import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.enableSingleInspection
 import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.initDefaultProfile
+import org.jetbrains.kotlin.idea.test.GradleProcessOutputInterceptor
 import org.jetbrains.kotlin.idea.test.invalidateLibraryCache
 import org.jetbrains.kotlin.idea.testFramework.*
-import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager
 import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
 import java.io.File
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/StatefulTestGradleProjectRefreshCallback.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/StatefulTestGradleProjectRefreshCallback.kt
index bf2989d3059..75754f0c4b1 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/StatefulTestGradleProjectRefreshCallback.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/StatefulTestGradleProjectRefreshCallback.kt
@@ -12,6 +12,7 @@ import com.intellij.openapi.externalSystem.service.project.ExternalProjectRefres
 import com.intellij.openapi.externalSystem.service.project.ProjectDataManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
+import org.jetbrains.kotlin.idea.test.GradleProcessOutputInterceptor
 import java.io.Closeable
 import kotlin.test.assertFalse
 import kotlin.test.fail
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt
deleted file mode 100644
index b2c9e7ed0ff..00000000000
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.testFramework
-
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.ex.ProjectManagerEx
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun ProjectManagerEx.forceCloseProjectEx(project: Project, dispose: Boolean): Boolean {
-    if (!dispose) error("dispose should be true")
-    return this.forceCloseProject(project)
-}
-
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias TestApplicationManager = com.intellij.testFramework.TestApplicationManager
\ No newline at end of file
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt.193 b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt.193
deleted file mode 100644
index e9542b8cb9d..00000000000
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt.193
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.testFramework
-
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.ex.ProjectManagerEx
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun ProjectManagerEx.forceCloseProjectEx(project: Project, dispose: Boolean): Boolean {
-    if (!dispose) error("dispose should be true")
-    return this.forceCloseProject(project, true)
-}
-
-// FIX ME WHEN BUNCH 193 REMOVED
-typealias TestApplicationManager = com.intellij.idea.IdeaTestApplication
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/gradleRoutines.kt.193 b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/gradleRoutines.kt.193
deleted file mode 100644
index d1d47e8a7e4..00000000000
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/gradleRoutines.kt.193
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.testFramework
-
-import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder
-import com.intellij.openapi.externalSystem.service.execution.ProgressExecutionMode
-import com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManagerImpl
-import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
-import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
-import com.intellij.openapi.project.DumbService
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.roots.ProjectRootManager
-import org.jetbrains.plugins.gradle.service.project.open.setupGradleSettings
-import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
-import org.jetbrains.plugins.gradle.settings.GradleSettings
-import org.jetbrains.plugins.gradle.util.GradleConstants
-import org.jetbrains.plugins.gradle.util.GradleLog
-import java.io.File
-import kotlin.test.assertNotNull
-
-fun refreshGradleProject(projectPath: String, project: Project) {
-    _importProject(File(projectPath).absolutePath, project)
-
-    dispatchAllInvocationEvents()
-}
-
-const val GRADLE_JDK_NAME = "Gradle JDK"
-
-/**
- * inspired by org.jetbrains.plugins.gradle.service.project.open.importProject(projectDirectory, project)
- */
-private fun _importProject(projectPath: String, project: Project) {
-    GradleLog.LOG.info("Import project at $projectPath")
-    val projectSdk = ProjectRootManager.getInstance(project).projectSdk
-    assertNotNull(projectSdk, "project SDK not found for ${project.name} at $projectPath")
-    val gradleProjectSettings = GradleProjectSettings()
-
-    GradleSettings.getInstance(project).gradleVmOptions =
-        "-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${System.getProperty("user.dir")}"
-
-    setupGradleSettings(gradleProjectSettings, projectPath, project, projectSdk)
-    gradleProjectSettings.gradleJvm = GRADLE_JDK_NAME
-
-    GradleSettings.getInstance(project).getLinkedProjectSettings(projectPath)?.let { linkedProjectSettings ->
-        linkedProjectSettings.gradleJvm = GRADLE_JDK_NAME
-    }
-
-    _attachGradleProjectAndRefresh(gradleProjectSettings, project)
-}
-
-/**
- * inspired by org.jetbrains.plugins.gradle.service.project.open.attachGradleProjectAndRefresh(gradleProjectSettings, project)
- * except everything is MODAL_SYNC
- */
-private fun _attachGradleProjectAndRefresh(
-    gradleProjectSettings: GradleProjectSettings,
-    project: Project
-) {
-    val externalProjectPath = gradleProjectSettings.externalProjectPath
-    ExternalProjectsManagerImpl.getInstance(project).runWhenInitialized {
-        DumbService.getInstance(project).runWhenSmart {
-            ExternalSystemUtil.ensureToolWindowInitialized(project, GradleConstants.SYSTEM_ID)
-        }
-    }
-
-    ExternalProjectsManagerImpl.disableProjectWatcherAutoUpdate(project)
-    val settings = ExternalSystemApiUtil.getSettings(project, GradleConstants.SYSTEM_ID)
-    if (settings.getLinkedProjectSettings(externalProjectPath) == null) {
-        settings.linkProject(gradleProjectSettings)
-    }
-
-    StatefulTestGradleProjectRefreshCallback(externalProjectPath, project).use { callback ->
-        ExternalSystemUtil.refreshProject(
-            externalProjectPath,
-            ImportSpecBuilder(project, GradleConstants.SYSTEM_ID)
-                .use(ProgressExecutionMode.MODAL_SYNC)
-                .callback(callback)
-                .build()
-        )
-    }
-}
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt
index 94fa6c8f5b9..185f5d5167c 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt
@@ -23,6 +23,7 @@ import com.intellij.openapi.startup.StartupManager
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.impl.PsiDocumentManagerBase
 import com.intellij.testFramework.ExtensionTestUtil
+import com.intellij.testFramework.TestApplicationManager
 import com.intellij.testFramework.runInEdtAndWait
 import com.intellij.util.ui.UIUtil
 import org.jetbrains.kotlin.idea.perf.util.logMessage
@@ -84,8 +85,7 @@ fun TestApplicationManager.closeProject(project: Project) {
     logMessage { "project '$name' is about to be closed" }
     dispatchAllInvocationEvents()
     val projectManagerEx = ProjectManagerEx.getInstanceEx()
-    projectManagerEx.forceCloseProjectEx(project, true)
-
+    projectManagerEx.forceCloseProject(project)
     logMessage { "project '$name' successfully closed" }
 }
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202 b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202
index 367b68ab33e..756f62ec7f0 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202
@@ -25,6 +25,7 @@ import com.intellij.platform.PlatformProjectOpenProcessor
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.impl.PsiDocumentManagerBase
 import com.intellij.testFramework.ExtensionTestUtil
+import com.intellij.testFramework.TestApplicationManager
 import com.intellij.testFramework.runInEdtAndWait
 import com.intellij.util.ui.UIUtil
 import org.jetbrains.kotlin.idea.perf.util.logMessage
@@ -85,8 +86,7 @@ fun TestApplicationManager.closeProject(project: Project) {
     logMessage { "project '$name' is about to be closed" }
     dispatchAllInvocationEvents()
     val projectManagerEx = ProjectManagerEx.getInstanceEx()
-    projectManagerEx.forceCloseProjectEx(project, true)
-
+    projectManagerEx.forceCloseProject(project)
     logMessage { "project '$name' successfully closed" }
 }
 
diff --git a/idea/resources-descriptors/META-INF/plugin.xml b/idea/resources-descriptors/META-INF/plugin.xml
index bf474888223..8f5c88df3b5 100644
--- a/idea/resources-descriptors/META-INF/plugin.xml
+++ b/idea/resources-descriptors/META-INF/plugin.xml
@@ -16,6 +16,19 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <idea-version since-build="201.7223.91" until-build="201.*"/>
 
   <change-notes><![CDATA[
+    <h3>1.4.20</h3>
+    <ul>
+      <li>Kotlin/JS: New project templates, improved Gradle plugin, experimental <b>compilation with errors mode</b> in the IR compiler.</li>
+      <li>Kotlin/Native: New escape analysis mechanism, wrapping of Objective-C exceptions, various functional and performance improvements.</li>
+      <li>IDE: Experimental support for <a href="https://blog.jetbrains.com/idea/2020/03/intellij-idea-2020-1-beta2/">Code Vision</a>, the <b>Redirect input from</b> option in Kotlin run configurations, and more.</li>
+      <li>JEP 280 (invokedynamic) string concatenation is available on the JVM.</li>
+      <li>Changes to the layout of multiplatform projects.</li>
+      <li>Improved CocoaPods support.</li>
+      <li>Standard library improvements: Extensions for java.nio.file.Path and performance optimizations.</li>
+      <li>Deprecation of the kotlin-android-extensions compiler plugin. Parcelable implementation generator has moved to the new kotlin-parcelize plugin.</li>
+    </ul>
+    For more details, see <a href="https://kotlinlang.org/docs/reference/whatsnew1420.html?utm_source=product&utm_medium=link">What’s New in Kotlin 1.4.20</a> and <a href="https://blog.jetbrains.com/kotlin/2020/11/kotlin-1-4-20-released/?utm_source=product&utm_medium=link">this blog post</a>.
+    <br><br>
     <h3>1.4.0</h3>
     Released: <b>August 17, 2020</b>
     <ul>
diff --git a/idea/resources-descriptors/META-INF/plugin.xml.193 b/idea/resources-descriptors/META-INF/plugin.xml.193
deleted file mode 100644
index b61c2441261..00000000000
--- a/idea/resources-descriptors/META-INF/plugin.xml.193
+++ /dev/null
@@ -1,176 +0,0 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" version="2" url="http://kotlinlang.org" allow-bundled-update="true">
-  <id>org.jetbrains.kotlin</id>
-
-  <name>Kotlin</name>
-  <description><![CDATA[
-The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
-<br>
-<a href="http://kotlinlang.org/docs/tutorials/getting-started.html">Getting Started in IntelliJ IDEA</a><br>
-<a href="http://kotlinlang.org/docs/tutorials/kotlin-android.html">Getting Started in Android Studio</a><br>
-<a href="http://slack.kotlinlang.org/">Public Slack</a><br>
-<a href="https://youtrack.jetbrains.com/issues/KT">Issue tracker</a><br>
-]]></description>
-  <version>@snapshot@</version>
-  <vendor url="http://www.jetbrains.com">JetBrains</vendor>
-
-  <idea-version since-build="193.4099.13" until-build="193.*"/>
-
-  <change-notes><![CDATA[
-    <h3>1.4.0</h3>
-    Released: <b>August 17, 2020</b>
-    <ul>
-      <li>New compiler with better type inference.</li>
-      <li>IR backends for JVM and JS in Alpha mode (<a href="https://kotlinlang.org/docs/reference/whatsnew14.html#unified-backends-and-extensibility">requires opt-in</a>).</li>
-      <li>A new flexible Kotlin Project Wizard for easy creation and configuration of different types of projects.</li>
-      <li>New IDE functionality to debug coroutines.</li>
-      <li>IDE performance improvements: many actions, such as project opening and autocomplete suggestions now complete up to 4 times faster.</li>
-      <li>New language features such as SAM conversions, trailing comma, and other.</li>
-      <li>Type annotations in the JVM bytecode and new modes for generating default interfaces in Kotlin/JVM.</li>
-      <li>New Gradle DSL for Kotlin/JS.</li>
-      <li>Improved performance and interop with Swift and Objective-C in Kotlin/Native.</li>
-      <li>Support for sharing code in several targets thanks to the hierarchical structure in multiplatform projects.</li>
-      <li>New collection operators, delegated properties improvements, the double-ended queue implementation ArrayDeque, and much more new things in the standard library.</li>
-    </ul>
-    For more details, see <a href="https://kotlinlang.org/docs/reference/whatsnew14.html?utm_source=product&utm_medium=link">What’s New in Kotlin 1.4.0</a> and <a href="http://blog.jetbrains.com/kotlin/2020/08/kotlin-1-4-released-with-a-focus-on-quality-and-performance/?utm_source=product&utm_medium=link">this blog post</a>.
-    <br><br>
-    To get the most out of the changes and improvements introduced in Kotlin 1.4, join our <a href="https://kotlinlang.org/lp/event-14/">Online Event</a> where you will be able to enjoy four days of Kotlin talks, Q&As with the Kotlin team, and more.
-    ]]>
-  </change-notes>
-
-  <depends>com.intellij.modules.platform</depends>
-
-  <depends optional="true" config-file="junit.xml">JUnit</depends>
-  <depends optional="true" config-file="gradle.xml">com.intellij.gradle</depends>
-  <depends optional="true" config-file="gradle-java.xml">org.jetbrains.plugins.gradle</depends>
-  <depends optional="true" config-file="kotlin-gradle-testing.xml">org.jetbrains.plugins.gradle</depends>
-  <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</depends>
-  <depends optional="true" config-file="maven.xml">org.jetbrains.idea.maven</depends>
-  <depends optional="true" config-file="testng-j.xml">TestNG-J</depends>
-  <depends optional="true" config-file="coverage.xml">Coverage</depends>
-  <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
-  <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
-  <depends optional="true" config-file="git4idea.xml">Git4Idea</depends>
-  <depends optional="true" config-file="stream-debugger.xml">org.jetbrains.debugger.streams</depends>
-  <depends optional="true" config-file="completion-stats.xml">com.intellij.stats.completion</depends>
-
-  <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
-
-  <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
-  <depends>com.intellij.modules.idea</depends>
-  <depends>com.intellij.modules.java</depends>
-  <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
-  <depends optional="true" config-file="kotlin-copyright.xml">com.intellij.copyright</depends>
-  <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
-  <!-- CIDR-PLUGIN-PLACEHOLDER-END -->
-
-  <xi:include href="plugin-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <!-- CIDR-PLUGIN-EXCLUDE-START -->
-  <xi:include href="jvm-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="parcelize.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <!-- CIDR-PLUGIN-EXCLUDE-END -->
-
-  <xi:include href="native-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="native.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <xi:include href="kotlinx-serialization.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <xi:include href="scripting-support.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <project-components>
-    <component>
-      <implementation-class>org.jetbrains.kotlin.idea.caches.trackers.KotlinCodeBlockModificationListener</implementation-class>
-    </component>
-  </project-components>
-
-  <application-components>
-    <component>
-      <implementation-class>org.jetbrains.kotlin.idea.PluginStartupComponent</implementation-class>
-    </component>
-  </application-components>
-
-  <extensionPoints>
-    <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
-
-    <extensionPoint qualifiedName="org.jetbrains.kotlin.pluginUpdateVerifier"
-                    interface="org.jetbrains.kotlin.idea.update.PluginUpdateVerifier"/>
-  </extensionPoints>
-
-  <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <extensions defaultExtensionNs="com.intellij.jvm">
-    <declarationSearcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.jvm.KotlinDeclarationSearcher"/>
-  </extensions>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupApplicationService" />
-
-    <postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService"/>
-
-    <postStartupActivity implementation="org.jetbrains.kotlin.idea.completion.LookupCancelWatcher"/>
-    <postStartupActivity implementation="org.jetbrains.kotlin.idea.caches.KotlinPackageContentModificationListener"/>
-    <postStartupActivity implementation="org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectComponent"/>
-
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.completion.LookupCancelService"/>
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectService"/>
-
-    <highlightingPassFactory implementation="org.jetbrains.kotlin.idea.highlighter.KotlinBeforeResolveHighlightingPass$Registrar"/>
-    <highlightingPassFactory implementation="org.jetbrains.kotlin.idea.highlighter.ScriptExternalHighlightingPass$Registrar"/>
-    <highlightingPassFactory implementation="org.jetbrains.kotlin.idea.refactoring.cutPaste.MoveDeclarationsPassFactory$Registrar"/>
-
-    <statistics.counterUsagesCollector groupId="kotlin.gradle.target" version="2"/>
-    <statistics.counterUsagesCollector groupId="kotlin.maven.target" version="3"/>
-    <statistics.counterUsagesCollector groupId="kotlin.jps.target" version="3"/>
-    <statistics.counterUsagesCollector groupId="kotlin.gradle.library" version="1"/>
-    <statistics.counterUsagesCollector groupId="kotlin.ide.refactoring" version="1"/>
-    <statistics.counterUsagesCollector groupId="kotlin.ide.newFileTempl" version="1"/>
-    <statistics.counterUsagesCollector groupId="kotlin.ide.npwizards" version="2"/>
-    <statistics.counterUsagesCollector groupId="kotlin.ide.debugger" version="2"/>
-    <statistics.counterUsagesCollector groupId="kotlin.ide.j2k" version="1"/>
-    <statistics.counterUsagesCollector groupId="kotlin.ide.editor" version="1"/>
-    <statistics.counterUsagesCollector groupId="kotlin.ide.migrationTool" version="1"/>
-    <statistics.counterUsagesCollector groupId="kotlin.ide.new.wizard" version="1"/>
-    <statistics.counterUsagesCollector groupId="kotlin.gradle.performance" version="1"/>
-    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.IDESettingsFUSCollector"/>
-    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector"/>
-    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.ProjectConfigurationCollector"/>
-
-    <fileTypeUsageSchemaDescriptor schema="Gradle Script" implementationClass="org.jetbrains.kotlin.idea.core.script.KotlinGradleScriptFileTypeSchemaDetector"/>
-
-    <completion.ml.model implementation="org.jetbrains.kotlin.idea.completion.ml.KotlinMLRankingProvider"/>
-    <completion.ml.contextFeatures language="kotlin" implementationClass="org.jetbrains.kotlin.idea.completion.ml.KotlinContextFeatureProvider"/>
-
-    <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
-
-    <fileType name="Kotlin"
-              implementationClass="org.jetbrains.kotlin.idea.KotlinFileType"
-              fieldName="INSTANCE"
-              language="kotlin"
-              extensions="kt;kts"/>
-    <fileType name="ARCHIVE" extensions="klib"/>
-    <fileType name="KNM"
-              implementationClass="org.jetbrains.kotlin.idea.klib.KlibMetaFileType"
-              fieldName="INSTANCE"
-              extensions="knm"/>
-    <fileType name="KJSM"
-              implementationClass="org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType"
-              fieldName="INSTANCE"
-              extensions="kjsm"/>
-
-    <fileType name="kotlin_builtins"
-              implementationClass="org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType"
-              fieldName="INSTANCE"
-              extensions="kotlin_builtins;kotlin_metadata"/>
-
-    <fileType name="kotlin_module"
-              implementationClass="org.jetbrains.kotlin.idea.KotlinModuleFileType"
-              fieldName="INSTANCE"
-              extensions="kotlin_module"/>
-  </extensions>
-</idea-plugin>
diff --git a/idea/resources-descriptors/META-INF/plugin.xml.202 b/idea/resources-descriptors/META-INF/plugin.xml.202
index 7d6aa6a6c86..7eb10ab8e9c 100644
--- a/idea/resources-descriptors/META-INF/plugin.xml.202
+++ b/idea/resources-descriptors/META-INF/plugin.xml.202
@@ -16,6 +16,19 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <idea-version since-build="202.1" until-build="202.*"/>
 
   <change-notes><![CDATA[
+    <h3>1.4.20</h3>
+    <ul>
+      <li>Kotlin/JS: New project templates, improved Gradle plugin, experimental <b>compilation with errors mode</b> in the IR compiler.</li>
+      <li>Kotlin/Native: New escape analysis mechanism, wrapping of Objective-C exceptions, various functional and performance improvements.</li>
+      <li>IDE: Experimental support for <a href="https://blog.jetbrains.com/idea/2020/03/intellij-idea-2020-1-beta2/">Code Vision</a>, the <b>Redirect input from</b> option in Kotlin run configurations, and more.</li>
+      <li>JEP 280 (invokedynamic) string concatenation is available on the JVM.</li>
+      <li>Changes to the layout of multiplatform projects.</li>
+      <li>Improved CocoaPods support.</li>
+      <li>Standard library improvements: Extensions for java.nio.file.Path and performance optimizations.</li>
+      <li>Deprecation of the kotlin-android-extensions compiler plugin. Parcelable implementation generator has moved to the new kotlin-parcelize plugin.</li>
+    </ul>
+    For more details, see <a href="https://kotlinlang.org/docs/reference/whatsnew1420.html?utm_source=product&utm_medium=link">What’s New in Kotlin 1.4.20</a> and <a href="https://blog.jetbrains.com/kotlin/2020/11/kotlin-1-4-20-released/?utm_source=product&utm_medium=link">this blog post</a>.
+    <br><br>
     <h3>1.4.0</h3>
     Released: <b>August 17, 2020</b>
     <ul>
diff --git a/idea/resources-descriptors/META-INF/plugin.xml.as40 b/idea/resources-descriptors/META-INF/plugin.xml.as40
index f5a9bb7b99a..2588cca74d4 100644
--- a/idea/resources-descriptors/META-INF/plugin.xml.as40
+++ b/idea/resources-descriptors/META-INF/plugin.xml.as40
@@ -16,6 +16,19 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <idea-version since-build="193.5233.102" until-build="193.*"/>
 
   <change-notes><![CDATA[
+    <h3>1.4.20</h3>
+    <ul>
+      <li>Kotlin/JS: New project templates, improved Gradle plugin, experimental <b>compilation with errors mode</b> in the IR compiler.</li>
+      <li>Kotlin/Native: New escape analysis mechanism, wrapping of Objective-C exceptions, various functional and performance improvements.</li>
+      <li>IDE: Experimental support for <a href="https://blog.jetbrains.com/idea/2020/03/intellij-idea-2020-1-beta2/">Code Vision</a>, the <b>Redirect input from</b> option in Kotlin run configurations, and more.</li>
+      <li>JEP 280 (invokedynamic) string concatenation is available on the JVM.</li>
+      <li>Changes to the layout of multiplatform projects.</li>
+      <li>Improved CocoaPods support.</li>
+      <li>Standard library improvements: Extensions for java.nio.file.Path and performance optimizations.</li>
+      <li>Deprecation of the kotlin-android-extensions compiler plugin. Parcelable implementation generator has moved to the new kotlin-parcelize plugin.</li>
+    </ul>
+    For more details, see <a href="https://kotlinlang.org/docs/reference/whatsnew1420.html?utm_source=product&utm_medium=link">What’s New in Kotlin 1.4.20</a> and <a href="https://blog.jetbrains.com/kotlin/2020/11/kotlin-1-4-20-released/?utm_source=product&utm_medium=link">this blog post</a>.
+    <br><br>
     <h3>1.4.0</h3>
     Released: <b>August 17, 2020</b>
     <ul>
diff --git a/idea/resources-descriptors/META-INF/plugin.xml.as41 b/idea/resources-descriptors/META-INF/plugin.xml.as41
index 7a8e09a2534..a70a1c3b054 100644
--- a/idea/resources-descriptors/META-INF/plugin.xml.as41
+++ b/idea/resources-descriptors/META-INF/plugin.xml.as41
@@ -16,6 +16,19 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <idea-version since-build="201.7223.91" until-build="201.*"/>
 
   <change-notes><![CDATA[
+    <h3>1.4.20</h3>
+    <ul>
+      <li>Kotlin/JS: New project templates, improved Gradle plugin, experimental <b>compilation with errors mode</b> in the IR compiler.</li>
+      <li>Kotlin/Native: New escape analysis mechanism, wrapping of Objective-C exceptions, various functional and performance improvements.</li>
+      <li>IDE: Experimental support for <a href="https://blog.jetbrains.com/idea/2020/03/intellij-idea-2020-1-beta2/">Code Vision</a>, the <b>Redirect input from</b> option in Kotlin run configurations, and more.</li>
+      <li>JEP 280 (invokedynamic) string concatenation is available on the JVM.</li>
+      <li>Changes to the layout of multiplatform projects.</li>
+      <li>Improved CocoaPods support.</li>
+      <li>Standard library improvements: Extensions for java.nio.file.Path and performance optimizations.</li>
+      <li>Deprecation of the kotlin-android-extensions compiler plugin. Parcelable implementation generator has moved to the new kotlin-parcelize plugin.</li>
+    </ul>
+    For more details, see <a href="https://kotlinlang.org/docs/reference/whatsnew1420.html?utm_source=product&utm_medium=link">What’s New in Kotlin 1.4.20</a> and <a href="https://blog.jetbrains.com/kotlin/2020/11/kotlin-1-4-20-released/?utm_source=product&utm_medium=link">this blog post</a>.
+    <br><br>
     <h3>1.4.0</h3>
     Released: <b>August 17, 2020</b>
     <ul>
diff --git a/idea/resources-descriptors/META-INF/plugin.xml.as42 b/idea/resources-descriptors/META-INF/plugin.xml.as42
index 804d998aae6..1a2237b7f41 100644
--- a/idea/resources-descriptors/META-INF/plugin.xml.as42
+++ b/idea/resources-descriptors/META-INF/plugin.xml.as42
@@ -15,8 +15,20 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <idea-version since-build="202.6397.94" until-build="202.*"/>
 
-  <change-notes>
+  <change-notes><![CDATA[
     <h3>1.4.20</h3>
+    <ul>
+      <li>Kotlin/JS: New project templates, improved Gradle plugin, experimental <b>compilation with errors mode</b> in the IR compiler.</li>
+      <li>Kotlin/Native: New escape analysis mechanism, wrapping of Objective-C exceptions, various functional and performance improvements.</li>
+      <li>IDE: Experimental support for <a href="https://blog.jetbrains.com/idea/2020/03/intellij-idea-2020-1-beta2/">Code Vision</a>, the <b>Redirect input from</b> option in Kotlin run configurations, and more.</li>
+      <li>JEP 280 (invokedynamic) string concatenation is available on the JVM.</li>
+      <li>Changes to the layout of multiplatform projects.</li>
+      <li>Improved CocoaPods support.</li>
+      <li>Standard library improvements: Extensions for java.nio.file.Path and performance optimizations.</li>
+      <li>Deprecation of the kotlin-android-extensions compiler plugin. Parcelable implementation generator has moved to the new kotlin-parcelize plugin.</li>
+    </ul>
+    For more details, see <a href="https://kotlinlang.org/docs/reference/whatsnew1420.html?utm_source=product&utm_medium=link">What’s New in Kotlin 1.4.20</a> and <a href="https://blog.jetbrains.com/kotlin/2020/11/kotlin-1-4-20-released/?utm_source=product&utm_medium=link">this blog post</a>.
+    ]]>
   </change-notes>
 
   <depends>com.intellij.modules.platform</depends>
diff --git a/idea/resources-fir/META-INF/plugin.xml b/idea/resources-fir/META-INF/plugin.xml
index abb1f81a657..fefad5ae0a1 100644
--- a/idea/resources-fir/META-INF/plugin.xml
+++ b/idea/resources-fir/META-INF/plugin.xml
@@ -100,6 +100,9 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
     <projectService serviceInterface="org.jetbrains.kotlin.idea.asJava.LightClassProvider"
                     serviceImplementation="org.jetbrains.kotlin.idea.asJava.LightClassProviderFirImpl"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.psi.KtFileClassProvider"
+                    serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.KtFileClassProviderImpl"/>
+
     <completion.contributor language="kotlin"
                             id="KotlinCompletionContributor"
                             order="first"
@@ -204,6 +207,14 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
 
     <highlightingPassFactory implementation="org.jetbrains.kotlin.idea.highlighter.KotlinBeforeResolveHighlightingPass$Registrar"/>
 
+    <java.elementFinder implementation="org.jetbrains.kotlin.asJava.finder.JavaElementFinder"/>
+
+    <projectService serviceInterface="org.jetbrains.kotlin.asJava.KotlinAsJavaSupport"
+                    serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.IDEKotlinAsJavaFirSupport"/>
+
+    <projectService serviceInterface="org.jetbrains.kotlin.asJava.LightClassGenerationSupport"
+                    serviceImplementation="org.jetbrains.kotlin.idea.asJava.FirLightClassGenerationSupport"/>
+
     <elementDescriptionProvider
         implementation="org.jetbrains.kotlin.idea.findUsages.KotlinElementDescriptionProviderBase"
         order="first"/>
diff --git a/idea/resources/META-INF/git4idea.xml.as41 b/idea/resources/META-INF/git4idea.xml.as41
deleted file mode 100644
index 1bb24d148a3..00000000000
--- a/idea/resources/META-INF/git4idea.xml.as41
+++ /dev/null
@@ -1,4 +0,0 @@
-<idea-plugin>
-    <extensions defaultExtensionNs="Git4Idea">
-    </extensions>
-</idea-plugin>
\ No newline at end of file
diff --git a/idea/resources/META-INF/git4idea.xml.as42 b/idea/resources/META-INF/git4idea.xml.as42
deleted file mode 100644
index 1bb24d148a3..00000000000
--- a/idea/resources/META-INF/git4idea.xml.as42
+++ /dev/null
@@ -1,4 +0,0 @@
-<idea-plugin>
-    <extensions defaultExtensionNs="Git4Idea">
-    </extensions>
-</idea-plugin>
\ No newline at end of file
diff --git a/idea/resources/META-INF/gradle-java.xml.193 b/idea/resources/META-INF/gradle-java.xml.193
deleted file mode 100644
index e0fc7cb7db5..00000000000
--- a/idea/resources/META-INF/gradle-java.xml.193
+++ /dev/null
@@ -1,67 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
-    <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinMPPSourceSetsFrameworkSupportProvider"/>
-    <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJavaFrameworkSupportProvider"/>
-    <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJSBrowserFrameworkSupportProvider"/>
-    <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJSNodeFrameworkSupportProvider"/>
-    <kotlinDslFrameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.KotlinDslGradleKotlinMPPFrameworkSupportProvider"/>
-    <kotlinDslFrameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.KotlinDslGradleKotlinJavaFrameworkSupportProvider"/>
-    <kotlinDslFrameworkSupport
-        implementation="org.jetbrains.kotlin.idea.configuration.KotlinDslGradleKotlinJSBrowserFrameworkSupportProvider"/>
-    <kotlinDslFrameworkSupport
-        implementation="org.jetbrains.kotlin.idea.configuration.KotlinDslGradleKotlinJSNodeFrameworkSupportProvider"/>
-    <pluginDescriptions implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradlePluginDescription"/>
-    <projectResolve implementation="org.jetbrains.kotlin.idea.configuration.KotlinNonJvmGutterConfigurator"/>
-    <projectResolve implementation="org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptModelResolver" order="first"/>
-    <projectResolve implementation="org.jetbrains.kotlin.idea.cocoapods.KotlinCocoaPodsModelResolver" order="first"/>
-    <projectResolve implementation="org.jetbrains.kotlin.idea.commonizer.KotlinCommonizerModelResolver" order="first"/>
-    <projectResolve implementation="org.jetbrains.kotlin.idea.cocoapods.KotlinCocoaPodsModelResolver" order="last"/>
-    <projectResolve implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleProjectResolverExtension" order="first"/>
-    <projectResolve implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleCoroutineDebugProjectResolver" order="last"/>
-    <projectResolve implementation="org.jetbrains.kotlin.kapt.idea.KaptProjectResolverExtension" order="last"/>
-    <projectResolve implementation="org.jetbrains.kotlin.allopen.ide.AllOpenProjectResolverExtension" order="last"/>
-    <projectResolve implementation="org.jetbrains.kotlin.noarg.ide.NoArgProjectResolverExtension" order="last"/>
-    <projectResolve implementation="org.jetbrains.kotlin.samWithReceiver.ide.SamWithReceiverProjectResolverExtension" order="last"/>
-  </extensions>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <postStartupActivity implementation="org.jetbrains.kotlin.idea.scripting.gradle.SdkValidator"/>
-
-    <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleSourceSetDataService"/>
-    <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleProjectDataService"/>
-    <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleLibraryDataService"/>
-    <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinTargetDataService"/>
-    <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinOutputPathsDataService"/>
-    <externalProjectDataService implementation="org.jetbrains.kotlin.idea.KotlinJavaMPPSourceSetDataService"/>
-    <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.klib.KotlinNativeLibraryDataService"/>
-    <externalSystemTaskNotificationListener
-        implementation="org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslSyncListener"
-    />
-    <editorNotificationProvider implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptNotificationProvider"/>
-
-    <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinJvmTestClassGradleConfigurationProducer"/>
-    <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinMultiplatformJvmTestClassGradleConfigurationProducer"/>
-    <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinJvmTestMethodGradleConfigurationProducer"/>
-    <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinMultiplatformJvmTestMethodGradleConfigurationProducer"/>
-
-  </extensions>
-
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <gradleProjectImportHandler implementation="org.jetbrains.kotlin.allopen.ide.AllOpenGradleProjectImportHandler"/>
-    <gradleProjectImportHandler implementation="org.jetbrains.kotlin.scripting.idea.plugin.ScriptingGradleProjectImportHandler"/>
-    <gradleProjectImportHandler implementation="org.jetbrains.kotlin.kapt.idea.KaptGradleProjectImportHandler"/>
-    <gradleProjectImportHandler implementation="org.jetbrains.kotlin.noarg.ide.NoArgGradleProjectImportHandler"/>
-    <gradleProjectImportHandler implementation="org.jetbrains.kotlin.samWithReceiver.ide.SamWithReceiverGradleProjectImportHandler"/>
-    <gradleProjectImportHandler implementation="org.jetbrains.kotlinx.serialization.idea.KotlinSerializationGradleImportHandler"/>
-
-    <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleModuleConfigurator"/>
-    <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsGradleModuleConfigurator"/>
-    <gradleModelFacade implementation="org.jetbrains.kotlin.idea.inspections.gradle.DefaultGradleModelFacade"/>
-
-    <scriptDefinitionContributor implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsContributor"
-                                 order="first"/>
-    <scriptAdditionalIdeaDependenciesProvider
-        implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptAdditionalIdeaDependenciesProvider"/>
-
-  </extensions>
-</idea-plugin>
diff --git a/idea/resources/META-INF/gradle.xml.193 b/idea/resources/META-INF/gradle.xml.193
deleted file mode 100644
index 61cae8560a0..00000000000
--- a/idea/resources/META-INF/gradle.xml.193
+++ /dev/null
@@ -1,58 +0,0 @@
-<idea-plugin>
-    <extensionPoints>
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.gradleProjectImportHandler" area="IDEA_PROJECT"
-                        interface="org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler"/>
-
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.gradleModelFacade"
-                        interface="org.jetbrains.kotlin.idea.inspections.gradle.KotlinGradleModelFacade"/>
-    </extensionPoints>
-
-    <extensions defaultExtensionNs="org.jetbrains.kotlin">
-        <buildSystemTypeDetector implementation="org.jetbrains.kotlin.idea.configuration.GradleDetector"/>
-        <scriptDiagnosticFixProvider implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDiagnosticFixProvider"/>
-        <experimentalFeature implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptConfigurationsImportingFeature"/>
-    </extensions>
-
-    <extensions defaultExtensionNs="org.jetbrains.kotlin.scripting.idea">
-        <listener order="first" implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptListener"/>
-
-        <loader order="first" implementation="org.jetbrains.kotlin.idea.scripting.gradle.legacy.GradleLegacyScriptConfigurationLoader"/>
-
-        <scriptingSupport implementation="org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager"/>
-
-        <settings.provider implementation="org.jetbrains.kotlin.idea.scripting.gradle.settings.GradleSettingsProvider"/>
-    </extensions>
-
-    <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
-        <orderEnumerationHandlerFactory implementation="org.jetbrains.kotlin.idea.gradle.execution.KotlinGradleOrderEnumerationHandler$Factory" order="first"/>
-        <projectResolve implementation="org.jetbrains.kotlin.idea.configuration.KotlinMPPGradleProjectResolver"/>
-        <testTasksProvider implementation="org.jetbrains.kotlin.idea.run.KotlinMPPGradleTestTasksProvider"/>
-        <executionEnvironmentProvider implementation="org.jetbrains.kotlin.idea.gradle.execution.KotlinGradleAppEnvProvider"/>
-    </extensions>
-
-    <extensions defaultExtensionNs="com.intellij">
-        <projectTaskRunner implementation="org.jetbrains.kotlin.idea.gradle.execution.KotlinMPPGradleProjectTaskRunner"
-                           id="gradle.mpp" order="first, before gradle"/>
-        <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinSourceSetDataService"/>
-        <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleProjectSettingsDataService"/>
-
-        <registryKey key="kotlin.mpp.tests.force.gradle"
-                     description="Run multi-platform tests with Gradle runner even if the platform runner is used by default.
-                     This setting currently affects only HMPP projects. You may need to delete existing test configurations for the change to take place."
-                     defaultValue="true"
-                     restartRequired="false"/>
-
-        <registryKey key="kotlin.gradle.scripts.scriptConfigurationsNeedToBeUpdatedBalloon"
-                     description="Show balloon when script configuration need to be updated along with project need to be imported balloon"
-                     defaultValue="false"
-                     restartRequired="false"/>
-
-        <projectService serviceImplementation="org.jetbrains.kotlin.idea.scripting.gradle.legacy.GradleStandaloneScriptActionsManager"/>
-    </extensions>
-
-    <actions>
-        <action id="Kotlin.Gradle.ShowDslLogs" class="org.jetbrains.kotlin.idea.actions.ShowKotlinGradleDslLogs"
-                text="Show Kotlin Gradle DSL Logs" description="Show Kotlin Gradle DSL logs">
-        </action>
-    </actions>
-</idea-plugin>
diff --git a/idea/resources/META-INF/inspections.xml b/idea/resources/META-INF/inspections.xml
index 245c43ec04a..eb699fcedf2 100644
--- a/idea/resources/META-INF/inspections.xml
+++ b/idea/resources/META-INF/inspections.xml
@@ -2510,7 +2510,7 @@
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.IncompleteDestructuringInspection"
                      groupPath="Kotlin"
                      groupName="Probable bugs"
-                     enabledByDefault="true"
+                     enabledByDefault="false"
                      level="WARNING"
                      language="kotlin"
                      key="inspection.incomplete.destructuring.declaration.display.name" bundle="messages.KotlinBundle"/>
diff --git a/idea/resources/META-INF/jvm-common.xml b/idea/resources/META-INF/jvm-common.xml
index 92bd7a71ceb..24bef92f4a7 100644
--- a/idea/resources/META-INF/jvm-common.xml
+++ b/idea/resources/META-INF/jvm-common.xml
@@ -207,11 +207,6 @@
         <clearBuildState implementation="org.jetbrains.kotlin.idea.compiler.configuration.ClearBuildManagerState"/>
         <facetValidatorCreator implementation="org.jetbrains.kotlin.idea.facet.KotlinLibraryValidatorCreator"/>
 
-        <gradleFrameworkSupport implementation="org.jetbrains.kotlin.gradle.kdsl.frameworkSupport.GradleJavaFrameworkSupportProvider" />
-        <gradleFrameworkSupport implementation="org.jetbrains.kotlin.gradle.kdsl.frameworkSupport.GradleKotlinDSLKotlinJavaFrameworkSupportProvider" />
-        <gradleFrameworkSupport implementation="org.jetbrains.kotlin.gradle.kdsl.frameworkSupport.GradleKotlinDSLKotlinJSFrameworkSupportProvider" />
-        <gradleFrameworkSupport implementation="org.jetbrains.kotlin.gradle.kdsl.frameworkSupport.GradleGroovyFrameworkSupportProvider" />
-
         <syntheticScopeProviderExtension implementation="org.jetbrains.kotlin.idea.debugger.evaluate.DebuggerFieldSyntheticScopeProvider"/>
         <expressionCodegenExtension implementation="org.jetbrains.kotlin.idea.debugger.evaluate.DebuggerFieldExpressionCodegenExtension"/>
         <completionInformationProvider implementation="org.jetbrains.kotlin.idea.debugger.evaluate.DebuggerFieldCompletionInformationProvider" />
diff --git a/idea/resources/META-INF/jvm.xml.193 b/idea/resources/META-INF/jvm.xml.193
deleted file mode 100644
index c2f9fde42c4..00000000000
--- a/idea/resources/META-INF/jvm.xml.193
+++ /dev/null
@@ -1,9 +0,0 @@
-<idea-plugin>
-
-    <extensions defaultExtensionNs="com.intellij">
-        <postStartupActivity implementation="org.jetbrains.kotlin.idea.configuration.ui.KotlinConfigurationCheckerStartupActivity"/>
-
-        <projectService serviceImplementation="org.jetbrains.kotlin.idea.configuration.ui.KotlinConfigurationCheckerService"/>
-    </extensions>
-
-</idea-plugin>
diff --git a/idea/resources/META-INF/maven.xml b/idea/resources/META-INF/maven.xml
index 0532149396b..61d8d60619c 100644
--- a/idea/resources/META-INF/maven.xml
+++ b/idea/resources/META-INF/maven.xml
@@ -37,7 +37,8 @@
 
   <extensionPoints>
     <extensionPoint qualifiedName="org.jetbrains.kotlin.mavenProjectImportHandler" area="IDEA_PROJECT"
-                    interface="org.jetbrains.kotlin.idea.maven.MavenProjectImportHandler"/>
+                    interface="org.jetbrains.kotlin.idea.maven.MavenProjectImportHandler"
+                    dynamic="true"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/idea/resources/META-INF/parcelize.xml b/idea/resources/META-INF/parcelize.xml
index 9e47ccce9c9..e78dae0dd50 100644
--- a/idea/resources/META-INF/parcelize.xml
+++ b/idea/resources/META-INF/parcelize.xml
@@ -4,12 +4,16 @@
     <irGenerationExtension implementation="org.jetbrains.kotlin.parcelize.ParcelizeIrGeneratorExtension"/>
     <syntheticResolveExtension implementation="org.jetbrains.kotlin.parcelize.ide.IdeParcelizeResolveExtension"/>
     <classBuilderFactoryInterceptorExtension implementation="org.jetbrains.kotlin.parcelize.ParcelizeClinitClassBuilderInterceptorExtension"/>
-    <storageComponentContainerContributor implementation="org.jetbrains.kotlin.parcelize.ParcelizeDeclarationCheckerComponentContainerContributor"/>
+    <storageComponentContainerContributor implementation="org.jetbrains.kotlin.parcelize.ide.IdeParcelizeDeclarationCheckerComponentContainerContributor"/>
 
     <ultraLightClassModifierExtension implementation="org.jetbrains.kotlin.parcelize.ide.ParcelizeUltraLightClassModifierExtension"/>
     <quickFixContributor implementation="org.jetbrains.kotlin.parcelize.ide.quickfixes.ParcelizeQuickFixContributor"/>
   </extensions>
 
+  <extensions defaultExtensionNs="com.intellij">
+    <externalProjectDataService implementation="org.jetbrains.kotlin.parcelize.ide.ParcelizeIdeModelDataService"/>
+  </extensions>
+
   <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
     <projectResolve implementation="org.jetbrains.kotlin.parcelize.ide.ParcelizeProjectResolverExtension" order="last"/>
   </extensions>
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/wizard/compose.svg b/idea/resources/org/jetbrains/kotlin/idea/icons/wizard/compose.svg
index f95b719367e..ade7a818507 100644
--- a/idea/resources/org/jetbrains/kotlin/idea/icons/wizard/compose.svg
+++ b/idea/resources/org/jetbrains/kotlin/idea/icons/wizard/compose.svg
@@ -1,169 +1,177 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="compose.svg"
-   id="svg4"
-   version="1.1"
-   fill="none"
-   viewBox="0 0 16 16"
-   height="16"
-   width="16">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8">
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1782"
-       x="-0.13479282"
-       width="1.2695856"
-       y="-0.13909304"
-       height="1.2781861">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="104.8038"
-         id="feGaussianBlur1784" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1990"
-       x="-0.14341821"
-       width="1.2868364"
-       y="-0.12867041"
-       height="1.2573408">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="104.68082"
-         id="feGaussianBlur1992" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1823"
-       x="-0.29199815"
-       width="1.5839963"
-       y="-0.10867695"
-       height="1.2173539">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="104.511"
-         id="feGaussianBlur1825" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="svg4"
-     inkscape:window-maximized="1"
-     inkscape:window-y="-10"
-     inkscape:window-x="0"
-     inkscape:cy="7.6206268"
-     inkscape:cx="4.0823914"
-     inkscape:zoom="37.830213"
-     showgrid="false"
-     id="namedview6"
-     inkscape:window-height="1053"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     transform="matrix(3.5028169,0,0,3.5028169,30.378576,22.373724)"
-     id="g892">
-    <g
-       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
-       id="g1014"
-       transform="matrix(-6.6902646e-4,0.00111512,-9.6747662e-4,-5.19253e-4,-4.544296,-2.9846895)">
-      <path
-         id="path1012"
-         style="fill:#c758d4"
-         d="M 1416,1167.98 C 1416,983.098 1292.83,833 1141.12,833 H 831.88 C 680.17,833 557,983.098 557,1167.98 V 2806.02 C 557,2990.9 680.17,3141 831.88,3141 h 309.24 c 151.71,0 274.88,-150.1 274.88,-334.98 z" />
-    </g>
-    <g
-       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
-       id="g1018"
-       transform="matrix(-0.00135559,0,0,0.00105915,-3.7249327,-6.141968)">
-      <path
-         id="path1016"
-         style="fill:#e15c64"
-         d="M 1416,1165.75 C 1416,982.102 1292.83,833 1141.12,833 H 831.88 C 680.17,833 557,982.102 557,1165.75 v 1642.5 C 557,2991.9 680.17,3141 831.88,3141 h 309.24 c 151.71,0 274.88,-149.1 274.88,-332.75 z" />
-    </g>
-    <g
-       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
-       id="g1022"
-       transform="matrix(6.6902646e-4,0.00111512,9.6429649e-4,-5.1754673e-4,-8.3287592,-2.9854666)">
-      <path
-         transform="matrix(0.91968658,0.0189408,0.01267053,0.93819614,35.945895,128.21248)"
-         d="m 1466.4401,983.28806 c 0,-185.48699 -123.17,-336.07998 -274.88,-336.07999 l -309.23998,-2e-5 c -151.70998,0 -274.87998,150.593 -274.87998,336.08001 V 2619.1281 c 0,185.49 123.17,336.08 274.87998,336.08 l 309.23998,1e-4 c 151.71,0 274.88,-150.5901 274.88,-336.0801 z"
-         style="clip-rule:evenodd;opacity:0.466334;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;filter:url(#filter1782)"
-         id="path1020-3" />
-      <path
-         id="path1020"
-         style="fill:#e15c64"
-         d="M 1416,1169.08 C 1416,983.593 1292.83,833 1141.12,833 H 831.88 C 680.17,833 557,983.593 557,1169.08 V 2804.92 C 557,2990.41 680.17,3141 831.88,3141 h 309.24 c 151.71,0 274.88,-150.59 274.88,-336.08 z" />
-    </g>
-    <g
-       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
-       id="g1026"
-       transform="matrix(6.8196289e-4,0.00110809,9.6307775e-4,-5.3022743e-4,-9.7156282,-5.2229558)">
-      <path
-         id="path1024"
-         style="fill:#fce034"
-         d="M 1416,1167.39 C 1416,982.834 1292.83,833 1141.12,833 H 831.88 C 680.17,833 557,982.834 557,1167.39 V 2806.61 C 557,2991.17 680.17,3141 831.88,3141 h 309.24 c 151.71,0 274.88,-149.83 274.88,-334.39 z" />
-    </g>
-    <g
-       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
-       id="g1030"
-       transform="matrix(6.8237504e-4,-0.00110786,-9.671053e-4,-5.3287682e-4,-4.4990877,-3.0272657)">
-      <path
-         transform="matrix(0.93067062,0.04879869,0.0332659,0.88498214,-26.963841,195.58012)"
-         d="m 1424.1162,973.45549 c 0,-183.7511 -123.17,-332.9301 -274.88,-332.93 l -309.24003,-10e-5 c -151.70994,0 -274.88001,149.1791 -274.87995,332.93 l -3e-5,1642.14011 c 0,183.75 123.17,332.93 274.88,332.93 h 309.24001 c 151.71,0 274.88,-149.18 274.88,-332.93 z"
-         style="clip-rule:evenodd;opacity:0.466;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;filter:url(#filter1990)"
-         id="path1028-6" />
-      <path
-         id="path1028"
-         style="fill:#fce034"
-         d="M 1416,1165.93 C 1416,982.179 1292.83,833 1141.12,833 H 831.88 C 680.17,833 557,982.179 557,1165.93 V 2808.07 C 557,2991.82 680.17,3141 831.88,3141 h 309.24 c 151.71,0 274.88,-149.18 274.88,-332.93 z" />
-    </g>
-    <path
-       transform="matrix(0.00126058,0,0,9.2273648e-4,-9.051421,-5.8908802)"
-       d="m 1410.3291,935.48864 c 0,-182.439 -123.1699,-330.56 -274.8799,-330.56 H 826.20925 c -151.71,0 -274.88,148.121 -274.88,330.56 V 2582.3686 c 0,182.44 123.17,330.56 274.88,330.56 h 309.23995 c 151.71,0 274.8799,-148.12 274.8799,-330.56 z"
-       style="clip-rule:evenodd;opacity:0.466;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;filter:url(#filter1823)"
-       id="path1032-6" />
-    <path
-       id="path1032"
-       style="clip-rule:evenodd;fill:#c758d4;fill-rule:evenodd;stroke-width:0.00120221;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
-       d="m -7.2300247,-4.9188302 c 0,-0.1945027 -0.1669713,-0.352433 -0.3726278,-0.352433 h -0.4192057 c -0.2056573,0 -0.3726275,0.1579141 -0.3726275,0.352433 v 1.7558517 c 0,0.1945027 0.1669712,0.3524331 0.3726275,0.3524331 h 0.4192057 c 0.2056574,0 0.3726278,-0.1579142 0.3726278,-0.3524331 z" />
-    <g
-       transform="matrix(0.00122316,0,0,0.0011569,-8.8823484,-6.3674527)"
-       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
-       id="g1698">
-      <path
-         d="m 1990.4512,909.12891 c -23.0877,0.17199 -46.4709,6.22331 -67.92,18.74218 l -815.8593,476.18161 c -32.3253,18.8669 -54.0152,48.7859 -63.0781,82.1153 -4.2202,13.2994 -6.504,27.4766 -6.504,42.209 v 958.3769 c 0,3.2599 0.1206,6.489 0.3399,9.6914 1.5009,46.1306 26.4207,90.2745 69.7637,114.6172 l 823.6445,462.584 c 10.6347,5.9728 21.7117,10.3693 32.9648,13.2812 33.8174,9.6997 71.3618,6.3502 104.6016,-12.3183 l 823.6445,-462.586 c 48.6622,-27.3302 74.0998,-79.6179 69.2461,-131.6562 V 1528.377 c 0,-27.767 -8.0875,-53.5741 -22.039,-75.211 -11.3966,-18.4102 -27.3633,-34.391 -47.4375,-46.1074 L 2075.957,930.87695 c -16.1836,-9.44568 -33.4681,-15.20631 -50.8965,-17.54101 -11.2664,-2.8616 -22.8992,-4.29427 -34.6093,-4.20703 z m 6.2187,339.72459 650.0352,379.3965 v 760.7559 l -646.2266,362.9414 -648.7988,-364.3848 v -762.2559 z"
-         inkscape:label="1"
-         style="opacity:0.34;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.653897;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect1612" />
-    </g>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 600 649.25" style="enable-background:new 0 0 600 649.25;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#083042;}
+	.st2{fill:#3DDB85;}
+	.st3{fill:#3DDC84;}
+	.st4{fill:#4285F4;}
+	.st5{fill:#D6F0FF;}
+	.st6{fill:#041619;}
+	.st7{fill:#37BF6E;}
+	.st8{fill:#3870B2;}
+	.st9{opacity:0.1;}
+</style>
+<g>
+	<rect class="st0" width="600" height="649.25"/>
+	<g>
+		<path class="st1" d="M217.84953,372.87985c-0.84554-1.43341-1.4126-3.03116-1.65274-4.7084
+			C216.43694,369.84869,217.004,371.44644,217.84953,372.87985z"/>
+		<path class="st1" d="M217.70691,279.60187h-0.00015c-0.79755,1.90082-1.32974,3.93826-1.53502,6.07083
+			C216.37701,283.54007,216.90921,281.50269,217.70691,279.60187z"/>
+		<path class="st1" d="M219.89713,375.50259c0.79663,0.78448,1.70255,1.47086,2.70325,2.03406l68.18677,38.51459l-68.18677-38.51459
+			C221.59967,376.97345,220.69376,376.28708,219.89713,375.50259z"/>
+		<path class="st1" d="M301.27426,464.73755c-0.18204,0.00482-0.36362,0.02054-0.54562,0.02197
+			c-4.98434,0.04099-9.98514-1.20554-14.47287-3.74002L184.5312,403.56143c-5.97159-3.36087-9.67946-9.66211-9.74603-16.50885
+			l-0.00165-116.83322c-0.04967-4.98636,0.93579-9.79251,2.95862-14.0282l-79.5333-44.55675
+			c-3.3485,6.99887-4.9792,14.94356-4.89709,23.1862l0.00272,192.85059c0.10989,11.30157,6.23016,21.70251,16.08743,27.25021
+			l167.91141,94.84311c7.40775,4.18353,15.66211,6.24097,23.88943,6.17346l0.00211-0.13556
+			C301.39258,543.77588,301.33328,495.26184,301.27426,464.73755z"/>
+		<path class="st2" d="M381.24014,277.46683v-0.00009c-0.19107-0.31577-0.38519-0.62976-0.59348-0.93549
+			c-0.46353-0.68329-0.9696-1.34009-1.51297-1.96655c0.54337,0.62646,1.04944,1.28326,1.51297,1.96655
+			C380.8548,276.83698,381.04907,277.15106,381.24014,277.46683z"/>
+		<path class="st2" d="M218.64075,277.61685c0.41566-0.73438,0.88191-1.43826,1.39886-2.10629
+			C219.52266,276.17859,219.05641,276.88248,218.64075,277.61685z"/>
+		<path class="st2" d="M297.3649,230.75699c0.45822-0.0369,0.91724-0.06113,1.37653-0.06551
+			C298.28214,230.69586,297.82312,230.72002,297.3649,230.75699z"/>
+		<path class="st3" d="M177.75031,256.17267c2.17949-4.55711,5.56285-8.44746,10.1691-11.16853l95.76321-56.49268
+			c8.90863-5.26447,19.94547-5.36597,28.95721-0.27811l96.81161,54.67958c4.31567,2.44055,8.09555,5.88586,10.86142,9.96346
+			c0.01089,0.01599,0.02008,0.0329,0.03094,0.0489l78.25052-46.73178c-4.56549-6.73065-10.80469-12.41774-17.92853-16.4462
+			L320.86383,99.49044c-14.87512-8.39819-33.09299-8.23064-47.798,0.45914l-158.07135,93.24947
+			c-7.60351,4.49161-13.18781,10.91313-16.78564,18.43536l79.5333,44.55675
+			C177.74501,256.18512,177.74744,256.17871,177.75031,256.17267z"/>
+		<path class="st2" d="M293.3873,231.50714c0.20496-0.06113,0.40994-0.12105,0.61642-0.17523
+			C293.79739,231.38609,293.59225,231.44609,293.3873,231.50714z"/>
+		<path class="st2" d="M218.05496,278.74078c0.18263-0.38187,0.37779-0.75671,0.58578-1.12393
+			c-0.20799,0.36722-0.40315,0.742-0.58578,1.12387c-0.13313,0.27817-0.22836,0.57581-0.34821,0.86115h0.00015
+			C217.8266,279.31659,217.92183,279.01895,218.05496,278.74078z"/>
+		<path class="st4" d="M498.59433,206.19351l-78.25052,46.73178c2.99667,4.41763,4.82147,9.55728,4.87415,14.92401l-0.0015,111.1832
+			c0.09402,10.35211-5.33179,19.96094-14.24026,25.21622l-95.76352,56.50174c-4.30557,2.54529-9.10986,3.85803-13.93842,3.98709
+			c0.05902,30.52429,0.11832,79.03833-0.06943,91.06488l-0.00211,0.13556c8.27258-0.06671,16.53296-2.258,23.90826-6.61749
+			l158.07181-93.26459c14.70471-8.67468,23.66074-24.5354,23.50558-41.62323l0.00241-183.52437
+			C506.60355,222.01778,503.57263,213.50307,498.59433,206.19351z"/>
+		<path class="st4" d="M383.03204,367.10388c-0.06293,0.19946-0.12949,0.39725-0.19864,0.59439
+			C382.90256,367.50122,382.96927,367.30341,383.03204,367.10388z"/>
+		<path class="st4" d="M382.00827,278.84402c-0.23532-0.46927-0.49554-0.92667-0.76813-1.37729v0.00009
+			C381.51273,277.91742,381.77295,278.37485,382.00827,278.84402z"/>
+		<path class="st4" d="M310.19708,415.87094l64.19122-37.87354c0.37311-0.22015,0.73715-0.45175,1.09186-0.69415
+			c-0.35471,0.2424-0.71875,0.47394-1.09186,0.69406L310.19708,415.87094z"/>
+		<path class="st4" d="M382.16235,369.36044c-0.22821,0.49814-0.46939,0.98996-0.73868,1.46671
+			C381.69296,370.3504,381.93414,369.85858,382.16235,369.36044z"/>
+		<path class="st4" d="M377.49182,375.724c0.9465-0.84976,1.80203-1.78607,2.55743-2.79318
+			C379.29385,373.93793,378.43848,374.87433,377.49182,375.724z"/>
+		<path class="st4" d="M381.42368,370.82715c-0.4119,0.72946-0.87088,1.43228-1.37442,2.10367
+			C380.5528,372.25943,381.01178,371.55661,381.42368,370.82715z"/>
+		<path class="st5" d="M217.70691,279.60187c-0.7977,1.90082-1.3299,3.9382-1.53517,6.07083
+			c-0.07848,0.81763-0.1138,1.64685-0.10535,2.48364l0.00105,78.31436c0.00558,0.57364,0.04936,1.1416,0.12935,1.70074
+			c0.24014,1.67725,0.80721,3.27499,1.65274,4.7084c0.5636,0.95557,1.25096,1.83817,2.04759,2.62274
+			c0.79663,0.78448,1.70255,1.47086,2.70325,2.03406l68.18677,38.51459c3.00812,1.69891,6.36011,2.53442,9.7012,2.50702
+			c0.2421-0.00195,0.48389-0.01825,0.72583-0.02921c3.11487-0.14059,6.20389-1.01532,8.98291-2.65811l64.19122-37.87363
+			c0.37311-0.22012,0.73715-0.45166,1.09186-0.69406c0.70938-0.48474,1.38074-1.0127,2.01166-1.57925
+			c0.94666-0.84967,1.80203-1.78607,2.55743-2.79318c0.50354-0.67139,0.96252-1.37421,1.37442-2.10367
+			c0.26929-0.47675,0.51047-0.96857,0.73868-1.46671c0.24875-0.54294,0.47305-1.09702,0.67105-1.66217
+			c0.06915-0.19714,0.13571-0.39493,0.19864-0.59439c0.60315-1.91672,0.92026-3.93964,0.9014-6.00919l0.00119-74.52701
+			c-0.01328-1.35391-0.1947-2.68628-0.52283-3.97949c-0.21887-0.86215-0.50293-1.70679-0.84586-2.52884
+			c-0.17145-0.41101-0.35754-0.81635-0.55768-1.21533c-0.23532-0.46918-0.49554-0.92661-0.76813-1.3772
+			c-0.19107-0.31577-0.38535-0.62985-0.59348-0.93558c-0.46353-0.68329-0.9696-1.34009-1.51297-1.96655
+			c-1.6304-1.87927-3.59799-3.48508-5.76755-4.71194l-64.89365-36.65227c-1.13263-0.63943-2.31293-1.15662-3.52283-1.55162
+			c-1.61288-0.52661-3.27802-0.83611-4.95187-0.92862c-0.4184-0.0231-0.8374-0.03276-1.25638-0.02876
+			c-0.45929,0.00438-0.9183,0.02861-1.37653,0.06551c-1.13171,0.09125-2.25589,0.2849-3.36118,0.57492
+			c-0.20648,0.05418-0.41147,0.11411-0.61642,0.17523c-1.49411,0.44548-2.94852,1.06636-4.32504,1.87982l-64.19092,37.86743
+			c-1.9297,1.14001-3.53912,2.58612-4.83173,4.25616c-0.51695,0.66803-0.9832,1.37192-1.39886,2.10629
+			c-0.20799,0.36722-0.40315,0.74207-0.58578,1.12393C217.92183,279.01895,217.8266,279.31659,217.70691,279.60187z"/>
+		<path class="st1" d="M301.21417,418.52905c-0.24194,0.01096-0.48373,0.02725-0.72583,0.02921
+			c-3.34109,0.0274-6.69308-0.80811-9.7012-2.50702l-68.18677-38.51459c-1.0007-0.5632-1.90662-1.24957-2.70325-2.03406
+			c-0.79663-0.78458-1.48399-1.66718-2.04759-2.62274c-0.84554-1.43341-1.4126-3.03116-1.65274-4.7084
+			c-0.07999-0.55914-0.12376-1.12711-0.12935-1.70074l-0.00105-78.31436c-0.00845-0.83679,0.02687-1.66602,0.10535-2.48364
+			c0.20528-2.13257,0.73747-4.17001,1.53502-6.07083l-18.41228-11.33652l-21.55234-12.07419
+			c-2.02283,4.23569-3.00829,9.04184-2.95862,14.0282l0.00165,116.83322c0.06657,6.84674,3.77444,13.14798,9.74603,16.50885
+			l101.72456,57.45807c4.48773,2.53448,9.48853,3.78101,14.47287,3.74002c0.18201-0.00143,0.36359-0.01715,0.54562-0.02197
+			c-0.02884-14.89322-0.0575-25.50403-0.0575-25.50403L301.21417,418.52905z"/>
+		<path class="st6" d="M301.21417,418.52905c-0.24194,0.01096-0.48373,0.02725-0.72583,0.02921
+			c-3.34109,0.0274-6.69308-0.80811-9.7012-2.50702l-68.18677-38.51459c-1.0007-0.5632-1.90662-1.24957-2.70325-2.03406
+			c-0.79663-0.78458-1.48399-1.66718-2.04759-2.62274c-0.84554-1.43341-1.4126-3.03116-1.65274-4.7084
+			c-0.07999-0.55914-0.12376-1.12711-0.12935-1.70074l-0.00105-78.31436c-0.00845-0.83679,0.02687-1.66602,0.10535-2.48364
+			c0.20528-2.13257,0.73747-4.17001,1.53502-6.07083l-18.41228-11.33652l-21.55234-12.07419
+			c-2.02283,4.23569-3.00829,9.04184-2.95862,14.0282l0.00165,116.83322c0.06657,6.84674,3.77444,13.14798,9.74603,16.50885
+			l101.72456,57.45807c4.48773,2.53448,9.48853,3.78101,14.47287,3.74002c0.18201-0.00143,0.36359-0.01715,0.54562-0.02197
+			c-0.02884-14.89322-0.0575-25.50403-0.0575-25.50403L301.21417,418.52905z"/>
+		<path class="st2" d="M409.45145,242.91293l-96.81161-54.67958c-9.01175-5.08786-20.04858-4.98636-28.95721,0.27811
+			l-95.76321,56.49268c-4.60625,2.72107-7.98961,6.61142-10.1691,11.16853c-0.00287,0.00604-0.00529,0.01245-0.00816,0.01849
+			l21.55234,12.07419l18.41228,11.33652c0.11984-0.28534,0.21507-0.58298,0.34821-0.86115
+			c0.18263-0.38187,0.37779-0.75665,0.58578-1.12387c0.41566-0.73438,0.88191-1.43826,1.39886-2.10629
+			c1.2926-1.67004,2.90202-3.11615,4.83173-4.25616l64.19092-37.86751c1.37653-0.81346,2.83093-1.43434,4.32504-1.87975
+			c0.20496-0.06105,0.4101-0.12105,0.61642-0.17523c1.10529-0.29002,2.22946-0.4836,3.36118-0.57492
+			c0.45822-0.03697,0.91724-0.06113,1.37653-0.06551c0.41898-0.004,0.83783,0.00558,1.25638,0.02876
+			c1.67386,0.09251,3.33899,0.40193,4.95187,0.92862c1.2099,0.395,2.3902,0.91219,3.52283,1.55162l64.89365,36.65218
+			c2.16956,1.22696,4.13715,2.83276,5.76755,4.71204c0.54337,0.62646,1.04944,1.28326,1.51297,1.96655
+			c0.20828,0.30573,0.4024,0.61972,0.59348,0.93549l16.55396-11.07449l22.54971-13.46695
+			c-0.01086-0.01601-0.02005-0.03291-0.03094-0.0489C417.547,248.7988,413.76712,245.35349,409.45145,242.91293z"/>
+		<path class="st7" d="M409.45145,242.91293l-96.81161-54.67958c-9.01175-5.08786-20.04858-4.98636-28.95721,0.27811
+			l-95.76321,56.49268c-4.60625,2.72107-7.98961,6.61142-10.1691,11.16853c-0.00287,0.00604-0.00529,0.01245-0.00816,0.01849
+			l21.55234,12.07419l18.41228,11.33652c0.11984-0.28534,0.21507-0.58298,0.34821-0.86115
+			c0.18263-0.38187,0.37779-0.75665,0.58578-1.12387c0.41566-0.73438,0.88191-1.43826,1.39886-2.10629
+			c1.2926-1.67004,2.90202-3.11615,4.83173-4.25616l64.19092-37.86751c1.37653-0.81346,2.83093-1.43434,4.32504-1.87975
+			c0.20496-0.06105,0.4101-0.12105,0.61642-0.17523c1.10529-0.29002,2.22946-0.4836,3.36118-0.57492
+			c0.45822-0.03697,0.91724-0.06113,1.37653-0.06551c0.41898-0.004,0.83783,0.00558,1.25638,0.02876
+			c1.67386,0.09251,3.33899,0.40193,4.95187,0.92862c1.2099,0.395,2.3902,0.91219,3.52283,1.55162l64.89365,36.65218
+			c2.16956,1.22696,4.13715,2.83276,5.76755,4.71204c0.54337,0.62646,1.04944,1.28326,1.51297,1.96655
+			c0.20828,0.30573,0.4024,0.61972,0.59348,0.93549l16.55396-11.07449l22.54971-13.46695
+			c-0.01086-0.01601-0.02005-0.03291-0.03094-0.0489C417.547,248.7988,413.76712,245.35349,409.45145,242.91293z"/>
+		<path class="st4" d="M381.24014,277.46674c0.27258,0.45062,0.53281,0.90802,0.76813,1.37729
+			c0.20013,0.39899,0.38623,0.80432,0.55768,1.21533c0.34293,0.82205,0.62698,1.66669,0.84586,2.52884
+			c0.32812,1.29321,0.50955,2.62558,0.52283,3.97949l-0.00104,74.52692c0.01886,2.06964-0.2984,4.09247-0.90155,6.00928
+			c-0.06277,0.19952-0.12949,0.39734-0.19864,0.59439c-0.198,0.56509-0.4223,1.11932-0.67105,1.66217
+			c-0.22821,0.49814-0.46939,0.98996-0.73868,1.46671c-0.4119,0.72946-0.87088,1.43228-1.37442,2.10367
+			c-0.7554,1.00711-1.61093,1.94342-2.55743,2.79318c-0.63092,0.56656-1.30228,1.09451-2.01166,1.57925
+			c-0.35471,0.2424-0.71875,0.474-1.09186,0.69415l-64.19122,37.87354c-2.77902,1.64279-5.86804,2.51752-8.98291,2.65811
+			l0.00259,20.70447c0,0,0.02866,10.61081,0.0575,25.50403c4.82855-0.12906,9.63284-1.4418,13.93842-3.98709l95.76352-56.50174
+			c8.90848-5.25528,14.33429-14.86411,14.24026-25.21622l0.0015-111.1832c-0.05267-5.36673-1.87747-10.50638-4.87415-14.92401
+			l-22.54971,13.46695L381.24014,277.46674z"/>
+		<path class="st8" d="M381.24014,277.46674c0.27258,0.45062,0.53281,0.90802,0.76813,1.37729
+			c0.20013,0.39899,0.38623,0.80432,0.55768,1.21533c0.34293,0.82205,0.62698,1.66669,0.84586,2.52884
+			c0.32812,1.29321,0.50955,2.62558,0.52283,3.97949l-0.00104,74.52692c0.01886,2.06964-0.2984,4.09247-0.90155,6.00928
+			c-0.06277,0.19952-0.12949,0.39734-0.19864,0.59439c-0.198,0.56509-0.4223,1.11932-0.67105,1.66217
+			c-0.22821,0.49814-0.46939,0.98996-0.73868,1.46671c-0.4119,0.72946-0.87088,1.43228-1.37442,2.10367
+			c-0.7554,1.00711-1.61093,1.94342-2.55743,2.79318c-0.63092,0.56656-1.30228,1.09451-2.01166,1.57925
+			c-0.35471,0.2424-0.71875,0.474-1.09186,0.69415l-64.19122,37.87354c-2.77902,1.64279-5.86804,2.51752-8.98291,2.65811
+			l0.00259,20.70447c0,0,0.02866,10.61081,0.0575,25.50403c4.82855-0.12906,9.63284-1.4418,13.93842-3.98709l95.76352-56.50174
+			c8.90848-5.25528,14.33429-14.86411,14.24026-25.21622l0.0015-111.1832c-0.05267-5.36673-1.87747-10.50638-4.87415-14.92401
+			l-22.54971,13.46695L381.24014,277.46674z"/>
+		<path class="st5" d="M293.3873,231.50714c-1.49411,0.4454-2.94852,1.06628-4.32504,1.87975l-64.19092,37.86751l64.19092-37.86743
+			C290.43878,232.5735,291.89319,231.95262,293.3873,231.50714z"/>
+		<path class="st9" d="M293.3873,231.50714c-1.49411,0.4454-2.94852,1.06628-4.32504,1.87975l-64.19092,37.86751l64.19092-37.86743
+			C290.43878,232.5735,291.89319,231.95262,293.3873,231.50714z"/>
+		<path class="st5" d="M379.1337,274.5647c-1.6304-1.87927-3.59799-3.48508-5.76755-4.71204l-64.89365-36.65218l64.89365,36.65227
+			C375.53571,271.07962,377.5033,272.68542,379.1337,274.5647z"/>
+		<path class="st9" d="M379.1337,274.5647c-1.6304-1.87927-3.59799-3.48508-5.76755-4.71204l-64.89365-36.65218l64.89365,36.65227
+			C375.53571,271.07962,377.5033,272.68542,379.1337,274.5647z"/>
+		<path class="st5" d="M298.74142,230.69148c0.41898-0.004,0.83798,0.00566,1.25638,0.02876
+			C299.57925,230.69707,299.1604,230.68748,298.74142,230.69148z"/>
+		<path class="st9" d="M298.74142,230.69148c0.41898-0.004,0.83798,0.00566,1.25638,0.02876
+			C299.57925,230.69707,299.1604,230.68748,298.74142,230.69148z"/>
+		<path class="st5" d="M294.00372,231.33191c1.10529-0.29002,2.22946-0.48367,3.36118-0.57492
+			C296.23318,230.84831,295.10901,231.04189,294.00372,231.33191z"/>
+		<path class="st9" d="M294.00372,231.33191c1.10529-0.29002,2.22946-0.48367,3.36118-0.57492
+			C296.23318,230.84831,295.10901,231.04189,294.00372,231.33191z"/>
+		<path class="st5" d="M299.9978,230.72025c1.67386,0.09251,3.33899,0.40201,4.95187,0.92862
+			C303.33679,231.12218,301.67166,230.81276,299.9978,230.72025z"/>
+		<path class="st9" d="M299.9978,230.72025c1.67386,0.09251,3.33899,0.40201,4.95187,0.92862
+			C303.33679,231.12218,301.67166,230.81276,299.9978,230.72025z"/>
+		<path class="st5" d="M382.8334,367.69827c-0.198,0.56516-0.4223,1.11923-0.67105,1.66217
+			C382.4111,368.8176,382.63541,368.26337,382.8334,367.69827z"/>
+		<path class="st9" d="M382.8334,367.69827c-0.198,0.56516-0.4223,1.11923-0.67105,1.66217
+			C382.4111,368.8176,382.63541,368.26337,382.8334,367.69827z"/>
+		<path class="st5" d="M382.56595,280.05936c0.34293,0.82205,0.62698,1.66669,0.84586,2.52884
+			C383.19293,281.72604,382.90887,280.88141,382.56595,280.05936z"/>
+		<path class="st9" d="M382.56595,280.05936c0.34293,0.82205,0.62698,1.66669,0.84586,2.52884
+			C383.19293,281.72604,382.90887,280.88141,382.56595,280.05936z"/>
+		<path class="st5" d="M383.03204,367.10388c0.60315-1.91681,0.92041-3.93964,0.90155-6.00928l0.00104-74.52692l-0.00119,74.52701
+			C383.9523,363.16425,383.63519,365.18716,383.03204,367.10388z"/>
+		<path class="st9" d="M383.03204,367.10388c0.60315-1.91681,0.92041-3.93964,0.90155-6.00928l0.00104-74.52692l-0.00119,74.52701
+			C383.9523,363.16425,383.63519,365.18716,383.03204,367.10388z"/>
+	</g>
+</g>
 </svg>
diff --git a/idea/scripting-support/build.gradle.kts b/idea/scripting-support/build.gradle.kts
index 1e294281714..219a941a658 100644
--- a/idea/scripting-support/build.gradle.kts
+++ b/idea/scripting-support/build.gradle.kts
@@ -31,10 +31,8 @@ dependencies {
 
     testRuntime(project(":idea:idea-android")) { isTransitive = false }
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntime(intellijPluginDep("java"))
-    }
+    testCompileOnly(intellijPluginDep("java"))
+    testRuntime(intellijPluginDep("java"))
 
     testRuntimeOnly(toolsJar())
     testRuntime(project(":kotlin-reflect"))
diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt.193 b/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt.193
deleted file mode 100644
index e1c7159a232..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt.193
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea
-
-// FIX ME WHEN BUNCH 201 REMOVED
-class KotlinDocumentationProvider : KotlinDocumentationProviderCompatBase()
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginMacros.kt.193 b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginMacros.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupApplicationService.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupApplicationService.java
index 434c5917a6a..e04fbb08c47 100644
--- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupApplicationService.java
+++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupApplicationService.java
@@ -20,6 +20,8 @@ import com.intellij.openapi.application.ApplicationManager;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class PluginStartupApplicationService {
 
@@ -32,9 +34,9 @@ public class PluginStartupApplicationService {
     public synchronized String getAliveFlagPath() {
         if (this.aliveFlagPath == null) {
             try {
-                File flagFile = File.createTempFile("kotlin-idea-", "-is-running");
-                flagFile.deleteOnExit();
-                this.aliveFlagPath = flagFile.getAbsolutePath();
+                Path flagFile = Files.createTempFile("kotlin-idea-", "-is-running");
+                flagFile.toFile().deleteOnExit();
+                this.aliveFlagPath = flagFile.toAbsolutePath().toString();
             }
             catch (IOException e) {
                 this.aliveFlagPath = "";
diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java.193 b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java.193
deleted file mode 100644
index 87ed061e3eb..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java.193
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea;
-
-import com.intellij.openapi.application.PathMacros;
-import com.intellij.openapi.components.BaseComponent;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.utils.PathUtil;
-
-public class PluginStartupComponent implements BaseComponent {
-
-    private static final String KOTLIN_BUNDLED = "KOTLIN_BUNDLED";
-
-    @Override
-    @NotNull
-    public String getComponentName() {
-        return PluginStartupComponent.class.getName();
-    }
-
-    @Override
-    public void initComponent() {
-        registerPathVariable();
-    }
-
-    private static void registerPathVariable() {
-        PathMacros macros = PathMacros.getInstance();
-        macros.setMacro(KOTLIN_BUNDLED, PathUtil.getKotlinPathsForIdeaPlugin().getHomePath().getPath());
-    }
-
-    @Override
-    public void disposeComponent() {}
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinRefactoringHelperForDelayedRequests.kt.193 b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinRefactoringHelperForDelayedRequests.kt.193
deleted file mode 100644
index fef84de6423..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinRefactoringHelperForDelayedRequests.kt.193
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.codeInsight
-
-import com.intellij.openapi.project.Project
-import com.intellij.refactoring.RefactoringHelper
-import com.intellij.usageView.UsageInfo
-import org.jetbrains.kotlin.idea.codeInsight.shorten.performDelayedRefactoringRequests
-import org.jetbrains.kotlin.idea.codeInsight.shorten.prepareDelayedRequests
-import org.jetbrains.kotlin.idea.util.application.runWriteAction
-
-class KotlinRefactoringHelperForDelayedRequests : RefactoringHelper<Any> {
-    override fun prepareOperation(usages: Array<out UsageInfo>?): Any? {
-        if (usages != null && usages.isNotEmpty()) {
-            val project = usages[0].project
-            prepareDelayedRequests(project)
-        }
-        return null
-    }
-
-    override fun performOperation(project: Project, operationData: Any?) {
-        runWriteAction { performDelayedRefactoringRequests(project) }
-    }
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinAbstractHintsProvider.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinAbstractHintsProvider.kt
index 5a104f7a9f2..1ef12fff9be 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinAbstractHintsProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinAbstractHintsProvider.kt
@@ -38,6 +38,13 @@ abstract class KotlinAbstractHintsProvider<T : Any> : InlayHintsProvider<T> {
         }
     }
 
+    /**
+     * Similar to [handlePresentations] we need to have a special handler to remove lambda related hints.
+     * Therefore [KotlinLambdasHintsProvider] provides its own "crutch" implementation.
+     */
+    protected open fun handleAfterLineEndHintsRemoval(editor: Editor, resolved: HintType, element: PsiElement) {
+    }
+
     override fun getCollectorFor(file: PsiFile, editor: Editor, settings: T, sink: InlayHintsSink): InlayHintsCollector? {
         return object : FactoryInlayHintsCollector(editor) {
             override fun collect(element: PsiElement, editor: Editor, sink: InlayHintsSink): Boolean {
@@ -45,8 +52,12 @@ abstract class KotlinAbstractHintsProvider<T : Any> : InlayHintsProvider<T> {
                 if (!isElementSupported(resolved, settings)) return true
 
                 val presentations = resolved.provideHints(element).mapNotNull { info -> convert(info, editor.project) }
-                if (presentations.isNotEmpty())
+                if (presentations.isNotEmpty()) {
                     handlePresentations(presentations, editor, sink)
+                } else {
+                    handleAfterLineEndHintsRemoval(editor, resolved, element)
+                }
+
                 return true
             }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinLambdasHintsProvider.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinLambdasHintsProvider.kt
index 3dbe6d3b84f..780377bda13 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinLambdasHintsProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinLambdasHintsProvider.kt
@@ -13,8 +13,13 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorCustomElementRenderer
 import com.intellij.openapi.editor.Inlay
 import com.intellij.openapi.editor.markup.TextAttributes
+import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.application.invokeLater
+import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.psi.KtFunctionLiteral
+import org.jetbrains.kotlin.psi.KtLambdaExpression
+import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import java.awt.Graphics
 import java.awt.Rectangle
 
@@ -64,6 +69,26 @@ class KotlinLambdasHintsProvider : KotlinAbstractHintsProvider<KotlinLambdasHint
         }
     }
 
+    override fun handleAfterLineEndHintsRemoval(editor: Editor, resolved: HintType, element: PsiElement) {
+        invokeLater {
+            val offset = when (resolved) {
+                HintType.LAMBDA_IMPLICIT_PARAMETER_RECEIVER -> {
+                    val lambdaExpression = (element as? KtFunctionLiteral)?.parent as? KtLambdaExpression
+                    lambdaExpression?.leftCurlyBrace?.textRange?.endOffset
+                }
+                HintType.LAMBDA_RETURN_EXPRESSION -> (element as? KtExpression)?.endOffset
+                else -> null
+            }
+
+            offset?.let {
+                val logicalLine = editor.offsetToLogicalPosition(offset).line
+                editor.inlayModel.getAfterLineEndElementsForLogicalLine(logicalLine)
+                    .filter { it.renderer is LambdaHintsRenderer }
+                    .forEach { it.dispose() }
+            }
+        }
+    }
+
     override fun createConfigurable(settings: Settings): ImmediateConfigurable {
         return createLambdaHintsImmediateConfigurable(settings)
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt
index 7a2b417446a..7168a812b1d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt
@@ -8,8 +8,10 @@ package org.jetbrains.kotlin.idea.hierarchy.calls
 import com.intellij.ide.hierarchy.HierarchyNodeDescriptor
 import com.intellij.ide.hierarchy.HierarchyTreeStructure
 import com.intellij.ide.hierarchy.call.CallHierarchyNodeDescriptor
+import com.intellij.ide.hierarchy.call.CalleeMethodsTreeStructure
 import com.intellij.ide.util.treeView.NodeDescriptor
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
 import com.intellij.util.ArrayUtil
 import org.jetbrains.kotlin.asJava.unwrapped
@@ -40,7 +42,7 @@ class KotlinCalleeTreeStructure(
     override fun buildChildren(nodeDescriptor: HierarchyNodeDescriptor): Array<Any> {
         if (nodeDescriptor is CallHierarchyNodeDescriptor) {
             val psiMethod = nodeDescriptor.enclosingElement as? PsiMethod ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
-            return createCalleeMethodsTreeStructure(myProject, psiMethod, scopeType).getChildElements(nodeDescriptor)
+            return CalleeMethodsTreeStructure(myProject, psiMethod as PsiMember, scopeType).getChildElements(nodeDescriptor)
         }
 
         val element = nodeDescriptor.psiElement as? KtElement ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt
index 4dc3c9225a0..b979e8e089d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt
@@ -9,6 +9,7 @@ import com.intellij.find.findUsages.JavaFindUsagesOptions
 import com.intellij.ide.hierarchy.HierarchyNodeDescriptor
 import com.intellij.ide.hierarchy.HierarchyTreeStructure
 import com.intellij.ide.hierarchy.call.CallHierarchyNodeDescriptor
+import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure
 import com.intellij.ide.util.treeView.NodeDescriptor
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMember
@@ -67,7 +68,7 @@ class KotlinCallerTreeStructure(
     ): Collection<Any> {
         if (nodeDescriptor is CallHierarchyNodeDescriptor) {
             val psiMethod = nodeDescriptor.enclosingElement as? PsiMethod ?: return emptyList()
-            return createCallerMethodsTreeStructure(myProject, psiMethod, scopeType).getChildElements(nodeDescriptor).toList()
+            return CallerMethodsTreeStructure(myProject, psiMethod as PsiMember, scopeType).getChildElements(nodeDescriptor).toList()
         }
 
         if (element !is KtDeclaration) return emptyList()
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt
deleted file mode 100644
index f107283542f..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("TYPEALIAS_EXPANSION_DEPRECATION", "DEPRECATION")
-
-package org.jetbrains.kotlin.idea.hierarchy.calls
-
-import com.intellij.ide.hierarchy.call.CalleeMethodsTreeStructure
-import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiMember
-import com.intellij.psi.PsiMethod
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun createCallerMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CallerMethodsTreeStructure {
-    return CallerMethodsTreeStructure(project, method as PsiMember, scopeType)
-}
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun createCalleeMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CalleeMethodsTreeStructure {
-    return CalleeMethodsTreeStructure(project, method as PsiMember, scopeType)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt.193 b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt.193
deleted file mode 100644
index 0b7f86715d6..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt.193
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("TYPEALIAS_EXPANSION_DEPRECATION", "DEPRECATION", "UnstableApiUsage")
-
-package org.jetbrains.kotlin.idea.hierarchy.calls
-
-import com.intellij.ide.hierarchy.call.CalleeMethodsTreeStructure
-import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiMethod
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun createCallerMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CallerMethodsTreeStructure {
-    return CallerMethodsTreeStructure(project, method, scopeType)
-}
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun createCalleeMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CalleeMethodsTreeStructure {
-    return CalleeMethodsTreeStructure(project, method, scopeType)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
index 92876c21556..8e3af5b1d27 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
@@ -34,18 +34,25 @@ import javax.swing.Icon
 
 class KotlinTestRunLineMarkerContributor : RunLineMarkerContributor() {
     companion object {
-        fun getTestStateIcon(url: String, project: Project, strict: Boolean): Icon? {
-            val defaultIcon = AllIcons.RunConfigurations.TestState.Run
-            val state = TestStateStorage.getInstance(project).getState(url)
-                ?: return if (strict) null else defaultIcon
+        fun getTestStateIcon(
+            urls: List<String>,
+            project: Project,
+            strict: Boolean,
+            defaultIcon: Icon = AllIcons.RunConfigurations.TestState.Run
+        ): Icon? {
+            for (url in urls) {
+                val state = TestStateStorage.getInstance(project).getState(url) ?: continue
 
-            return when (TestIconMapper.getMagnitude(state.magnitude)) {
-                TestStateInfo.Magnitude.ERROR_INDEX,
-                TestStateInfo.Magnitude.FAILED_INDEX -> AllIcons.RunConfigurations.TestState.Red2
-                TestStateInfo.Magnitude.PASSED_INDEX,
-                TestStateInfo.Magnitude.COMPLETE_INDEX -> AllIcons.RunConfigurations.TestState.Green2
-                else -> defaultIcon
+                return when (TestIconMapper.getMagnitude(state.magnitude)) {
+                    TestStateInfo.Magnitude.ERROR_INDEX,
+                    TestStateInfo.Magnitude.FAILED_INDEX -> AllIcons.RunConfigurations.TestState.Red2
+                    TestStateInfo.Magnitude.PASSED_INDEX,
+                    TestStateInfo.Magnitude.COMPLETE_INDEX -> AllIcons.RunConfigurations.TestState.Green2
+                    else -> defaultIcon
+                }
             }
+
+            return if (strict) null else defaultIcon
         }
 
         fun SimplePlatform.providesRunnableTests(): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantInnerClassModifierInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantInnerClassModifierInspection.kt
index 46a28ffb3cc..e0d46b3d0d4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantInnerClassModifierInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantInnerClassModifierInspection.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
+import org.jetbrains.kotlin.psi.psiUtil.containingClass
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.isSubclassOf
@@ -54,18 +55,21 @@ class RedundantInnerClassModifierInspection : AbstractKotlinInspection() {
         return anyDescendantOfType<KtExpression> { expression ->
             when (expression) {
                 is KtNameReferenceExpression -> {
-                    val reference = expression.mainReference.resolve()
-                    val referenceClass = reference?.getStrictParentOfType<KtClass>()
-                    if (expression.getStrictParentOfType<KtSuperTypeCallEntry>() != null) {
-                        return@anyDescendantOfType reference is KtClass && reference.isInner()
-                                || reference is KtPrimaryConstructor && referenceClass?.isInner() == true
+                    val reference = expression.mainReference.resolve()?.let {
+                        (it as? KtConstructor<*>)?.containingClass() ?: it
                     }
-                    if (referenceClass != null) {
-                        if (referenceClass == targetClass) return@anyDescendantOfType false
-                        if (referenceClass in outerClasses) return@anyDescendantOfType true
+                    if (reference is PsiClass && reference.parent is PsiClass) {
+                        return@anyDescendantOfType reference.getJavaClassDescriptor()?.isInner == true
+                    }
+                    val referenceContainingClass = reference?.getStrictParentOfType<KtClass>()
+                    if (referenceContainingClass != null) {
+                        if (referenceContainingClass == targetClass) return@anyDescendantOfType false
+                        if (referenceContainingClass in outerClasses) {
+                            return@anyDescendantOfType reference !is KtClass || reference.isInner()
+                        }
                     }
                     if (!hasSuperType) return@anyDescendantOfType false
-                    val referenceClassDescriptor = referenceClass?.descriptor as? ClassDescriptor
+                    val referenceClassDescriptor = referenceContainingClass?.descriptor as? ClassDescriptor
                         ?: reference?.getStrictParentOfType<PsiClass>()?.getJavaClassDescriptor()
                         ?: (expression.resolveToCall()?.resultingDescriptor as? SyntheticJavaPropertyDescriptor)
                             ?.getMethod?.containingDeclaration as? ClassDescriptor
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
index 280efc07315..714ef3ca2b1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.idea.intentions
 
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
@@ -21,21 +22,23 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.KtPsiFactory.CallableBuilder
 import org.jetbrains.kotlin.psi.KtPsiFactory.CallableBuilder.Target.CONSTRUCTOR
 import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
-import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
+import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
+import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.parents
 
-class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtPrimaryConstructor>(
-    KtPrimaryConstructor::class.java,
+class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingRangeIntention<KtClass>(
+    KtClass::class.java,
     KotlinBundle.lazyMessage("convert.to.secondary.constructor")
 ) {
-    override fun isApplicableTo(element: KtPrimaryConstructor, caretOffset: Int): Boolean {
-        val containingClass = element.containingClassOrObject as? KtClass ?: return false
-        if (containingClass.isAnnotation() || containingClass.isData()
-            || containingClass.superTypeListEntries.any { it is KtDelegatedSuperTypeEntry }
-        ) return false
-        return element.valueParameters.all { !it.hasValOrVar() || (it.name != null && it.annotationEntries.isEmpty()) }
+    override fun applicabilityRange(element: KtClass): TextRange? {
+        val primaryCtor = element.primaryConstructor ?: return null
+        val startOffset =
+            (if (primaryCtor.getConstructorKeyword() != null) primaryCtor else element.nameIdentifier)?.startOffset ?: return null
+        if (element.isAnnotation() || element.isData() || element.superTypeListEntries.any { it is KtDelegatedSuperTypeEntry }) return null
+        if (primaryCtor.valueParameters.any { it.hasValOrVar() && (it.name == null || it.annotationEntries.isNotEmpty()) }) return null
+        return TextRange(startOffset, primaryCtor.endOffset)
     }
 
     private fun KtReferenceExpression.isIndependent(classDescriptor: ClassDescriptor, context: BindingContext): Boolean =
@@ -54,15 +57,15 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
         return !propertyInitializer.anyDescendantOfType<KtReferenceExpression> { !it.isIndependent(classDescriptor, context) }
     }
 
-    override fun applyTo(element: KtPrimaryConstructor, editor: Editor?) {
-        val klass = element.containingClassOrObject as? KtClass ?: return
-        if (klass.isAnnotation()) return
-        val context = klass.analyze()
-        val factory = KtPsiFactory(klass)
-        val commentSaver = CommentSaver(element)
+    override fun applyTo(element: KtClass, editor: Editor?) {
+        val primaryCtor = element.primaryConstructor ?: return
+        if (element.isAnnotation()) return
+        val context = element.analyze()
+        val factory = KtPsiFactory(element)
+        val commentSaver = CommentSaver(primaryCtor)
         val initializerMap = mutableMapOf<KtProperty, String>()
-        for (property in klass.getProperties()) {
-            if (property.isIndependent(klass, context)) continue
+        for (property in element.getProperties()) {
+            if (property.isIndependent(element, context)) continue
             if (property.typeReference == null) {
                 with(SpecifyTypeExplicitlyIntention()) {
                     if (applicabilityRange(property) != null) {
@@ -77,10 +80,10 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
         }
         val constructor = factory.createSecondaryConstructor(
             CallableBuilder(CONSTRUCTOR).apply {
-                element.modifierList?.let { modifier(it.text) }
+                primaryCtor.modifierList?.let { modifier(it.text) }
                 typeParams()
                 name()
-                for (valueParameter in element.valueParameters) {
+                for (valueParameter in primaryCtor.valueParameters) {
                     val annotations = valueParameter.annotationEntries.joinToString(separator = " ") { it.text }
                     val vararg = if (valueParameter.isVarArg) VARARG_KEYWORD.value else ""
                     param(
@@ -89,18 +92,18 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
                     )
                 }
                 noReturnType()
-                for (superTypeEntry in klass.superTypeListEntries) {
+                for (superTypeEntry in element.superTypeListEntries) {
                     if (superTypeEntry is KtSuperTypeCallEntry) {
                         superDelegation(superTypeEntry.valueArgumentList?.text ?: "")
                         superTypeEntry.replace(factory.createSuperTypeEntry(superTypeEntry.typeReference!!.text))
                     }
                 }
                 val valueParameterInitializers =
-                    element.valueParameters.asSequence().filter { it.hasValOrVar() }.joinToString(separator = "\n") {
+                    primaryCtor.valueParameters.asSequence().filter { it.hasValOrVar() }.joinToString(separator = "\n") {
                         val name = it.name!!
                         "this.$name = $name"
                     }
-                val classBodyInitializers = klass.declarations.asSequence().filter {
+                val classBodyInitializers = element.declarations.asSequence().filter {
                     (it is KtProperty && initializerMap[it] != null) || it is KtAnonymousInitializer
                 }.joinToString(separator = "\n") {
                     if (it is KtProperty) {
@@ -112,8 +115,8 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
                             ""
                         }
                     } else {
-                        ((it as KtAnonymousInitializer).body as? KtBlockExpression)?.statements?.joinToString(separator = "\n") {
-                            it.text
+                        ((it as KtAnonymousInitializer).body as? KtBlockExpression)?.statements?.joinToString(separator = "\n") { stmt ->
+                            stmt.text
                         } ?: ""
                     }
                 }
@@ -124,20 +127,20 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
             }.asString()
         )
 
-        val lastEnumEntry = klass.declarations.lastOrNull { it is KtEnumEntry } as? KtEnumEntry
+        val lastEnumEntry = element.declarations.lastOrNull { it is KtEnumEntry } as? KtEnumEntry
         val secondaryConstructor =
-            lastEnumEntry?.let { klass.addDeclarationAfter(constructor, it) } ?: klass.addDeclarationBefore(constructor, null)
+            lastEnumEntry?.let { element.addDeclarationAfter(constructor, it) } ?: element.addDeclarationBefore(constructor, null)
         commentSaver.restore(secondaryConstructor)
 
-        convertValueParametersToProperties(element, klass, factory, lastEnumEntry)
-        if (klass.isEnum()) {
-            addSemicolonIfNotExist(klass, factory, lastEnumEntry)
+        convertValueParametersToProperties(primaryCtor, element, factory, lastEnumEntry)
+        if (element.isEnum()) {
+            addSemicolonIfNotExist(element, factory, lastEnumEntry)
         }
 
-        for (anonymousInitializer in klass.getAnonymousInitializers()) {
+        for (anonymousInitializer in element.getAnonymousInitializers()) {
             anonymousInitializer.delete()
         }
-        element.delete()
+        primaryCtor.delete()
     }
 
     private fun convertValueParametersToProperties(
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
index c72e467c993..906ca36beee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
@@ -44,7 +44,8 @@ class RemoveExplicitTypeArgumentsIntention : SelfTargetingOffsetIndependentInten
     companion object {
         fun isApplicableTo(element: KtTypeArgumentList, approximateFlexible: Boolean): Boolean {
             val callExpression = element.parent as? KtCallExpression ?: return false
-            if (callExpression.typeArguments.isEmpty()) return false
+            val typeArguments = callExpression.typeArguments
+            if (typeArguments.isEmpty() || typeArguments.any { it.typeReference?.annotationEntries?.isNotEmpty() == true }) return false
 
             val resolutionFacade = callExpression.getResolutionFacade()
             val bindingContext = resolutionFacade.analyze(callExpression, BodyResolveMode.PARTIAL_WITH_CFA)
diff --git a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt b/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt
index e4245bab394..ff0eefcaf53 100644
--- a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.idea.KotlinIconProviderBase
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.psi.KtFile
 
-// FIX ME WHEN BUNCH 193 REMOVED
 abstract class AbstractNavBarModelExtensionCompatBase : StructureAwareNavBarModelExtension() {
 
     protected abstract fun adjustElementImpl(psiElement: PsiElement?): PsiElement?
diff --git a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt.193 b/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt.193
deleted file mode 100644
index 14c48d2e50d..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt.193
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.navigationToolbar
-
-import com.intellij.ide.navigationToolbar.AbstractNavBarModelExtension
-import com.intellij.psi.PsiElement
-
-// FIX ME WHEN BUNCH 193 REMOVED
-abstract class AbstractNavBarModelExtensionCompatBase : AbstractNavBarModelExtension() {
-
-    protected abstract fun adjustElementImpl(psiElement: PsiElement?): PsiElement?
-
-    override fun adjustElement(psiElement: PsiElement): PsiElement? =
-        adjustElementImpl(psiElement)
-}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt b/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt
index a0363991b55..eafb48b87f7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt
@@ -28,8 +28,8 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware {
 
     // should be called after ClassesTreeStructureProvider
     override fun modify(
-        parent: AbstractTreeNodeAny,
-        children: Collection<AbstractTreeNodeAny>,
+        parent: AbstractTreeNode<*>,
+        children: Collection<AbstractTreeNode<*>>,
         settings: ViewSettings
     ): Collection<AbstractTreeNode<out Any>> {
         val result = ArrayList<AbstractTreeNode<out Any>>()
@@ -60,16 +60,16 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware {
         else -> null
     }
 
-    override fun getData(selected: Collection<AbstractTreeNodeAny>, dataName: String): Any? = null
+    override fun getData(selected: Collection<AbstractTreeNode<*>>, dataName: String): Any? = null
 }
 
 
 class KotlinSelectInProjectViewProvider(private val project: Project) : SelectableTreeStructureProvider, DumbAware {
-    override fun getData(selected: Collection<AbstractTreeNodeAny>, dataName: String): Any? = null
+    override fun getData(selected: Collection<AbstractTreeNode<*>>, dataName: String): Any? = null
 
     override fun modify(
-        parent: AbstractTreeNodeAny,
-        children: Collection<AbstractTreeNodeAny>,
+        parent: AbstractTreeNode<*>,
+        children: Collection<AbstractTreeNode<*>>,
         settings: ViewSettings
     ): Collection<AbstractTreeNode<out Any>> {
         return ArrayList(children)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java.193
deleted file mode 100644
index b62633af738..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java.193
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.refactoring.changeSignature;
-
-import com.intellij.psi.PsiElement;
-import com.intellij.refactoring.util.TextOccurrencesUtil;
-import com.intellij.usageView.UsageInfo;
-
-import java.util.Collection;
-
-// FIX ME WHEN BUNCH 201 REMOVED
-final class BunchedDeprecation {
-    public static void findNonCodeUsages(
-            PsiElement element,
-            String stringToSearch,
-            boolean searchInStringsAndComments,
-            boolean searchInNonJavaFiles,
-            String newQName,
-            Collection<? super UsageInfo> results) {
-        TextOccurrencesUtil.findNonCodeUsages(element, stringToSearch, searchInStringsAndComments, searchInNonJavaFiles, newQName, results);
-    }
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
index 547b546f16b..98953f0fa0d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui
 
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.ComboBox
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.refactoring.BaseRefactoringProcessor
 import com.intellij.refactoring.ui.RefactoringDialog
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt
deleted file mode 100644
index 1d4b6a39b3d..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui
-
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.ui.Messages
-import com.intellij.openapi.ui.Messages.OkCancelResult
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
-import javax.swing.Icon
-
-// FIX ME WHEN BUNCH 193 REMOVED
-
-@OkCancelResult
-fun showOkCancelDialog(
-    project: Project?,
-    message: String?,
-    title: String,
-    icon: Icon?
-): Int {
-    return Messages.showOkCancelDialog(
-        project,
-        message,
-        title,
-        Messages.getOkButton(),
-        Messages.getCancelButton(),
-        icon
-    )
-}
-
-typealias ComboBox = com.intellij.openapi.ui.ComboBox<DescriptorVisibility>
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193
deleted file mode 100644
index 726d23b3701..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui
-
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.ui.Messages
-import com.intellij.openapi.ui.Messages.OkCancelResult
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
-import javax.swing.Icon
-
-// FIX ME WHEN BUNCH 193 REMOVED
-
-@OkCancelResult
-fun showOkCancelDialog(
-    project: Project?,
-    message: String?,
-    title: String,
-    icon: Icon?
-): Int {
-    return Messages.showOkCancelDialog(
-        project,
-        message,
-        title,
-        icon
-    )
-}
-
-typealias ComboBox = javax.swing.JComboBox<DescriptorVisibility>
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
index 7bc0b51223e..e6f611c1f05 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
@@ -332,12 +332,15 @@ class KotlinChangeSignatureDialog(
         if (myMethod.canChangeReturnType() == MethodDescriptor.ReadWriteOption.ReadWrite &&
             myReturnTypeCodeFragment.getTypeInfo(isCovariant = true, forPreview = false, reanalyse = true).type == null
         ) {
-            if (showOkCancelDialog(
+            if (Messages.showOkCancelDialog(
                     myProject,
-                    KotlinBundle.message("message.text.return.type.cannot.be.resolved",
-                        myReturnTypeCodeFragment?.text.toString()
-                    ),
+                    KotlinBundle.message(
+                        "message.text.return.type.cannot.be.resolved",
+                                myReturnTypeCodeFragment?.text.toString()
+                            ),
                     RefactoringBundle.message("changeSignature.refactoring.name"),
+                    Messages.getOkButton(),
+                    Messages.getCancelButton(),
                     Messages.getWarningIcon()
                 ) != Messages.OK
             ) {
@@ -351,13 +354,16 @@ class KotlinChangeSignatureDialog(
                     KotlinBundle.message("text.parameter.0", item.parameter.name)
                 else
                     KotlinBundle.message("text.receiver")
-                if (showOkCancelDialog(
+                if (Messages.showOkCancelDialog(
                         myProject,
-                        KotlinBundle.message("message.type.for.cannot.be.resolved",
-                            item.typeCodeFragment.text,
-                            paramText
-                        ),
+                        KotlinBundle.message(
+                            "message.type.for.cannot.be.resolved",
+                                        item.typeCodeFragment.text,
+                                        paramText
+                                    ),
                         RefactoringBundle.message("changeSignature.refactoring.name"),
+                        Messages.getOkButton(),
+                        Messages.getCancelButton(),
                         Messages.getWarningIcon()
                     ) != Messages.OK
                 ) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinInnerHandler.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinInnerHandler.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java.193
deleted file mode 100644
index a7542175dec..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java.193
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations;
-
-import com.intellij.psi.PsiElement;
-import com.intellij.refactoring.util.TextOccurrencesUtil;
-import com.intellij.usageView.UsageInfo;
-
-import java.util.Collection;
-
-// FIX ME WHEN BUNCH 201 REMOVED
-final class BunchedDeprecation {
-    public static void findNonCodeUsages(
-            PsiElement element,
-            String stringToSearch,
-            boolean searchInStringsAndComments,
-            boolean searchInNonJavaFiles,
-            String newQName,
-            Collection<? super UsageInfo> results) {
-        TextOccurrencesUtil.findNonCodeUsages(element, stringToSearch, searchInStringsAndComments, searchInNonJavaFiles, newQName, results);
-    }
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSignaturePresentationBuilder.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSignaturePresentationBuilder.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringExecution.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringExecution.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringStateChanges.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringStateChanges.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringSupport.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringSupport.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringUI.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringUI.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java.193 b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java.193
deleted file mode 100644
index 7b644fd8bae..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java.193
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package org.jetbrains.kotlin.idea.script.configuration;
-
-import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.options.SearchableConfigurable;
-import com.intellij.openapi.options.UnnamedConfigurable;
-import com.intellij.openapi.project.Project;
-import com.intellij.ui.TitledSeparator;
-import com.intellij.ui.ToolbarDecorator;
-import com.intellij.ui.components.panels.VerticalLayout;
-import com.intellij.ui.table.TableView;
-import com.intellij.util.ui.UIUtil;
-import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.KotlinBundle;
-import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager;
-import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings;
-import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition;
-
-import javax.swing.*;
-import java.util.ArrayList;
-import java.util.List;
-
-public class KotlinScriptingSettingsConfigurable implements SearchableConfigurable {
-    public static final String ID = "preferences.language.Kotlin.scripting";
-
-    private JPanel root;
-    private JPanel panelScriptDefinitionsChooser;
-    private JPanel additionalSettingsPanel;
-
-    private final List<UnnamedConfigurable> scriptingSuppportSettingsConfigurables = new ArrayList<>();
-
-    private final KotlinScriptDefinitionsModel model;
-
-    private final Project project;
-    private final ScriptDefinitionsManager manager;
-    private final KotlinScriptingSettings settings;
-
-    public KotlinScriptingSettingsConfigurable(Project project) {
-        this.project = project;
-        manager = ScriptDefinitionsManager.Companion.getInstance(project);
-        settings = KotlinScriptingSettings.Companion.getInstance(project);
-        model = KotlinScriptDefinitionsModel.Companion.createModel(manager.getAllDefinitions(), settings);
-    }
-
-    @Nullable
-    @Override
-    public JComponent createComponent() {
-        panelScriptDefinitionsChooser.setLayout(new VerticalLayout(0));
-
-        panelScriptDefinitionsChooser.add(new TitledSeparator(KotlinBundle.message("kotlin.script.definitions.title")));
-
-        JLabel commentLabel = new JLabel(KotlinBundle.message("kotlin.script.definitions.model.name.autoReloadScriptDependencies.description"));
-        commentLabel.setForeground(UIUtil.getContextHelpForeground());
-        panelScriptDefinitionsChooser.add(commentLabel);
-
-        TableView<ModelDescriptor> table = new TableView<>(model);
-        panelScriptDefinitionsChooser.add(
-                ToolbarDecorator.createDecorator(table)
-                        .disableAddAction()
-                        .disableRemoveAction()
-                        .createPanel()
-        );
-
-        additionalSettingsPanel.setLayout(new VerticalLayout(0));
-
-        List<ScriptingSupportSpecificSettingsProvider> providers =
-                ScriptingSupportSpecificSettingsProvider.SETTINGS_PROVIDERS.getExtensionList(project);
-        for (ScriptingSupportSpecificSettingsProvider provider : providers) {
-            additionalSettingsPanel.add(new TitledSeparator(provider.getTitle()));
-
-            UnnamedConfigurable configurable = provider.createConfigurable();
-            scriptingSuppportSettingsConfigurables.add(configurable);
-
-            additionalSettingsPanel.add(configurable.createComponent());
-        }
-        return root;
-    }
-
-    @Override
-    public boolean isModified() {
-        for (UnnamedConfigurable supportSpecificSetting : scriptingSuppportSettingsConfigurables) {
-            if (supportSpecificSetting.isModified()) {
-                return true;
-            }
-        }
-
-        return isScriptDefinitionsChanged();
-    }
-
-    @Override
-    public void apply() throws ConfigurationException {
-        if (isScriptDefinitionsChanged()) {
-            for (ModelDescriptor item : model.getItems()) {
-                ScriptDefinition definition = item.getDefinition();
-                int order = model.getItems().indexOf(item);
-                settings.setOrder(definition, order);
-                settings.setEnabled(definition, item.isEnabled());
-                settings.setAutoReloadConfigurations(definition, item.getAutoReloadConfigurations());
-            }
-
-            manager.reorderScriptDefinitions();
-        }
-
-        for (UnnamedConfigurable supportSpecificSetting : scriptingSuppportSettingsConfigurables) {
-            supportSpecificSetting.apply();
-        }
-    }
-
-    @Override
-    public void reset() {
-        model.setDefinitions(manager.getAllDefinitions(), settings);
-        for (UnnamedConfigurable supportSpecificSetting : scriptingSuppportSettingsConfigurables) {
-            supportSpecificSetting.reset();
-        }
-    }
-
-    private boolean isScriptDefinitionsChanged() {
-        for (ModelDescriptor item : model.getItems()) {
-            if (settings.isScriptDefinitionEnabled(item.getDefinition()) != item.isEnabled()) {
-                return true;
-            }
-            if (settings.autoReloadConfigurations(item.getDefinition()) != item.getAutoReloadConfigurations()) {
-                return true;
-            }
-        }
-        return !model.getDefinitions().equals(manager.getAllDefinitions());
-    }
-
-
-    @Override
-    @Nls
-    public String getDisplayName() {
-        return KotlinBundle.message("script.name.kotlin.scripting");
-    }
-
-    @Override
-    @NotNull
-    public String getId() {
-        return ID;
-    }
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
index 6a3141aaa9d..d44e58a2652 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiCall
 import com.intellij.psi.search.LocalSearchScope
 import com.intellij.psi.search.SearchScope
 import com.intellij.psi.search.searches.ReferencesSearch
+import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
 import com.intellij.util.Processor
 import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor
@@ -22,7 +23,6 @@ import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor
 import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.*
 import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.idea.findUsages.processAllUsages
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.toValVar
@@ -45,7 +45,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions
 
 class InflowSlicer(
     element: KtElement,
-    processor: SliceUsageProcessor,
+    processor: Processor<in SliceUsage>,
     parentUsage: KotlinSliceUsage
 ) : Slicer(element, processor, parentUsage) {
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceAnalysisMode.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceAnalysisMode.kt
index 8681eafb3f9..ab57af9e49f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceAnalysisMode.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceAnalysisMode.kt
@@ -5,7 +5,8 @@
 
 package org.jetbrains.kotlin.idea.slicer
 
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
+import com.intellij.slicer.SliceUsage
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
@@ -34,7 +35,11 @@ data class KotlinSliceAnalysisMode(val behaviourStack: List<Behaviour>, val inli
         get() = behaviourStack.lastOrNull()
 
     interface Behaviour {
-        fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor)
+        fun processUsages(
+            element: KtElement,
+            parent: KotlinSliceUsage,
+            uniqueProcessor: Processor<in SliceUsage>
+        )
 
         val slicePresentationPrefix: String
         val testPresentationPrefix: String
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt
index 26922a1cbfe..fec9683dac4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt
@@ -27,7 +27,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.slicer.SliceAnalysisParams
 import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
@@ -98,7 +98,10 @@ open class KotlinSliceUsage : SliceUsage {
 
     override fun canBeLeaf() = element != null && mode == KotlinSliceAnalysisMode.Default
 
-    public override fun processUsagesFlownDownTo(element: PsiElement, uniqueProcessor: SliceUsageProcessor) {
+    public override fun processUsagesFlownDownTo(
+        element: PsiElement,
+        uniqueProcessor: Processor<in SliceUsage>
+    ) {
         val ktElement = element as? KtElement ?: return
         val behaviour = mode.currentBehaviour
         if (behaviour != null) {
@@ -108,7 +111,10 @@ open class KotlinSliceUsage : SliceUsage {
         }
     }
 
-    public override fun processUsagesFlownFromThe(element: PsiElement, uniqueProcessor: SliceUsageProcessor) {
+    public override fun processUsagesFlownFromThe(
+        element: PsiElement,
+        uniqueProcessor: Processor<in SliceUsage>
+    ) {
         val ktElement = element as? KtElement ?: return
         val behaviour = mode.currentBehaviour
         if (behaviour != null) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.193 b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.193
deleted file mode 100644
index 219bb5527a0..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.193
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.slicer
-
-import com.intellij.analysis.AnalysisScope
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.Disposer
-import com.intellij.openapi.wm.ToolWindowId
-import com.intellij.openapi.wm.ToolWindowManager
-import com.intellij.psi.PsiElement
-import com.intellij.slicer.DuplicateMap
-import com.intellij.slicer.SliceAnalysisParams
-import com.intellij.slicer.SlicePanel
-import com.intellij.slicer.SliceRootNode
-import com.intellij.usageView.UsageInfo
-import com.intellij.usageView.UsageViewBundle
-import com.intellij.usages.PsiElementUsageTarget
-import com.intellij.usages.UsageContextPanel
-import com.intellij.usages.UsageView
-import com.intellij.usages.UsageViewPresentation
-import com.intellij.usages.impl.UsageContextPanelBase
-import com.intellij.usages.impl.UsageViewImpl
-import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.psi.KtDeclaration
-import java.awt.BorderLayout
-import javax.swing.JLabel
-import javax.swing.JPanel
-import javax.swing.SwingConstants
-
-sealed class KotlinUsageContextDataFlowPanelBase(
-    project: Project,
-    presentation: UsageViewPresentation,
-    private val isInflow: Boolean
-) : UsageContextPanelBase(project, presentation) {
-    private var panel: JPanel? = null
-
-    abstract class ProviderBase : UsageContextPanel.Provider {
-        override fun isAvailableFor(usageView: UsageView): Boolean {
-            val target = (usageView as UsageViewImpl).targets.firstOrNull() ?: return false
-            val element = (target as? PsiElementUsageTarget)?.element
-            return element is KtDeclaration && element.isValid
-        }
-    }
-
-    private fun createParams(element: PsiElement): SliceAnalysisParams {
-        return SliceAnalysisParams().apply {
-            scope = AnalysisScope(element.project)
-            dataFlowToThis = isInflow
-            showInstanceDereferences = true
-        }
-    }
-
-    protected fun createPanel(element: PsiElement, dataFlowToThis: Boolean): JPanel {
-        val toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(ToolWindowId.FIND)
-        val params = createParams(element)
-
-        val rootNode = SliceRootNode(myProject, DuplicateMap(), KotlinSliceUsage(element, params))
-
-        return object : SlicePanel(myProject, dataFlowToThis, rootNode, false, toolWindow) {
-            override fun isToShowAutoScrollButton() = false
-
-            override fun isToShowPreviewButton() = false
-
-            override fun isAutoScroll() = false
-
-            override fun setAutoScroll(autoScroll: Boolean) {}
-
-            override fun isPreview() = false
-
-            override fun setPreview(preview: Boolean) {}
-        }
-    }
-
-    public override fun updateLayoutLater(infos: List<UsageInfo>?) {
-        if (infos == null) {
-            removeAll()
-            val title = UsageViewBundle.message("select.the.usage.to.preview", myPresentation.usagesWord)
-            add(JLabel(title, SwingConstants.CENTER), BorderLayout.CENTER)
-        } else {
-            val element = infos.firstOrNull()?.element ?: return
-            if (panel != null) {
-                Disposer.dispose(panel as Disposable)
-            }
-
-            val panel = createPanel(element, isInflow)
-            Disposer.register(this, panel as Disposable)
-            removeAll()
-            add(panel, BorderLayout.CENTER)
-            this.panel = panel
-        }
-        revalidate()
-    }
-
-    override fun dispose() {
-        super.dispose()
-        panel = null
-    }
-}
-
-class KotlinUsageContextDataInflowPanel(
-    project: Project,
-    presentation: UsageViewPresentation
-) : KotlinUsageContextDataFlowPanelBase(project, presentation, true) {
-    class Provider : ProviderBase() {
-        override fun create(usageView: UsageView): UsageContextPanel {
-            return KotlinUsageContextDataInflowPanel((usageView as UsageViewImpl).project, usageView.getPresentation())
-        }
-
-        override fun getTabTitle() = KotlinBundle.message("slicer.title.dataflow.to.here")
-    }
-}
-
-class KotlinUsageContextDataOutflowPanel(
-    project: Project,
-    presentation: UsageViewPresentation
-) : KotlinUsageContextDataFlowPanelBase(project, presentation, false) {
-    class Provider : ProviderBase() {
-        override fun create(usageView: UsageView): UsageContextPanel {
-            return KotlinUsageContextDataOutflowPanel((usageView as UsageViewImpl).project, usageView.getPresentation())
-        }
-
-        override fun getTabTitle() = KotlinBundle.message("slicer.title.dataflow.from.here")
-    }
-}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt
index e7c7f962128..16f0e88df76 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt
@@ -9,11 +9,14 @@ import com.intellij.slicer.SliceUsage
 import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.psi.KtElement
 
 data class LambdaCallsBehaviour(private val sliceProducer: SliceProducer) : KotlinSliceAnalysisMode.Behaviour {
-    override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) {
+    override fun processUsages(
+        element: KtElement,
+        parent: KotlinSliceUsage,
+        uniqueProcessor: Processor<in SliceUsage>
+    ) {
         val processor = object : Processor<SliceUsage> {
             override fun process(sliceUsage: SliceUsage): Boolean {
                 if (sliceUsage is KotlinSliceUsage && sliceUsage.mode.currentBehaviour === this@LambdaCallsBehaviour) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt
index 8eaff3817cd..07d3f578af5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt
@@ -5,12 +5,17 @@
 
 package org.jetbrains.kotlin.idea.slicer
 
+import com.intellij.slicer.SliceUsage
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.psi.KtElement
 
 data class LambdaParameterInflowBehaviour(val parameterIndex: Int) : KotlinSliceAnalysisMode.Behaviour {
-    override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) {
+    override fun processUsages(
+        element: KtElement,
+        parent: KotlinSliceUsage,
+        uniqueProcessor: Processor<in SliceUsage>
+    ) {
         InflowSlicer(element, uniqueProcessor, parent).processChildren(parent.forcedExpressionMode)
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt
index 291a4907fc4..7731f7cfeb1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt
@@ -5,12 +5,17 @@
 
 package org.jetbrains.kotlin.idea.slicer
 
+import com.intellij.slicer.SliceUsage
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.psi.KtElement
 
 object LambdaReceiverInflowBehaviour : KotlinSliceAnalysisMode.Behaviour {
-    override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) {
+    override fun processUsages(
+        element: KtElement,
+        parent: KotlinSliceUsage,
+        uniqueProcessor: Processor<in SliceUsage>
+    ) {
         InflowSlicer(element, uniqueProcessor, parent).processChildren(parent.forcedExpressionMode)
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaResultInflowBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaResultInflowBehaviour.kt
index 1288f09678b..c313be20a9c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaResultInflowBehaviour.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaResultInflowBehaviour.kt
@@ -5,12 +5,17 @@
 
 package org.jetbrains.kotlin.idea.slicer
 
+import com.intellij.slicer.SliceUsage
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.psi.KtElement
 
 object LambdaResultInflowBehaviour : KotlinSliceAnalysisMode.Behaviour {
-    override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) {
+    override fun processUsages(
+        element: KtElement,
+        parent: KotlinSliceUsage,
+        uniqueProcessor: Processor<in SliceUsage>
+    ) {
         InflowSlicer(element, uniqueProcessor, parent).processChildren(parent.forcedExpressionMode)
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
index 4e766b9fe7c..4e55a049140 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
@@ -11,7 +11,9 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.search.LocalSearchScope
 import com.intellij.psi.util.parentOfType
+import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.builtins.isExtensionFunctionType
 import org.jetbrains.kotlin.builtins.isFunctionType
 import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
@@ -24,7 +26,6 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachOverridingElement
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReadWriteAccessDetector
 import org.jetbrains.kotlin.idea.util.actualsForExpected
@@ -36,7 +37,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 class OutflowSlicer(
     element: KtElement,
-    processor: SliceUsageProcessor,
+    processor: Processor<in SliceUsage>,
     parentUsage: KotlinSliceUsage
 ) : Slicer(element, processor, parentUsage) {
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt
index 8addb8ded94..3930d1b225b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.slicer
 
 import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
+import com.intellij.util.Processor
 
 interface SliceProducer {
     fun produce(usage: UsageInfo, mode: KotlinSliceAnalysisMode, parent: SliceUsage): Collection<SliceUsage>?
@@ -34,7 +34,7 @@ fun SliceProducer.produceAndProcess(
     sliceUsage: SliceUsage,
     mode: KotlinSliceAnalysisMode,
     parentUsage: SliceUsage,
-    processor: SliceUsageProcessor
+    processor: Processor<in SliceUsage>
 ): Boolean {
     val result = produce(sliceUsage.usageInfo, mode, parentUsage) ?: listOf(sliceUsage)
     for (usage in result) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
index a9c1836964e..b62a7bf5dda 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
@@ -12,7 +12,9 @@ import com.intellij.psi.PsiMethod
 import com.intellij.psi.search.SearchScope
 import com.intellij.psi.util.parentOfType
 import com.intellij.slicer.JavaSliceUsage
+import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
+import com.intellij.util.Processor
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
@@ -29,7 +31,6 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.getDeepestSuperDeclarations
 import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions
 import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions
-import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.idea.findUsages.processAllExactUsages
 import org.jetbrains.kotlin.idea.findUsages.processAllUsages
 import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest
@@ -54,7 +55,7 @@ import java.util.*
 
 abstract class Slicer(
     protected val element: KtElement,
-    protected val processor: SliceUsageProcessor,
+    protected val processor: Processor<in SliceUsage>,
     protected val parentUsage: KotlinSliceUsage
 ) {
     abstract fun processChildren(forcedExpressionMode: Boolean)
diff --git a/idea/testData/checker/regression/Jet53.kt b/idea/testData/checker/regression/Jet53.kt
index 3ebca2acc7d..e7a7f0c8db9 100644
--- a/idea/testData/checker/regression/Jet53.kt
+++ b/idea/testData/checker/regression/Jet53.kt
@@ -1,5 +1,3 @@
-// FIR_COMPARISON
-
 import java.util.Collections
 
 fun <T> checkSubtype(t: T) = t
diff --git a/idea/testData/decompiler/decompiledTextJvm/PrivateConstField.expected.kt b/idea/testData/decompiler/decompiledTextJvm/PrivateConstField.expected.kt
new file mode 100644
index 00000000000..60dbcf9390d
--- /dev/null
+++ b/idea/testData/decompiler/decompiledTextJvm/PrivateConstField.expected.kt
@@ -0,0 +1,17 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package test
+
+public final class PrivateConstField public constructor() {
+    private companion object {
+        public const final val CONST: kotlin.Int /* compiled code */
+
+        @test.A @field:java.lang.Deprecated public const final val CONST_WITH_ANNOTATION: kotlin.Int /* compiled code */
+
+        public final val field: kotlin.Int /* compiled code */
+
+        @test.A @field:java.lang.Deprecated public final val fieldWithAnnotation: kotlin.Int /* compiled code */
+    }
+}
+
diff --git a/idea/testData/decompiler/decompiledTextJvm/PrivateConstField/PrivateConstField.kt b/idea/testData/decompiler/decompiledTextJvm/PrivateConstField/PrivateConstField.kt
new file mode 100644
index 00000000000..8c241547872
--- /dev/null
+++ b/idea/testData/decompiler/decompiledTextJvm/PrivateConstField/PrivateConstField.kt
@@ -0,0 +1,16 @@
+package test
+
+@Retention(AnnotationRetention.RUNTIME)
+annotation class A
+
+class PrivateConstField {
+    private companion object {
+        const val CONST: Int = 10
+        @A
+        const val CONST_WITH_ANNOTATION: Int = 10
+
+        val field: Int = 10
+        @A
+        val fieldWithAnnotation: Int = 10
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
index a349c6650af..a67510bc1f7 100644
--- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
+++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
@@ -52,6 +52,16 @@ PsiJetFileStubImpl[package=]
                   TYPE_REFERENCE
                     USER_TYPE
                       REFERENCE_EXPRESSION[referencedName=f]
+              ANNOTATION_ENTRY[hasValueArguments=false, shortName=Deprecated]
+                ANNOTATION_TARGET[useSiteTarget=FIELD]
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      USER_TYPE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION[referencedName=java]
+                        REFERENCE_EXPRESSION[referencedName=lang]
+                      REFERENCE_EXPRESSION[referencedName=Deprecated]
             TYPE_REFERENCE
               USER_TYPE
                 USER_TYPE
diff --git a/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.kt b/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.kt
new file mode 100644
index 00000000000..8c241547872
--- /dev/null
+++ b/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.kt
@@ -0,0 +1,16 @@
+package test
+
+@Retention(AnnotationRetention.RUNTIME)
+annotation class A
+
+class PrivateConstField {
+    private companion object {
+        const val CONST: Int = 10
+        @A
+        const val CONST_WITH_ANNOTATION: Int = 10
+
+        val field: Int = 10
+        @A
+        val fieldWithAnnotation: Int = 10
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.txt b/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.txt
new file mode 100644
index 00000000000..c59bb1faff3
--- /dev/null
+++ b/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.txt
@@ -0,0 +1,75 @@
+PsiJetFileStubImpl[package=test]
+  PACKAGE_DIRECTIVE
+    REFERENCE_EXPRESSION[referencedName=test]
+  IMPORT_LIST
+  CLASS[fqName=test.PrivateConstField, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateConstField, superNames=[]]
+    MODIFIER_LIST[public final]
+    PRIMARY_CONSTRUCTOR
+      MODIFIER_LIST[public]
+      VALUE_PARAMETER_LIST
+    CLASS_BODY
+      OBJECT_DECLARATION[fqName=test.PrivateConstField.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]]
+        MODIFIER_LIST[private companion]
+        CLASS_BODY
+          PROPERTY[fqName=test.PrivateConstField.Companion.CONST, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=CONST]
+            MODIFIER_LIST[public final const]
+            TYPE_REFERENCE
+              USER_TYPE
+                USER_TYPE
+                  REFERENCE_EXPRESSION[referencedName=kotlin]
+                REFERENCE_EXPRESSION[referencedName=Int]
+          PROPERTY[fqName=test.PrivateConstField.Companion.CONST_WITH_ANNOTATION, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=CONST_WITH_ANNOTATION]
+            MODIFIER_LIST[public final const]
+              ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION[referencedName=test]
+                      REFERENCE_EXPRESSION[referencedName=A]
+              ANNOTATION_ENTRY[hasValueArguments=false, shortName=Deprecated]
+                ANNOTATION_TARGET[useSiteTarget=FIELD]
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      USER_TYPE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION[referencedName=java]
+                        REFERENCE_EXPRESSION[referencedName=lang]
+                      REFERENCE_EXPRESSION[referencedName=Deprecated]
+            TYPE_REFERENCE
+              USER_TYPE
+                USER_TYPE
+                  REFERENCE_EXPRESSION[referencedName=kotlin]
+                REFERENCE_EXPRESSION[referencedName=Int]
+          PROPERTY[fqName=test.PrivateConstField.Companion.field, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=field]
+            MODIFIER_LIST[public final]
+            TYPE_REFERENCE
+              USER_TYPE
+                USER_TYPE
+                  REFERENCE_EXPRESSION[referencedName=kotlin]
+                REFERENCE_EXPRESSION[referencedName=Int]
+          PROPERTY[fqName=test.PrivateConstField.Companion.fieldWithAnnotation, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=fieldWithAnnotation]
+            MODIFIER_LIST[public final]
+              ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION[referencedName=test]
+                      REFERENCE_EXPRESSION[referencedName=A]
+              ANNOTATION_ENTRY[hasValueArguments=false, shortName=Deprecated]
+                ANNOTATION_TARGET[useSiteTarget=FIELD]
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      USER_TYPE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION[referencedName=java]
+                        REFERENCE_EXPRESSION[referencedName=lang]
+                      REFERENCE_EXPRESSION[referencedName=Deprecated]
+            TYPE_REFERENCE
+              USER_TYPE
+                USER_TYPE
+                  REFERENCE_EXPRESSION[referencedName=kotlin]
+                REFERENCE_EXPRESSION[referencedName=Int]
diff --git a/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt b/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt
index 183342c3500..ee657258e04 100644
--- a/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt
+++ b/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt
@@ -95,6 +95,18 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=kotlin]
             REFERENCE_EXPRESSION[referencedName=Unit]
+      CLASS[fqName=test.TypeAliases.OrderA, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OrderA, superNames=[]]
+        MODIFIER_LIST[public final]
+        PRIMARY_CONSTRUCTOR
+          MODIFIER_LIST[public]
+          VALUE_PARAMETER_LIST
+        CLASS_BODY
+      CLASS[fqName=test.TypeAliases.OrderB, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OrderB, superNames=[]]
+        MODIFIER_LIST[public final]
+        PRIMARY_CONSTRUCTOR
+          MODIFIER_LIST[public]
+          VALUE_PARAMETER_LIST
+        CLASS_BODY
       TYPEALIAS[fqName=test.TypeAliases.B, isTopLevel=false, name=B]
         MODIFIER_LIST[public]
         TYPE_REFERENCE
@@ -139,15 +151,3 @@ PsiJetFileStubImpl[package=test]
                 TYPE_REFERENCE
                   USER_TYPE
                     REFERENCE_EXPRESSION[referencedName=F]
-      CLASS[fqName=test.TypeAliases.OrderA, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OrderA, superNames=[]]
-        MODIFIER_LIST[public final]
-        PRIMARY_CONSTRUCTOR
-          MODIFIER_LIST[public]
-          VALUE_PARAMETER_LIST
-        CLASS_BODY
-      CLASS[fqName=test.TypeAliases.OrderB, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OrderB, superNames=[]]
-        MODIFIER_LIST[public final]
-        PRIMARY_CONSTRUCTOR
-          MODIFIER_LIST[public]
-          VALUE_PARAMETER_LIST
-        CLASS_BODY
diff --git a/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.0.java b/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.0.java
index d89e818ee2a..927140ac794 100644
--- a/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.0.java
+++ b/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.0.java
@@ -1,6 +1,7 @@
 // PSI_ELEMENT: com.intellij.psi.PsiField
 // OPTIONS: skipWrite
-// FIR_COMPARISON
 public class A {
     public String <caret>foo = "foo";
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.0.java b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.0.java
index a6da9c48dc8..e1b882c3f80 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.0.java
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.0.java
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: com.intellij.psi.PsiMethod
 // OPTIONS: usages
-// FIR_COMPARISON
 class A {
     public void <caret>foo() {
 
@@ -12,4 +11,6 @@ class B extends A {
     public void foo() {
 
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java b/idea/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java
index 2c2f6326307..2ff53d9e8e8 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: com.intellij.psi.PsiMethod
 // OPTIONS: usages
-// FIR_COMPARISON
 public class Bar {
     public String getValue() {
         return "value";
@@ -9,4 +8,6 @@ public class Bar {
     public String <caret>getValue(String param) {
         return "value " + param;
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.0.java b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.0.java
index 87201287485..09b647ad9b8 100644
--- a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.0.java
+++ b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.0.java
@@ -26,4 +26,6 @@ class Test {
         new B().getP();
         new B().setP(1);
     }
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.0.java b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.0.java
index 7307ae62079..5f54edd6c88 100644
--- a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.0.java
+++ b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.0.java
@@ -26,4 +26,6 @@ class Test {
         new B().getP();
         new B().setP(1);
     }
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt b/idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt
index 7eee200da89..914807914bc 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt
@@ -1,7 +1,8 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
 
 package pack
 
-data class A(val <caret>a: Int, val b: String)
\ No newline at end of file
+data class A(val <caret>a: Int, val b: String)
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt b/idea/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt
index e982ddead74..cc89e6ad4d8 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
 
 data class A(val <caret>a: Int, val b: Int) {
     fun f() {}
@@ -24,4 +23,6 @@ fun foo(x: X) {
     val (a3, b3) = constructor(1, 2)
 
     val (a4, b4) = A::class.java.newInstance()
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/callableReferences.results.txt b/idea/testData/findUsages/kotlin/conventions/components/callableReferences.results.txt
index 914d590b78e..a8748d1b0c6 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/callableReferences.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/callableReferences.results.txt
@@ -1,4 +1,4 @@
-Value read 20 val (a1, b1) = fun2()
-Value read 21 val (a2, b2) = fun3()
-Value read 24 val (a3, b3) = constructor(1, 2)
-Value read 26 val (a4, b4) = A::class.java.newInstance()
\ No newline at end of file
+Value read 19 val (a1, b1) = fun2()
+Value read 20 val (a2, b2) = fun3()
+Value read 23 val (a3, b3) = constructor(1, 2)
+Value read 25 val (a4, b4) = A::class.java.newInstance()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt b/idea/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt
index 3d634c2e6f3..8599b1feb0b 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_COMPARISON
 
 data class A(val <caret>x: Int, val y: Int) {
     companion object {
@@ -14,4 +13,5 @@ fun foo() {
     val (x, y) = A.b()
 }
 
-// DISABLE-ERRORS
\ No newline at end of file
+// DISABLE-ERRORS
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.kt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.kt
index 6119cc3c610..34ddea020b2 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
 
 package pack
 
@@ -27,3 +26,5 @@ fun List<A>.ext1() {
 }
 
 fun <T> T.getThis(): T = this
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt
index 6b33de76b75..e341678cd0f 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt
@@ -1,5 +1,5 @@
-[dataClass.0.kt] Value read 18 val (x, y) = getThis()
-[dataClass.0.kt] Value read 26 val (x, y) = get(0)
+[dataClass.0.kt] Value read 17 val (x, y) = getThis()
+[dataClass.0.kt] Value read 25 val (x, y) = get(0)
 [dataClass.1.kt] Function call 6 a.component1()
 [dataClass.1.kt] Value read 10 val (x2, y2, z2) = g()
 [dataClass.1.kt] Value read 11 val (x3, y3, z3) = h()
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt b/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt
index 648738f6ed5..5bcfa5b097f 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt
@@ -1,7 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_IGNORE
 
 data class A(val n: Int, val s: String, val o: Any)
 
@@ -11,3 +10,5 @@ fun test() {
     a.<caret>component1()
     val (x, y, z) = a
 }
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.DisabledComponents.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.DisabledComponents.results.txt
index 6cc2333674b..d357ddd40e6 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.DisabledComponents.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.DisabledComponents.results.txt
@@ -1 +1 @@
-Value read 10 a.n
\ No newline at end of file
+Value read 9 a.n
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.results.txt
index 4e7b8e03693..4c5e0fc1500 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.results.txt
@@ -1,3 +1,3 @@
-Function call 11 a.component1()
-Value read 10 a.n
-Value read 12 val (x, y, z) = a
\ No newline at end of file
+Function call 10 a.component1()
+Value read 11 val (x, y, z) = a
+Value read 9 a.n
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt
index c8ffe57b030..67d362e9c9a 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
 
 data class A(val <caret>x: Int, val y: Int, val z: String)
 data class B(val a: A, val n: Int)
@@ -16,4 +15,6 @@ fun f(b: B, c: C) {
 
     val (a1, n1) = c
     val (x1, y1, z1) = a1
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.DisabledComponents.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.DisabledComponents.results.txt
index 4b7f75086cf..1a4cac1ec64 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.DisabledComponents.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.DisabledComponents.results.txt
@@ -1 +1 @@
-Value read 15 val (x, y, z) = a
\ No newline at end of file
+Value read 14 val (x, y, z) = a
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.results.txt
index 5914ef3eb03..cf1e5766db6 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.results.txt
@@ -1,2 +1,2 @@
-Value read 15 val (x, y, z) = a
-Value read 18 val (x1, y1, z1) = a1
\ No newline at end of file
+Value read 14 val (x, y, z) = a
+Value read 17 val (x1, y1, z1) = a1
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/for.0.kt b/idea/testData/findUsages/kotlin/conventions/components/for.0.kt
index b3fd3d9c14f..2c900bc6e47 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/for.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/for.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
 
 data class A(val <caret>n: Int, val s: String, val o: Any) {
 
@@ -12,3 +11,5 @@ fun test() {
         val (x, y) = a
     }
 }
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/for.results.txt b/idea/testData/findUsages/kotlin/conventions/components/for.results.txt
index a5135ac314e..724ac623714 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/for.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/for.results.txt
@@ -1,2 +1,2 @@
-Value read 12 val (x, y) = a
-Value read 8 for ((x, y, z) in arrayOf<A>()) {
\ No newline at end of file
+Value read 11 val (x, y) = a
+Value read 7 for ((x, y, z) in arrayOf<A>()) {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt
index 9009348a28a..00bc5348a35 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
 
 data class A(val <caret>x: Int, val y: Int)
 
@@ -15,4 +14,5 @@ fun y(o: Any) {
     val list = o as List<A>
     val (x, y) = list[0]
 }
-// DISABLE-ERRORS
\ No newline at end of file
+// DISABLE-ERRORS
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.DisabledComponents.results.txt b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.DisabledComponents.results.txt
index 69570935fcc..2265fbf60c6 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.DisabledComponents.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.DisabledComponents.results.txt
@@ -1,2 +1,2 @@
-Value read 16 val (x, y) = list[0]
-Value read 9 val (x, y) = o
\ No newline at end of file
+Value read 15 val (x, y) = list[0]
+Value read 8 val (x, y) = o
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.results.txt b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.results.txt
index 4ec53e72927..1915a5a9715 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.results.txt
@@ -1,3 +1,3 @@
-Value read 10 val (x1, y1) = A(1, "", "")
-Value read 16 val (x, y) = list[0]
-Value read 9 val (x, y) = o
\ No newline at end of file
+Value read 15 val (x, y) = list[0]
+Value read 8 val (x, y) = o
+Value read 9 val (x1, y1) = A(1, "", "")
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt b/idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt
index 3ca4332cb18..4c2670fade5 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
 
 data class A(val <caret>a: Int, val b: Int)
 
@@ -39,4 +38,6 @@ var Any.v: (A) -> Unit
 
 fun f() {
     "".v = { val (x, y ) = it }
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/lambdas.DisabledComponents.results.txt b/idea/testData/findUsages/kotlin/conventions/components/lambdas.DisabledComponents.results.txt
index 480c0684b09..c828eaff1ca 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/lambdas.DisabledComponents.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/lambdas.DisabledComponents.results.txt
@@ -1 +1 @@
-Value read 29 takeFun2 { a, n -> val (x, y) = a!! }
\ No newline at end of file
+Value read 28 takeFun2 { a, n -> val (x, y) = a!! }
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/lambdas.results.txt b/idea/testData/findUsages/kotlin/conventions/components/lambdas.results.txt
index e2a46fa1bcf..727ae9b3a12 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/lambdas.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/lambdas.results.txt
@@ -1,8 +1,8 @@
-Value read 20 p[0] = { val (x, y) = it }
-Value read 26 takeExtFun { val (x, y) = this }
-Value read 28 takeFun1 { val (x, y) = it }
-Value read 29 takeFun2 { a, n -> val (x, y) = a!! }
-Value read 30 takeFun3 { val (x, y) = it[0] }
-Value read 32 x(p) { val (x, y) = it }
-Value read 33 x(p, fun (p) { val (x, y) = p })
-Value read 41 "".v = { val (x, y ) = it }
\ No newline at end of file
+Value read 19 p[0] = { val (x, y) = it }
+Value read 25 takeExtFun { val (x, y) = this }
+Value read 27 takeFun1 { val (x, y) = it }
+Value read 28 takeFun2 { a, n -> val (x, y) = a!! }
+Value read 29 takeFun3 { val (x, y) = it[0] }
+Value read 31 x(p) { val (x, y) = it }
+Value read 32 x(p, fun (p) { val (x, y) = p })
+Value read 40 "".v = { val (x, y ) = it }
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt b/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt
index 7341d0c5bd4..d74333999ae 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
 
 data class A(val <caret>n: Int, val s: String)
 
@@ -34,3 +33,5 @@ fun y2(a: A): Boolean = condition(a)
 fun y3(a: A) {
     condition(a)
 }
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.results.txt b/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.results.txt
index 2c02b0c22c7..db6050293f0 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.results.txt
@@ -1,2 +1,2 @@
-Value read 20 val (x1, y1) = if (b) {
-Value read 21 A(1, "").apply { val (x2, y2) = this }
\ No newline at end of file
+Value read 19 val (x1, y1) = if (b) {
+Value read 20 A(1, "").apply { val (x2, y2) = this }
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/operators.0.kt b/idea/testData/findUsages/kotlin/conventions/components/operators.0.kt
index 327b0e469a7..759147ece55 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/operators.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/operators.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 data class A(val <caret>x: Int, val y: Int) {
     fun f() {
diff --git a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt
index 46a19fdb756..92a47d598c1 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt
@@ -1,10 +1,11 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_COMPARISON
 data class A(val <caret>a: A?, val n: Int)
 
 fun f(a: A) {
     val (a1, n1) = a
     val (a2, n2) =
             a?.a ?: return
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.DisabledComponents.results.txt b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.DisabledComponents.results.txt
index f4ca9423288..367941e5a32 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.DisabledComponents.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.DisabledComponents.results.txt
@@ -1,3 +1,3 @@
-Value read 7 val (a1, n1) = a
-Value read 8 val (a2, n2) =
-Value read 9 a?.a ?: return
+Value read 6 val (a1, n1) = a
+Value read 7 val (a2, n2) =
+Value read 8 a?.a ?: return
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.results.txt b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.results.txt
index 112e8c1e732..367941e5a32 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.results.txt
@@ -1,3 +1,3 @@
-Value read 7 val (a1, n1) = a
-Value read 8 val (a2, n2) =
-Value read 9 a?.a ?: return
\ No newline at end of file
+Value read 6 val (a1, n1) = a
+Value read 7 val (a2, n2) =
+Value read 8 a?.a ?: return
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt
index 349a51333fe..385a5420e5f 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 data class A(val <caret>b: B, val n: Int)
 data class B(val a: A?, val s: String)
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt
index 341ae2c0bc6..70632b16f07 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt
@@ -5,3 +5,5 @@ package test
 class <caret>Foo {
 
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt
index 48c18e7742e..7c975bea1fc 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt
@@ -11,3 +11,5 @@ open class <caret>Server {
         println("Server")
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt
index 2f3f0d98cdc..6f15274ac9a 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt
@@ -4,3 +4,5 @@ package testing
 
 class <caret>Server() {
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
index 3369e6b2079..ff2769a5ea1 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
@@ -1,4 +1,4 @@
 Field declaration 4 private Server myServer = new Server();
 Method parameter declaration 6 public void setServer(Server server) {
 Method return type 10 public Server getMyServer() {
-New instance creation 4 private Server myServer = new Server();
+New instance creation 4 private Server myServer = new Server();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt
index c85b5d872b4..eeb85152853 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt
@@ -4,3 +4,5 @@ package testing
 
 class <caret>Server() {
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt
index 17a9cd7cc20..bd8194be3e2 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt
@@ -35,3 +35,5 @@ open class A: X {
         println("!$s!")
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt
index 873c0431a26..7fb33f55f4f 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt
@@ -35,3 +35,5 @@ open class <caret>A: X {
         println("!$s!")
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.0.kt
index 6bbcc6e8a43..dac52b7dda5 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.0.kt
@@ -3,3 +3,5 @@
 open class <caret>A {
     constructor() {}
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt
index 3e0c6e6e7f9..4e5d5c365ff 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt
@@ -1,8 +1,9 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: usages, constructorUsages
-// FIR_COMPARISON
 
 package server
 
 data class <caret>Data
-// DISABLE-ERRORS
\ No newline at end of file
+// DISABLE-ERRORS
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt
index 18f76ae9575..9ea86dfbf2e 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: usages, constructorUsages, skipImports
-// FIR_COMPARISON
 
 package server
 
@@ -9,3 +8,5 @@ open class <caret>Server {
         println("Server")
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt
index a5ce1368fe5..80ef3beb8d3 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: functionUsages
-// FIR_COMPARISON
 
 interface <caret>X {
     val a: String
@@ -37,3 +36,5 @@ open class A: X {
         println("!$s!")
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt
index 12a7d80bb70..f8a34015652 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: functionUsages
-// FIR_COMPARISON
 
 interface X {
     val a: String
@@ -37,3 +36,5 @@ open class <caret>A: X {
         println("!$s!")
     }
 }
+
+// FIR_COMPARISON
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt
index 288fc667b85..be55c42e0f1 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: propertyUsages
-// FIR_COMPARISON
 
 interface <caret>X {
     val a: String
@@ -37,3 +36,5 @@ open class A: X {
         println("!$s!")
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt
index 1e37ad183c6..8185ca7eb33 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: propertyUsages
-// FIR_COMPARISON
 
 interface X {
     val a: String
@@ -37,3 +36,5 @@ open class <caret>A(val t: String, var u: String): X {
         println("!$s!")
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt
index 7b1d8d49519..bb577cd6c59 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt
@@ -11,3 +11,5 @@ public open class Outer {
         }
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt
index 8efd5f43491..d5101c39631 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: usages, constructorUsages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun foo(): Any {
     class <caret>Bar
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt
index c74dbf58bf0..96350d32922 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: usages, constructorUsages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun foo(): Any {
     if (false) {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt
index 5977bcfefe6..bba4425f8cb 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: usages, constructorUsages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package server
 
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.0.kt
index c54e961b28a..9b3972ca69e 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: usages, constructorUsages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 class <caret>C {
     init {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/usageInTypeAlias.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/usageInTypeAlias.0.kt
index 867c2d0e82a..6f7b2689766 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/usageInTypeAlias.0.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/usageInTypeAlias.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 class <caret>A<T>
 
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt
index a9e677900c1..db705ddaf11 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt
@@ -24,4 +24,5 @@ enum class E {
     open fun <caret>foo(n: Int): Int = n
 }
 
-// DISABLE-ERRORS
\ No newline at end of file
+// DISABLE-ERRORS
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt
index 9f5e427d31f..5be523366c2 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: textOccurrences
-// FIR_COMPARISON
 
 package test
 
@@ -9,3 +8,5 @@ class Foo {
 
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinAliasedMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinAliasedMethodUsages.0.kt
index 0e3d17641cf..d56e22067e3 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinAliasedMethodUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinAliasedMethodUsages.0.kt
@@ -1,7 +1,8 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_COMPARISON
 
 package server
 
 fun <caret>processRequest() = "foo"
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt
index bff59dde5d6..d5784dc1fa5 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun foo() {
     fun <caret>bar() {
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt
index 31af2cebcd6..aefed6f2a87 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodAliasedUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodAliasedUsages.0.kt
index 78ab1c70bad..37db92492b1 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodAliasedUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodAliasedUsages.0.kt
@@ -13,3 +13,5 @@ class Client {
         processRequest()
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodsAliasedUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodsAliasedUsages.0.kt
index 667e49e84c2..cb6ecb60c4b 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodsAliasedUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodsAliasedUsages.0.kt
@@ -1,7 +1,6 @@
 // IGNORE: see KotlinFindUsagesHandlerFactory: it is ambiguous case: ImportAlias does not have any reference to be resolved
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtImportAlias
 // OPTIONS: usages
-// FIR_COMPARISON
 
 package c
 
@@ -16,4 +15,6 @@ fun test() {
     a(1)
     b()
     b(1)
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt
index f968bc3c2f4..ecb4a73b2ac 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt
@@ -9,3 +9,5 @@ public open class Outer() {
         }
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt
index f17a2b57afd..0ffb1d234a3 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package server
 
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt
index 54d91660179..4217971794d 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt
@@ -4,3 +4,4 @@ package server
 
 fun <caret>processRequest() = "foo"
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.0.kt
index 309d2b4c262..fe2bcaad76d 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.0.kt
@@ -6,3 +6,4 @@ package server
 
 fun <caret>processRequest() = "foo"
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt
index 904bf0bd7d8..85c25b095ff 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt
@@ -1,8 +1,8 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages, skipImports
-// FIR_COMPARISON
 
 package server
 
 fun <caret>processRequest() = "foo"
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.0.kt
index bda2ef20787..04c78096b76 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.0.kt
@@ -5,3 +5,4 @@ package server
 
 fun <caret>processRequest() = "foo"
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt
index cedd1a2e88b..f1308e61b9a 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt
@@ -8,4 +8,6 @@ interface TraitWithImpl {
 
 public class TraitWithDelegatedWithImpl(f: TraitWithImpl): TraitWithImpl by f
 
-fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
\ No newline at end of file
+fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
index 9c77d572ee6..fa47694da29 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
@@ -1,2 +1,2 @@
 [kotlinTraitImplThroughDelegate.0.kt] Function call 11 fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
-[kotlinTraitImplThroughDelegate.1.java] Unclassified usage 7 some.foo();
+[kotlinTraitImplThroughDelegate.1.java] Unclassified usage 7 some.foo();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.0.kt
index b69ac36b4f0..39762bb2b8e 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.0.kt
@@ -8,4 +8,6 @@ interface TraitNoImpl {
 
 public class TraitWithDelegatedNoImpl(f: TraitNoImpl): TraitNoImpl by f
 
-fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
\ No newline at end of file
+fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
index 00135113003..a00a08aef8d 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
@@ -1,2 +1,2 @@
 [kotlinTraitNoImplThroughDelegate.0.kt] Function call 11 fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
-[kotlinTraitNoImplThroughDelegate.1.java] Unclassified usage 7 some.foo();
+[kotlinTraitNoImplThroughDelegate.1.java] Unclassified usage 7 some.foo();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.0.kt
index 7dfaaf5ee76..012e11226ec 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package anonymousUnused
 
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.0.kt
index 1dd5b65c282..c637aaa4476 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package anonymousUnused
 
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.0.kt
index 25a900cd538..d8731c582c5 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package anonymousUnused
 
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.0.kt
index e27a4dfa9a4..bd5eafba602 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package anonymousUnused
 
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.0.kt
index c5ce4bb6237..7a5aace6416 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 class Foo {
     private val localObject = object : Any() {
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInCompanion.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInCompanion.0.kt
index 6ce1c251e06..1a8f95ffad9 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInCompanion.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInCompanion.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 class Foo {
     companion object {
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInTopLevel.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInTopLevel.0.kt
index 030d6f43768..ebcaa016e7f 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInTopLevel.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInTopLevel.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 private val localObject = object : Any() {
     fun <caret>f() {
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt
index aba007c5d3b..7cf8fdc8190 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt
@@ -14,3 +14,4 @@ fun main(a: A) {
 }
 
 // for KT-3769 Find usages gives no result for overrides
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.0.kt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.0.kt
index e340f106a7b..5e1e72d8a56 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.0.kt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.0.kt
@@ -26,4 +26,5 @@ fun test() {
     B().p = 1
 }
 
-// DISABLE-ERRORS
\ No newline at end of file
+// DISABLE-ERRORS
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.0.kt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.0.kt
index 7a887986a92..3d32751c507 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.0.kt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.0.kt
@@ -27,4 +27,5 @@ fun test() {
     B().p = 1
 }
 
-// DISABLE-ERRORS
\ No newline at end of file
+// DISABLE-ERRORS
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.0.kt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.0.kt
index 6241e9be9f5..c36ac11086f 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.0.kt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.0.kt
@@ -27,4 +27,5 @@ fun test() {
     B().p = 1
 }
 
-// DISABLE-ERRORS
\ No newline at end of file
+// DISABLE-ERRORS
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt
index b8bec636e17..f20bea10ca8 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt
@@ -5,3 +5,4 @@ object <caret>O {
     var foo: String = "foo"
 }
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
index d9869ae083f..c1826f60666 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
@@ -1,2 +1,2 @@
 Class static member access 7 System.out.println("foo = " + O.INSTANCE.getFoo());
-Usage in import 3 import server.O;
+Usage in import 3 import server.O;
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinImportedObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinImportedObjectUsages.0.kt
index 78698ede455..4c6a77eebdb 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinImportedObjectUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinImportedObjectUsages.0.kt
@@ -1,5 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtObjectDeclaration
-// FIR_IGNORE
+// FIR_COMPARISON
 
 import Imported as Alias
 
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt
index 88516991946..d9294d55561 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt
@@ -1,5 +1,4 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtObjectDeclaration
-// FIR_COMPARISON
 
 package server
 
@@ -7,3 +6,4 @@ object <caret>O {
     var foo: String = "foo"
 }
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt
index 4df5126c072..7fa1d97377f 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtObjectDeclaration
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package server
 
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/missingName.0.kt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/missingName.0.kt
index 66ac5d7c4e6..f5a2c6fdd3d 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/missingName.0.kt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/missingName.0.kt
@@ -1,7 +1,8 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtPrimaryConstructor
 // OPTIONS: usages
-// FIR_COMPARISON
 
 class <caret>() {
 
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt
index edbb3a33722..ff59bfbf8a1 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt
@@ -14,3 +14,5 @@ open class B: A<String>("") {
             println("set:" + value)
         }
 }
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt
index 54a8e62b431..9b628a27a03 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt
@@ -14,3 +14,5 @@ open class B: A<String>("") {
             println("set:" + value)
         }
 }
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt
index 35d9bd52f27..741875fac00 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt
@@ -14,3 +14,5 @@ open class B: A<String>("") {
             println("set:" + value)
         }
 }
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt
index 2a7453cb8d4..c475a2f87c9 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun foo(): String {
     val <caret>bar = ""
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt
index b6506851916..3401b5cb7a3 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun foo(): String {
     if (true) {
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt
index 62d8b5a69d0..e1951218b67 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 class Outer {
     val x = Outer.t
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertySameNameAsMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertySameNameAsMethodUsages.0.kt
index d909e4419a1..974d3baf43f 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertySameNameAsMethodUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertySameNameAsMethodUsages.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 class P
 
diff --git a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
index 2db8c9d6e23..fe9a8a6a1fb 100644
--- a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
+++ b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
@@ -26,4 +26,6 @@ class C : B() {
 
 fun test() {
     B()
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt
index d1c5ebf08ec..e6926554e22 100644
--- a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt
+++ b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt
@@ -22,4 +22,6 @@ class C: B("") {
 
 fun test() {
     B("")
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt
index fcb1c992d5d..3c73d26ffe9 100644
--- a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt
+++ b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt
@@ -1,8 +1,9 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass
 // FILTERING_RULES: org.jetbrains.kotlin.idea.findUsages.KotlinImportFilteringRule
 // OPTIONS: usages, constructorUsages
-// FIR_COMPARISON
 
 package testing
 
 public class <caret>Test
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/enumFunctionUsages.0.kt b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/enumFunctionUsages.0.kt
index 4ded1e86f33..3b87abc9b19 100644
--- a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/enumFunctionUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/enumFunctionUsages.0.kt
@@ -24,4 +24,5 @@ enum class E {
     internal open fun <caret>foo(n: Int): Int = n
 }
 
-// DISABLE-ERRORS
\ No newline at end of file
+// DISABLE-ERRORS
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt
index a93c41dff58..0f6672672f9 100644
--- a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt
@@ -1,8 +1,8 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages
-// FIR_COMPARISON
 
 package server
 
 internal fun <caret>processRequest() = "foo"
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt
index 148d2b63d7c..553c292140b 100644
--- a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt
+++ b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt
@@ -1,6 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtNamedFunction
 // OPTIONS: usages, skipImports
-// FIR_COMPARISON
 package server
 
 interface TraitWithImpl {
@@ -11,4 +10,5 @@ public class TraitWithDelegatedWithImpl(f: TraitWithImpl): TraitWithImpl by f
 
 fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
 
-// ERROR: Modifier 'internal' is not applicable inside 'interface'
\ No newline at end of file
+// ERROR: Modifier 'internal' is not applicable inside 'interface'
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
index 48f73b7af93..e2e8d26e09c 100644
--- a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
@@ -1 +1 @@
-Function call 12 fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
\ No newline at end of file
+Function call 11 fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/usagesOfBaseForFunction.0.kt b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/usagesOfBaseForFunction.0.kt
index 461c8313de6..0f115b34b9a 100644
--- a/idea/testData/findUsages/kotlin/internal/findFunctionUsages/usagesOfBaseForFunction.0.kt
+++ b/idea/testData/findUsages/kotlin/internal/findFunctionUsages/usagesOfBaseForFunction.0.kt
@@ -14,4 +14,5 @@ fun main(a: A) {
 }
 
 // for KT-3769 Find usages gives no result for overrides
-// ERROR: Modifier 'internal' is not applicable inside 'interface'
\ No newline at end of file
+// ERROR: Modifier 'internal' is not applicable inside 'interface'
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt b/idea/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt
index c6a36bc700e..2b684f77454 100644
--- a/idea/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt
+++ b/idea/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package server
 
diff --git a/idea/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt
index 2a3f57a292d..19e499f262b 100644
--- a/idea/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt
@@ -1,8 +1,8 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
-// FIR_COMPARISON
 
 package server
 
 internal var <caret>foo: String = "foo"
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt b/idea/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
index 8bfb37bbcfd..02a7e398307 100644
--- a/idea/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
+++ b/idea/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
@@ -26,4 +26,6 @@ class C : B() {
 
 fun test() {
     B()
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/secondaryConstructor.0.kt b/idea/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/secondaryConstructor.0.kt
index 267750e8f31..723da63c473 100644
--- a/idea/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/secondaryConstructor.0.kt
+++ b/idea/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/secondaryConstructor.0.kt
@@ -22,4 +22,6 @@ class C: B("") {
 
 fun test() {
     B("")
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt b/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt
index 11e6d7ff85b..280e2c60d00 100644
--- a/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt
+++ b/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt
@@ -3,3 +3,5 @@
 open class <caret>Foo {
     vv open val foo = 1
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/variable/readAccess.0.kt b/idea/testData/findUsages/kotlin/variable/readAccess.0.kt
index 02408a1bb6c..c283fa29d24 100644
--- a/idea/testData/findUsages/kotlin/variable/readAccess.0.kt
+++ b/idea/testData/findUsages/kotlin/variable/readAccess.0.kt
@@ -1,7 +1,7 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
 // OPTIONS: skipWrite
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun foo() {
     var <caret>v = 1
diff --git a/idea/testData/findUsages/kotlin/variable/varInDoWhile.0.kt b/idea/testData/findUsages/kotlin/variable/varInDoWhile.0.kt
index 0e5bb9092f9..c0ae0fc6665 100644
--- a/idea/testData/findUsages/kotlin/variable/varInDoWhile.0.kt
+++ b/idea/testData/findUsages/kotlin/variable/varInDoWhile.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun test() {
     do {
diff --git a/idea/testData/findUsages/kotlin/variable/writeAccess.0.kt b/idea/testData/findUsages/kotlin/variable/writeAccess.0.kt
index 349d5c09c99..cda26b9e453 100644
--- a/idea/testData/findUsages/kotlin/variable/writeAccess.0.kt
+++ b/idea/testData/findUsages/kotlin/variable/writeAccess.0.kt
@@ -1,7 +1,7 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
 // OPTIONS: usages
 // OPTIONS: skipRead
-// FIR_IGNORE
+// FIR_COMPARISON
 
 fun foo() {
     var <caret>v = 1
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
index 0d39b524ea9..a4bdf24dee5 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
@@ -1,7 +1,7 @@
 // PSI_ELEMENT: com.intellij.psi.PsiClass
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt
index 8287442924e..40db0062a87 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt
@@ -1,7 +1,7 @@
 // PSI_ELEMENT: com.intellij.psi.PsiMethod
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
index 12cca58c500..6411970d056 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
@@ -1,7 +1,7 @@
 // PSI_ELEMENT: com.intellij.psi.PsiField
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
index 67b23f8af74..b71927a7011 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
@@ -1,7 +1,7 @@
 // PSI_ELEMENT: com.intellij.psi.PsiField
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
index 17bc2e7685f..a70fd925969 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
@@ -1,7 +1,7 @@
 // PSI_ELEMENT: com.intellij.psi.PsiMethod
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_IGNORE
+// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt
index c07dc17de37..305914a7e9b 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt
@@ -2,7 +2,6 @@
 // OPTIONS: usages, constructorUsages
 // FIND_BY_REF
 // WITH_FILE_NAME
-// FIR_IGNORE
 
 package usages
 
@@ -17,4 +16,6 @@ class Y(): A(1)
 fun test() {
     val a: <caret>A = A()
     val aa = A(1)
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
index f1a9c8d8d0b..b71d5a2cdda 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
@@ -1,8 +1,8 @@
-[LibraryClassUsages.0.kt] Local variable declaration 18 val a: A = A()
-[LibraryClassUsages.0.kt] New instance creation 18 val a: A = A()
-[LibraryClassUsages.0.kt] New instance creation 19 val aa = A(1)
-[LibraryClassUsages.0.kt] Supertype 11 class X: A {
-[LibraryClassUsages.0.kt] Supertype 15 class Y(): A(1)
+[LibraryClassUsages.0.kt] Local variable declaration 17 val a: A = A()
+[LibraryClassUsages.0.kt] New instance creation 17 val a: A = A()
+[LibraryClassUsages.0.kt] New instance creation 18 val aa = A(1)
+[LibraryClassUsages.0.kt] Supertype 10 class X: A {
+[LibraryClassUsages.0.kt] Supertype 14 class Y(): A(1)
 [LibraryClassUsages.1.java] Local variable declaration 11 A a = new A();
 [LibraryClassUsages.1.java] Local variable declaration 12 A aa = new A(1);
 [LibraryClassUsages.1.java] New instance creation 11 A a = new A();
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt
index b1173b09e43..3c2b0bc72e3 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt
@@ -2,7 +2,6 @@
 // OPTIONS: usages, constructorUsages
 // FIND_BY_REF
 // WITH_FILE_NAME
-// FIR_IGNORE
 
 package usages
 
@@ -10,4 +9,6 @@ import library.*
 
 fun test() {
     val a = A.<caret>Companion
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
index 04c30086340..2e2f67d99b4 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
@@ -1,3 +1,3 @@
-[LibraryCompanionObjectUsages.0.kt] Companion object 12 val a = A.Companion
+[LibraryCompanionObjectUsages.0.kt] Companion object 11 val a = A.Companion
 [LibraryCompanionObjectUsages.1.java] Local variable declaration 7 A.Companion o = A.Companion;
 [LibraryCompanionObjectUsages.1.java] Unclassified usage 7 A.Companion o = A.Companion;
\ No newline at end of file
diff --git a/idea/testData/gradle/testRunConfigurations/preferredConfigurations/src/test/kotlin/MyKotlinTest.kt.193 b/idea/testData/gradle/testRunConfigurations/preferredConfigurations/src/test/kotlin/MyKotlinTest.kt.193
deleted file mode 100644
index 62944811dec..00000000000
--- a/idea/testData/gradle/testRunConfigurations/preferredConfigurations/src/test/kotlin/MyKotlinTest.kt.193
+++ /dev/null
@@ -1,11 +0,0 @@
-import org.junit.Test
-
-class <lineMarker descr="Run Test" settings=":cleanTest :test --tests \"MyKotlinTest\"">MyKotlinTest</lineMarker> {
-    @Test
-    fun <lineMarker descr="Run Test" settings=":cleanTest :test --tests \"MyKotlinTest.testA\"">testA</lineMarker>() {
-    }
-
-    @Test
-    fun <lineMarker descr="Run Test" settings=":cleanTest :test --tests \"MyKotlinTest.testB\"">testB</lineMarker>() {
-    }
-}
\ No newline at end of file
diff --git a/idea/testData/highlighter/AutoCreatedItParameter.kt b/idea/testData/highlighter/AutoCreatedItParameter.kt
index f50f05c068b..68af0a13a90 100644
--- a/idea/testData/highlighter/AutoCreatedItParameter.kt
+++ b/idea/testData/highlighter/AutoCreatedItParameter.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR
 fun <info textAttributesKey="KOTLIN_FUNCTION_DECLARATION">test</info>() {
     val <info textAttributesKey="KOTLIN_LOCAL_VARIABLE">vect</info> = <info textAttributesKey="KOTLIN_CONSTRUCTOR">MyIterable</info><<info textAttributesKey="KOTLIN_CLASS">Int</info>>()
     <info textAttributesKey="KOTLIN_LOCAL_VARIABLE">vect</info>.<info textAttributesKey="KOTLIN_FUNCTION_CALL">filter</info> { <info textAttributesKey="KOTLIN_CLOSURE_DEFAULT_PARAMETER">it</info> != 2 }.<info textAttributesKey="KOTLIN_FUNCTION_CALL">forEach</info> { <info textAttributesKey="KOTLIN_CLOSURE_DEFAULT_PARAMETER">it</info>.<info textAttributesKey="KOTLIN_FUNCTION_CALL">toString</info>() }
diff --git a/idea/testData/highlighter/Variables.kt b/idea/testData/highlighter/Variables.kt
index 76ccf692242..0b5ba7192b2 100644
--- a/idea/testData/highlighter/Variables.kt
+++ b/idea/testData/highlighter/Variables.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 
 var <info textAttributesKey="KOTLIN_MUTABLE_VARIABLE"><info textAttributesKey="KOTLIN_PACKAGE_PROPERTY">x</info></info> = 5
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedClass.1.java b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedClass.1.java
new file mode 100644
index 00000000000..734a588b631
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedClass.1.java
@@ -0,0 +1,3 @@
+public class Java {
+    public abstract class NestedClass {}
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedClass.kt b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedClass.kt
new file mode 100644
index 00000000000..deb8d78e4ed
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedClass.kt
@@ -0,0 +1,4 @@
+// PROBLEM: none
+class Test : Java() {
+    <caret>inner class Foo : Java.NestedClass()
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.1.java b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.1.java
new file mode 100644
index 00000000000..8d6b55783aa
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.1.java
@@ -0,0 +1,3 @@
+public class Java {
+    public interface NestedInterface {}
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.1.java.after b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.1.java.after
new file mode 100644
index 00000000000..8d6b55783aa
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.1.java.after
@@ -0,0 +1,3 @@
+public class Java {
+    public interface NestedInterface {}
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.kt b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.kt
new file mode 100644
index 00000000000..806e71bbaf9
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.kt
@@ -0,0 +1,3 @@
+class Test : Java() {
+    <caret>inner class Foo : Java.NestedInterface
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.kt.after b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.kt.after
new file mode 100644
index 00000000000..9c7a31868d6
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.kt.after
@@ -0,0 +1,3 @@
+class Test : Java() {
+    class Foo : Java.NestedInterface
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.1.java b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.1.java
new file mode 100644
index 00000000000..367b724177c
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.1.java
@@ -0,0 +1,3 @@
+public class Java {
+    public abstract static class NestedStaticClass {}
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.1.java.after b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.1.java.after
new file mode 100644
index 00000000000..367b724177c
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.1.java.after
@@ -0,0 +1,3 @@
+public class Java {
+    public abstract static class NestedStaticClass {}
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.kt b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.kt
new file mode 100644
index 00000000000..9a2bee584f0
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.kt
@@ -0,0 +1,3 @@
+class Test : Java() {
+    <caret>inner class Foo2 : Java.NestedStaticClass()
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.kt.after b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.kt.after
new file mode 100644
index 00000000000..5391a5a8b98
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.kt.after
@@ -0,0 +1,3 @@
+class Test : Java() {
+    class Foo2 : Java.NestedStaticClass()
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember.kt b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember.kt
new file mode 100644
index 00000000000..7b7d34c90dd
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember.kt
@@ -0,0 +1,8 @@
+// PROBLEM: none
+class Test {
+    private <caret>inner class Inner {
+        val inner2 = Inner2()
+    }
+
+    private inner class Inner2
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember2.kt b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember2.kt
new file mode 100644
index 00000000000..4f978ba4716
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember2.kt
@@ -0,0 +1,8 @@
+// PROBLEM: none
+class Test {
+    private <caret>inner class Inner {
+        val inner2 = Inner2()
+    }
+
+    private inner class Inner2()
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember3.kt b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember3.kt
new file mode 100644
index 00000000000..b87e81c2575
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember3.kt
@@ -0,0 +1,7 @@
+class Test {
+    private <caret>inner class Inner {
+        val inner2 = Inner2()
+    }
+
+    private class Inner2
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember3.kt.after b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember3.kt.after
new file mode 100644
index 00000000000..b32b6e22a55
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember3.kt.after
@@ -0,0 +1,7 @@
+class Test {
+    private class Inner {
+        val inner2 = Inner2()
+    }
+
+    private class Inner2
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReferenceInSuperTypeConstructorCall.kt b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReferenceInSuperTypeConstructorCall.kt
new file mode 100644
index 00000000000..bc82844c65f
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReferenceInSuperTypeConstructorCall.kt
@@ -0,0 +1,11 @@
+// PROBLEM: none
+abstract class Base(val x: Int)
+
+open class Outer(val x: Int) {
+    <caret>inner class Inner {
+        fun useX() {
+            object : Base(x) {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReferenceInSuperTypeConstructorCall2.kt b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReferenceInSuperTypeConstructorCall2.kt
new file mode 100644
index 00000000000..29065924d10
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReferenceInSuperTypeConstructorCall2.kt
@@ -0,0 +1,6 @@
+// PROBLEM: none
+class A(private val someText: String) {
+    private <caret>inner class B() : C(someText)
+}
+
+abstract class C(private val text: String)
\ No newline at end of file
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassBody.kt b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassBody.kt
new file mode 100644
index 00000000000..4f75d64350b
--- /dev/null
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassBody.kt
@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+class Foo() <caret>{
+    fun bar() {}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassName.kt b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassName.kt
new file mode 100644
index 00000000000..70c4386d3b3
--- /dev/null
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassName.kt
@@ -0,0 +1 @@
+class <caret>Foo(val x: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassName.kt.after b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassName.kt.after
new file mode 100644
index 00000000000..1d5ddae62fb
--- /dev/null
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassName.kt.after
@@ -0,0 +1,7 @@
+class Foo {
+    val x: Int
+
+    constructor(x: Int) {
+        this.x = x
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassNameWithConstructorKeyword.kt b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassNameWithConstructorKeyword.kt
new file mode 100644
index 00000000000..5a604301014
--- /dev/null
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassNameWithConstructorKeyword.kt
@@ -0,0 +1,2 @@
+// IS_APPLICABLE: false
+class Fo<caret>o constructor()
\ No newline at end of file
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassNameWithoutPrimaryConstructor.kt b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassNameWithoutPrimaryConstructor.kt
new file mode 100644
index 00000000000..6f2363e340a
--- /dev/null
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassNameWithoutPrimaryConstructor.kt
@@ -0,0 +1,2 @@
+// IS_APPLICABLE: false
+class <caret>Foo
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/hasAnnotation.kt b/idea/testData/intentions/removeExplicitTypeArguments/hasAnnotation.kt
new file mode 100644
index 00000000000..035d153b97f
--- /dev/null
+++ b/idea/testData/intentions/removeExplicitTypeArguments/hasAnnotation.kt
@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+annotation class Foo(val value: String)
+
+fun main() {
+    val l = listOf<@Foo("bar") <caret>String>("")
+}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
index 463d99ff1d1..6751687e89c 100644
--- a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
@@ -1,4 +1,4 @@
-actual class <lineMarker descr="Has declaration in common module">WithConstructor</lineMarker> actual constructor(actual val x: Int, actual val s: String)
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>WithConstructor<!> actual constructor(actual val x: Int, actual val s: String)
 
 /*
 LINEMARKER: Has declaration in common module
diff --git a/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt b/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt
index 13b3b1fe791..0dfc7338f67 100644
--- a/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt
@@ -1,6 +1,6 @@
 
-open class <lineMarker descr="<html><body>Is subclassed by<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#kotlinClass/testModule_Common:ExpectedChild">ExpectedChild [testModule_Common]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#kotlinClass/testModule_JVM:ExpectedChild">ExpectedChild [testModule_JVM]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#kotlinClass/testModule_Common:SimpleChild">SimpleChild</a><br><div style='margin-top: 5px'><font size='2'>Click or press Ctrl+Alt+B to navigate</font></div></body</html>">SimpleParent</lineMarker>
+open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] ExpectedChild [jvm] SimpleChild'")!>SimpleParent<!>
 
-expect class <lineMarker descr="Has actuals in JVM">ExpectedChild</lineMarker> : SimpleParent
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>ExpectedChild<!> : SimpleParent
 
 class SimpleChild : SimpleParent()
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt b/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt b/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
index c7848f8b937..0fb926b4985 100644
--- a/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
@@ -1,8 +1,8 @@
 package test
 
-actual enum class <lineMarker>Enum</lineMarker> {
-    <lineMarker>A</lineMarker>,
-    <lineMarker>B</lineMarker>,
-    <lineMarker>C</lineMarker>,
+actual enum class <!LINE_MARKER("descr='Has declaration in common module'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has declaration in common module'")!>A<!>,
+    <!LINE_MARKER("descr='Has declaration in common module'")!>B<!>,
+    <!LINE_MARKER("descr='Has declaration in common module'")!>C<!>,
     D
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
index 0c6e2c14140..35b3db6102e 100644
--- a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
@@ -1,6 +1,6 @@
 package test
 
-actual enum class <lineMarker descr="Has declaration in common module">Enum</lineMarker> { A, B, C }
+actual enum class <!LINE_MARKER("descr='Has declaration in common module'")!>Enum<!> { A, B, C }
 
 /*
 LINEMARKER: Has declaration in common module
diff --git a/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt b/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
index 7a5e725d644..2b5478c0768 100644
--- a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
@@ -1,5 +1,5 @@
-expect class <lineMarker>WithConstructor</lineMarker>(x: Int, s: String) {
-    val <lineMarker>x</lineMarker>: Int
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>WithConstructor<!>(x: Int, s: String) {
+    val <!LINE_MARKER("descr='Has actuals in JVM'")!>x<!>: Int
 
-    val <lineMarker>s</lineMarker>: String
+    val <!LINE_MARKER("descr='Has actuals in JVM'")!>s<!>: String
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
index 299bd98f447..0ed0bf85630 100644
--- a/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
@@ -1,7 +1,7 @@
 package test
 
-expect enum class <lineMarker>Enum</lineMarker> {
-    <lineMarker>A</lineMarker>,
-    <lineMarker>B</lineMarker>,
-    <lineMarker>C</lineMarker>
+expect enum class <!LINE_MARKER("descr='Has actuals in JVM'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>,
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>B<!>,
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>C<!>
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
index 065dd8f0523..cbf5dcf0675 100644
--- a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
@@ -1,6 +1,6 @@
 package test
 
-expect enum class <lineMarker descr="Has actuals in JVM">Enum</lineMarker> { A, B, C, D }
+expect enum class <!LINE_MARKER("descr='Has actuals in JVM'")!>Enum<!> { A, B, C, D }
 
 /*
 LINEMARKER: Has actuals in JVM
diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
index 6c0f30ab284..d66935c2213 100644
--- a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
@@ -1,7 +1,7 @@
 package test
 
-expect enum class <lineMarker descr="Has actuals in JVM">Enum</lineMarker> {
-    <lineMarker descr="Has actuals in JVM">A</lineMarker>, B, C, D
+expect enum class <!LINE_MARKER("descr='Has actuals in JVM'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>, B, C, D
 }
 
 /*
diff --git a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
index fa233eae1d0..53282e881ae 100644
--- a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
@@ -1,9 +1,9 @@
 package sample
 
-expect fun <lineMarker descr="Has actuals in common">sameFile</lineMarker>()
+expect fun <!LINE_MARKER("descr='Has actuals in common'")!>sameFile<!>()
 
-actual fun <lineMarker>sameFile</lineMarker>() = Unit
+actual fun <!LINE_MARKER("descr='null'")!>sameFile<!>() = Unit
 
-expect fun <lineMarker descr="Has actuals in common">sameModule</lineMarker>()
+expect fun <!LINE_MARKER("descr='Has actuals in common'")!>sameModule<!>()
 
 fun noExpectActualDeclaration() = Unit
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt
new file mode 100644
index 00000000000..8da128002e5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt
@@ -0,0 +1 @@
+MODULE common { platform=[JVM, JS, Native] }
diff --git a/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt b/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
index 6e2612c3fda..c8e65651448 100644
--- a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
@@ -1,4 +1,4 @@
-actual annotation class <lineMarker>Ann</lineMarker> actual constructor(
-        actual val <lineMarker>x</lineMarker>: Int,
-        actual val <lineMarker>y</lineMarker>: String
+actual annotation class <!LINE_MARKER("descr='Has declaration in common module'")!>Ann<!> actual constructor(
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>x<!>: Int,
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>y<!>: String
 )
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
index e44371c8b76..5abadf3d27d 100644
--- a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
@@ -1,6 +1,6 @@
-actual annotation class <lineMarker descr="Has declaration in common module">Ann</lineMarker>(
-        actual val <lineMarker descr="Has declaration in common module">x</lineMarker>: Int, actual val y: String,
-        actual val <lineMarker descr="Has declaration in common module">z</lineMarker>: Double, actual val b: Boolean
+actual annotation class <!LINE_MARKER("descr='Has declaration in common module'")!>Ann<!>(
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>x<!>: Int, actual val y: String,
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>z<!>: Double, actual val b: Boolean
 )
 
 /*
diff --git a/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
index ec3badfc50f..91f4d34938c 100644
--- a/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class <lineMarker>WithCompanion</lineMarker> {
-    actual companion <lineMarker>object</lineMarker> {
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>WithCompanion<!> {
+    actual companion <!LINE_MARKER("descr='Has declaration in common module'")!>object<!> {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
index 604846fad0f..960c0b31601 100644
--- a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class <lineMarker>NoConstructor2</lineMarker>(name: String) {
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>NoConstructor2<!>(name: String) {
     val myName = name
-    actual fun <lineMarker>extraFun</lineMarker>() {}
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>extraFun<!>() {}
 }
 
diff --git a/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
index 87cd13f446e..56128a1ab2a 100644
--- a/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
@@ -1,10 +1,10 @@
-actual sealed class <lineMarker>Sealed</lineMarker> {
+actual sealed class <!LINE_MARKER("descr='Is subclassed by Sealed1 in Sealed [jvm] Sealed2 in Sealed [jvm]'"), LINE_MARKER("descr='Has declaration in common module'")!>Sealed<!> {
 
-    actual object <lineMarker>Sealed1</lineMarker> : Sealed()
+    actual object <!LINE_MARKER("descr='Has declaration in common module'")!>Sealed1<!> : Sealed()
 
-    actual class <lineMarker>Sealed2</lineMarker> : Sealed() {
-        actual val <lineMarker>x</lineMarker> = 42
-        actual fun <lineMarker>foo</lineMarker>() = ""
+    actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Sealed2<!> : Sealed() {
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>x<!> = 42
+        actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>() = ""
     }
 }
 
diff --git a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
index bb6ef41c824..b7e0b67ea7b 100644
--- a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class <lineMarker>SecondaryConstructor</lineMarker> {
-    actual <lineMarker>constructor</lineMarker>(name: String, surname: String) {}
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>SecondaryConstructor<!> {
+    actual <!LINE_MARKER("descr='Has declaration in common module'")!>constructor<!>(name: String, surname: String) {}
 }
 
 
diff --git a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
index 7ae6035b463..a727af437aa 100644
--- a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
@@ -2,5 +2,5 @@ class Some {
     val x: String = "Some"
 }
 
-actual typealias <lineMarker>TypeAlias</lineMarker> = Some
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>TypeAlias<!> = Some
 
diff --git a/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt b/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
index 7a8fcddc333..9ff4aa951af 100644
--- a/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
@@ -1,4 +1,4 @@
-expect class <lineMarker>Header</lineMarker> {
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Header<!> {
 
 }
 
diff --git a/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
index 41cf458d099..680c20354e8 100644
--- a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
+++ b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
@@ -1 +1 @@
-actual typealias <lineMarker>Expected</lineMarker> = ExpectedImpl
\ No newline at end of file
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>Expected<!> = ExpectedImpl
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
index 6477429372c..0144f6531ec 100644
--- a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
@@ -1,11 +1,11 @@
-expect class <lineMarker>Header</lineMarker> {
-    fun <lineMarker>foo</lineMarker>(): Int
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Header<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
 }
 
-expect class <lineMarker>Incomplete</lineMarker> {
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Incomplete<!> {
     fun foo(): Int
 }
 
-expect fun <lineMarker>foo</lineMarker>(arg: Int): String
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(arg: Int): String
 
-expect val <lineMarker>flag</lineMarker>: Boolean
+expect val <!LINE_MARKER("descr='Has actuals in JVM'")!>flag<!>: Boolean
diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
index 6b880d726aa..dcbf99a22d2 100644
--- a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
@@ -1,11 +1,11 @@
-actual class <lineMarker>Header</lineMarker> {
-    actual fun <lineMarker>foo</lineMarker>() = 42
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Header<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>() = 42
 }
 
-actual class <lineMarker>Incomplete</lineMarker>
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Incomplete<!>
 
-actual fun <lineMarker>foo</lineMarker>(arg: Int) = arg.toString()
+actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(arg: Int) = arg.toString()
 
-actual val <lineMarker>flag</lineMarker> = true
+actual val <!LINE_MARKER("descr='Has declaration in common module'")!>flag<!> = true
 
 
diff --git a/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
index c33599807b5..eebedf407a3 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
@@ -1,5 +1,5 @@
-expect class <lineMarker>WithCompanion</lineMarker> {
-    companion <lineMarker>object</lineMarker> {
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>WithCompanion<!> {
+    companion <!LINE_MARKER("descr='Has actuals in JVM'")!>object<!> {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
index cd7bdf8b692..99190697843 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
@@ -1,4 +1,4 @@
-expect annotation class <lineMarker>Ann</lineMarker>(
-        val <lineMarker>x</lineMarker>: Int,
-        val <lineMarker>y</lineMarker>: String
+expect annotation class <!LINE_MARKER("descr='Has actuals in JVM'")!>Ann<!>(
+        val <!LINE_MARKER("descr='Has actuals in JVM'")!>x<!>: Int,
+        val <!LINE_MARKER("descr='Has actuals in JVM'")!>y<!>: String
 )
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
index d5eeccb138e..cbf70367676 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
@@ -1,3 +1,3 @@
-expect class <lineMarker>NoConstructor2</lineMarker> {
-    fun <lineMarker>extraFun</lineMarker>()
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>NoConstructor2<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>extraFun<!>()
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
index 94ca21d39a9..b1a37cd2667 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
@@ -1,9 +1,9 @@
-expect sealed class <lineMarker>Sealed</lineMarker> {
+expect sealed class <!LINE_MARKER("descr='Is subclassed by Sealed1 [common] Sealed1 in Sealed [jvm] Sealed2 [common] Sealed2 in Sealed [jvm]'"), LINE_MARKER("descr='Has actuals in JVM'")!>Sealed<!> {
 
-    object <lineMarker>Sealed1</lineMarker> : Sealed
+    object <!LINE_MARKER("descr='Has actuals in JVM'")!>Sealed1<!> : Sealed
 
-    class <lineMarker>Sealed2</lineMarker> : Sealed {
-        val <lineMarker>x</lineMarker>: Int
-        fun <lineMarker>foo</lineMarker>(): String
+    class <!LINE_MARKER("descr='Has actuals in JVM'")!>Sealed2<!> : Sealed {
+        val <!LINE_MARKER("descr='Has actuals in JVM'")!>x<!>: Int
+        fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): String
     }
 }
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
index f20aba4ec3c..9fed52110ad 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
@@ -1,3 +1,3 @@
-expect class <lineMarker>SecondaryConstructor</lineMarker>{
-    <lineMarker>constructor</lineMarker>(name: String, surname: String)
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>SecondaryConstructor<!>{
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>constructor<!>(name: String, surname: String)
 }
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
index c19aa8bb8a1..8615ed4a5d5 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
@@ -1,3 +1,3 @@
-expect class <lineMarker>TypeAlias</lineMarker> {
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>TypeAlias<!> {
     val x: String
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
index 26251a07f1f..1d9bd2cc5c1 100644
--- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
@@ -1,21 +1,21 @@
 package test
 
-open class <lineMarker>SimpleParent</lineMarker> {
-    open fun <lineMarker>foo</lineMarker>(n: Int) {}
-    open val <lineMarker>bar</lineMarker>: Int get() = 1
+open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] ExpectedChild [jvm] ExpectedChildChild ExpectedChildChildJvm SimpleChild'")!>SimpleParent<!> {
+    open fun <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>foo<!>(n: Int) {}
+    open val <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>bar<!>: Int get() = 1
 }
 
-expect open class <lineMarker><lineMarker>ExpectedChild</lineMarker></lineMarker> : SimpleParent {
-    override fun <lineMarker><lineMarker>foo</lineMarker></lineMarker>(n: Int)
-    override val <lineMarker><lineMarker>bar</lineMarker></lineMarker>: Int
+expect open class <!LINE_MARKER("descr='Is subclassed by ExpectedChildChild ExpectedChildChildJvm'"), LINE_MARKER("descr='Has actuals in JVM'")!>ExpectedChild<!> : SimpleParent {
+    override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''"), LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'")!>foo<!>(n: Int)
+    override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''"), LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'")!>bar<!>: Int
 }
 
 class ExpectedChildChild : ExpectedChild() {
-    override fun <lineMarker>foo</lineMarker>(n: Int) {}
-    override val <lineMarker>bar</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'ExpectedChild''")!>foo<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'ExpectedChild''")!>bar<!>: Int get() = 1
 }
 
 class SimpleChild : SimpleParent() {
-    override fun <lineMarker>foo</lineMarker>(n: Int) {}
-    override val <lineMarker>bar</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>foo<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>bar<!>: Int get() = 1
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
index c5fb5905f01..5443d3b24bb 100644
--- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
@@ -1,21 +1,21 @@
 package test
 
-open class <lineMarker>SimpleParent</lineMarker> {
-    open fun <lineMarker>`foo fun`</lineMarker>(n: Int) {}
-    open val <lineMarker>`bar fun`</lineMarker>: Int get() = 1
+open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] ExpectedChild [jvm] ExpectedChildChild ExpectedChildChildJvm SimpleChild'")!>SimpleParent<!> {
+    open fun <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>`foo fun`<!>(n: Int) {}
+    open val <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>`bar fun`<!>: Int get() = 1
 }
 
-expect open class <lineMarker><lineMarker>ExpectedChild</lineMarker></lineMarker> : SimpleParent {
-    override fun <lineMarker><lineMarker>`foo fun`</lineMarker></lineMarker>(n: Int)
-    override val <lineMarker><lineMarker>`bar fun`</lineMarker></lineMarker>: Int
+expect open class <!LINE_MARKER("descr='Is subclassed by ExpectedChildChild ExpectedChildChildJvm'"), LINE_MARKER("descr='Has actuals in JVM'")!>ExpectedChild<!> : SimpleParent {
+    override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''"), LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'")!>`foo fun`<!>(n: Int)
+    override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''"), LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'")!>`bar fun`<!>: Int
 }
 
 class ExpectedChildChild : ExpectedChild() {
-    override fun <lineMarker>`foo fun`</lineMarker>(n: Int) {}
-    override val <lineMarker>`bar fun`</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'ExpectedChild''")!>`foo fun`<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'ExpectedChild''")!>`bar fun`<!>: Int get() = 1
 }
 
 class SimpleChild : SimpleParent() {
-    override fun <lineMarker>`foo fun`</lineMarker>(n: Int) {}
-    override val <lineMarker>`bar fun`</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>`foo fun`<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>`bar fun`<!>: Int get() = 1
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
index 490d72915ea..4111f1ed22a 100644
--- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
@@ -1,11 +1,11 @@
 package test
 
-actual open class <lineMarker><lineMarker>ExpectedChild</lineMarker></lineMarker> : SimpleParent() {
-    actual override fun <lineMarker><lineMarker><lineMarker>foo</lineMarker></lineMarker></lineMarker>(n: Int) {}
-    actual override val <lineMarker><lineMarker><lineMarker>bar</lineMarker></lineMarker></lineMarker>: Int get() = 1
+actual open class <!LINE_MARKER("descr='Is subclassed by ExpectedChildChildJvm'"), LINE_MARKER("descr='Has declaration in common module'")!>ExpectedChild<!> : SimpleParent() {
+    actual override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''"), LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChildJvm'")!>foo<!>(n: Int) {}
+    actual override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''"), LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChildJvm'")!>bar<!>: Int get() = 1
 }
 
 class ExpectedChildChildJvm : ExpectedChild() {
-    override fun <lineMarker>foo</lineMarker>(n: Int) {}
-    override val <lineMarker>bar</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'ExpectedChild''")!>foo<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'ExpectedChild''")!>bar<!>: Int get() = 1
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt
index dd5b060371c..418f4218b61 100644
--- a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt
@@ -1,5 +1,5 @@
-interface <lineMarker>I</lineMarker> {
-    suspend fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;KJs<br>&nbsp;&nbsp;&nbsp;&nbsp;KJvm</body></html>">foo</lineMarker>(s: String)
+interface <!LINE_MARKER("descr='Is implemented by KJs KJvm'")!>I<!> {
+    suspend fun <!LINE_MARKER("descr='Is implemented in KJs KJvm'")!>foo<!>(s: String)
 }
 
 /*
diff --git a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt
new file mode 100644
index 00000000000..5820c9936e0
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt
@@ -0,0 +1,6 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+MODULE js { platform=[JS] }
+
+jvm -> common { kind=DEPENDS_ON }
+js -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt b/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt b/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt
index cc1c972043c..2c6611d4048 100644
--- a/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt
+++ b/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt
@@ -1 +1 @@
-expect fun <lineMarker descr="Has actuals in JVM">foo</lineMarker>(): Int
\ No newline at end of file
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitive/dependencies.txt b/idea/testData/multiModuleLineMarker/transitive/dependencies.txt
new file mode 100644
index 00000000000..b2fde8faed7
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/transitive/dependencies.txt
@@ -0,0 +1,6 @@
+MODULE base_common { platform=[JVM, JS, Native] }
+MODULE base_jvm { platform=[JVM] }
+MODULE user_jvm { platform=[JVM] }
+
+base_jvm -> base_common { kind=DEPENDS_ON }
+user_jvm -> base_common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitive/user_jvm_dep(base-jvm)_dep(base-common)/user.kt b/idea/testData/multiModuleLineMarker/transitive/user_jvm/user.kt
similarity index 100%
rename from idea/testData/multiModuleLineMarker/transitive/user_jvm_dep(base-jvm)_dep(base-common)/user.kt
rename to idea/testData/multiModuleLineMarker/transitive/user_jvm/user.kt
diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt b/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt
new file mode 100644
index 00000000000..0249f83a26e
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt
@@ -0,0 +1,6 @@
+MODULE base_common { platform=[JVM, JS, Native] }
+MODULE user_common { platform=[JVM, JS, Native] }
+MODULE user_jvm { platform=[JVM] }
+
+user_common -> base_common { kind=DEPENDS_ON }
+user_jvm -> user_common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_common_dep(base-common)/user.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_common/user.kt
similarity index 100%
rename from idea/testData/multiModuleLineMarker/transitiveCommon/user_common_dep(base-common)/user.kt
rename to idea/testData/multiModuleLineMarker/transitiveCommon/user_common/user.kt
diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt
new file mode 100644
index 00000000000..07b1da0e710
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt
@@ -0,0 +1,3 @@
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Expected<!> {
+    actual val <!LINE_MARKER("descr='Has declaration in common module'")!>some<!> = Some()
+}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt
deleted file mode 100644
index 68715f9470e..00000000000
--- a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual class <lineMarker>Expected</lineMarker> {
-    actual val <lineMarker>some</lineMarker> = Some()
-}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt b/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt
index a1965111cc2..ad60efb0710 100644
--- a/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt
@@ -1,3 +1,3 @@
-expect fun <lineMarker descr="Has actuals in JVM">foo</lineMarker>(): Int
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
 
-expect fun <lineMarker descr="Has actuals in JVM">foo</lineMarker>(arg: Int): Int
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(arg: Int): Int
diff --git a/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt b/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
index b4eed14b822..ace4e1bab24 100644
--- a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
+++ b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
@@ -2,6 +2,6 @@
 
 package sample
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, left")!>A<!> {
-    fun <!AMBIGUOUS_ACTUALS("Function 'foo'", "bottom, left")!>foo<!>(): Int
+expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, left")!>A<!> {
+    fun <!AMBIGUOUS_ACTUALS("Function 'foo'; bottom, left")!>foo<!>(): Int
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
index 237a5d750af..502bde6fc0c 100644
--- a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
@@ -2,7 +2,7 @@
 
 package foo
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'", "bottom, middle")!>ActualInMiddleCompatibleInBottom<!>
-expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleActualInBottom'", "bottom, middle")!>CompatibleInMiddleActualInBottom<!>
+expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'; bottom, middle")!>ActualInMiddleCompatibleInBottom<!>
+expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleActualInBottom'; bottom, middle")!>CompatibleInMiddleActualInBottom<!>
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleAndBottom'", "bottom, middle")!>CompatibleInMiddleAndBottom<!>
\ No newline at end of file
+expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleAndBottom'; bottom, middle")!>CompatibleInMiddleAndBottom<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
index 2cc6d86f804..587cf9e0e7e 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
@@ -2,4 +2,4 @@
 
 package foo
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, middle")!>A<!>
\ No newline at end of file
+expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, middle")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
index 35f51d5efbc..6da3b5ddb84 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
@@ -2,4 +2,4 @@
 
 package foo
 
-actual fun foo<!ACTUAL_WITHOUT_EXPECT("Actual function 'foo'", " The following declaration is incompatible because number of value parameters is different:     public expect fun foo(): Int ")!>(x: Int)<!>: Int = x
\ No newline at end of file
+actual fun foo<!ACTUAL_WITHOUT_EXPECT("Actual function 'foo'; The following declaration is incompatible because number of value parameters is different:    public expect fun foo(): Int")!>(x: Int)<!>: Int = x
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
index 4b63aec7964..21a344f975a 100644
--- a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
@@ -1,3 +1,3 @@
 // !RENDER_DIAGNOSTICS_MESSAGES
 
-actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'", "left, right")!>A<!>
\ No newline at end of file
+actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'; left, right")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common1/common.kt b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common1/common.kt
new file mode 100644
index 00000000000..53d06499b90
--- /dev/null
+++ b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common1/common.kt
@@ -0,0 +1,5 @@
+data class CommonDataClass1(val property: CommonObject1?)
+
+object CommonObject1 {
+    fun doSomething() {}
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common2/common.kt b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common2/common.kt
new file mode 100644
index 00000000000..337cebf2d01
--- /dev/null
+++ b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common2/common.kt
@@ -0,0 +1,5 @@
+data class CommonDataClass2(val property: CommonObject2?)
+
+object CommonObject2 {
+    fun doSomething() {}
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common3/common.kt b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common3/common.kt
new file mode 100644
index 00000000000..b77ea5d8b16
--- /dev/null
+++ b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common3/common.kt
@@ -0,0 +1,5 @@
+data class CommonDataClass3(val property: CommonObject3?)
+
+object CommonObject3 {
+    fun doSomething() {}
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common4/common.kt b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common4/common.kt
new file mode 100644
index 00000000000..93036191e73
--- /dev/null
+++ b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/common4/common.kt
@@ -0,0 +1,5 @@
+data class CommonDataClass4(val property: CommonObject4?)
+
+object CommonObject4 {
+    fun doSomething() {}
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/dependencies.txt b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/dependencies.txt
new file mode 100644
index 00000000000..153ed8c60ff
--- /dev/null
+++ b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/dependencies.txt
@@ -0,0 +1,13 @@
+MODULE common1 { platform=[JVM, JS, Native] }
+MODULE common2 { platform=[JVM, JS, Native] }
+MODULE common3 { platform=[JVM, JS, Native] }
+MODULE common4 { platform=[JVM, JS, Native] }
+MODULE jvm1 { platform=[JVM] }
+MODULE jvm2 { platform=[JVM] }
+
+common2 -> common1 { kind=DEPENDS_ON }
+common3 -> common1 { kind=DEPENDS_ON }
+common4 -> common2, common3 { kind=DEPENDS_ON }
+jvm1 -> common4 { kind=DEPENDS_ON }
+jvm2 -> common4 { kind=DEPENDS_ON }
+jvm2 -> jvm1 { kind=DEPENDENCY }
diff --git a/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/jvm1/jvm1.kt b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/jvm1/jvm1.kt
new file mode 100644
index 00000000000..1213364806f
--- /dev/null
+++ b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/jvm1/jvm1.kt
@@ -0,0 +1,5 @@
+data class JvmDataClass(val property: JvmObject?)
+
+object JvmObject {
+    fun doSomething() {}
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/jvm2/jvm2.kt b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/jvm2/jvm2.kt
new file mode 100644
index 00000000000..9164f211aa7
--- /dev/null
+++ b/idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/jvm2/jvm2.kt
@@ -0,0 +1,21 @@
+fun test(c1: CommonDataClass1, c2: CommonDataClass2, c3: CommonDataClass3, c4: CommonDataClass4, jvm: JvmDataClass) {
+    if (c1.property != null) {
+        <!DEBUG_INFO_SMARTCAST!>c1.property<!>.doSomething()
+    }
+
+    if (c2.property != null) {
+        <!DEBUG_INFO_SMARTCAST!>c2.property<!>.doSomething()
+    }
+
+    if (c3.property != null) {
+        <!DEBUG_INFO_SMARTCAST!>c3.property<!>.doSomething()
+    }
+
+    if (c4.property != null) {
+        <!DEBUG_INFO_SMARTCAST!>c4.property<!>.doSomething()
+    }
+
+    if (jvm.property != null) {
+        <!SMARTCAST_IMPOSSIBLE!>jvm.property<!>.doSomething()
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/navigationToolbar/ClassProperty.kt.193 b/idea/testData/navigationToolbar/ClassProperty.kt.193
deleted file mode 100644
index 4a43c8154c8..00000000000
--- a/idea/testData/navigationToolbar/ClassProperty.kt.193
+++ /dev/null
@@ -1,8 +0,0 @@
-// NAV_BAR_ITEMS: src, ClassProperty
-
-class ClassProperty  {
-    val foo: Int
-        get() {
-            return 42<caret>
-        }
-}
\ No newline at end of file
diff --git a/idea/testData/navigationToolbar/MethodInClass.kt.193 b/idea/testData/navigationToolbar/MethodInClass.kt.193
deleted file mode 100644
index 48d174267b7..00000000000
--- a/idea/testData/navigationToolbar/MethodInClass.kt.193
+++ /dev/null
@@ -1,5 +0,0 @@
-// NAV_BAR_ITEMS: src, MethodInClass
-
-class MethodInClass {
-    fun foo() { <caret> }
-}
\ No newline at end of file
diff --git a/idea/testData/navigationToolbar/SeveralClassesInFile.kt.193 b/idea/testData/navigationToolbar/SeveralClassesInFile.kt.193
deleted file mode 100644
index 513cc5c22d8..00000000000
--- a/idea/testData/navigationToolbar/SeveralClassesInFile.kt.193
+++ /dev/null
@@ -1,13 +0,0 @@
-// NAV_BAR_ITEMS: src, SeveralClassesInFile.kt
-
-class Foo {
-
-}
-
-class SeveralClassesInFile {
-    <caret>
-}
-
-fun method() {
-
-}
diff --git a/idea/testData/navigationToolbar/fileNameDoesntMatchClassName.kt.193 b/idea/testData/navigationToolbar/fileNameDoesntMatchClassName.kt.193
deleted file mode 100644
index 972955af0c3..00000000000
--- a/idea/testData/navigationToolbar/fileNameDoesntMatchClassName.kt.193
+++ /dev/null
@@ -1,5 +0,0 @@
-// NAV_BAR_ITEMS: src, fileNameDoesntMatchClassName.kt
-
-class Foo {
-    fun bar() { <caret> }
-}
diff --git a/idea/testData/navigationToolbar/topLevelFunction.kt.193 b/idea/testData/navigationToolbar/topLevelFunction.kt.193
deleted file mode 100644
index 0694a9a3a68..00000000000
--- a/idea/testData/navigationToolbar/topLevelFunction.kt.193
+++ /dev/null
@@ -1,9 +0,0 @@
-// NAV_BAR_ITEMS: src, topLevelFunction.kt
-
-fun foo() {
-    val bar = <caret>"string"
-}
-
-class SomeClass {
-
-}
diff --git a/idea/testData/navigationToolbar/topLevelProperty.kt.193 b/idea/testData/navigationToolbar/topLevelProperty.kt.193
deleted file mode 100644
index 055c49a1509..00000000000
--- a/idea/testData/navigationToolbar/topLevelProperty.kt.193
+++ /dev/null
@@ -1,6 +0,0 @@
-// NAV_BAR_ITEMS: src, topLevelProperty.kt
-
-val foo: Int
-    get() {
-        return 1<caret>
-    }
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaUpperBound.before.Main.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaUpperBound.before.Main.kt
index bf56f1bf186..c14b4754ce8 100644
--- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaUpperBound.before.Main.kt
+++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaUpperBound.before.Main.kt
@@ -1,4 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddModifierFix" "false"
+// ACTION: Convert to secondary constructor
 // ACTION: Create test
 // ACTION: Enable a trailing comma by default in the formatter
 // ACTION: Inline type parameter
diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/specificImport.kt.193 b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/specificImport.kt.193
deleted file mode 100644
index d1a9d5d7720..00000000000
--- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/specificImport.kt.193
+++ /dev/null
@@ -1,5 +0,0 @@
-package a
-
-fun bar() {
-    val t: b.X = b.X()
-}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/specificImport.kt.193 b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/specificImport.kt.193
deleted file mode 100644
index 20a79ef33ae..00000000000
--- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/specificImport.kt.193
+++ /dev/null
@@ -1,5 +0,0 @@
-package b
-
-fun bar() {
-    val t: b.X = b.X()
-}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/specificImport.kt.193 b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/specificImport.kt.193
deleted file mode 100644
index c097f16a1e9..00000000000
--- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/specificImport.kt.193
+++ /dev/null
@@ -1,5 +0,0 @@
-package a
-
-fun bar(s: String) {
-    val t: a.X = a.X()
-}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/specificImport.kt.193 b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/specificImport.kt.193
deleted file mode 100644
index 6ed96e3c617..00000000000
--- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/specificImport.kt.193
+++ /dev/null
@@ -1,5 +0,0 @@
-package a
-
-fun bar(s: String) {
-    val t: a.Y = a.Y()
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt
index 4501f19162a..debe8714cdf 100644
--- a/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt
@@ -10,51 +10,40 @@ import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
 import org.jetbrains.kotlin.asJava.PsiClassRenderer
 import org.jetbrains.kotlin.asJava.PsiClassRenderer.renderClass
 import org.jetbrains.kotlin.idea.perf.UltraLightChecker
+import org.jetbrains.kotlin.idea.perf.UltraLightChecker.checkByJavaFile
 import org.jetbrains.kotlin.idea.perf.UltraLightChecker.checkDescriptorsLeak
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 
 abstract class AbstractUltraLightClassLoadingTest : KotlinLightCodeInsightFixtureTestCase() {
     override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
-    fun doTest(testDataPath: String) {
+    open fun doTest(testDataPath: String) {
         val sourceText = File(testDataPath).readText()
         val file = myFixture.addFileToProject(testDataPath, sourceText) as KtFile
 
         UltraLightChecker.checkForReleaseCoroutine(sourceText, module)
 
-        val expectedTextFile = File(testDataPath.replaceFirst("\\.kt\$".toRegex(), ".java"))
-        if (expectedTextFile.exists()) {
-            val renderedResult =
-                UltraLightChecker.allClasses(file).mapNotNull { ktClass ->
-                    LightClassGenerationSupport.getInstance(ktClass.project).createUltraLightClass(ktClass)?.let { it to ktClass }
-                }.joinToString("\n\n") { (ultraLightClass, ktClass) ->
-                    with(UltraLightChecker) {
-                        val extendedTypeRendererOld = PsiClassRenderer.extendedTypeRenderer
-                        try {
-                            PsiClassRenderer.extendedTypeRenderer = file.name == "typeAnnotations.kt"
-                            ultraLightClass.renderClass()
-                        } finally {
-                            PsiClassRenderer.extendedTypeRenderer = extendedTypeRendererOld
-                        }.also {
-                            checkDescriptorsLeak(ultraLightClass)
-                        }
-                    }
+        val checkByJavaFile = InTextDirectivesUtils.isDirectiveDefined(sourceText, "CHECK_BY_JAVA_FILE")
+
+        val ktClassOrObjects = UltraLightChecker.allClasses(file)
+
+        if (checkByJavaFile) {
+            val classFabric = LightClassGenerationSupport.getInstance(project)
+            val classList = ktClassOrObjects.mapNotNull { classFabric.createUltraLightClass(it) }
+            checkByJavaFile(testDataPath, classList)
+            classList.forEach { checkDescriptorsLeak(it) }
+        } else {
+            for (ktClass in ktClassOrObjects) {
+                val ultraLightClass = UltraLightChecker.checkClassEquivalence(ktClass)
+                if (ultraLightClass != null) {
+                    checkDescriptorsLeak(ultraLightClass)
                 }
-
-            KotlinTestUtils.assertEqualsToFile(expectedTextFile, renderedResult)
-            return
-        }
-
-        for (ktClass in UltraLightChecker.allClasses(file)) {
-            val ultraLightClass = UltraLightChecker.checkClassEquivalence(ktClass)
-            if (ultraLightClass != null) {
-                checkDescriptorsLeak(ultraLightClass)
             }
         }
-
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightFacadeClassLoadingTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightFacadeClassLoadingTest.kt
index 01e003506c6..9d88439cef0 100644
--- a/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightFacadeClassLoadingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightFacadeClassLoadingTest.kt
@@ -18,7 +18,7 @@ import java.io.File
 abstract class AbstractUltraLightFacadeClassTest : KotlinLightCodeInsightFixtureTestCase() {
     override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
-    fun doTest(testDataPath: String) {
+    open fun doTest(testDataPath: String) {
         val sourceText = File(testDataPath).readText()
         myFixture.addFileToProject(testDataPath, sourceText) as KtFile
 
@@ -32,6 +32,10 @@ abstract class AbstractUltraLightFacadeClassTest : KotlinLightCodeInsightFixture
         val scope = GlobalSearchScope.allScope(project)
         val facades = KotlinAsJavaSupport.getInstance(project).getFacadeNames(FqName.ROOT, scope)
 
+        checkLightFacades(testDataPath, facades, scope)
+    }
+
+    protected open fun checkLightFacades(testDataPath: String, facades: Collection<String>, scope: GlobalSearchScope) {
         for (facadeName in facades) {
             val ultraLightClass = UltraLightChecker.checkFacadeEquivalence(FqName(facadeName), scope, project)
             if (ultraLightClass != null) {
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesMultiModuleTest.kt
index 7972f533a21..ad65c740c5b 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesMultiModuleTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesMultiModuleTest.kt
@@ -49,6 +49,6 @@ abstract class AbstractFindUsagesMultiModuleTest : AbstractMultiModuleTest() {
         UsefulTestCase.assertInstanceOf(caretElement!!, caretElementClass)
 
         val options = parser?.parse(mainFileText, project)
-        findUsagesAndCheckResults(mainFileText, prefix, rootPath, caretElement, options, project, alwaysAppendFileName = true)
+        findUsagesAndCheckResults(mainFileText, prefix, rootPath, caretElement, options, project, alwaysAppendFileName = true, isFirPlugin = isFirPlugin)
     }
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt
index 53325f0d496..24bdaf08624 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt
@@ -194,14 +194,41 @@ abstract class AbstractFindUsagesTest : KotlinLightCodeInsightFixtureTestCase()
             val prefixForCheck = prefix + prefixForResults
             if (isLibraryElement) {
                 val originalElement = caretElement.originalElement
-                findUsagesAndCheckResults(mainFileText, prefixForCheck, rootPath, originalElement, options, project)
+                findUsagesAndCheckResults(
+                    mainFileText,
+                    prefixForCheck,
+                    rootPath,
+                    originalElement,
+                    options,
+                    project,
+                    alwaysAppendFileName = false,
+                    isFirPlugin = isFirPlugin
+                )
 
                 val navigationElement = caretElement.navigationElement
                 if (navigationElement !== originalElement) {
-                    findUsagesAndCheckResults(mainFileText, prefixForCheck, rootPath, navigationElement, options, project)
+                    findUsagesAndCheckResults(
+                        mainFileText,
+                        prefixForCheck,
+                        rootPath,
+                        navigationElement,
+                        options,
+                        project,
+                        alwaysAppendFileName = false,
+                        isFirPlugin = isFirPlugin
+                    )
                 }
             } else {
-                findUsagesAndCheckResults(mainFileText, prefixForCheck, rootPath, caretElement, options, project)
+                findUsagesAndCheckResults(
+                    mainFileText,
+                    prefixForCheck,
+                    rootPath,
+                    caretElement,
+                    options,
+                    project,
+                    alwaysAppendFileName = false,
+                    isFirPlugin = isFirPlugin
+                )
             }
         } finally {
             fixtureClasses.forEach { TestFixtureExtension.unloadFixture(it) }
@@ -259,7 +286,8 @@ internal fun <T : PsiElement> findUsagesAndCheckResults(
     caretElement: T,
     options: FindUsagesOptions?,
     project: Project,
-    alwaysAppendFileName: Boolean = false
+    alwaysAppendFileName: Boolean = false,
+    isFirPlugin: Boolean = false
 ) {
     val highlightingMode = InTextDirectivesUtils.isDirectiveDefined(mainFileText, "// HIGHLIGHTING")
 
@@ -277,7 +305,7 @@ internal fun <T : PsiElement> findUsagesAndCheckResults(
         val searchSuperDeclaration =
             InTextDirectivesUtils.findLinesWithPrefixesRemoved(mainFileText, "$CHECK_SUPER_METHODS_YES_NO_DIALOG:").firstOrNull() != "no"
 
-        findUsages(caretElement, options, highlightingMode, project, searchSuperDeclaration)
+        findUsages(caretElement, options, highlightingMode, project, searchSuperDeclaration, isFirPlugin)
     } finally {
         ExpressionsOfTypeProcessor.testLog = null
         if (logList.size > 0) {
@@ -332,7 +360,16 @@ internal fun <T : PsiElement> findUsagesAndCheckResults(
         try {
             ExpressionsOfTypeProcessor.mode = ExpressionsOfTypeProcessor.Mode.ALWAYS_PLAIN
 
-            findUsagesAndCheckResults(mainFileText, prefix, rootPath, caretElement, options, project)
+            findUsagesAndCheckResults(
+                mainFileText,
+                prefix,
+                rootPath,
+                caretElement,
+                options,
+                project,
+                alwaysAppendFileName = false,
+                isFirPlugin = isFirPlugin
+            )
         } finally {
             ExpressionsOfTypeProcessor.mode = ExpressionsOfTypeProcessor.Mode.ALWAYS_SMART
         }
@@ -344,7 +381,8 @@ internal fun findUsages(
     options: FindUsagesOptions?,
     highlightingMode: Boolean,
     project: Project,
-    searchSuperDeclaration: Boolean = true
+    searchSuperDeclaration: Boolean = true,
+    isFirPlugin: Boolean = false
 ): Collection<UsageInfo> {
     try {
         val handler: FindUsagesHandler = if (targetElement is PsiMember)
@@ -367,9 +405,23 @@ internal fun findUsages(
         val processor = CommonProcessors.CollectProcessor<UsageInfo>()
         for (psiElement in handler.primaryElements + handler.secondaryElements) {
             if (highlightingMode) {
-                project.runReadActionInSmartMode {
-                    for (reference in handler.findReferencesToHighlight(psiElement, options.searchScope)) {
-                        processor.process(UsageInfo(reference))
+                if (isFirPlugin) {
+                    ProgressManager.getInstance().run(
+                        object : Task.Modal(project, "", false) {
+                            override fun run(indicator: ProgressIndicator) {
+                                project.runReadActionInSmartMode {
+                                    for (reference in handler.findReferencesToHighlight(psiElement, options.searchScope)) {
+                                        processor.process(UsageInfo(reference))
+                                    }
+                                }
+                            }
+                        },
+                    )
+                } else {
+                    project.runReadActionInSmartMode {
+                        for (reference in handler.findReferencesToHighlight(psiElement, options.searchScope)) {
+                            processor.process(UsageInfo(reference))
+                        }
                     }
                 }
             } else {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt
index 55e9f14df40..100a66eee15 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt
@@ -25,7 +25,7 @@ abstract class KotlinHierarchyViewTestBase : KotlinLightCodeInsightFixtureTestCa
     ) {
         myFixture.configureByFiles(*fileNames)
         val expectedStructure = loadExpectedStructure()
-        doHierarchyTestCompat(hierarchyFixture, treeStructureComputable, expectedStructure)
+        HierarchyViewTestFixture.doHierarchyTest(treeStructureComputable.compute(), expectedStructure)
     }
 
     @Throws(IOException::class)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
index 507ecd5410e..5eb3a847aaf 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
@@ -128,8 +128,7 @@ abstract class AbstractIdeCompiledLightClassTest : KotlinDaemonAnalyzerTestCase(
 }
 
 private fun testLightClass(expected: File, testData: File, normalize: (String) -> String, findLightClass: (String) -> PsiClass?) {
-    LightClassTestCommon.testLightClass(
-        expected,
+    val actual = LightClassTestCommon.getActualLightClassText(
         testData,
         findLightClass = findLightClass,
         normalizeText = { text ->
@@ -144,9 +143,10 @@ private fun testLightClass(expected: File, testData: File, normalize: (String) -
                 .run(normalize)
         }
     )
+    KotlinTestUtils.assertEqualsToFile(expected, actual)
 }
 
-private fun findClass(fqName: String, ktFile: KtFile?, project: Project): PsiClass? {
+fun findClass(fqName: String, ktFile: KtFile?, project: Project): PsiClass? {
     ktFile?.script?.let {
         return it.toLightClass()
     }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
index fafe2c3a388..3a04a61725f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.checkers.utils.DiagnosticsRenderingConfiguration
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromTextFile
 import org.jetbrains.kotlin.idea.project.KotlinMultiplatformAnalysisModeComponent
+import org.jetbrains.kotlin.idea.codeMetaInfo.AbstractDiagnosticCodeMetaInfoTest
 import org.jetbrains.kotlin.idea.resolve.getDataFlowValueFactory
 import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest
@@ -120,7 +121,7 @@ abstract class AbstractHierarchicalExpectActualTest : AbstractMultiModuleIdeReso
     }
 }
 
-abstract class AbstractMultiplatformAnalysisTest : AbstractMultiModuleIdeResolveTest() {
+abstract class AbstractMultiplatformAnalysisTest : AbstractDiagnosticCodeMetaInfoTest() {
     override fun getTestDataPath(): String = "${PluginTestCaseBase.getTestDataPathBase()}/multiplatform"
 
     override fun setUp() {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt
index 3e104408702..6ed47dac6c9 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt
@@ -5,22 +5,10 @@
 
 package org.jetbrains.kotlin.idea.caches.resolve
 
-import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromDirStructure
+import org.jetbrains.kotlin.idea.codeMetaInfo.AbstractLineMarkerCodeMetaInfoTest
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
-import java.io.File
 
-abstract class AbstractMultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() {
+abstract class AbstractMultiModuleLineMarkerTest : AbstractLineMarkerCodeMetaInfoTest() {
 
     override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/multiModuleLineMarker/"
-
-    override val shouldCheckLineMarkers = true
-
-    override val shouldCheckResult = false
-
-    override fun doTestLineMarkers() = true
-
-    protected fun doTest(path: String) {
-        setupMppProjectFromDirStructure(File(path))
-        checkLineMarkersInProject()
-    }
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
index 793a5ef65e8..28b76bd5015 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
@@ -208,6 +208,11 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna
         runTest("idea/testData/multiplatform/simple/");
     }
 
+    @TestMetadata("smartCastOnPropertyFromDependentModule")
+    public void testSmartCastOnPropertyFromDependentModule() throws Exception {
+        runTest("idea/testData/multiplatform/smartCastOnPropertyFromDependentModule/");
+    }
+
     @TestMetadata("supertypes")
     public void testSupertypes() throws Exception {
         runTest("idea/testData/multiplatform/supertypes/");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/PsiElementChecker.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/PsiElementChecker.kt.193
deleted file mode 100644
index 26fe638f7ec..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/PsiElementChecker.kt.193
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.caches.resolve
-
-import com.intellij.openapi.util.Key
-import com.intellij.psi.*
-import org.jetbrains.kotlin.asJava.elements.KtLightElement
-import org.jetbrains.kotlin.asJava.elements.KtLightModifierList
-import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.junit.Assert
-
-object PsiElementChecker {
-    val TEST_DATA_KEY = Key.create<Int>("Test Key")
-
-    fun checkPsiElementStructure(lightClass: PsiClass) {
-        checkPsiElement(lightClass)
-
-        lightClass.methods.forEach {
-            it.parameterList.parameters.forEach { checkPsiElement(it) }
-            checkPsiElement(it)
-        }
-
-        lightClass.fields.forEach { checkPsiElement(it) }
-
-        lightClass.innerClasses.forEach { checkPsiElementStructure(it) }
-    }
-
-    private fun checkPsiElement(element: PsiElement) {
-        if (element !is KtLightElement<*, *> && element !is KtLightModifierList<*>) return
-
-        if (element is PsiModifierListOwner) {
-            val modifierList = element.modifierList
-            if (modifierList != null) {
-                checkPsiElement(modifierList)
-            }
-        }
-
-        if (element is PsiTypeParameterListOwner) {
-            val typeParameterList = element.typeParameterList
-            if (typeParameterList != null) {
-                checkPsiElement(typeParameterList)
-                typeParameterList.typeParameters.forEach { checkPsiElement(it) }
-            }
-        }
-
-        with(element) {
-            try {
-                Assert.assertEquals("Number of methods has changed. Please update test.", 55, PsiElement::class.java.methods.size)
-
-                project
-                Assert.assertTrue(language == KotlinLanguage.INSTANCE)
-                manager
-                children
-                parent
-                firstChild
-                lastChild
-                nextSibling
-                prevSibling
-                containingFile
-                textRange
-                //textRangeInParent - throws an exception for non-physical elements, it is expected behaviour
-                startOffsetInParent
-                textLength
-                findElementAt(0)
-                findReferenceAt(0)
-                textOffset
-                text
-                textToCharArray()
-                navigationElement
-                originalElement
-                textMatches("")
-                Assert.assertTrue(textMatches(this))
-                textContains('a')
-                accept(PsiElementVisitor.EMPTY_VISITOR)
-                acceptChildren(PsiElementVisitor.EMPTY_VISITOR)
-
-                val copy = copy()
-                Assert.assertTrue(copy == null || copy::class.java == this::class.java)
-
-                // Modify methods:
-                // add(this)
-                // addBefore(this, lastChild)
-                // addAfter(firstChild, this)
-                // checkAdd(this)
-                // addRange(firstChild, lastChild)
-                // addRangeBefore(firstChild, lastChild, lastChild)
-                // addRangeAfter(firstChild, lastChild, firstChild)
-                // delete()
-                // checkDelete()
-                // deleteChildRange(firstChild, lastChild)
-                // replace(this)
-
-                Assert.assertTrue(isValid)
-                isWritable
-                reference
-                references
-                putCopyableUserData(TEST_DATA_KEY, 12)
-
-                Assert.assertTrue(getCopyableUserData(TEST_DATA_KEY) == 12)
-                // Assert.assertTrue(copy().getCopyableUserData(TEST_DATA_KEY) == 12) { this } Doesn't work
-
-                // processDeclarations(...)
-
-                context
-                isPhysical
-                resolveScope
-                useScope
-                node
-                toString()
-                Assert.assertTrue(isEquivalentTo(this))
-            } catch (t: Throwable) {
-                throw AssertionErrorWithCause("Failed for ${this::class.java} ${this}", t)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractRenderingKDocTest.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractRenderingKDocTest.kt.193
deleted file mode 100644
index 865bde9426d..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractRenderingKDocTest.kt.193
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.codeInsight
-
-import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
-
-//BUNCH 201
-abstract class AbstractRenderingKDocTest : KotlinLightCodeInsightFixtureTestCase() {
-    protected fun doTest(path: String) = Unit
-}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt
index 145244d4f52..949752da78d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.idea.codeInsight.postfix
 
-import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat
+import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
@@ -30,7 +30,7 @@ abstract class AbstractPostfixTemplateProviderTest : KotlinLightCodeInsightFixtu
         myFixture.configureByFile(fileName)
         val template = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// TEMPLATE:")
         if (template != null) {
-            setTemplateTestingCompat(project, testRootDisposable)
+            TemplateManagerImpl.setTemplateTesting(testRootDisposable)
             myFixture.type(template.replace("\\t", "\t"))
         } else {
             myFixture.type('\t')
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
new file mode 100644
index 00000000000..b7f5bf28cd6
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.codeMetaInfo
+
+import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase
+import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl
+import com.intellij.lang.annotation.HighlightSeverity
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.module.ModuleManager
+import com.intellij.openapi.project.DumbService
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VfsUtilCore
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.psi.PsiManager
+import com.intellij.psi.impl.PsiManagerImpl
+import com.intellij.psi.impl.cache.CacheManager
+import com.intellij.psi.impl.source.tree.PsiErrorElementImpl
+import com.intellij.psi.impl.source.tree.TreeElement
+import com.intellij.psi.impl.source.tree.TreeUtil
+import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.search.UsageSearchContext
+import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
+import com.intellij.testFramework.runInEdtAndWait
+import com.intellij.util.io.exists
+import gnu.trove.TIntArrayList
+import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest
+import org.jetbrains.kotlin.checkers.diagnostics.DebugInfoDiagnostic
+import org.jetbrains.kotlin.checkers.diagnostics.SyntaxErrorDiagnostic
+import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory0
+import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil
+import org.jetbrains.kotlin.checkers.utils.DiagnosticsRenderingConfiguration
+import org.jetbrains.kotlin.daemon.common.OSKind
+import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
+import org.jetbrains.kotlin.diagnostics.AbstractDiagnostic
+import org.jetbrains.kotlin.diagnostics.Severity
+import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
+import org.jetbrains.kotlin.idea.codeMetaInfo.models.*
+import org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations.AbstractCodeMetaInfoRenderConfiguration
+import org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations.DiagnosticCodeMetaInfoRenderConfiguration
+import org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations.HighlightingRenderConfiguration
+import org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations.LineMarkerRenderConfiguration
+import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromTextFile
+import org.jetbrains.kotlin.idea.resolve.getDataFlowValueFactory
+import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings
+import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest
+import org.jetbrains.kotlin.idea.util.sourceRoots
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.junit.Ignore
+import java.io.File
+import java.nio.file.Paths
+
+@Ignore
+class CodeMetaInfoTestCase(
+    val codeMetaInfoTypes: Collection<AbstractCodeMetaInfoRenderConfiguration>,
+    val checkNoDiagnosticError: Boolean = false
+) : DaemonAnalyzerTestCase() {
+
+    fun getDiagnosticCodeMetaInfos(
+        configuration: DiagnosticCodeMetaInfoRenderConfiguration = DiagnosticCodeMetaInfoRenderConfiguration(),
+        parseDirective: Boolean = true
+    ): List<CodeMetaInfo> {
+        val tempSourceKtFile = PsiManager.getInstance(project).findFile(file.virtualFile) as KtFile
+        val resolutionFacade = tempSourceKtFile.getResolutionFacade()
+        val (bindingContext, moduleDescriptor) = resolutionFacade.analyzeWithAllCompilerChecks(listOf(tempSourceKtFile))
+        val directives = KotlinTestUtils.parseDirectives(file.text)
+        val diagnosticsFilter = BaseDiagnosticsTest.parseDiagnosticFilterDirective(directives, allowUnderscoreUsage = false)
+        val diagnostics = CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(
+            bindingContext,
+            file,
+            markDynamicCalls = false,
+            dynamicCallDescriptors = mutableListOf(),
+            configuration = DiagnosticsRenderingConfiguration(
+                platform = null, // we don't need to attach platform-description string to diagnostic here
+                withNewInference = false,
+                languageVersionSettings = resolutionFacade.getLanguageVersionSettings(),
+            ),
+            dataFlowValueFactory = resolutionFacade.getDataFlowValueFactory(),
+            moduleDescriptor = moduleDescriptor as ModuleDescriptorImpl
+        ).map { it.diagnostic }.filter { !parseDirective || diagnosticsFilter.value(it) }
+        configuration.renderParams = directives.contains(BaseDiagnosticsTest.RENDER_DIAGNOSTICS_MESSAGES)
+        return getCodeMetaInfo(diagnostics, configuration)
+    }
+
+    fun getLineMarkerCodeMetaInfos(configuration: LineMarkerRenderConfiguration): Collection<CodeMetaInfo> {
+        if ("!CHECK_HIGHLIGHTING" in file.text)
+            return emptyList()
+
+        CodeInsightTestFixtureImpl.instantiateAndRun(file, editor, TIntArrayList().toNativeArray(), false)
+        val lineMarkers = DaemonCodeAnalyzerImpl.getLineMarkers(getDocument(file), project)
+        return getCodeMetaInfo(lineMarkers, configuration)
+    }
+
+    fun getHighlightingCodeMetaInfos(configuration: HighlightingRenderConfiguration): Collection<CodeMetaInfo> {
+        val infos = CodeInsightTestFixtureImpl.instantiateAndRun(file, editor, TIntArrayList().toNativeArray(), false)
+
+        return getCodeMetaInfo(infos, configuration)
+    }
+
+    fun checkFile(expectedFile: File, project: Project, editor: Editor) {
+        myProject = project
+        myPsiManager = PsiManager.getInstance(myProject) as PsiManagerImpl
+        runInEdtAndWait {
+            setActiveEditor(editor)
+            check(expectedFile)
+        }
+    }
+
+    fun checkFile(file: VirtualFile, expectedFile: File, project: Project) {
+        myProject = project
+        myPsiManager = PsiManager.getInstance(myProject) as PsiManagerImpl
+        configureByExistingFile(file)
+        check(expectedFile)
+    }
+
+    fun check(expectedFile: File) {
+        val codeMetaInfoForCheck = mutableListOf<CodeMetaInfo>()
+        PsiDocumentManager.getInstance(myProject).commitAllDocuments()
+
+        //to load text
+        ApplicationManager.getApplication().runWriteAction { TreeUtil.clearCaches(myFile.node as TreeElement) }
+
+        //to initialize caches
+        if (!DumbService.isDumb(myProject)) {
+            CacheManager.SERVICE.getInstance(myProject)
+                .getFilesWithWord("XXX", UsageSearchContext.IN_COMMENTS, GlobalSearchScope.allScope(myProject), true)
+        }
+
+        for (configuration in codeMetaInfoTypes) {
+            when (configuration) {
+                is DiagnosticCodeMetaInfoRenderConfiguration -> {
+                    codeMetaInfoForCheck.addAll(getDiagnosticCodeMetaInfos(configuration))
+                }
+                is HighlightingRenderConfiguration -> {
+                    codeMetaInfoForCheck.addAll(getHighlightingCodeMetaInfos(configuration))
+                }
+                is LineMarkerRenderConfiguration -> {
+                    codeMetaInfoForCheck.addAll(getLineMarkerCodeMetaInfos(configuration))
+                }
+                else -> throw IllegalArgumentException("Unexpected code meta info configuration: $configuration")
+            }
+        }
+        if (codeMetaInfoTypes.any { it is DiagnosticCodeMetaInfoRenderConfiguration } &&
+            !codeMetaInfoTypes.any { it is HighlightingRenderConfiguration }
+        ) {
+            checkHighlightErrorItemsInDiagnostics(
+                getDiagnosticCodeMetaInfos(DiagnosticCodeMetaInfoRenderConfiguration(), false).filterIsInstance<DiagnosticCodeMetaInfo>()
+            )
+        }
+        val parsedMetaInfo = CodeMetaInfoParser.getCodeMetaInfoFromText(expectedFile.readText()).toMutableList()
+        codeMetaInfoForCheck.forEach { codeMetaInfo ->
+            val correspondingParsed = parsedMetaInfo.firstOrNull { it == codeMetaInfo }
+            if (correspondingParsed != null) {
+                parsedMetaInfo.remove(correspondingParsed)
+                codeMetaInfo.platforms.addAll(correspondingParsed.platforms)
+                if (correspondingParsed.platforms.isNotEmpty() && OSKind.current.toString() !in correspondingParsed.platforms)
+                    codeMetaInfo.platforms.add(OSKind.current.toString())
+            }
+        }
+        parsedMetaInfo.forEach {
+            if (it.platforms.isNotEmpty() && OSKind.current.toString() !in it.platforms) codeMetaInfoForCheck.add(
+                it
+            )
+        }
+        val textWithCodeMetaInfo = CodeMetaInfoRenderer.renderTagsToText(codeMetaInfoForCheck, myEditor.document.text)
+        KotlinTestUtils.assertEqualsToFile(
+            expectedFile,
+            textWithCodeMetaInfo.toString()
+        )
+
+        if (checkNoDiagnosticError) {
+            val diagnosticsErrors =
+                getDiagnosticCodeMetaInfos().filter { (it as DiagnosticCodeMetaInfo).diagnostic.severity == Severity.ERROR }
+            assertTrue(
+                "Diagnostics with severity ERROR were found: ${diagnosticsErrors.joinToString { it.asString() }}",
+                diagnosticsErrors.isEmpty()
+            )
+        }
+    }
+
+    private fun checkHighlightErrorItemsInDiagnostics(
+        diagnostics: Collection<DiagnosticCodeMetaInfo>
+    ) {
+        val highlightItems: List<CodeMetaInfo> =
+            getHighlightingCodeMetaInfos(HighlightingRenderConfiguration()).filter { (it as HighlightingCodeMetaInfo).highlightingInfo.severity == HighlightSeverity.ERROR }
+
+        highlightItems.forEach { highlightingCodeMetaInfo ->
+            assert(
+                diagnostics.any { diagnosticCodeMetaInfo ->
+                    diagnosticCodeMetaInfo.start == highlightingCodeMetaInfo.start &&
+                            when (diagnosticCodeMetaInfo.diagnostic) {
+                                is SyntaxErrorDiagnostic -> {
+                                    val diagnostic: SyntaxErrorDiagnostic = diagnosticCodeMetaInfo.diagnostic
+                                    (highlightingCodeMetaInfo as HighlightingCodeMetaInfo).highlightingInfo.description in (diagnostic.psiElement as PsiErrorElementImpl).errorDescription
+                                }
+                                is AbstractDiagnostic<*> -> {
+                                    val diagnostic: AbstractDiagnostic<*> = diagnosticCodeMetaInfo.diagnostic
+                                    diagnostic.factory.toString() in (highlightingCodeMetaInfo as HighlightingCodeMetaInfo).highlightingInfo.description
+                                }
+                                is DebugInfoDiagnostic -> {
+                                    val diagnostic: DebugInfoDiagnostic = diagnosticCodeMetaInfo.diagnostic
+                                    diagnostic.factory == DebugInfoDiagnosticFactory0.MISSING_UNRESOLVED &&
+                                            "[DEBUG] Reference is not resolved to anything, but is not marked unresolved" in (highlightingCodeMetaInfo as HighlightingCodeMetaInfo).highlightingInfo.description
+                                }
+                                else -> throw java.lang.IllegalArgumentException("Unknown diagnostic type: ${diagnosticCodeMetaInfo.diagnostic}")
+                            }
+                },
+            ) { "Could not find DIAGNOSTIC for ${(highlightingCodeMetaInfo as HighlightingCodeMetaInfo).highlightingInfo}" }
+        }
+    }
+}
+
+abstract class AbstractDiagnosticCodeMetaInfoTest : AbstractCodeMetaInfoTest() {
+    override fun getConfigurations() = listOf(
+        DiagnosticCodeMetaInfoRenderConfiguration()
+    )
+}
+
+abstract class AbstractLineMarkerCodeMetaInfoTest : AbstractCodeMetaInfoTest() {
+    override fun getConfigurations() = listOf(
+        LineMarkerRenderConfiguration()
+    )
+}
+
+abstract class AbstractHighlightingCodeMetaInfoTest : AbstractCodeMetaInfoTest() {
+    override fun getConfigurations() = listOf(
+        HighlightingRenderConfiguration()
+    )
+}
+
+abstract class AbstractCodeMetaInfoTest : AbstractMultiModuleTest() {
+    open val checkNoDiagnosticError get() = false
+    open fun getConfigurations() = listOf(
+        DiagnosticCodeMetaInfoRenderConfiguration(),
+        LineMarkerRenderConfiguration(),
+        HighlightingRenderConfiguration()
+    )
+
+    protected open fun setupProject(testDataPath: String) {
+        val dependenciesTxt = File(testDataPath, "dependencies.txt")
+        require(dependenciesTxt.exists()) {
+            "${dependenciesTxt.absolutePath} does not exist. dependencies.txt is required"
+        }
+        setupMppProjectFromTextFile(File(testDataPath))
+    }
+
+    fun doTest(testDataPath: String) {
+        val testRoot = File(testDataPath)
+        val checker = CodeMetaInfoTestCase(getConfigurations(), checkNoDiagnosticError)
+        setupProject(testDataPath)
+
+        for (module in ModuleManager.getInstance(project).modules) {
+            for (sourceRoot in module.sourceRoots) {
+                VfsUtilCore.processFilesRecursively(sourceRoot) { file ->
+                    if (file.isDirectory) return@processFilesRecursively true
+
+                    checker.checkFile(file, file.findCorrespondingFileInTestDir(sourceRoot, testRoot), project)
+                    true
+                }
+            }
+        }
+    }
+
+    private fun VirtualFile.findCorrespondingFileInTestDir(containingRoot: VirtualFile, testDir: File): File {
+        val tempRootPath = Paths.get(containingRoot.path)
+        val tempProjectDirPath = tempRootPath.parent
+        val tempSourcePath = Paths.get(path)
+        val relativeToProjectRootPath = tempProjectDirPath.relativize(tempSourcePath)
+        val testSourcesProjectDirPath = testDir.toPath()
+        val testSourcePath = testSourcesProjectDirPath.resolve(relativeToProjectRootPath)
+
+        require(testSourcePath.exists()) {
+            "Can't find file in testdata for copied file $this: checked at path ${testSourcePath.toAbsolutePath()}"
+        }
+        return testSourcePath.toFile()
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/CodeMetaInfoParser.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/CodeMetaInfoParser.kt
new file mode 100644
index 00000000000..0888b5b084e
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/CodeMetaInfoParser.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.codeMetaInfo
+
+import com.intellij.util.containers.Stack
+import org.jetbrains.kotlin.idea.codeMetaInfo.models.ParsedCodeMetaInfo
+import org.junit.Assert
+
+object CodeMetaInfoParser {
+    private val openingRegex = "(<!([^>]+?)!>)".toRegex()
+    private val closingRegex = "(<!>)".toRegex()
+
+    private val descriptionRegex = "\\(\".*?\"\\)".toRegex()
+    private val platformRegex = "\\{(.+)}".toRegex()
+
+    fun getCodeMetaInfoFromText(renderedText: String): List<ParsedCodeMetaInfo> {
+        var text = renderedText
+        val openingMatchResults = Stack<MatchResult>()
+        val closingMatchResults = Stack<MatchResult>()
+        val result = mutableListOf<ParsedCodeMetaInfo>()
+
+        while (true) {
+            var openingStartOffset = Int.MAX_VALUE
+            var closingStartOffset = Int.MAX_VALUE
+            val opening = openingRegex.find(text)
+            val closing = closingRegex.find(text)
+            if (opening == null && closing == null) break
+
+            if (opening != null)
+                openingStartOffset = opening.range.first
+            if (closing != null)
+                closingStartOffset = closing.range.first
+
+            text = if (openingStartOffset < closingStartOffset) {
+                openingMatchResults.push(opening)
+                text.removeRange(openingStartOffset, opening!!.range.last + 1)
+            } else {
+                closingMatchResults.push(closing)
+                text.removeRange(closingStartOffset, closing!!.range.last + 1)
+            }
+        }
+        if (openingMatchResults.size != closingMatchResults.size) {
+            Assert.fail("Opening and closing tags counts are not equals")
+        }
+        while (!openingMatchResults.isEmpty()) {
+            val openingMatchResult = openingMatchResults.pop()
+            val closingMatchResult = closingMatchResults.pop()
+            val metaInfoWithoutParams = openingMatchResult.groups[2]!!.value.replace(descriptionRegex, "")
+            metaInfoWithoutParams.split(",").forEach {
+                val tag = platformRegex.replace(it, "").trim()
+                val platforms =
+                    if (platformRegex.containsMatchIn(it)) platformRegex.find(it)!!.destructured.component1().split(";") else listOf()
+                result.add(
+                    ParsedCodeMetaInfo(
+                        openingMatchResult.range.first, closingMatchResult.range.first, platforms.toMutableList(), tag,
+                    )
+                )
+            }
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/CodeMetaInfoRenderer.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/CodeMetaInfoRenderer.kt
new file mode 100644
index 00000000000..a1f6da6e64f
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/CodeMetaInfoRenderer.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.codeMetaInfo
+
+import com.intellij.util.containers.Stack
+import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil
+import org.jetbrains.kotlin.idea.codeMetaInfo.models.CodeMetaInfo
+import java.io.File
+
+object CodeMetaInfoRenderer {
+    fun renderTagsToText(
+        codeMetaInfos: List<CodeMetaInfo>,
+        originalText: String
+    ): StringBuffer {
+        val result = StringBuffer()
+        if (codeMetaInfos.isEmpty()) {
+            result.append(originalText)
+            return result
+        }
+        val sortedMetaInfos = getSortedCodeMetaInfos(codeMetaInfos)
+        val opened = Stack<CodeMetaInfo>()
+
+        for ((i, c) in originalText.withIndex()) {
+            checkOpenedAndCloseStringIfNeeded(opened, i, result)
+            val matchedCodeMetaInfos = sortedMetaInfos.filter { it.start == i }
+            if (matchedCodeMetaInfos.isNotEmpty()) {
+                openStartTag(result)
+                val iterator = matchedCodeMetaInfos.listIterator()
+                var current: CodeMetaInfo? = iterator.next()
+
+                while (current != null) {
+                    val next: CodeMetaInfo? = if (iterator.hasNext()) iterator.next() else null
+                    opened.push(current)
+                    result.append(current.asString())
+                    when {
+                        next == null ->
+                            closeStartTag(result)
+                        next.end == current.end ->
+                            result.append(", ")
+                        else ->
+                            closeStartAndOpenNewTag(result)
+                    }
+                    current = next
+                }
+            }
+            result.append(c)
+        }
+        checkOpenedAndCloseStringIfNeeded(opened, originalText.length, result)
+        return result
+    }
+
+    private fun getSortedCodeMetaInfos(metaInfos: Collection<CodeMetaInfo>): List<CodeMetaInfo> {
+        return metaInfos.sortedWith(compareBy<CodeMetaInfo> { it.start }.then(compareByDescending { it.end }))
+    }
+
+    private fun closeString(result: StringBuffer) = result.append("<!>")
+    private fun openStartTag(result: StringBuffer) = result.append("<!")
+    private fun closeStartTag(result: StringBuffer) = result.append("!>")
+    private fun closeStartAndOpenNewTag(result: StringBuffer) = result.append("!><!")
+
+    private fun checkOpenedAndCloseStringIfNeeded(opened: Stack<CodeMetaInfo>, end: Int, result: StringBuffer) {
+        var prev: CodeMetaInfo? = null
+        while (!opened.isEmpty() && end == opened.peek().end) {
+            if (prev == null || prev.start != opened.peek().start)
+                closeString(result)
+            prev = opened.pop()
+        }
+    }
+}
+
+fun clearFileFromDiagnosticMarkup(file: File) {
+    val text = file.readText()
+    val cleanText = clearTextFromDiagnosticMarkup(text)
+    file.writeText(cleanText)
+}
+
+fun clearTextFromDiagnosticMarkup(text: String): String = CheckerTestUtil.rangeStartOrEndPattern.matcher(text).replaceAll("")
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/CodeMetaInfo.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/CodeMetaInfo.kt
new file mode 100644
index 00000000000..8e483721a5a
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/CodeMetaInfo.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.codeMetaInfo.models
+
+import com.intellij.codeInsight.daemon.LineMarkerInfo
+import com.intellij.codeInsight.daemon.impl.HighlightInfo
+import org.jetbrains.kotlin.checkers.diagnostics.ActualDiagnostic
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations.AbstractCodeMetaInfoRenderConfiguration
+import org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations.DiagnosticCodeMetaInfoRenderConfiguration
+import org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations.HighlightingRenderConfiguration
+import org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations.LineMarkerRenderConfiguration
+import org.jetbrains.kotlin.idea.editor.fixers.end
+import org.jetbrains.kotlin.idea.editor.fixers.start
+
+interface CodeMetaInfo {
+    val start: Int
+    val end: Int
+    val renderConfiguration: AbstractCodeMetaInfoRenderConfiguration
+    val platforms: MutableList<String>
+
+    fun asString(): String
+    fun getTag(): String
+}
+
+class DiagnosticCodeMetaInfo(
+    override val start: Int,
+    override val end: Int,
+    override val renderConfiguration: AbstractCodeMetaInfoRenderConfiguration,
+    val diagnostic: Diagnostic
+) : CodeMetaInfo {
+    override val platforms: MutableList<String> = mutableListOf()
+
+    override fun asString() = renderConfiguration.asString(this)
+
+    override fun getTag() = (renderConfiguration as DiagnosticCodeMetaInfoRenderConfiguration).getTag(this)
+}
+
+class LineMarkerCodeMetaInfo(
+    override val renderConfiguration: AbstractCodeMetaInfoRenderConfiguration,
+    val lineMarker: LineMarkerInfo<*>
+) : CodeMetaInfo {
+    override val start: Int
+        get() = lineMarker.startOffset
+    override val end: Int
+        get() = lineMarker.endOffset
+    override val platforms: MutableList<String> = mutableListOf()
+
+    override fun asString() = renderConfiguration.asString(this)
+
+    override fun getTag() = (renderConfiguration as LineMarkerRenderConfiguration).getTag()
+}
+
+class HighlightingCodeMetaInfo(
+    override val renderConfiguration: AbstractCodeMetaInfoRenderConfiguration,
+    val highlightingInfo: HighlightInfo
+) : CodeMetaInfo {
+    override val start: Int
+        get() = highlightingInfo.startOffset
+    override val end: Int
+        get() = highlightingInfo.endOffset
+    override val platforms: MutableList<String> = mutableListOf()
+
+    override fun asString() = renderConfiguration.asString(this)
+
+    override fun getTag() = (renderConfiguration as HighlightingRenderConfiguration).getTag()
+}
+
+class ParsedCodeMetaInfo(
+    override val start: Int,
+    override val end: Int,
+    override val platforms: MutableList<String>,
+    private val tag: String
+) : CodeMetaInfo {
+    override val renderConfiguration = object : AbstractCodeMetaInfoRenderConfiguration(false) {}
+
+    override fun asString() = renderConfiguration.asString(this)
+
+    override fun equals(other: Any?): Boolean {
+        if (other == null || other !is CodeMetaInfo) return false
+        return this.tag == other.getTag() && this.start == other.start && this.end == other.end
+    }
+
+    override fun getTag() = tag
+}
+
+fun createCodeMetaInfo(obj: Any, renderConfiguration: AbstractCodeMetaInfoRenderConfiguration): List<CodeMetaInfo> {
+    fun errorMessage() = "Unexpected render configuration for object $obj"
+    return when (obj) {
+        is Diagnostic -> {
+            require(renderConfiguration is DiagnosticCodeMetaInfoRenderConfiguration, ::errorMessage)
+            obj.textRanges.map { DiagnosticCodeMetaInfo(it.start, it.end, renderConfiguration, obj) }
+        }
+        is ActualDiagnostic -> {
+            require(renderConfiguration is DiagnosticCodeMetaInfoRenderConfiguration, ::errorMessage)
+            obj.diagnostic.textRanges.map { DiagnosticCodeMetaInfo(it.start, it.end, renderConfiguration, obj.diagnostic) }
+        }
+        is HighlightInfo -> {
+            require(renderConfiguration is HighlightingRenderConfiguration, ::errorMessage)
+            listOf(HighlightingCodeMetaInfo(renderConfiguration, obj))
+        }
+        is LineMarkerInfo<*> -> {
+            require(renderConfiguration is LineMarkerRenderConfiguration, ::errorMessage)
+            listOf(LineMarkerCodeMetaInfo(renderConfiguration, obj))
+        }
+        else -> throw IllegalArgumentException("Unknown type for creating CodeMetaInfo object $obj")
+    }
+}
+
+fun getCodeMetaInfo(
+    objects: List<Any>,
+    renderConfiguration: AbstractCodeMetaInfoRenderConfiguration
+): List<CodeMetaInfo> {
+    return objects.flatMap { createCodeMetaInfo(it, renderConfiguration) }
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt
new file mode 100644
index 00000000000..6fff12d11d6
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.codeMetaInfo.renderConfigurations
+
+import com.intellij.openapi.util.text.StringUtil
+import com.intellij.util.containers.ContainerUtil
+import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory1
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.diagnostics.rendering.*
+import org.jetbrains.kotlin.idea.codeMetaInfo.models.DiagnosticCodeMetaInfo
+import org.jetbrains.kotlin.idea.codeMetaInfo.models.HighlightingCodeMetaInfo
+import org.jetbrains.kotlin.idea.codeMetaInfo.models.CodeMetaInfo
+import org.jetbrains.kotlin.idea.codeMetaInfo.models.LineMarkerCodeMetaInfo
+
+
+abstract class AbstractCodeMetaInfoRenderConfiguration(var renderParams: Boolean = true) {
+    private val clickOrPressRegex = "Click or press (.*)to navigate".toRegex() //We have different hotkeys on different platforms
+    open fun asString(codeMetaInfo: CodeMetaInfo) = codeMetaInfo.getTag() + getPlatformsString(codeMetaInfo)
+
+    open fun getAdditionalParams(codeMetaInfo: CodeMetaInfo) = ""
+
+    protected fun sanitizeLineMarkerTooltip(originalText: String?): String {
+        if (originalText == null) return "null"
+        val noHtmlTags = StringUtil.removeHtmlTags(originalText)
+            .replace(" ", "")
+            .replace(clickOrPressRegex, "")
+            .trim()
+        return sanitizeLineBreaks(noHtmlTags)
+    }
+
+    protected fun sanitizeLineBreaks(originalText: String): String {
+        var sanitizedText = originalText
+        sanitizedText = StringUtil.replace(sanitizedText, "\r\n", " ")
+        sanitizedText = StringUtil.replace(sanitizedText, "\n", " ")
+        sanitizedText = StringUtil.replace(sanitizedText, "\r", " ")
+        return sanitizedText
+    }
+
+    protected fun getPlatformsString(codeMetaInfo: CodeMetaInfo): String {
+        if (codeMetaInfo.platforms.isEmpty()) return ""
+        return "{${codeMetaInfo.platforms.joinToString(";")}}"
+    }
+}
+
+open class DiagnosticCodeMetaInfoRenderConfiguration(
+    val withNewInference: Boolean = true,
+    val renderSeverity: Boolean = false
+) : AbstractCodeMetaInfoRenderConfiguration() {
+    private val crossPlatformLineBreak = """\r?\n""".toRegex()
+
+    override fun asString(codeMetaInfo: CodeMetaInfo): String {
+        if (codeMetaInfo !is DiagnosticCodeMetaInfo) return ""
+        return (getTag(codeMetaInfo)
+                + getPlatformsString(codeMetaInfo)
+                + getParamsString(codeMetaInfo))
+            .replace(crossPlatformLineBreak, "")
+    }
+
+    private fun getParamsString(codeMetaInfo: DiagnosticCodeMetaInfo): String {
+        if (!renderParams) return ""
+        val params = mutableListOf<String>()
+        val renderer = when (codeMetaInfo.diagnostic.factory) {
+            is DebugInfoDiagnosticFactory1 -> DiagnosticWithParameters1Renderer(
+                "{0}",
+                Renderers.TO_STRING
+            ) as DiagnosticRenderer<Diagnostic>
+            else -> DefaultErrorMessages.getRendererForDiagnostic(codeMetaInfo.diagnostic)
+        }
+        if (renderer is AbstractDiagnosticWithParametersRenderer) {
+            val renderParameters = renderer.renderParameters(codeMetaInfo.diagnostic)
+            params.addAll(ContainerUtil.map(renderParameters) { it.toString() })
+        }
+        if (renderSeverity)
+            params.add("severity='${codeMetaInfo.diagnostic.severity}'")
+
+        params.add(getAdditionalParams(codeMetaInfo))
+
+        return "(\"${params.filter { it.isNotEmpty() }.joinToString("; ")}\")"
+    }
+
+    fun getTag(codeMetaInfo: DiagnosticCodeMetaInfo): String {
+        return codeMetaInfo.diagnostic.factory.name
+    }
+}
+
+open class LineMarkerRenderConfiguration(var renderDescription: Boolean = true) : AbstractCodeMetaInfoRenderConfiguration() {
+    override fun asString(codeMetaInfo: CodeMetaInfo): String {
+        if (codeMetaInfo !is LineMarkerCodeMetaInfo) return ""
+        return getTag() + getParamsString(codeMetaInfo)
+    }
+
+    fun getTag() = "LINE_MARKER"
+
+    private fun getParamsString(lineMarkerCodeMetaInfo: LineMarkerCodeMetaInfo): String {
+        if (!renderParams) return ""
+        val params = mutableListOf<String>()
+
+        if (renderDescription)
+            params.add("descr='${sanitizeLineMarkerTooltip(lineMarkerCodeMetaInfo.lineMarker.lineMarkerTooltip)}'")
+
+        params.add(getAdditionalParams(lineMarkerCodeMetaInfo))
+
+        val paramsString = params.filter { it.isNotEmpty() }.joinToString("; ")
+        return if (paramsString.isEmpty()) "" else "(\"$paramsString\")"
+    }
+}
+
+open class HighlightingRenderConfiguration(
+    val renderDescription: Boolean = true,
+    val renderTextAttributesKey: Boolean = true,
+    val renderSeverity: Boolean = true
+) : AbstractCodeMetaInfoRenderConfiguration() {
+
+    override fun asString(codeMetaInfo: CodeMetaInfo): String {
+        if (codeMetaInfo !is HighlightingCodeMetaInfo) return ""
+        return getTag() + getParamsString(codeMetaInfo)
+    }
+
+    fun getTag() = "HIGHLIGHTING"
+
+    private fun getParamsString(highlightingCodeMetaInfo: HighlightingCodeMetaInfo): String {
+        if (!renderParams) return ""
+
+        val params = mutableListOf<String>()
+        if (renderSeverity)
+            params.add("severity='${highlightingCodeMetaInfo.highlightingInfo.severity}'")
+        if (renderDescription)
+            params.add("descr='${sanitizeLineBreaks(highlightingCodeMetaInfo.highlightingInfo.description)}'")
+        if (renderTextAttributesKey)
+            params.add("textAttributesKey='${highlightingCodeMetaInfo.highlightingInfo.forcedTextAttributesKey}'")
+
+        params.add(getAdditionalParams(highlightingCodeMetaInfo))
+        val paramsString = params.filter { it.isNotEmpty() }.joinToString("; ")
+
+        return if (paramsString.isEmpty()) "" else "(\"$paramsString\")"
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/compat.kt b/idea/tests/org/jetbrains/kotlin/idea/compat.kt
index 7a26ad9faa7..f29b1514ffd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/compat.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/compat.kt
@@ -5,22 +5,9 @@
 
 package org.jetbrains.kotlin.idea
 
-import com.intellij.ide.hierarchy.HierarchyTreeStructure
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.extensions.ExtensionPointName
-import com.intellij.openapi.util.Computable
 import com.intellij.testFramework.ExtensionTestUtil
-import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture
-
-// FIX ME WHEN BUNCH 193 REMOVED
-@Suppress("UNUSED_PARAMETER")
-fun doHierarchyTestCompat(
-    hierarchyFixture: HierarchyViewTestFixture,
-    treeStructureComputable: Computable<out HierarchyTreeStructure>,
-    expectedStructure: String,
-) {
-    HierarchyViewTestFixture.doHierarchyTest(treeStructureComputable.compute(), expectedStructure)
-}
 
 fun <T> maskExtensions(
     pointName: ExtensionPointName<T>,
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java
index ac1868f2890..f56fc1333f0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java
@@ -163,6 +163,11 @@ public class ClsStubBuilderTestGenerated extends AbstractClsStubBuilderTest {
         runTest("idea/testData/decompiler/stubBuilder/Objects/");
     }
 
+    @TestMetadata("PrivateConstField")
+    public void testPrivateConstField() throws Exception {
+        runTest("idea/testData/decompiler/stubBuilder/PrivateConstField/");
+    }
+
     @TestMetadata("PrivateToThis")
     public void testPrivateToThis() throws Exception {
         runTest("idea/testData/decompiler/stubBuilder/PrivateToThis/");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java
index 6b319edd3fe..87e4a3c3920 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java
@@ -53,6 +53,11 @@ public class JvmDecompiledTextTestGenerated extends AbstractJvmDecompiledTextTes
         runTest("idea/testData/decompiler/decompiledTextJvm/ParameterName/");
     }
 
+    @TestMetadata("PrivateConstField")
+    public void testPrivateConstField() throws Exception {
+        runTest("idea/testData/decompiler/decompiledTextJvm/PrivateConstField/");
+    }
+
     @TestMetadata("TestKt")
     public void testTestKt() throws Exception {
         runTest("idea/testData/decompiler/decompiledTextJvm/TestKt/");
@@ -128,6 +133,19 @@ public class JvmDecompiledTextTestGenerated extends AbstractJvmDecompiledTextTes
         }
     }
 
+    @TestMetadata("idea/testData/decompiler/decompiledTextJvm/PrivateConstField")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PrivateConstField extends AbstractJvmDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPrivateConstField() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/decompiler/decompiledTextJvm/PrivateConstField"), Pattern.compile("^([^\\.]+)$"), null, true);
+        }
+    }
+
     @TestMetadata("idea/testData/decompiler/decompiledTextJvm/TestKt")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt
index 4a839c3369a..c3f30cb6ef0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt
@@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.hierarchy
 
 import com.intellij.ide.hierarchy.*
 import com.intellij.ide.hierarchy.actions.BrowseHierarchyActionBase
+import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure
 import com.intellij.ide.hierarchy.type.SubtypesHierarchyTreeStructure
 import com.intellij.ide.hierarchy.type.SupertypesHierarchyTreeStructure
 import com.intellij.ide.hierarchy.type.TypeHierarchyTreeStructure
@@ -15,10 +16,7 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.fileEditor.impl.text.TextEditorPsiDataProvider
 import com.intellij.openapi.util.Computable
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiMethod
+import com.intellij.psi.*
 import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintException
 import com.intellij.rt.execution.junit.ComparisonDetailsExtractor
 import com.intellij.testFramework.LightProjectDescriptor
@@ -29,7 +27,6 @@ import junit.framework.TestCase
 import org.jetbrains.kotlin.idea.KotlinHierarchyViewTestBase
 import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCalleeTreeStructure
 import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallerTreeStructure
-import org.jetbrains.kotlin.idea.hierarchy.calls.createCallerMethodsTreeStructure
 import org.jetbrains.kotlin.idea.hierarchy.overrides.KotlinOverrideTreeStructure
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
@@ -124,10 +121,9 @@ abstract class AbstractHierarchyTest : KotlinHierarchyViewTestBase() {
 
     private val callerJavaHierarchyStructure: Computable<HierarchyTreeStructure>
         get() = Computable {
-            createCallerMethodsTreeStructure(
+            CallerMethodsTreeStructure(
                 project,
-                (getElementAtCaret(LanguageCallHierarchy.INSTANCE) as PsiMethod),
-                HierarchyBrowserBaseEx.SCOPE_PROJECT
+                (getElementAtCaret(LanguageCallHierarchy.INSTANCE) as PsiMethod) as PsiMember, HierarchyBrowserBaseEx.SCOPE_PROJECT
             )
         }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
index 7752c4b1cbd..e5d4e063f74 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
@@ -7978,6 +7978,36 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
             runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/extendInnerClass2.kt");
         }
 
+        @TestMetadata("extendJavaNestedClass.kt")
+        public void testExtendJavaNestedClass() throws Exception {
+            runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedClass.kt");
+        }
+
+        @TestMetadata("extendJavaNestedInterface.kt")
+        public void testExtendJavaNestedInterface() throws Exception {
+            runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedInterface.kt");
+        }
+
+        @TestMetadata("extendJavaNestedStaticClass.kt")
+        public void testExtendJavaNestedStaticClass() throws Exception {
+            runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/extendJavaNestedStaticClass.kt");
+        }
+
+        @TestMetadata("hasConstructorCallOfOuterClassMember.kt")
+        public void testHasConstructorCallOfOuterClassMember() throws Exception {
+            runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember.kt");
+        }
+
+        @TestMetadata("hasConstructorCallOfOuterClassMember2.kt")
+        public void testHasConstructorCallOfOuterClassMember2() throws Exception {
+            runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember2.kt");
+        }
+
+        @TestMetadata("hasConstructorCallOfOuterClassMember3.kt")
+        public void testHasConstructorCallOfOuterClassMember3() throws Exception {
+            runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/hasConstructorCallOfOuterClassMember3.kt");
+        }
+
         @TestMetadata("hasOuterClassMemberReference.kt")
         public void testHasOuterClassMemberReference() throws Exception {
             runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReference.kt");
@@ -8003,6 +8033,16 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
             runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReference5.kt");
         }
 
+        @TestMetadata("hasOuterClassMemberReferenceInSuperTypeConstructorCall.kt")
+        public void testHasOuterClassMemberReferenceInSuperTypeConstructorCall() throws Exception {
+            runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReferenceInSuperTypeConstructorCall.kt");
+        }
+
+        @TestMetadata("hasOuterClassMemberReferenceInSuperTypeConstructorCall2.kt")
+        public void testHasOuterClassMemberReferenceInSuperTypeConstructorCall2() throws Exception {
+            runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassMemberReferenceInSuperTypeConstructorCall2.kt");
+        }
+
         @TestMetadata("hasOuterClassTypeReference.kt")
         public void testHasOuterClassTypeReference() throws Exception {
             runTest("idea/testData/inspectionsLocal/redundantInnerClassModifier/hasOuterClassTypeReference.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 373bc9190b0..ec83710c5e7 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -5962,6 +5962,26 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/annotationClass.kt");
         }
 
+        @TestMetadata("caretOnClassBody.kt")
+        public void testCaretOnClassBody() throws Exception {
+            runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassBody.kt");
+        }
+
+        @TestMetadata("caretOnClassName.kt")
+        public void testCaretOnClassName() throws Exception {
+            runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassName.kt");
+        }
+
+        @TestMetadata("caretOnClassNameWithConstructorKeyword.kt")
+        public void testCaretOnClassNameWithConstructorKeyword() throws Exception {
+            runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassNameWithConstructorKeyword.kt");
+        }
+
+        @TestMetadata("caretOnClassNameWithoutPrimaryConstructor.kt")
+        public void testCaretOnClassNameWithoutPrimaryConstructor() throws Exception {
+            runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/caretOnClassNameWithoutPrimaryConstructor.kt");
+        }
+
         @TestMetadata("dataClass.kt")
         public void testDataClass() throws Exception {
             runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/dataClass.kt");
@@ -14446,6 +14466,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/removeExplicitTypeArguments/getterBody.kt");
         }
 
+        @TestMetadata("hasAnnotation.kt")
+        public void testHasAnnotation() throws Exception {
+            runTest("idea/testData/intentions/removeExplicitTypeArguments/hasAnnotation.kt");
+        }
+
         @TestMetadata("inapplicableTypeThatIsAFunItCannotBeInferred.kt")
         public void testInapplicableTypeThatIsAFunItCannotBeInferred() throws Exception {
             runTest("idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigationToolbar/AbstractKotlinNavBarTest.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/navigationToolbar/AbstractKotlinNavBarTest.kt.193
deleted file mode 100644
index 8c65f9b10fd..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/navigationToolbar/AbstractKotlinNavBarTest.kt.193
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.navigationToolbar
-
-import com.intellij.ide.navigationToolbar.NavBarModel
-import com.intellij.ide.navigationToolbar.NavBarModelExtension
-import com.intellij.ide.navigationToolbar.NavBarPresentation
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.ex.EditorEx
-import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.test.InTextDirectivesUtils
-
-
-abstract class AbstractKotlinNavBarTest : KotlinLightCodeInsightFixtureTestCase() {
-
-    // inspired by: com.intellij.ide.navigationToolbar.JavaNavBarTest#assertNavBarModel
-    protected fun doTest(testPath: String) {
-        val psiFile = myFixture.configureByFile(testDataFile().name)
-        val model = NavBarModel(myFixture.project)
-
-        model::class.java.getDeclaredMethod("updateModel", DataContext::class.java)
-            .apply { isAccessible = true }
-            .invoke(model, (myFixture.editor as EditorEx).dataContext)
-
-        val actualItems = (0 until model.size()).map {
-            NavBarPresentation.calcPresentableText(model[it])
-        }
-        val expectedItems = InTextDirectivesUtils.findListWithPrefixes(psiFile.text, "// NAV_BAR_ITEMS:")
-        assertOrderedEquals(actualItems, expectedItems)
-    }
-}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt b/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
index b1690b74d8f..f064061e698 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
@@ -20,16 +20,20 @@ import com.intellij.util.ref.DebugReflectionUtil
 import junit.framework.TestCase
 import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
 import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
+import org.jetbrains.kotlin.asJava.PsiClassRenderer
 import org.jetbrains.kotlin.asJava.PsiClassRenderer.renderClass
 import org.jetbrains.kotlin.asJava.classes.*
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseBase
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtScript
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Assert
+import java.io.File
 import kotlin.test.assertFails
 
 fun UsefulTestCase.forceUsingOldLightClassesForTest() {
@@ -76,6 +80,29 @@ object UltraLightChecker {
         return ultraLightClass
     }
 
+
+    fun checkByJavaFile(testDataPath: String, lightClasses: List<KtLightClass>) {
+        val expectedTextFile = getJavaFileForTest(testDataPath)
+        val renderedResult = renderLightClasses(testDataPath, lightClasses)
+            KotlinTestUtils.assertEqualsToFile(expectedTextFile, renderedResult)
+    }
+
+    fun getJavaFileForTest(testDataPath: String): File {
+        val expectedTextFile = KotlinTestUtils.replaceExtension(File(testDataPath), "java")
+        KotlinLightCodeInsightFixtureTestCaseBase.assertTrue(expectedTextFile.exists())
+        return expectedTextFile
+    }
+
+    fun renderLightClasses(testDataPath: String, lightClasses: List<KtLightClass>): String {
+        val extendedTypeRendererOld = PsiClassRenderer.extendedTypeRenderer
+        return try {
+            PsiClassRenderer.extendedTypeRenderer = testDataPath.endsWith("typeAnnotations.kt")
+            lightClasses.joinToString("\n\n") { it.renderClass() }
+        } finally {
+            PsiClassRenderer.extendedTypeRenderer = extendedTypeRendererOld
+        }
+    }
+
     fun checkClassEquivalence(ktClass: KtClassOrObject): KtUltraLightClass? {
         val gold = KtLightClassForSourceDeclaration.createNoCache(ktClass, forceUsingOldLightClasses = true)
         val ultraLightClass = LightClassGenerationSupport.getInstance(ktClass.project).createUltraLightClass(ktClass) ?: return null
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
index 473b9f9f1bc..2bd4fb58780 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
@@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.CharsetToolkit
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
+import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
 import com.intellij.util.ArrayUtil
 import com.intellij.util.PathUtil
 import junit.framework.ComparisonFailure
@@ -335,7 +336,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest
                     TestCase.fail("Action '$text' is available (but must not) in test $testFilePath")
                 }
 
-                invokeIntentionCompat(action, file, editor)
+                CodeInsightTestFixtureImpl.invokeIntention(action, file, editor)
 
                 if (!shouldBeAvailableAfterExecution) {
                     val afterAction = findActionByPattern(pattern, getAvailableActions())
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt
deleted file mode 100644
index 63c5a48cb3f..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.quickfix
-
-import com.intellij.codeInsight.intention.IntentionAction
-import com.intellij.openapi.editor.Editor
-import com.intellij.psi.PsiFile
-import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun invokeIntentionCompat(action: IntentionAction, file: PsiFile, editor: Editor) {
-    CodeInsightTestFixtureImpl.invokeIntention(action, file, editor)
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt.193
deleted file mode 100644
index 4b0b9bdc2a4..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt.193
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.quickfix
-
-import com.intellij.codeInsight.intention.IntentionAction
-import com.intellij.openapi.editor.Editor
-import com.intellij.psi.PsiFile
-import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun invokeIntentionCompat(action: IntentionAction, file: PsiFile, editor: Editor) {
-    CodeInsightTestFixtureImpl.invokeIntention(action, file, editor, action.text)
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
index e5c06e8f70e..444f1aab602 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
@@ -15,7 +15,6 @@ import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase
 import com.intellij.testFramework.fixtures.CodeInsightTestUtil
 import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat
 import org.jetbrains.kotlin.idea.refactoring.rename.KotlinMemberInplaceRenameHandler
 import org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler
 import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter
@@ -202,7 +201,7 @@ class InplaceRenameTest : LightPlatformCodeInsightTestCase() {
 
         val project = editor.project!!
 
-        setTemplateTestingCompat(project, testRootDisposable)
+        TemplateManagerImpl.setTemplateTesting(testRootDisposable)
 
         object : WriteCommandAction.Simple<Any>(project) {
             override fun run() {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSignatureChangePresentationTest.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSignatureChangePresentationTest.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailabilityTest.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailabilityTest.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringChangeCollectorTest.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringChangeCollectorTest.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringChangeListenerTest.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringChangeListenerTest.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringTest.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringTest.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/compat.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/resolve/compat.kt.193
deleted file mode 100644
index 7b7285977c6..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/compat.kt.193
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.resolve
-
-import com.intellij.mock.MockProject
-import com.intellij.pom.PomModel
-import com.intellij.pom.tree.TreeAspect
-import org.jetbrains.kotlin.idea.caches.trackers.KotlinCodeBlockModificationListener
-
-internal fun createAndRegisterKotlinCodeBlockModificationListener(project: MockProject, pomModel: PomModel, treeAspect: TreeAspect) {
-    project.registerService(PomModel::class.java, pomModel)
-    project.picoContainer.registerComponentInstance(
-        KotlinCodeBlockModificationListener(project, treeAspect)
-    )
-}
-
-internal fun unregisterKotlinCodeBlockModificationListener(project: MockProject) {
-    val picoContainer = project.picoContainer
-    picoContainer.unregisterComponent(KotlinCodeBlockModificationListener::class.java)
-    picoContainer.unregisterComponent(PomModel::class.java)
-}
\ No newline at end of file
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index cbb700c369b..1e074a308c8 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -24,10 +24,8 @@ dependencies {
 
     testCompileOnly(intellijDep())
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    testCompileOnly(intellijPluginDep("java"))
+    testRuntimeOnly(intellijPluginDep("java"))
 
     testCompile(project(":idea:idea-native")) { isTransitive = false }
     testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193
deleted file mode 100644
index 44f97066eb6..00000000000
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.j2k
-
-import com.intellij.codeInsight.ContainerProvider
-import com.intellij.codeInsight.NullableNotNullManager
-import com.intellij.codeInsight.NullableNotNullManagerImpl
-import com.intellij.codeInsight.runner.JavaMainMethodProvider
-import com.intellij.core.CoreApplicationEnvironment
-import com.intellij.core.JavaCoreApplicationEnvironment
-import com.intellij.core.JavaCoreProjectEnvironment
-import com.intellij.lang.MetaLanguage
-import com.intellij.lang.jvm.facade.JvmElementProvider
-import com.intellij.openapi.extensions.Extensions
-import com.intellij.openapi.extensions.ExtensionsArea
-import com.intellij.openapi.fileTypes.FileTypeExtensionPoint
-import com.intellij.openapi.util.Disposer
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.psi.*
-import com.intellij.psi.augment.PsiAugmentProvider
-import com.intellij.psi.augment.TypeAnnotationModifier
-import com.intellij.psi.compiled.ClassFileDecompilers
-import com.intellij.psi.impl.JavaClassSupersImpl
-import com.intellij.psi.impl.PsiTreeChangePreprocessor
-import com.intellij.psi.meta.MetaDataContributor
-import com.intellij.psi.stubs.BinaryFileStubBuilders
-import com.intellij.psi.util.JavaClassSupers
-import junit.framework.TestCase
-import org.jetbrains.kotlin.utils.PathUtil
-import java.io.File
-import java.net.URLClassLoader
-
-abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() {
-    val DISPOSABLE = Disposer.newDisposable()
-
-    fun doTest(javaPath: String) {
-        try {
-            val fileContents = FileUtil.loadFile(File(javaPath), true)
-            val javaCoreEnvironment: JavaCoreProjectEnvironment = setUpJavaCoreEnvironment()
-            translateToKotlin(fileContents, javaCoreEnvironment.project)
-        }
-        finally {
-            Disposer.dispose(DISPOSABLE)
-        }
-    }
-
-    fun setUpJavaCoreEnvironment(): JavaCoreProjectEnvironment {
-        // FIXME: There is no `Extensions.cleanRootArea` in 193 platform
-        // Extensions.cleanRootArea(DISPOSABLE)
-        val area = Extensions.getRootArea()
-
-        registerExtensionPoints(area)
-
-        val applicationEnvironment = JavaCoreApplicationEnvironment(DISPOSABLE)
-        val javaCoreEnvironment = object : JavaCoreProjectEnvironment(DISPOSABLE, applicationEnvironment) {
-            override fun preregisterServices() {
-                val projectArea = Extensions.getArea(project)
-                CoreApplicationEnvironment.registerExtensionPoint(projectArea, PsiTreeChangePreprocessor.EP_NAME, PsiTreeChangePreprocessor::class.java)
-                CoreApplicationEnvironment.registerExtensionPoint(projectArea, PsiElementFinder.EP_NAME, PsiElementFinder::class.java)
-                CoreApplicationEnvironment.registerExtensionPoint(projectArea, JvmElementProvider.EP_NAME, JvmElementProvider::class.java)
-            }
-        }
-
-        javaCoreEnvironment.project.registerService(NullableNotNullManager::class.java, object : NullableNotNullManagerImpl(javaCoreEnvironment.project) {
-            override fun isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases)
-            override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true
-            override fun hasHardcodedContracts(element: PsiElement): Boolean = false
-            override fun getNullables() = emptyList<String>()
-            override fun setNullables(vararg p0: String) = Unit
-            override fun getNotNulls() = emptyList<String>()
-            override fun setNotNulls(vararg p0: String) = Unit
-            override fun getDefaultNullable() = ""
-            override fun setDefaultNullable(defaultNullable: String) = Unit
-            override fun getDefaultNotNull() = ""
-            override fun setDefaultNotNull(p0: String) = Unit
-            override fun setInstrumentedNotNulls(p0: List<String>) = Unit
-            override fun getInstrumentedNotNulls() = emptyList<String>()
-        })
-
-        applicationEnvironment.application.registerService(JavaClassSupers::class.java, JavaClassSupersImpl::class.java)
-
-        for (root in PathUtil.getJdkClassesRootsFromCurrentJre()) {
-            javaCoreEnvironment.addJarToClassPath(root)
-        }
-        val annotations: File? = findAnnotations()
-        if (annotations != null && annotations.exists()) {
-            javaCoreEnvironment.addJarToClassPath(annotations)
-        }
-        return javaCoreEnvironment
-    }
-
-    private fun registerExtensionPoints(area: ExtensionsArea) {
-        CoreApplicationEnvironment.registerExtensionPoint(area, BinaryFileStubBuilders.EP_NAME, FileTypeExtensionPoint::class.java)
-        CoreApplicationEnvironment.registerExtensionPoint(area, FileContextProvider.EP_NAME, FileContextProvider::class.java)
-
-        CoreApplicationEnvironment.registerExtensionPoint(area, MetaDataContributor.EP_NAME, MetaDataContributor::class.java)
-        CoreApplicationEnvironment.registerExtensionPoint(area, PsiAugmentProvider.EP_NAME, PsiAugmentProvider::class.java)
-        CoreApplicationEnvironment.registerExtensionPoint(area, JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider::class.java)
-
-        CoreApplicationEnvironment.registerExtensionPoint(area, ContainerProvider.EP_NAME, ContainerProvider::class.java)
-        CoreApplicationEnvironment.registerExtensionPoint(area, ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler::class.java)
-
-        CoreApplicationEnvironment.registerExtensionPoint(area, TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier::class.java)
-        CoreApplicationEnvironment.registerExtensionPoint(area, MetaLanguage.EP_NAME, MetaLanguage::class.java)
-        CoreApplicationEnvironment.registerExtensionPoint(area, JavaModuleSystem.EP_NAME, JavaModuleSystem::class.java)
-    }
-
-    fun findAnnotations(): File? {
-        var classLoader = JavaToKotlinTranslator::class.java.classLoader
-        while (classLoader != null) {
-            val loader = classLoader
-            if (loader is URLClassLoader) {
-                for (url in loader.urLs) {
-                    if ("file" == url.protocol && url.file!!.endsWith("/annotations.jar")) {
-                        return File(url.file!!)
-                    }
-                }
-            }
-            classLoader = classLoader.parent
-        }
-        return null
-    }
-}
diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index 2bb19dede65..de19db01850 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -44,9 +44,7 @@ dependencies {
         testRuntime(project(it))
     }
 
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    testRuntimeOnly(intellijPluginDep("java"))
 
     testRuntimeOnly(toolsJar())
     testRuntime(project(":kotlin-reflect"))
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
index e20a4493e95..7eda8ebed38 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
@@ -15,16 +15,19 @@ import org.jetbrains.kotlin.incremental.testingUtils.assertEqualDirectories
 import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture
 import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
 import java.io.File
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.createTempDirectory
 import kotlin.reflect.KFunction1
 
 class RelocatableJpsCachesTest : BaseKotlinJpsBuildTestCase() {
     private val enableICFixture = EnableICFixture()
     private lateinit var workingDir: File
 
+    @OptIn(ExperimentalPathApi::class)
     override fun setUp() {
         super.setUp()
         enableICFixture.setUp()
-        workingDir = createTempDir("RelocatableJpsCachesTest", getTestName(false))
+        workingDir = createTempDirectory("RelocatableJpsCachesTest-" + getTestName(false)).toFile()
     }
 
     override fun tearDown() {
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 887425b0058..d0b97301a60 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.daemon.common.isDaemonEnabled
 import org.jetbrains.kotlin.incremental.*
 import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.ICReporterBase
+import org.jetbrains.kotlin.build.report.ICReporterBase
 import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
 import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageManager
 import org.jetbrains.kotlin.jps.model.kotlinKind
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt
index 2d5b915f069..6f51a4e29b3 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.jps.incremental
 
 import java.io.File
 
-private val NORMAL_VERSION = 13
+private val NORMAL_VERSION = 14
 private val NORMAL_VERSION_FILE_NAME = "format-version.txt"
 
 fun localCacheVersionManager(dataRoot: File, isCachesEnabled: Boolean) =
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
index f8faf7a0149..2464d4f46f3 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
@@ -46,6 +46,9 @@ import org.jetbrains.kotlin.utils.keysToMap
 import org.jetbrains.org.objectweb.asm.ClassReader
 import java.io.File
 import java.io.IOException
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
 
 private const val JVM_BUILD_META_INFO_FILE_NAME = "jvm-build-meta-info.txt"
 
@@ -242,14 +245,18 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
                 append("-test")
             }
         }
-        val dir = System.getProperty("kotlin.jps.dir.for.module.files")?.let { File(it) }?.takeIf { it.isDirectory }
+
+        fun createTempFile(dir: Path?, prefix: String?, suffix: String?): Path =
+            if (dir != null) Files.createTempFile(dir, prefix, suffix) else Files.createTempFile(prefix, suffix)
+
+        val dir = System.getProperty("kotlin.jps.dir.for.module.files")?.let { Paths.get(it) }?.takeIf { Files.isDirectory(it) }
         return try {
-            File.createTempFile("kjps", readableSuffix + ".script.xml", dir)
+            createTempFile(dir, "kjps", readableSuffix + ".script.xml")
         } catch (e: IOException) {
             // sometimes files cannot be created, because file name is too long (Windows, Mac OS)
             // see https://bugs.openjdk.java.net/browse/JDK-8148023
             try {
-                File.createTempFile("kjps", ".script.xml", dir)
+                createTempFile(dir, "kjps", ".script.xml")
             } catch (e: IOException) {
                 val message = buildString {
                     append("Could not create module file when building chunk $chunk")
@@ -259,7 +266,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
                 }
                 throw RuntimeException(message, e)
             }
-        }
+        }.toFile()
     }
 
     private fun findClassPathRoots(): Collection<File> {
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java
index dba90aaf3e6..71a1ce9b29f 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java
@@ -84,8 +84,8 @@ public class JSConfigurationKeys {
     public static final CompilerConfigurationKey<Boolean> PRINT_REACHABILITY_INFO =
             CompilerConfigurationKey.create("print declarations' reachability info during performing DCE");
 
-    public static final CompilerConfigurationKey<Boolean> DISABLE_FAKE_OVERRIDE_VALIDATOR =
-            CompilerConfigurationKey.create("disable IR fake override validator");
+    public static final CompilerConfigurationKey<Boolean> FAKE_OVERRIDE_VALIDATOR =
+            CompilerConfigurationKey.create("IR fake override validator");
 
     public static final CompilerConfigurationKey<ErrorTolerancePolicy> ERROR_TOLERANCE_POLICY =
             CompilerConfigurationKey.create("set up policy to ignore compilation errors");
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 1d819a6f959..1c859531e88 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -232,7 +232,7 @@ val currentOsType = run {
     OsType(osName, osArch)
 }
 
-val jsShellDirectory = "https://archive.mozilla.org/pub/firefox/nightly/2019/08/2019-08-11-09-56-40-mozilla-central"
+val jsShellDirectory = "https://archive.mozilla.org/pub/firefox/nightly/2020/06/2020-06-29-15-46-04-mozilla-central"
 val jsShellSuffix = when (currentOsType) {
     OsType(OsName.LINUX, OsArch.X86_32) -> "linux-i686"
     OsType(OsName.LINUX, OsArch.X86_64) -> "linux-x86_64"
@@ -248,6 +248,7 @@ val downloadedTools = File(buildDir, "tools")
 val downloadJsShell by task<Download> {
     src(jsShellLocation)
     dest(File(downloadedTools, "jsshell-$jsShellSuffix.zip"))
+    overwrite(false)
 }
 
 val unzipJsShell by task<Copy> {
@@ -257,13 +258,44 @@ val unzipJsShell by task<Copy> {
     into(unpackedDir)
 }
 
+val v8osString = when (currentOsType) {
+    OsType(OsName.LINUX, OsArch.X86_32) -> "linux32"
+    OsType(OsName.LINUX, OsArch.X86_64) -> "linux64"
+    OsType(OsName.MAC, OsArch.X86_64) -> "mac64"
+    OsType(OsName.WINDOWS, OsArch.X86_32) -> "win32"
+    OsType(OsName.WINDOWS, OsArch.X86_64) -> "win64"
+    else -> error("unsupported os type $currentOsType")
+}
+
+val v8edition = "rel" // rel or dbg
+val v8version = "8.8.104"
+val v8fileName = "v8-${v8osString}-${v8edition}-${v8version}"
+val v8url = "https://storage.googleapis.com/chromium-v8/official/canary/$v8fileName.zip"
+
+val downloadV8 by task<Download> {
+    src(v8url)
+    dest(File(downloadedTools, "$v8fileName.zip"))
+    overwrite(false)
+}
+
+val unzipV8 by task<Copy> {
+    dependsOn(downloadV8)
+    from(zipTree(downloadV8.get().dest))
+    val unpackedDir = File(downloadedTools, v8fileName)
+    into(unpackedDir)
+}
+
 projectTest("wasmTest", true) {
     dependsOn(unzipJsShell)
+    dependsOn(unzipV8)
     include("org/jetbrains/kotlin/js/test/wasm/semantics/*")
     val jsShellExecutablePath = File(unzipJsShell.get().destinationDir, "js").absolutePath
-    systemProperty("javascript.engine.path.SpiderMonkey", jsShellExecutablePath)
+    val v8ExecutablePath = File(unzipV8.get().destinationDir, "d8").absolutePath
 
-    dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs")
+    systemProperty("javascript.engine.path.SpiderMonkey", jsShellExecutablePath)
+    systemProperty("javascript.engine.path.V8", v8ExecutablePath)
+
+    dependsOn(":kotlin-stdlib-wasm:compileKotlinJs")
     systemProperty("kotlin.wasm.stdlib.path", "libraries/stdlib/wasm/build/classes/kotlin/js/main")
 
     setUpBoxTests()
diff --git a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt
index caa6b693e16..9756a8f1c4a 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt
@@ -18,6 +18,8 @@ import org.jetbrains.kotlin.backend.common.phaser.invokeToplevel
 import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion
 import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion
 import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor
+import org.jetbrains.kotlin.build.report.BuildReporter
+import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
@@ -63,8 +65,10 @@ import org.junit.Before
 import org.junit.Ignore
 import org.junit.Test
 import java.io.File
+import kotlin.io.path.*
 import org.jetbrains.kotlin.konan.file.File as KonanFile
 
+@OptIn(ExperimentalPathApi::class)
 @Ignore
 class GenerateIrRuntime {
     private val lookupTracker: LookupTracker = LookupTracker.DO_NOTHING
@@ -249,7 +253,7 @@ class GenerateIrRuntime {
         val irVersion = KlibIrVersion.INSTANCE.toString()
 
         val versions = KotlinLibraryVersioning(libraryVersion, compilerVersion, abiVersion, metadataVersion, irVersion)
-        val file = createTempFile(directory = workingDir)
+        val file = createTempFile(directory = workingDir.toPath()).toFile()
         val writer = KotlinLibraryOnlyIrWriter(file.absolutePath, "", versions, BuiltInsPlatform.JS, emptyList(), false)
         val files = fullRuntimeSourceSet
         val analysisResult = doFrontEnd(files)
@@ -271,7 +275,7 @@ class GenerateIrRuntime {
         val irVersion = KlibIrVersion.INSTANCE.toString()
 
         val versions = KotlinLibraryVersioning(libraryVersion, compilerVersion, abiVersion, metadataVersion, irVersion)
-        val file = createTempFile(directory = workingDir)
+        val file = createTempFile(directory = workingDir.toPath()).toFile()
         val writer = KotlinLibraryOnlyIrWriter(file.absolutePath, "", versions, BuiltInsPlatform.JS, emptyList(), true)
         val files = fullRuntimeSourceSet
         val analysisResult = doFrontEnd(files)
@@ -316,7 +320,7 @@ class GenerateIrRuntime {
         withJsIC {
             val buildHistoryFile = File(cachesDir, "build-history.bin")
             val compiler = IncrementalJsCompilerRunner(
-                cachesDir, EmptyICReporter,
+                cachesDir, BuildReporter(EmptyICReporter, DoNothingBuildMetricsReporter),
                 buildHistoryFile = buildHistoryFile,
                 modulesApiHistory = EmptyModulesApiHistory
             )
@@ -360,7 +364,7 @@ class GenerateIrRuntime {
             withJsIC {
                 val buildHistoryFile = File(cachesDir, "build-history.bin")
                 val compiler = IncrementalJsCompilerRunner(
-                    cachesDir, EmptyICReporter,
+                    cachesDir, BuildReporter(EmptyICReporter, DoNothingBuildMetricsReporter),
                     buildHistoryFile = buildHistoryFile,
                     modulesApiHistory = EmptyModulesApiHistory
                 )
@@ -471,15 +475,16 @@ class GenerateIrRuntime {
         return psi2IrTranslator.generateModuleFragment(psi2IrContext, files, irProviders, emptyList(), null)
     }
 
+    @OptIn(ExperimentalPathApi::class)
     private fun doSerializeModule(moduleFragment: IrModuleFragment, bindingContext: BindingContext, files: List<KtFile>, perFile: Boolean = false): String {
-        val tmpKlibDir = createTempDir().also { it.deleteOnExit() }
+        val tmpKlibDir = createTempDirectory().also { it.toFile().deleteOnExit() }.toString()
         serializeModuleIntoKlib(
             moduleName,
             project,
             configuration,
             bindingContext,
             files,
-            tmpKlibDir.path,
+            tmpKlibDir,
             emptyList(),
             moduleFragment,
             mutableMapOf(),
@@ -488,7 +493,7 @@ class GenerateIrRuntime {
             perFile
         )
 
-        return tmpKlibDir.path
+        return tmpKlibDir
     }
 
     private fun doDeserializeModuleMetadata(moduleRef: KotlinLibrary): ModuleDescriptorImpl {
diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
index e489e6be078..ce1ee679fbe 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.js.test.AbstractJsLineNumberTest
 import org.jetbrains.kotlin.js.test.es6.semantics.*
 import org.jetbrains.kotlin.js.test.ir.semantics.*
 import org.jetbrains.kotlin.js.test.semantics.*
-import org.jetbrains.kotlin.js.test.wasm.semantics.AbstractIrWasmBoxWasmTest
+import org.jetbrains.kotlin.js.test.wasm.semantics.AbstractIrCodegenBoxWasmTest
 import org.jetbrains.kotlin.test.TargetBackend
 
 fun main(args: Array<String>) {
@@ -62,14 +62,6 @@ fun main(args: Array<String>) {
             testClass<AbstractJsLineNumberTest> {
                 model("lineNumbers/", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.JS)
             }
-
-            testClass<AbstractIrWasmBoxWasmTest> {
-                model("wasmBox", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.WASM)
-            }
-
-            testClass<AbstractIrWasmBoxJsTest> {
-                model("wasmBox", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.JS_IR)
-            }
         }
 
         testGroup("js/js.tests/test", "compiler/testData", testRunnerMethodName = "runTest0") {
@@ -85,6 +77,33 @@ fun main(args: Array<String>) {
                 model("codegen/boxError", targetBackend = TargetBackend.JS_IR)
             }
 
+            testClass<AbstractIrCodegenBoxWasmTest> {
+                model(
+                    "codegen/box", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.WASM, excludeDirs = listOf(
+                        
+                        // TODO: Support reflection
+                        "toArray", "classLiteral", "reflection",
+
+                        // TODO: Add stdlib
+                        "contracts", "platformTypes",
+
+                        // TODO: ArrayList
+                        "ranges/stepped/unsigned",
+
+                        // TODO: Support coroutines
+                        "coroutines", "parametersMetadata",
+
+                        // TODO: Support exceptions
+                        "finally", "deadCodeElimination", "controlStructures/tryCatchInExpressions",
+
+                        // TODO: Support delegated properties
+                        "delegatedProperty",
+
+                        "oldLanguageVersions"
+                    )
+                )
+            }
+
             testClass<AbstractIrJsCodegenBoxES6Test> {
                 model("codegen/box", targetBackend = TargetBackend.JS_IR_ES6)
             }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
index 2b9d852f8c0..96e3cf1ea64 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
@@ -956,3 +956,14 @@ abstract class BasicBoxTest(
             else ScriptEngineV8Lazy(KotlinTestUtils.tmpDirForReusableFolder("j2v8_library_path").path)
     }
 }
+
+fun KotlinTestWithEnvironment.createPsiFile(fileName: String): KtFile {
+    val psiManager = PsiManager.getInstance(project)
+    val fileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL)
+
+    val file = fileSystem.findFileByPath(fileName) ?: error("File not found: $fileName")
+
+    return psiManager.findFile(file) as KtFile
+}
+
+fun KotlinTestWithEnvironment.createPsiFiles(fileNames: List<String>): List<KtFile> = fileNames.map(this::createPsiFile)
\ No newline at end of file
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt
index 5258988720c..68594c305d3 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt
@@ -9,18 +9,21 @@ import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.psi.PsiManager
+import junit.framework.TestCase
 import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
 import org.jetbrains.kotlin.backend.common.phaser.toPhaseMap
 import org.jetbrains.kotlin.backend.wasm.compileWasm
 import org.jetbrains.kotlin.backend.wasm.wasmPhases
+import org.jetbrains.kotlin.checkers.parseLanguageVersionSettings
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
-import org.jetbrains.kotlin.config.CommonConfigurationKeys
-import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.*
+import org.jetbrains.kotlin.ir.backend.js.MainModule
 import org.jetbrains.kotlin.ir.backend.js.loadKlib
 import org.jetbrains.kotlin.js.config.JsConfig
 import org.jetbrains.kotlin.js.facade.TranslationUnit
+import org.jetbrains.kotlin.js.test.engines.ExternalTool
 import org.jetbrains.kotlin.js.test.engines.SpiderMonkeyEngine
 import org.jetbrains.kotlin.library.resolver.impl.KotlinLibraryResolverResultImpl
 import org.jetbrains.kotlin.library.resolver.impl.KotlinResolvedLibraryImpl
@@ -28,10 +31,11 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtPsiFactory
+import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.Directives
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.KotlinTestWithEnvironment
-import org.jetbrains.kotlin.test.TestFiles
+import org.jetbrains.kotlin.test.*
 import java.io.Closeable
 import java.io.File
 import java.lang.Boolean.getBoolean
@@ -48,8 +52,13 @@ abstract class BasicWasmBoxTest(
 
     private val spiderMonkey by lazy { SpiderMonkeyEngine() }
 
+    fun doTestWithCoroutinesPackageReplacement(filePath: String, coroutinesPackage: String) {
+        TODO("TestWithCoroutinesPackageReplacement are not supported")
+    }
+
     fun doTest(filePath: String) {
         val file = File(filePath)
+
         val outputDir = getOutputDir(file)
         val fileContent = KotlinTestUtils.doLoadFile(file)
 
@@ -58,21 +67,31 @@ abstract class BasicWasmBoxTest(
             val testPackage = testFactory.testPackage
             val outputFileBase = outputDir.absolutePath + "/" + getTestName(true)
             val outputWatFile = outputFileBase + ".wat"
+            val outputWasmFile = outputFileBase + ".wasm"
             val outputJsFile = outputFileBase + ".js"
 
+            val languageVersionSettings = inputFiles.mapNotNull { it.languageVersionSettings }.firstOrNull()
+
             val kotlinFiles = inputFiles.filter { it.fileName.endsWith(".kt") }
             val psiFiles = createPsiFiles(kotlinFiles.map { File(it.fileName).canonicalPath }.sorted())
-            val config = createConfig()
+            val config = createConfig(languageVersionSettings)
             translateFiles(
+                file,
                 psiFiles.map(TranslationUnit::SourceFile),
                 File(outputWatFile),
+                File(outputWasmFile),
                 File(outputJsFile),
                 config,
                 testPackage,
                 TEST_FUNCTION
             )
 
-            spiderMonkey.runFile(outputJsFile)
+            ExternalTool(System.getProperty("javascript.engine.path.V8"))
+                .run(
+                    "--experimental-wasm-typed-funcref",
+                    "--experimental-wasm-gc",
+                    outputJsFile
+                )
         }
     }
 
@@ -86,26 +105,32 @@ abstract class BasicWasmBoxTest(
     }
 
     private fun translateFiles(
+        testFile: File,
         units: List<TranslationUnit>,
         outputWatFile: File,
+        outputWasmFile: File,
         outputJsFile: File,
         config: JsConfig,
         testPackage: String?,
         testFunction: String
     ) {
         val filesToCompile = units.map { (it as TranslationUnit.SourceFile).file }
-        val debugMode = getBoolean("kotlin.js.debugMode")
+        val debugMode = getBoolean("kotlin.wasm.debugMode")
 
         val phaseConfig = if (debugMode) {
             val allPhasesSet = wasmPhases.toPhaseMap().values.toSet()
             val dumpOutputDir = File(outputWatFile.parent, outputWatFile.nameWithoutExtension + "-irdump")
             println("\n ------ Dumping phases to file://$dumpOutputDir")
+            println("\n ------  KT file://${testFile.absolutePath}")
+            println("\n ------ WAT file://$outputWatFile")
+            println("\n ------ WASM file://$outputWasmFile")
+            println(" ------  JS file://$outputJsFile")
             PhaseConfig(
                 wasmPhases,
                 dumpToDirectory = dumpOutputDir.path,
-                toDumpStateAfter = allPhasesSet,
-                toValidateStateAfter = allPhasesSet,
-                dumpOnlyFqName = null
+                // toDumpStateAfter = allPhasesSet,
+                // toValidateStateAfter = allPhasesSet,
+                // dumpOnlyFqName = null
             )
         } else {
             PhaseConfig(wasmPhases)
@@ -113,7 +138,7 @@ abstract class BasicWasmBoxTest(
 
         val compilerResult = compileWasm(
             project = config.project,
-            files = filesToCompile,
+            mainModule = MainModule.SourceFiles(filesToCompile),
             analyzer = AnalyzerWithCompilerReport(config.configuration),
             configuration = config.configuration,
             phaseConfig = phaseConfig,
@@ -124,37 +149,26 @@ abstract class BasicWasmBoxTest(
         )
 
         outputWatFile.write(compilerResult.wat)
-
-        val runtime = File("libraries/stdlib/wasm/runtime/runtime.js").readText()
+        outputWasmFile.writeBytes(compilerResult.wasm)
 
         val testRunner = """
-            const wat = read(String.raw`${outputWatFile.absoluteFile}`);
-            const wasmBinary = wasmTextToBinary(wat);
+            const wasmBinary = read(String.raw`${outputWasmFile.absoluteFile}`, 'binary');
             const wasmModule = new WebAssembly.Module(wasmBinary);
-            const wasmInstance = new WebAssembly.Instance(wasmModule, { runtime });
+            const wasmInstance = new WebAssembly.Instance(wasmModule, { runtime, js_code });
 
             const actualResult = wasmInstance.exports.$testFunction();
             if (actualResult !== "OK")
                 throw `Wrong box result '${'$'}{actualResult}'; Expected "OK"`;
         """.trimIndent()
 
-        outputJsFile.write(runtime + "\n" + compilerResult.js + "\n" + testRunner)
+        outputJsFile.write(compilerResult.js + "\n" + testRunner)
     }
 
-    private fun createPsiFile(fileName: String): KtFile {
-        val psiManager = PsiManager.getInstance(project)
-        val fileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL)
 
-        val file = fileSystem.findFileByPath(fileName) ?: error("File not found: $fileName")
-
-        return psiManager.findFile(file) as KtFile
-    }
-
-    private fun createPsiFiles(fileNames: List<String>): List<KtFile> = fileNames.map(this::createPsiFile)
-
-    private fun createConfig(): JsConfig {
+    private fun createConfig(languageVersionSettings: LanguageVersionSettings?): JsConfig {
         val configuration = environment.configuration.copy()
         configuration.put(CommonConfigurationKeys.MODULE_NAME, TEST_MODULE)
+        configuration.languageVersionSettings = languageVersionSettings ?: LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE)
         return JsConfig(project, configuration, null, null)
     }
 
@@ -169,11 +183,13 @@ abstract class BasicWasmBoxTest(
                 }
             }
 
+            val languageVersionSettings = parseLanguageVersionSettings(directives)
+
             val temporaryFile = File(tmpDir, "WASM_TEST/$fileName")
             KotlinTestUtils.mkdirs(temporaryFile.parentFile)
             temporaryFile.writeText(text, Charsets.UTF_8)
 
-            return TestFile(temporaryFile.absolutePath)
+            return TestFile(temporaryFile.absolutePath, languageVersionSettings)
         }
 
         var testPackage: String? = null
@@ -184,7 +200,7 @@ abstract class BasicWasmBoxTest(
         }
     }
 
-    private class TestFile(val fileName: String)
+    private class TestFile(val fileName: String, val languageVersionSettings: LanguageVersionSettings?)
 
     override fun createEnvironment() =
         KotlinCoreEnvironment.createForTests(testRootDisposable, CompilerConfiguration(), EnvironmentConfigFiles.JS_CONFIG_FILES)
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/engines/SpiderMonkey.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/engines/SpiderMonkey.kt
index 76fc2836e14..2a1db810565 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/engines/SpiderMonkey.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/engines/SpiderMonkey.kt
@@ -39,6 +39,6 @@ class SpiderMonkeyEngine(
     private val jsShell = ExternalTool(jsShellPath)
 
     fun runFile(file: String) {
-        jsShell.run(file)
+        jsShell.run("--wasm-gc", file)
     }
 }
\ No newline at end of file
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
index aba203116e1..0ef28c60d79 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
@@ -1082,6 +1082,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/bridges/genericProperty.kt");
         }
 
+        @TestMetadata("innerClassTypeParameters.kt")
+        public void testInnerClassTypeParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt");
+        }
+
         @TestMetadata("jsName.kt")
         public void testJsName() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/jsName.kt");
@@ -1132,6 +1137,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/bridges/kt318.kt");
         }
 
+        @TestMetadata("kt42137.kt")
+        public void testKt42137() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt42137.kt");
+        }
+
         @TestMetadata("longChainOneBridge.kt")
         public void testLongChainOneBridge() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
@@ -5723,6 +5733,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("nonLocalReturn.kt")
+        public void testNonLocalReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt");
+        }
+
         @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt")
         public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines");
@@ -8538,6 +8553,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/delegatedProperty/extensionPropertyAndExtensionGetValue.kt");
         }
 
+        @TestMetadata("functionRefDelefate.kt")
+        public void testFunctionRefDelefate() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt");
+        }
+
         @TestMetadata("genericDelegate.kt")
         public void testGenericDelegate() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
@@ -10655,6 +10675,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
         }
 
+        @TestMetadata("typeParameterAsUpperBound.kt")
+        public void testTypeParameterAsUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt");
+        }
+
         @TestMetadata("typeParametersInLocalFunction.kt")
         public void testTypeParametersInLocalFunction() throws Exception {
             runTest("compiler/testData/codegen/box/functions/typeParametersInLocalFunction.kt");
@@ -11502,6 +11527,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
         }
 
+        @TestMetadata("boxImplDoesNotExecuteInitBlock.kt")
+        public void testBoxImplDoesNotExecuteInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt");
+        }
+
         @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -11652,6 +11682,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("defaultWithInlineClassArgument.kt")
         public void testDefaultWithInlineClassArgument() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultWithInlineClassArgument.kt");
@@ -11772,6 +11807,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt");
         }
 
+        @TestMetadata("initBlock.kt")
+        public void testInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/initBlock.kt");
+        }
+
         @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
         public void testInlineClassAsLastExpressionInInLambda() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
@@ -12122,6 +12162,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt");
         }
 
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/stringPlus.kt");
+        }
+
         @TestMetadata("toStringCallingPrivateFun.kt")
         public void testToStringCallingPrivateFun() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
@@ -12142,6 +12187,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt");
         }
 
+        @TestMetadata("UIntSafeAsInt.kt")
+        public void testUIntSafeAsInt() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt");
+        }
+
         @TestMetadata("unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testUnboxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -12347,6 +12397,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt");
             }
 
+            @TestMetadata("overrideGenericWithInlineClass.kt")
+            public void testOverrideGenericWithInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt");
+            }
+
             @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt")
             public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");
@@ -13282,6 +13337,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
         }
 
+        @TestMetadata("innerWithDefaultInner.kt")
+        public void testInnerWithDefaultInner() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
+        }
+
         @TestMetadata("kt3132.kt")
         public void testKt3132() throws Exception {
             runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
@@ -13870,6 +13930,16 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             public void testAllFilesPresentInGenerics() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/generics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
             }
+
+            @TestMetadata("kt42824.kt")
+            public void testKt42824() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42824.kt");
+            }
+
+            @TestMetadata("kt42825.kt")
+            public void testKt42825() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42825.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions")
@@ -17031,6 +17101,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
             }
 
+            @TestMetadata("kt42281.kt")
+            public void testKt42281() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
+            }
+
             @TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
             public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
@@ -18778,6 +18853,16 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             public void testKt13241_Collection() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Collection.kt");
             }
+
+            @TestMetadata("kt43159_ArrayUpperBound.kt")
+            public void testKt43159_ArrayUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt");
+            }
+
+            @TestMetadata("kt43159_GenericArray.kt")
+            public void testKt43159_GenericArray() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/ranges/forInProgressionWithIndex")
@@ -22836,6 +22921,19 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
                 }
             }
 
+            @TestMetadata("compiler/testData/codegen/box/reflection/mapping/inlineClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class InlineClasses extends AbstractIrJsCodegenBoxES6Test {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInlineClasses() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/mapping/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
+                }
+            }
+
             @TestMetadata("compiler/testData/codegen/box/reflection/mapping/jvmStatic")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -25312,6 +25410,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath);
         }
 
+        @TestMetadata("abstractClassWithFakeOverride.kt")
+        public void testAbstractClassWithFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt");
+        }
+
         public void testAllFilesPresentInTraits() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
         }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
index a9114f89e89..8ac0f210150 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
@@ -1082,6 +1082,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/bridges/genericProperty.kt");
         }
 
+        @TestMetadata("innerClassTypeParameters.kt")
+        public void testInnerClassTypeParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt");
+        }
+
         @TestMetadata("jsName.kt")
         public void testJsName() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/jsName.kt");
@@ -1132,6 +1137,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/bridges/kt318.kt");
         }
 
+        @TestMetadata("kt42137.kt")
+        public void testKt42137() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt42137.kt");
+        }
+
         @TestMetadata("longChainOneBridge.kt")
         public void testLongChainOneBridge() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
@@ -5723,6 +5733,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("nonLocalReturn.kt")
+        public void testNonLocalReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt");
+        }
+
         @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt")
         public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines");
@@ -8538,6 +8553,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/extensionPropertyAndExtensionGetValue.kt");
         }
 
+        @TestMetadata("functionRefDelefate.kt")
+        public void testFunctionRefDelefate() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt");
+        }
+
         @TestMetadata("genericDelegate.kt")
         public void testGenericDelegate() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
@@ -10655,6 +10675,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
         }
 
+        @TestMetadata("typeParameterAsUpperBound.kt")
+        public void testTypeParameterAsUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt");
+        }
+
         @TestMetadata("typeParametersInLocalFunction.kt")
         public void testTypeParametersInLocalFunction() throws Exception {
             runTest("compiler/testData/codegen/box/functions/typeParametersInLocalFunction.kt");
@@ -11502,6 +11527,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
         }
 
+        @TestMetadata("boxImplDoesNotExecuteInitBlock.kt")
+        public void testBoxImplDoesNotExecuteInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt");
+        }
+
         @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -11652,6 +11682,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("defaultWithInlineClassArgument.kt")
         public void testDefaultWithInlineClassArgument() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultWithInlineClassArgument.kt");
@@ -11772,6 +11807,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt");
         }
 
+        @TestMetadata("initBlock.kt")
+        public void testInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/initBlock.kt");
+        }
+
         @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
         public void testInlineClassAsLastExpressionInInLambda() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
@@ -12122,6 +12162,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt");
         }
 
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/stringPlus.kt");
+        }
+
         @TestMetadata("toStringCallingPrivateFun.kt")
         public void testToStringCallingPrivateFun() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
@@ -12142,6 +12187,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt");
         }
 
+        @TestMetadata("UIntSafeAsInt.kt")
+        public void testUIntSafeAsInt() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt");
+        }
+
         @TestMetadata("unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testUnboxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -12347,6 +12397,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt");
             }
 
+            @TestMetadata("overrideGenericWithInlineClass.kt")
+            public void testOverrideGenericWithInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt");
+            }
+
             @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt")
             public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");
@@ -13282,6 +13337,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
         }
 
+        @TestMetadata("innerWithDefaultInner.kt")
+        public void testInnerWithDefaultInner() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
+        }
+
         @TestMetadata("kt3132.kt")
         public void testKt3132() throws Exception {
             runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
@@ -13870,6 +13930,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             public void testAllFilesPresentInGenerics() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/generics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
             }
+
+            @TestMetadata("kt42824.kt")
+            public void testKt42824() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42824.kt");
+            }
+
+            @TestMetadata("kt42825.kt")
+            public void testKt42825() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42825.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions")
@@ -17031,6 +17101,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
             }
 
+            @TestMetadata("kt42281.kt")
+            public void testKt42281() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
+            }
+
             @TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
             public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
@@ -18778,6 +18853,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             public void testKt13241_Collection() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Collection.kt");
             }
+
+            @TestMetadata("kt43159_ArrayUpperBound.kt")
+            public void testKt43159_ArrayUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt");
+            }
+
+            @TestMetadata("kt43159_GenericArray.kt")
+            public void testKt43159_GenericArray() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/ranges/forInProgressionWithIndex")
@@ -22836,6 +22921,19 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 }
             }
 
+            @TestMetadata("compiler/testData/codegen/box/reflection/mapping/inlineClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class InlineClasses extends AbstractIrJsCodegenBoxTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInlineClasses() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/mapping/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+                }
+            }
+
             @TestMetadata("compiler/testData/codegen/box/reflection/mapping/jvmStatic")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -25312,6 +25410,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
         }
 
+        @TestMetadata("abstractClassWithFakeOverride.kt")
+        public void testAbstractClassWithFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt");
+        }
+
         public void testAllFilesPresentInTraits() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
         }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrWasmBoxJsTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrWasmBoxJsTestGenerated.java
deleted file mode 100644
index fa0c7332dde..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrWasmBoxJsTestGenerated.java
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.js.test.ir.semantics;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("js/js.translator/testData/wasmBox")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class IrWasmBoxJsTestGenerated extends AbstractIrWasmBoxJsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInWasmBox() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-    }
-
-    @TestMetadata("basicTypes.kt")
-    public void testBasicTypes() throws Exception {
-        runTest("js/js.translator/testData/wasmBox/basicTypes.kt");
-    }
-
-    @TestMetadata("primitivesOperatos.kt")
-    public void testPrimitivesOperatos() throws Exception {
-        runTest("js/js.translator/testData/wasmBox/primitivesOperatos.kt");
-    }
-
-    @TestMetadata("js/js.translator/testData/wasmBox/number")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Number extends AbstractIrWasmBoxJsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInNumber() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/number"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-        }
-
-        @TestMetadata("assignmentIntOverflow.kt")
-        public void testAssignmentIntOverflow() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/assignmentIntOverflow.kt");
-        }
-
-        @TestMetadata("byteAndShortConversions.kt")
-        public void testByteAndShortConversions() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/byteAndShortConversions.kt");
-        }
-
-        @TestMetadata("conversionsWithTruncation.kt")
-        public void testConversionsWithTruncation() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/conversionsWithTruncation.kt");
-        }
-
-        @TestMetadata("conversionsWithoutTruncation.kt")
-        public void testConversionsWithoutTruncation() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/conversionsWithoutTruncation.kt");
-        }
-
-        @TestMetadata("division.kt")
-        public void testDivision() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/division.kt");
-        }
-
-        @TestMetadata("doubleConversions.kt")
-        public void testDoubleConversions() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/doubleConversions.kt");
-        }
-
-        @TestMetadata("hexadecimalConstant.kt")
-        public void testHexadecimalConstant() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/hexadecimalConstant.kt");
-        }
-
-        @TestMetadata("incDecOptimization.kt")
-        public void testIncDecOptimization() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/incDecOptimization.kt");
-        }
-
-        @TestMetadata("intConversions.kt")
-        public void testIntConversions() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/intConversions.kt");
-        }
-
-        @TestMetadata("intDivFloat.kt")
-        public void testIntDivFloat() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/intDivFloat.kt");
-        }
-
-        @TestMetadata("intIncDecOverflow.kt")
-        public void testIntIncDecOverflow() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/intIncDecOverflow.kt");
-        }
-
-        @TestMetadata("intOverflow.kt")
-        public void testIntOverflow() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/intOverflow.kt");
-        }
-
-        @TestMetadata("kt2342.kt")
-        public void testKt2342() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/kt2342.kt");
-        }
-
-        @TestMetadata("longBinaryOperations.kt")
-        public void testLongBinaryOperations() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longBinaryOperations.kt");
-        }
-
-        @TestMetadata("longBitOperations.kt")
-        public void testLongBitOperations() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longBitOperations.kt");
-        }
-
-        @TestMetadata("longCompareToIntrinsic.kt")
-        public void testLongCompareToIntrinsic() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longCompareToIntrinsic.kt");
-        }
-
-        @TestMetadata("longEqualsIntrinsic.kt")
-        public void testLongEqualsIntrinsic() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longEqualsIntrinsic.kt");
-        }
-
-        @TestMetadata("longHashCode.kt")
-        public void testLongHashCode() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longHashCode.kt");
-        }
-
-        @TestMetadata("longUnaryOperations.kt")
-        public void testLongUnaryOperations() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longUnaryOperations.kt");
-        }
-
-        @TestMetadata("mixedTypesOverflow.kt")
-        public void testMixedTypesOverflow() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/mixedTypesOverflow.kt");
-        }
-
-        @TestMetadata("numberCompareTo.kt")
-        public void testNumberCompareTo() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/numberCompareTo.kt");
-        }
-
-        @TestMetadata("numberConversions.kt")
-        public void testNumberConversions() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/numberConversions.kt");
-        }
-
-        @TestMetadata("numberEquals.kt")
-        public void testNumberEquals() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/numberEquals.kt");
-        }
-
-        @TestMetadata("numberIncDec.kt")
-        public void testNumberIncDec() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/numberIncDec.kt");
-        }
-    }
-
-    @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class PassedCommonTests extends AbstractIrWasmBoxJsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInPassedCommonTests() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class BoxingOptimization extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInBoxingOptimization() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("explicitEqualsOnDouble.kt")
-            public void testExplicitEqualsOnDouble() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization/explicitEqualsOnDouble.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/classes")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Classes extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInClasses() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/classes"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("kt2482.kt")
-            public void testKt2482() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/classes/kt2482.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/constants")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Constants extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInConstants() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/constants"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("float.kt")
-            public void testFloat() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/constants/float.kt");
-            }
-
-            @TestMetadata("long.kt")
-            public void testLong() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/constants/long.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class ControlStructures extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInControlStructures() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("ifConst1.kt")
-            public void testIfConst1() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst1.kt");
-            }
-
-            @TestMetadata("ifConst2.kt")
-            public void testIfConst2() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst2.kt");
-            }
-
-            @TestMetadata("kt1899.kt")
-            public void testKt1899() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/kt1899.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class ExtensionProperties extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInExtensionProperties() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("topLevel.kt")
-            public void testTopLevel() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties/topLevel.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/functions")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Functions extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInFunctions() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/functions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("kt2280.kt")
-            public void testKt2280() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/functions/kt2280.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/ieee754")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Ieee754 extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInIeee754() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/ieee754"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("lessDouble_properIeeeAndNewInference.kt")
-            public void testLessDouble_properIeeeAndNewInference() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/ieee754/lessDouble_properIeeeAndNewInference.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/ir")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Ir extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInIr() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/ir"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class ClosureConversion extends AbstractIrWasmBoxJsTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInClosureConversion() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-
-                @TestMetadata("closureConversion1.kt")
-                public void testClosureConversion1() throws Exception {
-                    runTest("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion1.kt");
-                }
-
-                @TestMetadata("closureConversion3.kt")
-                public void testClosureConversion3() throws Exception {
-                    runTest("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion3.kt");
-                }
-
-                @TestMetadata("closureConversion4.kt")
-                public void testClosureConversion4() throws Exception {
-                    runTest("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion4.kt");
-                }
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/labels")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Labels extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInLabels() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/labels"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("propertyAccessor.kt")
-            public void testPropertyAccessor() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/labels/propertyAccessor.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class LazyCodegen extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInLazyCodegen() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Optimizations extends AbstractIrWasmBoxJsTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInOptimizations() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-
-                @TestMetadata("negateConstantCompare.kt")
-                public void testNegateConstantCompare() throws Exception {
-                    runTest("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations/negateConstantCompare.kt");
-                }
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class OperatorConventions extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInOperatorConventions() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("annotatedAssignment.kt")
-            public void testAnnotatedAssignment() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/annotatedAssignment.kt");
-            }
-
-            @TestMetadata("infixFunctionOverBuiltinMember.kt")
-            public void testInfixFunctionOverBuiltinMember() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/infixFunctionOverBuiltinMember.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class PrimitiveTypes extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInPrimitiveTypes() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("ea35963.kt")
-            public void testEa35963() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/ea35963.kt");
-            }
-
-            @TestMetadata("incrementByteCharShort.kt")
-            public void testIncrementByteCharShort() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/incrementByteCharShort.kt");
-            }
-
-            @TestMetadata("kt1634.kt")
-            public void testKt1634() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt1634.kt");
-            }
-
-            @TestMetadata("kt3078.kt")
-            public void testKt3078() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt3078.kt");
-            }
-
-            @TestMetadata("kt6590_identityEquals.kt")
-            public void testKt6590_identityEquals() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt6590_identityEquals.kt");
-            }
-
-            @TestMetadata("kt737.kt")
-            public void testKt737() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt737.kt");
-            }
-
-            @TestMetadata("kt828.kt")
-            public void testKt828() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt828.kt");
-            }
-
-            @TestMetadata("kt877.kt")
-            public void testKt877() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt877.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/publishedApi")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class PublishedApi extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInPublishedApi() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/publishedApi"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("topLevel.kt")
-            public void testTopLevel() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/publishedApi/topLevel.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/unaryOp")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class UnaryOp extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInUnaryOp() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/unaryOp"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("intrinsic.kt")
-            public void testIntrinsic() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/unaryOp/intrinsic.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/when")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class When extends AbstractIrWasmBoxJsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInWhen() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/when"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
-            }
-
-            @TestMetadata("noElseNoMatch.kt")
-            public void testNoElseNoMatch() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/when/noElseNoMatch.kt");
-            }
-        }
-    }
-}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt
index 0c1fb92b0f5..5d1d1f3cd54 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt
@@ -19,11 +19,6 @@ abstract class AbstractIrJsCodegenBoxErrorTest : BasicIrBoxTest(
     "codegen/irBoxError/"
 )
 
-abstract class AbstractIrWasmBoxJsTest : BasicIrBoxTest(
-    TEST_DATA_DIR_PATH + "wasmBox/",
-    "irWasmBox/"
-)
-
 abstract class AbstractIrJsCodegenInlineTest : BasicIrBoxTest(
     "compiler/testData/codegen/boxInline/",
     "codegen/irBoxInline/"
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
index c947e3968e9..c5f9692f93b 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
@@ -1082,6 +1082,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/bridges/genericProperty.kt");
         }
 
+        @TestMetadata("innerClassTypeParameters.kt")
+        public void testInnerClassTypeParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt");
+        }
+
         @TestMetadata("jsName.kt")
         public void testJsName() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/jsName.kt");
@@ -1132,6 +1137,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/bridges/kt318.kt");
         }
 
+        @TestMetadata("kt42137.kt")
+        public void testKt42137() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt42137.kt");
+        }
+
         @TestMetadata("longChainOneBridge.kt")
         public void testLongChainOneBridge() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
@@ -5723,6 +5733,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("nonLocalReturn.kt")
+        public void testNonLocalReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt");
+        }
+
         @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt")
         public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines");
@@ -8538,6 +8553,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/extensionPropertyAndExtensionGetValue.kt");
         }
 
+        @TestMetadata("functionRefDelefate.kt")
+        public void testFunctionRefDelefate() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/functionRefDelefate.kt");
+        }
+
         @TestMetadata("genericDelegate.kt")
         public void testGenericDelegate() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
@@ -10655,6 +10675,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
         }
 
+        @TestMetadata("typeParameterAsUpperBound.kt")
+        public void testTypeParameterAsUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt");
+        }
+
         @TestMetadata("typeParametersInLocalFunction.kt")
         public void testTypeParametersInLocalFunction() throws Exception {
             runTest("compiler/testData/codegen/box/functions/typeParametersInLocalFunction.kt");
@@ -11567,6 +11592,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
         }
 
+        @TestMetadata("boxImplDoesNotExecuteInitBlock.kt")
+        public void testBoxImplDoesNotExecuteInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt");
+        }
+
         @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -11717,6 +11747,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
         }
 
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
         @TestMetadata("defaultWithInlineClassArgument.kt")
         public void testDefaultWithInlineClassArgument() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/defaultWithInlineClassArgument.kt");
@@ -11837,6 +11872,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/genericVararg2ndConstructor.kt");
         }
 
+        @TestMetadata("initBlock.kt")
+        public void testInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/initBlock.kt");
+        }
+
         @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
         public void testInlineClassAsLastExpressionInInLambda() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
@@ -12187,6 +12227,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt");
         }
 
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/stringPlus.kt");
+        }
+
         @TestMetadata("toStringCallingPrivateFun.kt")
         public void testToStringCallingPrivateFun() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
@@ -12207,6 +12252,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt");
         }
 
+        @TestMetadata("UIntSafeAsInt.kt")
+        public void testUIntSafeAsInt() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt");
+        }
+
         @TestMetadata("unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testUnboxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -12412,6 +12462,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt");
             }
 
+            @TestMetadata("overrideGenericWithInlineClass.kt")
+            public void testOverrideGenericWithInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt");
+            }
+
             @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt")
             public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception {
                 runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");
@@ -13347,6 +13402,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
         }
 
+        @TestMetadata("innerWithDefaultInner.kt")
+        public void testInnerWithDefaultInner() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
+        }
+
         @TestMetadata("kt3132.kt")
         public void testKt3132() throws Exception {
             runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
@@ -13935,6 +13995,16 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             public void testAllFilesPresentInGenerics() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/generics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
             }
+
+            @TestMetadata("kt42824.kt")
+            public void testKt42824() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42824.kt");
+            }
+
+            @TestMetadata("kt42825.kt")
+            public void testKt42825() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/generics/kt42825.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions")
@@ -17136,6 +17206,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
             }
 
+            @TestMetadata("kt42281.kt")
+            public void testKt42281() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
+            }
+
             @TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
             public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
                 runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
@@ -18883,6 +18958,16 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             public void testKt13241_Collection() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Collection.kt");
             }
+
+            @TestMetadata("kt43159_ArrayUpperBound.kt")
+            public void testKt43159_ArrayUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt");
+            }
+
+            @TestMetadata("kt43159_GenericArray.kt")
+            public void testKt43159_GenericArray() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_GenericArray.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/ranges/forInProgressionWithIndex")
@@ -22851,6 +22936,19 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                 }
             }
 
+            @TestMetadata("compiler/testData/codegen/box/reflection/mapping/inlineClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class InlineClasses extends AbstractJsCodegenBoxTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInlineClasses() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/mapping/inlineClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
+                }
+            }
+
             @TestMetadata("compiler/testData/codegen/box/reflection/mapping/jvmStatic")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -25327,6 +25425,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath);
         }
 
+        @TestMetadata("abstractClassWithFakeOverride.kt")
+        public void testAbstractClassWithFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt");
+        }
+
         public void testAllFilesPresentInTraits() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
         }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
new file mode 100644
index 00000000000..2e47c7a0607
--- /dev/null
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
@@ -0,0 +1,14793 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.js.test.wasm.semantics;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("compiler/testData/codegen/box")
+@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+    }
+
+    public void testAllFilesPresentInBox() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "toArray", "classLiteral", "reflection", "contracts", "platformTypes", "ranges/stepped/unsigned", "coroutines", "parametersMetadata", "finally", "deadCodeElimination", "controlStructures/tryCatchInExpressions", "delegatedProperty", "oldLanguageVersions");
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/annotations")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Annotations extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInAnnotations() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/annotations"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("nestedAnnotation.kt")
+        public void testNestedAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/nestedAnnotation.kt");
+        }
+
+        @TestMetadata("nestedClassesInAnnotations.kt")
+        public void testNestedClassesInAnnotations() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt");
+        }
+
+        @TestMetadata("resolveWithLowPriorityAnnotation.kt")
+        public void testResolveWithLowPriorityAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/annotations/annotatedLambda")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class AnnotatedLambda extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInAnnotatedLambda() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/annotations/annotatedLambda"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/annotations/typeAnnotations")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class TypeAnnotations extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInTypeAnnotations() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/annotations/typeAnnotations"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/argumentOrder")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ArgumentOrder extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInArgumentOrder() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/argumentOrder"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("argumentOrderInObjectSuperCall.kt")
+        public void testArgumentOrderInObjectSuperCall() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/argumentOrderInObjectSuperCall.kt");
+        }
+
+        @TestMetadata("argumentOrderInSuperCall.kt")
+        public void testArgumentOrderInSuperCall() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/argumentOrderInSuperCall.kt");
+        }
+
+        @TestMetadata("arguments.kt")
+        public void testArguments() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/arguments.kt");
+        }
+
+        @TestMetadata("captured.kt")
+        public void testCaptured() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/captured.kt");
+        }
+
+        @TestMetadata("capturedInExtension.kt")
+        public void testCapturedInExtension() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt");
+        }
+
+        @TestMetadata("defaults.kt")
+        public void testDefaults() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/defaults.kt");
+        }
+
+        @TestMetadata("extension.kt")
+        public void testExtension() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/extension.kt");
+        }
+
+        @TestMetadata("extensionInClass.kt")
+        public void testExtensionInClass() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/extensionInClass.kt");
+        }
+
+        @TestMetadata("kt9277.kt")
+        public void testKt9277() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/kt9277.kt");
+        }
+
+        @TestMetadata("lambdaMigration.kt")
+        public void testLambdaMigration() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/lambdaMigration.kt");
+        }
+
+        @TestMetadata("lambdaMigrationInClass.kt")
+        public void testLambdaMigrationInClass() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/lambdaMigrationInClass.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/simple.kt");
+        }
+
+        @TestMetadata("simpleInClass.kt")
+        public void testSimpleInClass() throws Exception {
+            runTest("compiler/testData/codegen/box/argumentOrder/simpleInClass.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/arrays")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Arrays extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInArrays() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/arrays"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("arrayConstructorWithNonInlineLambda.kt")
+        public void testArrayConstructorWithNonInlineLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/arrayConstructorWithNonInlineLambda.kt");
+        }
+
+        @TestMetadata("arrayConstructorsSimple.kt")
+        public void testArrayConstructorsSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/arrayConstructorsSimple.kt");
+        }
+
+        @TestMetadata("arrayGetAssignMultiIndex.kt")
+        public void testArrayGetAssignMultiIndex() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt");
+        }
+
+        @TestMetadata("arrayGetMultiIndex.kt")
+        public void testArrayGetMultiIndex() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt");
+        }
+
+        @TestMetadata("arrayInstanceOf.kt")
+        public void testArrayInstanceOf() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/arrayInstanceOf.kt");
+        }
+
+        @TestMetadata("arrayPlusAssign.kt")
+        public void testArrayPlusAssign() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/arrayPlusAssign.kt");
+        }
+
+        @TestMetadata("forEachBooleanArray.kt")
+        public void testForEachBooleanArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/forEachBooleanArray.kt");
+        }
+
+        @TestMetadata("forEachByteArray.kt")
+        public void testForEachByteArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/forEachByteArray.kt");
+        }
+
+        @TestMetadata("forEachCharArray.kt")
+        public void testForEachCharArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/forEachCharArray.kt");
+        }
+
+        @TestMetadata("forEachDoubleArray.kt")
+        public void testForEachDoubleArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/forEachDoubleArray.kt");
+        }
+
+        @TestMetadata("forEachFloatArray.kt")
+        public void testForEachFloatArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/forEachFloatArray.kt");
+        }
+
+        @TestMetadata("forEachIntArray.kt")
+        public void testForEachIntArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/forEachIntArray.kt");
+        }
+
+        @TestMetadata("forEachLongArray.kt")
+        public void testForEachLongArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/forEachLongArray.kt");
+        }
+
+        @TestMetadata("forEachShortArray.kt")
+        public void testForEachShortArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/forEachShortArray.kt");
+        }
+
+        @TestMetadata("genericArrayInObjectLiteralConstructor.kt")
+        public void testGenericArrayInObjectLiteralConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/genericArrayInObjectLiteralConstructor.kt");
+        }
+
+        @TestMetadata("inProjectionAsParameter.kt")
+        public void testInProjectionAsParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/inProjectionAsParameter.kt");
+        }
+
+        @TestMetadata("inProjectionOfArray.kt")
+        public void testInProjectionOfArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/inProjectionOfArray.kt");
+        }
+
+        @TestMetadata("inProjectionOfList.kt")
+        public void testInProjectionOfList() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/inProjectionOfList.kt");
+        }
+
+        @TestMetadata("indices.kt")
+        public void testIndices() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/indices.kt");
+        }
+
+        @TestMetadata("indicesChar.kt")
+        public void testIndicesChar() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/indicesChar.kt");
+        }
+
+        @TestMetadata("inlineInitializer.kt")
+        public void testInlineInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/inlineInitializer.kt");
+        }
+
+        @TestMetadata("iterator.kt")
+        public void testIterator() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iterator.kt");
+        }
+
+        @TestMetadata("iteratorBooleanArray.kt")
+        public void testIteratorBooleanArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt");
+        }
+
+        @TestMetadata("iteratorByteArray.kt")
+        public void testIteratorByteArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorByteArray.kt");
+        }
+
+        @TestMetadata("iteratorByteArrayNextByte.kt")
+        public void testIteratorByteArrayNextByte() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorByteArrayNextByte.kt");
+        }
+
+        @TestMetadata("iteratorCharArray.kt")
+        public void testIteratorCharArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorCharArray.kt");
+        }
+
+        @TestMetadata("iteratorDoubleArray.kt")
+        public void testIteratorDoubleArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorDoubleArray.kt");
+        }
+
+        @TestMetadata("iteratorFloatArray.kt")
+        public void testIteratorFloatArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorFloatArray.kt");
+        }
+
+        @TestMetadata("iteratorIntArray.kt")
+        public void testIteratorIntArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorIntArray.kt");
+        }
+
+        @TestMetadata("iteratorLongArray.kt")
+        public void testIteratorLongArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorLongArray.kt");
+        }
+
+        @TestMetadata("iteratorLongArrayNextLong.kt")
+        public void testIteratorLongArrayNextLong() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorLongArrayNextLong.kt");
+        }
+
+        @TestMetadata("iteratorShortArray.kt")
+        public void testIteratorShortArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/iteratorShortArray.kt");
+        }
+
+        @TestMetadata("kt1291.kt")
+        public void testKt1291() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt1291.kt");
+        }
+
+        @TestMetadata("kt238.kt")
+        public void testKt238() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt238.kt");
+        }
+
+        @TestMetadata("kt3771.kt")
+        public void testKt3771() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt3771.kt");
+        }
+
+        @TestMetadata("kt4118.kt")
+        public void testKt4118() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt4118.kt");
+        }
+
+        @TestMetadata("kt4348.kt")
+        public void testKt4348() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt4348.kt");
+        }
+
+        @TestMetadata("kt4357.kt")
+        public void testKt4357() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt4357.kt");
+        }
+
+        @TestMetadata("kt7009.kt")
+        public void testKt7009() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt7009.kt");
+        }
+
+        @TestMetadata("kt7288.kt")
+        public void testKt7288() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt7288.kt");
+        }
+
+        @TestMetadata("kt779.kt")
+        public void testKt779() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt779.kt");
+        }
+
+        @TestMetadata("kt945.kt")
+        public void testKt945() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/kt945.kt");
+        }
+
+        @TestMetadata("longAsIndex.kt")
+        public void testLongAsIndex() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/longAsIndex.kt");
+        }
+
+        @TestMetadata("nonNullArray.kt")
+        public void testNonNullArray() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/nonNullArray.kt");
+        }
+
+        @TestMetadata("stdlib.kt")
+        public void testStdlib() throws Exception {
+            runTest("compiler/testData/codegen/box/arrays/stdlib.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/arrays/arraysOfInlineClass")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ArraysOfInlineClass extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            @TestMetadata("accessArrayOfInlineClass.kt")
+            public void testAccessArrayOfInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/arraysOfInlineClass/accessArrayOfInlineClass.kt");
+            }
+
+            @TestMetadata("accessArrayOfUnsigned.kt")
+            public void testAccessArrayOfUnsigned() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/arraysOfInlineClass/accessArrayOfUnsigned.kt");
+            }
+
+            public void testAllFilesPresentInArraysOfInlineClass() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/arrays/arraysOfInlineClass"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("arrayOfInlineClassOfArrayOfInlineClass.kt")
+            public void testArrayOfInlineClassOfArrayOfInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/arraysOfInlineClass/arrayOfInlineClassOfArrayOfInlineClass.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/arrays/forInReversed")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInReversed extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInReversed() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/arrays/forInReversed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("reversedArrayOriginalUpdatedInLoopBody.kt")
+            public void testReversedArrayOriginalUpdatedInLoopBody() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/forInReversed/reversedArrayOriginalUpdatedInLoopBody.kt");
+            }
+
+            @TestMetadata("reversedArrayReversedArrayOriginalUpdatedInLoopBody.kt")
+            public void testReversedArrayReversedArrayOriginalUpdatedInLoopBody() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/forInReversed/reversedArrayReversedArrayOriginalUpdatedInLoopBody.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/arrays/multiDecl")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MultiDecl extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMultiDecl() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/arrays/multiDecl"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("kt15560.kt")
+            public void testKt15560() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/multiDecl/kt15560.kt");
+            }
+
+            @TestMetadata("kt15568.kt")
+            public void testKt15568() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/multiDecl/kt15568.kt");
+            }
+
+            @TestMetadata("kt15575.kt")
+            public void testKt15575() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/multiDecl/kt15575.kt");
+            }
+
+            @TestMetadata("MultiDeclFor.kt")
+            public void testMultiDeclFor() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclFor.kt");
+            }
+
+            @TestMetadata("MultiDeclForComponentExtensions.kt")
+            public void testMultiDeclForComponentExtensions() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentExtensions.kt");
+            }
+
+            @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+            public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentMemberExtensions.kt");
+            }
+
+            @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+            public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+            }
+
+            @TestMetadata("MultiDeclForValCaptured.kt")
+            public void testMultiDeclForValCaptured() throws Exception {
+                runTest("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForValCaptured.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/arrays/multiDecl/int")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Int extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInt() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/arrays/multiDecl/int"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensions.kt")
+                public void testMultiDeclForComponentExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                    runTest("compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentMemberExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/arrays/multiDecl/long")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Long extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInLong() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/arrays/multiDecl/long"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensions.kt")
+                public void testMultiDeclForComponentExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                    runTest("compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentMemberExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                }
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/assert")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Assert extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInAssert() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/assert/jvm")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Jvm extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception {
+                KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInJvm() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/binaryOp")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class BinaryOp extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInBinaryOp() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/binaryOp"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("bitwiseOp.kt")
+        public void testBitwiseOp() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/bitwiseOp.kt");
+        }
+
+        @TestMetadata("bitwiseOpAny.kt")
+        public void testBitwiseOpAny() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/bitwiseOpAny.kt");
+        }
+
+        @TestMetadata("bitwiseOpNullable.kt")
+        public void testBitwiseOpNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/bitwiseOpNullable.kt");
+        }
+
+        @TestMetadata("call.kt")
+        public void testCall() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/call.kt");
+        }
+
+        @TestMetadata("callAny.kt")
+        public void testCallAny() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/callAny.kt");
+        }
+
+        @TestMetadata("callNullable.kt")
+        public void testCallNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/callNullable.kt");
+        }
+
+        @TestMetadata("compareBoxedChars.kt")
+        public void testCompareBoxedChars() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/compareBoxedChars.kt");
+        }
+
+        @TestMetadata("eqNullableDoubles.kt")
+        public void testEqNullableDoubles() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/eqNullableDoubles.kt");
+        }
+
+        @TestMetadata("eqNullableDoublesToInt.kt")
+        public void testEqNullableDoublesToInt() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/eqNullableDoublesToInt.kt");
+        }
+
+        @TestMetadata("eqNullableDoublesToIntWithTP.kt")
+        public void testEqNullableDoublesToIntWithTP() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/eqNullableDoublesToIntWithTP.kt");
+        }
+
+        @TestMetadata("eqNullableDoublesWithTP.kt")
+        public void testEqNullableDoublesWithTP() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/eqNullableDoublesWithTP.kt");
+        }
+
+        @TestMetadata("intrinsic.kt")
+        public void testIntrinsic() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/intrinsic.kt");
+        }
+
+        @TestMetadata("intrinsicAny.kt")
+        public void testIntrinsicAny() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/intrinsicAny.kt");
+        }
+
+        @TestMetadata("intrinsicNullable.kt")
+        public void testIntrinsicNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt");
+        }
+
+        @TestMetadata("kt11163.kt")
+        public void testKt11163() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/kt11163.kt");
+        }
+
+        @TestMetadata("kt11163_properIeee754comparisons.kt")
+        public void testKt11163_properIeee754comparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/kt11163_properIeee754comparisons.kt");
+        }
+
+        @TestMetadata("kt23030_properIeee754comparisons.kt")
+        public void testKt23030_properIeee754comparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/kt23030_properIeee754comparisons.kt");
+        }
+
+        @TestMetadata("kt6747_identityEquals.kt")
+        public void testKt6747_identityEquals() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/kt6747_identityEquals.kt");
+        }
+
+        @TestMetadata("overflowChar.kt")
+        public void testOverflowChar() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/overflowChar.kt");
+        }
+
+        @TestMetadata("overflowInt.kt")
+        public void testOverflowInt() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/overflowInt.kt");
+        }
+
+        @TestMetadata("overflowLong.kt")
+        public void testOverflowLong() throws Exception {
+            runTest("compiler/testData/codegen/box/binaryOp/overflowLong.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/boxingOptimization")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class BoxingOptimization extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInBoxingOptimization() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/boxingOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("boxedIntegersCmp.kt")
+        public void testBoxedIntegersCmp() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/boxedIntegersCmp.kt");
+        }
+
+        @TestMetadata("boxedPrimitivesAreEqual.kt")
+        public void testBoxedPrimitivesAreEqual() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/boxedPrimitivesAreEqual.kt");
+        }
+
+        @TestMetadata("boxedRealsCmp.kt")
+        public void testBoxedRealsCmp() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/boxedRealsCmp.kt");
+        }
+
+        @TestMetadata("casts.kt")
+        public void testCasts() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/casts.kt");
+        }
+
+        @TestMetadata("explicitEqualsOnDouble.kt")
+        public void testExplicitEqualsOnDouble() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/explicitEqualsOnDouble.kt");
+        }
+
+        @TestMetadata("fold.kt")
+        public void testFold() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/fold.kt");
+        }
+
+        @TestMetadata("foldRange.kt")
+        public void testFoldRange() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/foldRange.kt");
+        }
+
+        @TestMetadata("intCompareTo.kt")
+        public void testIntCompareTo() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/intCompareTo.kt");
+        }
+
+        @TestMetadata("kt15871.kt")
+        public void testKt15871() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/kt15871.kt");
+        }
+
+        @TestMetadata("kt19767.kt")
+        public void testKt19767() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/kt19767.kt");
+        }
+
+        @TestMetadata("kt19767_2.kt")
+        public void testKt19767_2() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/kt19767_2.kt");
+        }
+
+        @TestMetadata("kt19767_chain.kt")
+        public void testKt19767_chain() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/kt19767_chain.kt");
+        }
+
+        @TestMetadata("kt5588.kt")
+        public void testKt5588() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/kt5588.kt");
+        }
+
+        @TestMetadata("kt5844.kt")
+        public void testKt5844() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/kt5844.kt");
+        }
+
+        @TestMetadata("maxMinByOrNull.kt")
+        public void testMaxMinByOrNull() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/maxMinByOrNull.kt");
+        }
+
+        @TestMetadata("nullCheck.kt")
+        public void testNullCheck() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/nullCheck.kt");
+        }
+
+        @TestMetadata("safeCallWithElvis.kt")
+        public void testSafeCallWithElvis() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/safeCallWithElvis.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/simple.kt");
+        }
+
+        @TestMetadata("simpleUninitializedMerge.kt")
+        public void testSimpleUninitializedMerge() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/simpleUninitializedMerge.kt");
+        }
+
+        @TestMetadata("taintedValues.kt")
+        public void testTaintedValues() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/taintedValues.kt");
+        }
+
+        @TestMetadata("taintedValuesBox.kt")
+        public void testTaintedValuesBox() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/taintedValuesBox.kt");
+        }
+
+        @TestMetadata("unsafeRemoving.kt")
+        public void testUnsafeRemoving() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/unsafeRemoving.kt");
+        }
+
+        @TestMetadata("variables.kt")
+        public void testVariables() throws Exception {
+            runTest("compiler/testData/codegen/box/boxingOptimization/variables.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/bridges")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Bridges extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        @TestMetadata("abstractOverrideBridge.kt")
+        public void testAbstractOverrideBridge() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/abstractOverrideBridge.kt");
+        }
+
+        public void testAllFilesPresentInBridges() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/bridges"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("complexMultiInheritance.kt")
+        public void testComplexMultiInheritance() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/complexMultiInheritance.kt");
+        }
+
+        @TestMetadata("covariantGenericDiamond.kt")
+        public void testCovariantGenericDiamond() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/covariantGenericDiamond.kt");
+        }
+
+        @TestMetadata("delegation.kt")
+        public void testDelegation() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/delegation.kt");
+        }
+
+        @TestMetadata("delegationComplex.kt")
+        public void testDelegationComplex() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/delegationComplex.kt");
+        }
+
+        @TestMetadata("delegationComplexWithList.kt")
+        public void testDelegationComplexWithList() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/delegationComplexWithList.kt");
+        }
+
+        @TestMetadata("delegationProperty.kt")
+        public void testDelegationProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/delegationProperty.kt");
+        }
+
+        @TestMetadata("diamond.kt")
+        public void testDiamond() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/diamond.kt");
+        }
+
+        @TestMetadata("fakeCovariantOverride.kt")
+        public void testFakeCovariantOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/fakeCovariantOverride.kt");
+        }
+
+        @TestMetadata("fakeGenericCovariantOverrideWithDelegation.kt")
+        public void testFakeGenericCovariantOverrideWithDelegation() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverrideWithDelegation.kt");
+        }
+
+        @TestMetadata("fakeOverrideFromInterfaceThroughIntermediateClass.kt")
+        public void testFakeOverrideFromInterfaceThroughIntermediateClass() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/fakeOverrideFromInterfaceThroughIntermediateClass.kt");
+        }
+
+        @TestMetadata("fakeOverrideMultiFile.kt")
+        public void testFakeOverrideMultiFile() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/fakeOverrideMultiFile.kt");
+        }
+
+        @TestMetadata("fakeOverrideOfTraitImpl.kt")
+        public void testFakeOverrideOfTraitImpl() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/fakeOverrideOfTraitImpl.kt");
+        }
+
+        @TestMetadata("fakeOverrideWithSeveralSuperDeclarations.kt")
+        public void testFakeOverrideWithSeveralSuperDeclarations() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/fakeOverrideWithSeveralSuperDeclarations.kt");
+        }
+
+        @TestMetadata("fakeOverrideWithSynthesizedImplementation.kt")
+        public void testFakeOverrideWithSynthesizedImplementation() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/fakeOverrideWithSynthesizedImplementation.kt");
+        }
+
+        @TestMetadata("genericProperty.kt")
+        public void testGenericProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/genericProperty.kt");
+        }
+
+        @TestMetadata("innerClassTypeParameters.kt")
+        public void testInnerClassTypeParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/innerClassTypeParameters.kt");
+        }
+
+        @TestMetadata("kt12416.kt")
+        public void testKt12416() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt12416.kt");
+        }
+
+        @TestMetadata("kt1939.kt")
+        public void testKt1939() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt1939.kt");
+        }
+
+        @TestMetadata("kt1959.kt")
+        public void testKt1959() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt1959.kt");
+        }
+
+        @TestMetadata("kt2702.kt")
+        public void testKt2702() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt2702.kt");
+        }
+
+        @TestMetadata("kt2833.kt")
+        public void testKt2833() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt2833.kt");
+        }
+
+        @TestMetadata("kt2920.kt")
+        public void testKt2920() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt2920.kt");
+        }
+
+        @TestMetadata("kt318.kt")
+        public void testKt318() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt318.kt");
+        }
+
+        @TestMetadata("kt42137.kt")
+        public void testKt42137() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt42137.kt");
+        }
+
+        @TestMetadata("longChainOneBridge.kt")
+        public void testLongChainOneBridge() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
+        }
+
+        @TestMetadata("manyTypeArgumentsSubstitutedSuccessively.kt")
+        public void testManyTypeArgumentsSubstitutedSuccessively() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt");
+        }
+
+        @TestMetadata("methodFromTrait.kt")
+        public void testMethodFromTrait() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
+        }
+
+        @TestMetadata("overrideAbstractProperty.kt")
+        public void testOverrideAbstractProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt");
+        }
+
+        @TestMetadata("overrideReturnType.kt")
+        public void testOverrideReturnType() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/overrideReturnType.kt");
+        }
+
+        @TestMetadata("propertyAccessorsWithoutBody.kt")
+        public void testPropertyAccessorsWithoutBody() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt");
+        }
+
+        @TestMetadata("propertyDiamond.kt")
+        public void testPropertyDiamond() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/propertyDiamond.kt");
+        }
+
+        @TestMetadata("propertyDiamondFakeOverride.kt")
+        public void testPropertyDiamondFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/propertyDiamondFakeOverride.kt");
+        }
+
+        @TestMetadata("propertyInConstructor.kt")
+        public void testPropertyInConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/propertyInConstructor.kt");
+        }
+
+        @TestMetadata("propertySetter.kt")
+        public void testPropertySetter() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/propertySetter.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/simple.kt");
+        }
+
+        @TestMetadata("simpleEnum.kt")
+        public void testSimpleEnum() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/simpleEnum.kt");
+        }
+
+        @TestMetadata("simpleGenericMethod.kt")
+        public void testSimpleGenericMethod() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/simpleGenericMethod.kt");
+        }
+
+        @TestMetadata("simpleObject.kt")
+        public void testSimpleObject() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/simpleObject.kt");
+        }
+
+        @TestMetadata("simpleReturnType.kt")
+        public void testSimpleReturnType() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/simpleReturnType.kt");
+        }
+
+        @TestMetadata("simpleTraitImpl.kt")
+        public void testSimpleTraitImpl() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/simpleTraitImpl.kt");
+        }
+
+        @TestMetadata("simpleUpperBound.kt")
+        public void testSimpleUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/simpleUpperBound.kt");
+        }
+
+        @TestMetadata("strListContains.kt")
+        public void testStrListContains() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/strListContains.kt");
+        }
+
+        @TestMetadata("traitImplInheritsTraitImpl.kt")
+        public void testTraitImplInheritsTraitImpl() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/traitImplInheritsTraitImpl.kt");
+        }
+
+        @TestMetadata("twoParentsWithDifferentMethodsTwoBridges.kt")
+        public void testTwoParentsWithDifferentMethodsTwoBridges() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt");
+        }
+
+        @TestMetadata("twoParentsWithDifferentMethodsTwoBridges2.kt")
+        public void testTwoParentsWithDifferentMethodsTwoBridges2() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges2.kt");
+        }
+
+        @TestMetadata("twoParentsWithTheSameMethodOneBridge.kt")
+        public void testTwoParentsWithTheSameMethodOneBridge() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt");
+        }
+
+        @TestMetadata("typeParameterInExtensionReceiver.kt")
+        public void testTypeParameterInExtensionReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/typeParameterInExtensionReceiver.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class SubstitutionInSuperClass extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            @TestMetadata("abstractFun.kt")
+            public void testAbstractFun() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/abstractFun.kt");
+            }
+
+            public void testAllFilesPresentInSubstitutionInSuperClass() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/bridges/substitutionInSuperClass"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("boundedTypeArguments.kt")
+            public void testBoundedTypeArguments() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/boundedTypeArguments.kt");
+            }
+
+            @TestMetadata("delegation.kt")
+            public void testDelegation() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/delegation.kt");
+            }
+
+            @TestMetadata("differentErasureInSuperClass.kt")
+            public void testDifferentErasureInSuperClass() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/differentErasureInSuperClass.kt");
+            }
+
+            @TestMetadata("enum.kt")
+            public void testEnum() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt");
+            }
+
+            @TestMetadata("genericMethod.kt")
+            public void testGenericMethod() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/genericMethod.kt");
+            }
+
+            @TestMetadata("object.kt")
+            public void testObject() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt");
+            }
+
+            @TestMetadata("property.kt")
+            public void testProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/property.kt");
+            }
+
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/simple.kt");
+            }
+
+            @TestMetadata("upperBound.kt")
+            public void testUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/upperBound.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/builderInference")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class BuilderInference extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInBuilderInference() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("kt41164.kt")
+        public void testKt41164() throws Exception {
+            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
+        }
+
+        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+        }
+
+        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class BuiltinStubMethods extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInBuiltinStubMethods() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("customReadOnlyIterator.kt")
+        public void testCustomReadOnlyIterator() throws Exception {
+            runTest("compiler/testData/codegen/box/builtinStubMethods/customReadOnlyIterator.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ExtendJavaCollections extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInExtendJavaCollections() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MapGetOrDefault extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMapGetOrDefault() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/mapGetOrDefault"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/builtinStubMethods/mapRemove")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MapRemove extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMapRemove() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/mapRemove"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/callableReference")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class CallableReference extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInCallableReference() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("kt37604.kt")
+        public void testKt37604() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt37604.kt");
+        }
+
+        @TestMetadata("nested.kt")
+        public void testNested() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/nested.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/callableReference/adaptedReferences")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class AdaptedReferences extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInAdaptedReferences() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/adaptedReferences"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("defaultWithGenericExpectedType.kt")
+            public void testDefaultWithGenericExpectedType() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt");
+            }
+
+            @TestMetadata("inlineVarargAndDefault.kt")
+            public void testInlineVarargAndDefault() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt");
+            }
+
+            @TestMetadata("inlineVarargInts.kt")
+            public void testInlineVarargInts() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt");
+            }
+
+            @TestMetadata("localFunctionWithDefault.kt")
+            public void testLocalFunctionWithDefault() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt");
+            }
+
+            @TestMetadata("manyDefaultsAndVararg.kt")
+            public void testManyDefaultsAndVararg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt");
+            }
+
+            @TestMetadata("simpleDefaultArgument.kt")
+            public void testSimpleDefaultArgument() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt");
+            }
+
+            @TestMetadata("simpleEmptyVararg.kt")
+            public void testSimpleEmptyVararg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt");
+            }
+
+            @TestMetadata("varargViewedAsArray.kt")
+            public void testVarargViewedAsArray() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt");
+            }
+
+            @TestMetadata("varargWithDefaultValue.kt")
+            public void testVarargWithDefaultValue() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class SuspendConversion extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInSuspendConversion() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/adaptedReferences/suspendConversion"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/callableReference/bound")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Bound extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBound() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/bound"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("captureVarInInitBlock.kt")
+            public void testCaptureVarInInitBlock() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/bound/captureVarInInitBlock.kt");
+            }
+
+            @TestMetadata("captureVarInPropertyInit.kt")
+            public void testCaptureVarInPropertyInit() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/bound/captureVarInPropertyInit.kt");
+            }
+
+            @TestMetadata("smartCastForExtensionReceiver.kt")
+            public void testSmartCastForExtensionReceiver() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/bound/smartCastForExtensionReceiver.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/callableReference/bound/equals")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Equals extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInEquals() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/bound/equals"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/callableReference/equality")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Equality extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEquality() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/equality"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("extensionReceiverVsDefault.kt")
+            public void testExtensionReceiverVsDefault() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/equality/extensionReceiverVsDefault.kt");
+            }
+
+            @TestMetadata("varargAsArrayMemberOrExtension.kt")
+            public void testVarargAsArrayMemberOrExtension() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayMemberOrExtension.kt");
+            }
+
+            @TestMetadata("varargAsArrayWithDefaults.kt")
+            public void testVarargAsArrayWithDefaults() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayWithDefaults.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/callableReference/function")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Function extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            @TestMetadata("abstractClassMember.kt")
+            public void testAbstractClassMember() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/abstractClassMember.kt");
+            }
+
+            public void testAllFilesPresentInFunction() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/function"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("booleanNotIntrinsic.kt")
+            public void testBooleanNotIntrinsic() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/booleanNotIntrinsic.kt");
+            }
+
+            @TestMetadata("classMemberFromClass.kt")
+            public void testClassMemberFromClass() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/classMemberFromClass.kt");
+            }
+
+            @TestMetadata("classMemberFromExtension.kt")
+            public void testClassMemberFromExtension() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/classMemberFromExtension.kt");
+            }
+
+            @TestMetadata("classMemberFromTopLevelStringNoArgs.kt")
+            public void testClassMemberFromTopLevelStringNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelStringNoArgs.kt");
+            }
+
+            @TestMetadata("classMemberFromTopLevelStringOneStringArg.kt")
+            public void testClassMemberFromTopLevelStringOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt");
+            }
+
+            @TestMetadata("classMemberFromTopLevelUnitNoArgs.kt")
+            public void testClassMemberFromTopLevelUnitNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt");
+            }
+
+            @TestMetadata("classMemberFromTopLevelUnitOneStringArg.kt")
+            public void testClassMemberFromTopLevelUnitOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt");
+            }
+
+            @TestMetadata("coercionToUnit.kt")
+            public void testCoercionToUnit() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/coercionToUnit.kt");
+            }
+
+            @TestMetadata("constructorFromTopLevelNoArgs.kt")
+            public void testConstructorFromTopLevelNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/constructorFromTopLevelNoArgs.kt");
+            }
+
+            @TestMetadata("constructorFromTopLevelOneStringArg.kt")
+            public void testConstructorFromTopLevelOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/constructorFromTopLevelOneStringArg.kt");
+            }
+
+            @TestMetadata("enumValueOfMethod.kt")
+            public void testEnumValueOfMethod() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/enumValueOfMethod.kt");
+            }
+
+            @TestMetadata("equalsIntrinsic.kt")
+            public void testEqualsIntrinsic() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/equalsIntrinsic.kt");
+            }
+
+            @TestMetadata("extensionFromClass.kt")
+            public void testExtensionFromClass() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/extensionFromClass.kt");
+            }
+
+            @TestMetadata("extensionFromExtension.kt")
+            public void testExtensionFromExtension() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/extensionFromExtension.kt");
+            }
+
+            @TestMetadata("extensionFromTopLevelStringNoArgs.kt")
+            public void testExtensionFromTopLevelStringNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelStringNoArgs.kt");
+            }
+
+            @TestMetadata("extensionFromTopLevelStringOneStringArg.kt")
+            public void testExtensionFromTopLevelStringOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelStringOneStringArg.kt");
+            }
+
+            @TestMetadata("extensionFromTopLevelUnitNoArgs.kt")
+            public void testExtensionFromTopLevelUnitNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelUnitNoArgs.kt");
+            }
+
+            @TestMetadata("extensionFromTopLevelUnitOneStringArg.kt")
+            public void testExtensionFromTopLevelUnitOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt");
+            }
+
+            @TestMetadata("genericMember.kt")
+            public void testGenericMember() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/genericMember.kt");
+            }
+
+            @TestMetadata("innerConstructorFromClass.kt")
+            public void testInnerConstructorFromClass() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/innerConstructorFromClass.kt");
+            }
+
+            @TestMetadata("innerConstructorFromExtension.kt")
+            public void testInnerConstructorFromExtension() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/innerConstructorFromExtension.kt");
+            }
+
+            @TestMetadata("innerConstructorFromTopLevelNoArgs.kt")
+            public void testInnerConstructorFromTopLevelNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/innerConstructorFromTopLevelNoArgs.kt");
+            }
+
+            @TestMetadata("innerConstructorFromTopLevelOneStringArg.kt")
+            public void testInnerConstructorFromTopLevelOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt");
+            }
+
+            @TestMetadata("kt32462.kt")
+            public void testKt32462() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
+            }
+
+            @TestMetadata("nestedConstructorFromClass.kt")
+            public void testNestedConstructorFromClass() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt");
+            }
+
+            @TestMetadata("nestedConstructorFromTopLevelNoArgs.kt")
+            public void testNestedConstructorFromTopLevelNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt");
+            }
+
+            @TestMetadata("nestedConstructorFromTopLevelOneStringArg.kt")
+            public void testNestedConstructorFromTopLevelOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt");
+            }
+
+            @TestMetadata("newArray.kt")
+            public void testNewArray() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/newArray.kt");
+            }
+
+            @TestMetadata("overloadedFun.kt")
+            public void testOverloadedFun() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/overloadedFun.kt");
+            }
+
+            @TestMetadata("privateClassMember.kt")
+            public void testPrivateClassMember() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/privateClassMember.kt");
+            }
+
+            @TestMetadata("specialCalls.kt")
+            public void testSpecialCalls() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/specialCalls.kt");
+            }
+
+            @TestMetadata("topLevelFromClass.kt")
+            public void testTopLevelFromClass() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/topLevelFromClass.kt");
+            }
+
+            @TestMetadata("topLevelFromExtension.kt")
+            public void testTopLevelFromExtension() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/topLevelFromExtension.kt");
+            }
+
+            @TestMetadata("topLevelFromTopLevelStringNoArgs.kt")
+            public void testTopLevelFromTopLevelStringNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelStringNoArgs.kt");
+            }
+
+            @TestMetadata("topLevelFromTopLevelStringOneStringArg.kt")
+            public void testTopLevelFromTopLevelStringOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt");
+            }
+
+            @TestMetadata("topLevelFromTopLevelUnitNoArgs.kt")
+            public void testTopLevelFromTopLevelUnitNoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt");
+            }
+
+            @TestMetadata("topLevelFromTopLevelUnitOneStringArg.kt")
+            public void testTopLevelFromTopLevelUnitOneStringArg() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt");
+            }
+
+            @TestMetadata("traitImplMethodWithClassReceiver.kt")
+            public void testTraitImplMethodWithClassReceiver() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/traitImplMethodWithClassReceiver.kt");
+            }
+
+            @TestMetadata("traitMember.kt")
+            public void testTraitMember() throws Exception {
+                runTest("compiler/testData/codegen/box/callableReference/function/traitMember.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/callableReference/function/local")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Local extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInLocal() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/function/local"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("captureOuter.kt")
+                public void testCaptureOuter() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/captureOuter.kt");
+                }
+
+                @TestMetadata("classMember.kt")
+                public void testClassMember() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/classMember.kt");
+                }
+
+                @TestMetadata("closureWithSideEffect.kt")
+                public void testClosureWithSideEffect() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/closureWithSideEffect.kt");
+                }
+
+                @TestMetadata("constructor.kt")
+                public void testConstructor() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/constructor.kt");
+                }
+
+                @TestMetadata("constructorWithInitializer.kt")
+                public void testConstructorWithInitializer() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/constructorWithInitializer.kt");
+                }
+
+                @TestMetadata("enumExtendsTrait.kt")
+                public void testEnumExtendsTrait() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/enumExtendsTrait.kt");
+                }
+
+                @TestMetadata("extension.kt")
+                public void testExtension() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/extension.kt");
+                }
+
+                @TestMetadata("extensionToLocalClass.kt")
+                public void testExtensionToLocalClass() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/extensionToLocalClass.kt");
+                }
+
+                @TestMetadata("extensionToPrimitive.kt")
+                public void testExtensionToPrimitive() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/extensionToPrimitive.kt");
+                }
+
+                @TestMetadata("extensionWithClosure.kt")
+                public void testExtensionWithClosure() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/extensionWithClosure.kt");
+                }
+
+                @TestMetadata("genericMember.kt")
+                public void testGenericMember() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/genericMember.kt");
+                }
+
+                @TestMetadata("localClassMember.kt")
+                public void testLocalClassMember() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/localClassMember.kt");
+                }
+
+                @TestMetadata("localLocal.kt")
+                public void testLocalLocal() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/localLocal.kt");
+                }
+
+                @TestMetadata("recursiveClosure.kt")
+                public void testRecursiveClosure() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/recursiveClosure.kt");
+                }
+
+                @TestMetadata("simple.kt")
+                public void testSimple() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/simple.kt");
+                }
+
+                @TestMetadata("simpleClosure.kt")
+                public void testSimpleClosure() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/simpleClosure.kt");
+                }
+
+                @TestMetadata("simpleWithArg.kt")
+                public void testSimpleWithArg() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/simpleWithArg.kt");
+                }
+
+                @TestMetadata("unitWithSideEffect.kt")
+                public void testUnitWithSideEffect() throws Exception {
+                    runTest("compiler/testData/codegen/box/callableReference/function/local/unitWithSideEffect.kt");
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/callableReference/property")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Property extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInProperty() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/property"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/callableReference/serializability")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Serializability extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInSerializability() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/casts")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Casts extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInCasts() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/casts"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("asSafeFail.kt")
+        public void testAsSafeFail() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/asSafeFail.kt");
+        }
+
+        @TestMetadata("asSafeForConstants.kt")
+        public void testAsSafeForConstants() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/asSafeForConstants.kt");
+        }
+
+        @TestMetadata("asUnit.kt")
+        public void testAsUnit() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/asUnit.kt");
+        }
+
+        @TestMetadata("intersectionTypeMultipleBounds.kt")
+        public void testIntersectionTypeMultipleBounds() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/intersectionTypeMultipleBounds.kt");
+        }
+
+        @TestMetadata("intersectionTypeMultipleBoundsImplicitReceiver.kt")
+        public void testIntersectionTypeMultipleBoundsImplicitReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/intersectionTypeMultipleBoundsImplicitReceiver.kt");
+        }
+
+        @TestMetadata("intersectionTypeSmartcast.kt")
+        public void testIntersectionTypeSmartcast() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt");
+        }
+
+        @TestMetadata("intersectionTypeWithMultipleBoundsAsReceiver.kt")
+        public void testIntersectionTypeWithMultipleBoundsAsReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/intersectionTypeWithMultipleBoundsAsReceiver.kt");
+        }
+
+        @TestMetadata("intersectionTypeWithoutGenericsAsReceiver.kt")
+        public void testIntersectionTypeWithoutGenericsAsReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/intersectionTypeWithoutGenericsAsReceiver.kt");
+        }
+
+        @TestMetadata("isNullablePrimitive.kt")
+        public void testIsNullablePrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/isNullablePrimitive.kt");
+        }
+
+        @TestMetadata("kt22714.kt")
+        public void testKt22714() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/kt22714.kt");
+        }
+
+        @TestMetadata("lambdaToUnitCast.kt")
+        public void testLambdaToUnitCast() throws Exception {
+            runTest("compiler/testData/codegen/box/casts/lambdaToUnitCast.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/casts/functions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Functions extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInFunctions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/casts/functions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/casts/javaInterop")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class JavaInterop extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInJavaInterop() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/casts/javaInterop"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class LiteralExpressionAsGenericArgument extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInLiteralExpressionAsGenericArgument() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("binaryExpressionCast.kt")
+            public void testBinaryExpressionCast() throws Exception {
+                runTest("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/binaryExpressionCast.kt");
+            }
+
+            @TestMetadata("labeledExpressionCast.kt")
+            public void testLabeledExpressionCast() throws Exception {
+                runTest("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/labeledExpressionCast.kt");
+            }
+
+            @TestMetadata("parenthesizedExpressionCast.kt")
+            public void testParenthesizedExpressionCast() throws Exception {
+                runTest("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.kt");
+            }
+
+            @TestMetadata("superConstructor.kt")
+            public void testSuperConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/superConstructor.kt");
+            }
+
+            @TestMetadata("unaryExpressionCast.kt")
+            public void testUnaryExpressionCast() throws Exception {
+                runTest("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/unaryExpressionCast.kt");
+            }
+
+            @TestMetadata("vararg.kt")
+            public void testVararg() throws Exception {
+                runTest("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/vararg.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/casts/mutableCollections")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MutableCollections extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMutableCollections() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/casts/mutableCollections"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/checkcastOptimization")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class CheckcastOptimization extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInCheckcastOptimization() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/checkcastOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("kt19128.kt")
+        public void testKt19128() throws Exception {
+            runTest("compiler/testData/codegen/box/checkcastOptimization/kt19128.kt");
+        }
+
+        @TestMetadata("kt19246.kt")
+        public void testKt19246() throws Exception {
+            runTest("compiler/testData/codegen/box/checkcastOptimization/kt19246.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/classes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Classes extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/classes"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("boxPrimitiveTypeInClinitOfClassObject.kt")
+        public void testBoxPrimitiveTypeInClinitOfClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt");
+        }
+
+        @TestMetadata("classNamedAsOldPackageFacade.kt")
+        public void testClassNamedAsOldPackageFacade() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/classNamedAsOldPackageFacade.kt");
+        }
+
+        @TestMetadata("classObject.kt")
+        public void testClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/classObject.kt");
+        }
+
+        @TestMetadata("classObjectAsExtensionReceiver.kt")
+        public void testClassObjectAsExtensionReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt");
+        }
+
+        @TestMetadata("classObjectField.kt")
+        public void testClassObjectField() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/classObjectField.kt");
+        }
+
+        @TestMetadata("classObjectInTrait.kt")
+        public void testClassObjectInTrait() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/classObjectInTrait.kt");
+        }
+
+        @TestMetadata("classObjectNotOfEnum.kt")
+        public void testClassObjectNotOfEnum() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt");
+        }
+
+        @TestMetadata("classObjectWithPrivateGenericMember.kt")
+        public void testClassObjectWithPrivateGenericMember() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt");
+        }
+
+        @TestMetadata("classObjectsWithParentClasses.kt")
+        public void testClassObjectsWithParentClasses() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt");
+        }
+
+        @TestMetadata("defaultObjectSameNamesAsInOuter.kt")
+        public void testDefaultObjectSameNamesAsInOuter() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt");
+        }
+
+        @TestMetadata("delegateConstructorCallWithKeywords.kt")
+        public void testDelegateConstructorCallWithKeywords() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/delegateConstructorCallWithKeywords.kt");
+        }
+
+        @TestMetadata("delegation2.kt")
+        public void testDelegation2() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/delegation2.kt");
+        }
+
+        @TestMetadata("delegation3.kt")
+        public void testDelegation3() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/delegation3.kt");
+        }
+
+        @TestMetadata("delegation4.kt")
+        public void testDelegation4() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/delegation4.kt");
+        }
+
+        @TestMetadata("delegationGenericArg.kt")
+        public void testDelegationGenericArg() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/delegationGenericArg.kt");
+        }
+
+        @TestMetadata("delegationGenericArgUpperBound.kt")
+        public void testDelegationGenericArgUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/delegationGenericArgUpperBound.kt");
+        }
+
+        @TestMetadata("delegationGenericLongArg.kt")
+        public void testDelegationGenericLongArg() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/delegationGenericLongArg.kt");
+        }
+
+        @TestMetadata("delegationMethodsWithArgs.kt")
+        public void testDelegationMethodsWithArgs() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt");
+        }
+
+        @TestMetadata("exceptionConstructor.kt")
+        public void testExceptionConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/exceptionConstructor.kt");
+        }
+
+        @TestMetadata("extensionOnNamedClassObject.kt")
+        public void testExtensionOnNamedClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/extensionOnNamedClassObject.kt");
+        }
+
+        @TestMetadata("funDelegation.kt")
+        public void testFunDelegation() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/funDelegation.kt");
+        }
+
+        @TestMetadata("implementComparableInSubclass.kt")
+        public void testImplementComparableInSubclass() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/implementComparableInSubclass.kt");
+        }
+
+        @TestMetadata("inheritance.kt")
+        public void testInheritance() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/inheritance.kt");
+        }
+
+        @TestMetadata("inheritedInnerClass.kt")
+        public void testInheritedInnerClass() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/inheritedInnerClass.kt");
+        }
+
+        @TestMetadata("inheritedMethod.kt")
+        public void testInheritedMethod() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/inheritedMethod.kt");
+        }
+
+        @TestMetadata("initializerBlock.kt")
+        public void testInitializerBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/initializerBlock.kt");
+        }
+
+        @TestMetadata("initializerBlockResetToDefault.kt")
+        public void testInitializerBlockResetToDefault() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/initializerBlockResetToDefault.kt");
+        }
+
+        @TestMetadata("kt1018.kt")
+        public void testKt1018() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1018.kt");
+        }
+
+        @TestMetadata("kt1157.kt")
+        public void testKt1157() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1157.kt");
+        }
+
+        @TestMetadata("kt1247.kt")
+        public void testKt1247() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1247.kt");
+        }
+
+        @TestMetadata("kt1345.kt")
+        public void testKt1345() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1345.kt");
+        }
+
+        @TestMetadata("kt1439.kt")
+        public void testKt1439() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1439.kt");
+        }
+
+        @TestMetadata("kt1538.kt")
+        public void testKt1538() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1538.kt");
+        }
+
+        @TestMetadata("kt1578.kt")
+        public void testKt1578() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1578.kt");
+        }
+
+        @TestMetadata("kt1611.kt")
+        public void testKt1611() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1611.kt");
+        }
+
+        @TestMetadata("kt1721.kt")
+        public void testKt1721() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1721.kt");
+        }
+
+        @TestMetadata("kt1726.kt")
+        public void testKt1726() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1726.kt");
+        }
+
+        @TestMetadata("kt1759.kt")
+        public void testKt1759() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1759.kt");
+        }
+
+        @TestMetadata("kt1891.kt")
+        public void testKt1891() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1891.kt");
+        }
+
+        @TestMetadata("kt1976.kt")
+        public void testKt1976() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt1976.kt");
+        }
+
+        @TestMetadata("kt2224.kt")
+        public void testKt2224() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2224.kt");
+        }
+
+        @TestMetadata("kt2384.kt")
+        public void testKt2384() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2384.kt");
+        }
+
+        @TestMetadata("kt2390.kt")
+        public void testKt2390() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2390.kt");
+        }
+
+        @TestMetadata("kt2477.kt")
+        public void testKt2477() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2477.kt");
+        }
+
+        @TestMetadata("kt2480.kt")
+        public void testKt2480() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2480.kt");
+        }
+
+        @TestMetadata("kt2482.kt")
+        public void testKt2482() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2482.kt");
+        }
+
+        @TestMetadata("kt2485.kt")
+        public void testKt2485() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2485.kt");
+        }
+
+        @TestMetadata("kt249.kt")
+        public void testKt249() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt249.kt");
+        }
+
+        @TestMetadata("kt2532.kt")
+        public void testKt2532() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2532.kt");
+        }
+
+        @TestMetadata("kt2566.kt")
+        public void testKt2566() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2566.kt");
+        }
+
+        @TestMetadata("kt2566_2.kt")
+        public void testKt2566_2() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2566_2.kt");
+        }
+
+        @TestMetadata("kt2607.kt")
+        public void testKt2607() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2607.kt");
+        }
+
+        @TestMetadata("kt2626.kt")
+        public void testKt2626() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2626.kt");
+        }
+
+        @TestMetadata("kt2711.kt")
+        public void testKt2711() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2711.kt");
+        }
+
+        @TestMetadata("kt2784.kt")
+        public void testKt2784() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt2784.kt");
+        }
+
+        @TestMetadata("kt285.kt")
+        public void testKt285() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt285.kt");
+        }
+
+        @TestMetadata("kt3001.kt")
+        public void testKt3001() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt3001.kt");
+        }
+
+        @TestMetadata("kt3114.kt")
+        public void testKt3114() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt3114.kt");
+        }
+
+        @TestMetadata("kt3414.kt")
+        public void testKt3414() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt3414.kt");
+        }
+
+        @TestMetadata("kt3546.kt")
+        public void testKt3546() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt3546.kt");
+        }
+
+        @TestMetadata("kt40332.kt")
+        public void testKt40332() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt40332.kt");
+        }
+
+        @TestMetadata("kt454.kt")
+        public void testKt454() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt454.kt");
+        }
+
+        @TestMetadata("kt471.kt")
+        public void testKt471() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt471.kt");
+        }
+
+        @TestMetadata("kt48.kt")
+        public void testKt48() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt48.kt");
+        }
+
+        @TestMetadata("kt504.kt")
+        public void testKt504() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt504.kt");
+        }
+
+        @TestMetadata("kt5347.kt")
+        public void testKt5347() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt5347.kt");
+        }
+
+        @TestMetadata("kt6136.kt")
+        public void testKt6136() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt6136.kt");
+        }
+
+        @TestMetadata("kt633.kt")
+        public void testKt633() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt633.kt");
+        }
+
+        @TestMetadata("kt6816.kt")
+        public void testKt6816() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt6816.kt");
+        }
+
+        @TestMetadata("kt723.kt")
+        public void testKt723() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt723.kt");
+        }
+
+        @TestMetadata("kt725.kt")
+        public void testKt725() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt725.kt");
+        }
+
+        @TestMetadata("kt8011a.kt")
+        public void testKt8011a() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt8011a.kt");
+        }
+
+        @TestMetadata("kt940.kt")
+        public void testKt940() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt940.kt");
+        }
+
+        @TestMetadata("kt9642.kt")
+        public void testKt9642() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/kt9642.kt");
+        }
+
+        @TestMetadata("namedClassObject.kt")
+        public void testNamedClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
+        }
+
+        @TestMetadata("outerThis.kt")
+        public void testOuterThis() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/outerThis.kt");
+        }
+
+        @TestMetadata("privateOuterFunctions.kt")
+        public void testPrivateOuterFunctions() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/privateOuterFunctions.kt");
+        }
+
+        @TestMetadata("privateOuterProperty.kt")
+        public void testPrivateOuterProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/privateOuterProperty.kt");
+        }
+
+        @TestMetadata("privateToThis.kt")
+        public void testPrivateToThis() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/privateToThis.kt");
+        }
+
+        @TestMetadata("propertyDelegation.kt")
+        public void testPropertyDelegation() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/propertyDelegation.kt");
+        }
+
+        @TestMetadata("propertyInInitializer.kt")
+        public void testPropertyInInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/propertyInInitializer.kt");
+        }
+
+        @TestMetadata("rightHandOverride.kt")
+        public void testRightHandOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/rightHandOverride.kt");
+        }
+
+        @TestMetadata("sealedInSameFile.kt")
+        public void testSealedInSameFile() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/sealedInSameFile.kt");
+        }
+
+        @TestMetadata("selfcreate.kt")
+        public void testSelfcreate() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/selfcreate.kt");
+        }
+
+        @TestMetadata("simpleBox.kt")
+        public void testSimpleBox() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/simpleBox.kt");
+        }
+
+        @TestMetadata("superConstructorCallWithComplexArg.kt")
+        public void testSuperConstructorCallWithComplexArg() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/superConstructorCallWithComplexArg.kt");
+        }
+
+        @TestMetadata("typedDelegation.kt")
+        public void testTypedDelegation() throws Exception {
+            runTest("compiler/testData/codegen/box/classes/typedDelegation.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/classes/inner")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Inner extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInInner() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/classes/inner"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("extensionWithOuter.kt")
+            public void testExtensionWithOuter() throws Exception {
+                runTest("compiler/testData/codegen/box/classes/inner/extensionWithOuter.kt");
+            }
+
+            @TestMetadata("instantiateInDerived.kt")
+            public void testInstantiateInDerived() throws Exception {
+                runTest("compiler/testData/codegen/box/classes/inner/instantiateInDerived.kt");
+            }
+
+            @TestMetadata("instantiateInDerivedLabeled.kt")
+            public void testInstantiateInDerivedLabeled() throws Exception {
+                runTest("compiler/testData/codegen/box/classes/inner/instantiateInDerivedLabeled.kt");
+            }
+
+            @TestMetadata("instantiateInSameClass.kt")
+            public void testInstantiateInSameClass() throws Exception {
+                runTest("compiler/testData/codegen/box/classes/inner/instantiateInSameClass.kt");
+            }
+
+            @TestMetadata("kt6708.kt")
+            public void testKt6708() throws Exception {
+                runTest("compiler/testData/codegen/box/classes/inner/kt6708.kt");
+            }
+
+            @TestMetadata("properOuter.kt")
+            public void testProperOuter() throws Exception {
+                runTest("compiler/testData/codegen/box/classes/inner/properOuter.kt");
+            }
+
+            @TestMetadata("properSuperLinking.kt")
+            public void testProperSuperLinking() throws Exception {
+                runTest("compiler/testData/codegen/box/classes/inner/properSuperLinking.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/closures")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Closures extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInClosures() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("anonymousObjectAsLastExpressionInLambda.kt")
+        public void testAnonymousObjectAsLastExpressionInLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/anonymousObjectAsLastExpressionInLambda.kt");
+        }
+
+        @TestMetadata("captureExtensionReceiver.kt")
+        public void testCaptureExtensionReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/captureExtensionReceiver.kt");
+        }
+
+        @TestMetadata("captureExtensionReceiverX2.kt")
+        public void testCaptureExtensionReceiverX2() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/captureExtensionReceiverX2.kt");
+        }
+
+        @TestMetadata("capturedLocalGenericFun.kt")
+        public void testCapturedLocalGenericFun() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/capturedLocalGenericFun.kt");
+        }
+
+        @TestMetadata("closureInsideConstrucor.kt")
+        public void testClosureInsideConstrucor() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/closureInsideConstrucor.kt");
+        }
+
+        @TestMetadata("closureWithParameter.kt")
+        public void testClosureWithParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/closureWithParameter.kt");
+        }
+
+        @TestMetadata("closureWithParameterAndBoxing.kt")
+        public void testClosureWithParameterAndBoxing() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt");
+        }
+
+        @TestMetadata("crossinlineLocalDeclaration.kt")
+        public void testCrossinlineLocalDeclaration() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/crossinlineLocalDeclaration.kt");
+        }
+
+        @TestMetadata("doubleEnclosedLocalVariable.kt")
+        public void testDoubleEnclosedLocalVariable() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/doubleEnclosedLocalVariable.kt");
+        }
+
+        @TestMetadata("enclosingLocalVariable.kt")
+        public void testEnclosingLocalVariable() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/enclosingLocalVariable.kt");
+        }
+
+        @TestMetadata("enclosingThis.kt")
+        public void testEnclosingThis() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/enclosingThis.kt");
+        }
+
+        @TestMetadata("extensionClosure.kt")
+        public void testExtensionClosure() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/extensionClosure.kt");
+        }
+
+        @TestMetadata("kt10044.kt")
+        public void testKt10044() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt10044.kt");
+        }
+
+        @TestMetadata("kt11634.kt")
+        public void testKt11634() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt11634.kt");
+        }
+
+        @TestMetadata("kt11634_2.kt")
+        public void testKt11634_2() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt11634_2.kt");
+        }
+
+        @TestMetadata("kt11634_3.kt")
+        public void testKt11634_3() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt11634_3.kt");
+        }
+
+        @TestMetadata("kt11634_4.kt")
+        public void testKt11634_4() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt11634_4.kt");
+        }
+
+        @TestMetadata("kt19389.kt")
+        public void testKt19389() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt19389.kt");
+        }
+
+        @TestMetadata("kt19389_set.kt")
+        public void testKt19389_set() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt19389_set.kt");
+        }
+
+        @TestMetadata("kt2151.kt")
+        public void testKt2151() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt2151.kt");
+        }
+
+        @TestMetadata("kt3152.kt")
+        public void testKt3152() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt3152.kt");
+        }
+
+        @TestMetadata("kt3523.kt")
+        public void testKt3523() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt3523.kt");
+        }
+
+        @TestMetadata("kt3738.kt")
+        public void testKt3738() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt3738.kt");
+        }
+
+        @TestMetadata("kt3905.kt")
+        public void testKt3905() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt3905.kt");
+        }
+
+        @TestMetadata("kt4106.kt")
+        public void testKt4106() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt4106.kt");
+        }
+
+        @TestMetadata("kt4137.kt")
+        public void testKt4137() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt4137.kt");
+        }
+
+        @TestMetadata("kt5589.kt")
+        public void testKt5589() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/kt5589.kt");
+        }
+
+        @TestMetadata("localClassFunClosure.kt")
+        public void testLocalClassFunClosure() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localClassFunClosure.kt");
+        }
+
+        @TestMetadata("localClassLambdaClosure.kt")
+        public void testLocalClassLambdaClosure() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localClassLambdaClosure.kt");
+        }
+
+        @TestMetadata("localFunInInit.kt")
+        public void testLocalFunInInit() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localFunInInit.kt");
+        }
+
+        @TestMetadata("localFunctionInFunction.kt")
+        public void testLocalFunctionInFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localFunctionInFunction.kt");
+        }
+
+        @TestMetadata("localFunctionInInitBlock.kt")
+        public void testLocalFunctionInInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localFunctionInInitBlock.kt");
+        }
+
+        @TestMetadata("localFunctionInInitializer.kt")
+        public void testLocalFunctionInInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localFunctionInInitializer.kt");
+        }
+
+        @TestMetadata("localGenericFun.kt")
+        public void testLocalGenericFun() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localGenericFun.kt");
+        }
+
+        @TestMetadata("localReturn.kt")
+        public void testLocalReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localReturn.kt");
+        }
+
+        @TestMetadata("localReturnWithAutolabel.kt")
+        public void testLocalReturnWithAutolabel() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/localReturnWithAutolabel.kt");
+        }
+
+        @TestMetadata("recursiveClosure.kt")
+        public void testRecursiveClosure() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/recursiveClosure.kt");
+        }
+
+        @TestMetadata("simplestClosure.kt")
+        public void testSimplestClosure() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/simplestClosure.kt");
+        }
+
+        @TestMetadata("simplestClosureAndBoxing.kt")
+        public void testSimplestClosureAndBoxing() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/simplestClosureAndBoxing.kt");
+        }
+
+        @TestMetadata("subclosuresWithinInitializers.kt")
+        public void testSubclosuresWithinInitializers() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/subclosuresWithinInitializers.kt");
+        }
+
+        @TestMetadata("underscoreParameters.kt")
+        public void testUnderscoreParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/closures/underscoreParameters.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/closures/captureInSuperConstructorCall")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CaptureInSuperConstructorCall extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCaptureInSuperConstructorCall() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/captureInSuperConstructorCall"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("constructorParameterAndLocalCapturedInLambdaInLocalClass.kt")
+            public void testConstructorParameterAndLocalCapturedInLambdaInLocalClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/constructorParameterAndLocalCapturedInLambdaInLocalClass.kt");
+            }
+
+            @TestMetadata("constructorParameterCapturedInLambdaInLocalClass.kt")
+            public void testConstructorParameterCapturedInLambdaInLocalClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/constructorParameterCapturedInLambdaInLocalClass.kt");
+            }
+
+            @TestMetadata("constructorParameterCapturedInLambdaInLocalClass2.kt")
+            public void testConstructorParameterCapturedInLambdaInLocalClass2() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/constructorParameterCapturedInLambdaInLocalClass2.kt");
+            }
+
+            @TestMetadata("kt13454.kt")
+            public void testKt13454() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt13454.kt");
+            }
+
+            @TestMetadata("kt14148.kt")
+            public void testKt14148() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt14148.kt");
+            }
+
+            @TestMetadata("kt4174.kt")
+            public void testKt4174() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt4174.kt");
+            }
+
+            @TestMetadata("kt4174a.kt")
+            public void testKt4174a() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt4174a.kt");
+            }
+
+            @TestMetadata("localCapturedInAnonymousObjectInLocalClass.kt")
+            public void testLocalCapturedInAnonymousObjectInLocalClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/localCapturedInAnonymousObjectInLocalClass.kt");
+            }
+
+            @TestMetadata("localCapturedInAnonymousObjectInLocalClass2.kt")
+            public void testLocalCapturedInAnonymousObjectInLocalClass2() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/localCapturedInAnonymousObjectInLocalClass2.kt");
+            }
+
+            @TestMetadata("localCapturedInLambdaInInnerClassInLocalClass.kt")
+            public void testLocalCapturedInLambdaInInnerClassInLocalClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/localCapturedInLambdaInInnerClassInLocalClass.kt");
+            }
+
+            @TestMetadata("localCapturedInLambdaInLocalClass.kt")
+            public void testLocalCapturedInLambdaInLocalClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/localCapturedInLambdaInLocalClass.kt");
+            }
+
+            @TestMetadata("localFunctionCapturedInLambda.kt")
+            public void testLocalFunctionCapturedInLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/localFunctionCapturedInLambda.kt");
+            }
+
+            @TestMetadata("outerAndLocalCapturedInLocalClass.kt")
+            public void testOuterAndLocalCapturedInLocalClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerAndLocalCapturedInLocalClass.kt");
+            }
+
+            @TestMetadata("outerCapturedInFunctionLiteral.kt")
+            public void testOuterCapturedInFunctionLiteral() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInFunctionLiteral.kt");
+            }
+
+            @TestMetadata("outerCapturedInInlineLambda.kt")
+            public void testOuterCapturedInInlineLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInInlineLambda.kt");
+            }
+
+            @TestMetadata("outerCapturedInInlineLambda2.kt")
+            public void testOuterCapturedInInlineLambda2() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInInlineLambda2.kt");
+            }
+
+            @TestMetadata("outerCapturedInLambda.kt")
+            public void testOuterCapturedInLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambda.kt");
+            }
+
+            @TestMetadata("outerCapturedInLambda2.kt")
+            public void testOuterCapturedInLambda2() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambda2.kt");
+            }
+
+            @TestMetadata("outerCapturedInLambdaInSecondaryConstructor.kt")
+            public void testOuterCapturedInLambdaInSecondaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSecondaryConstructor.kt");
+            }
+
+            @TestMetadata("outerCapturedInLambdaInSubExpression.kt")
+            public void testOuterCapturedInLambdaInSubExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSubExpression.kt");
+            }
+
+            @TestMetadata("outerCapturedInLocalClass.kt")
+            public void testOuterCapturedInLocalClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLocalClass.kt");
+            }
+
+            @TestMetadata("outerCapturedInNestedLambda.kt")
+            public void testOuterCapturedInNestedLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInNestedLambda.kt");
+            }
+
+            @TestMetadata("outerCapturedInNestedObject.kt")
+            public void testOuterCapturedInNestedObject() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInNestedObject.kt");
+            }
+
+            @TestMetadata("outerCapturedInObject.kt")
+            public void testOuterCapturedInObject() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInObject.kt");
+            }
+
+            @TestMetadata("outerCapturedInObject2.kt")
+            public void testOuterCapturedInObject2() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInObject2.kt");
+            }
+
+            @TestMetadata("outerEnumEntryCapturedInLambdaInInnerClass.kt")
+            public void testOuterEnumEntryCapturedInLambdaInInnerClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerEnumEntryCapturedInLambdaInInnerClass.kt");
+            }
+
+            @TestMetadata("properValueCapturedByClosure1.kt")
+            public void testProperValueCapturedByClosure1() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/properValueCapturedByClosure1.kt");
+            }
+
+            @TestMetadata("properValueCapturedByClosure2.kt")
+            public void testProperValueCapturedByClosure2() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/properValueCapturedByClosure2.kt");
+            }
+
+            @TestMetadata("referenceToCapturedVariablesInMultipleLambdas.kt")
+            public void testReferenceToCapturedVariablesInMultipleLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureInSuperConstructorCall/referenceToCapturedVariablesInMultipleLambdas.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/closures/captureOuterProperty")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CaptureOuterProperty extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCaptureOuterProperty() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/captureOuterProperty"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("captureFunctionInProperty.kt")
+            public void testCaptureFunctionInProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureOuterProperty/captureFunctionInProperty.kt");
+            }
+
+            @TestMetadata("inFunction.kt")
+            public void testInFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureOuterProperty/inFunction.kt");
+            }
+
+            @TestMetadata("inProperty.kt")
+            public void testInProperty() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureOuterProperty/inProperty.kt");
+            }
+
+            @TestMetadata("inPropertyDeepObjectChain.kt")
+            public void testInPropertyDeepObjectChain() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyDeepObjectChain.kt");
+            }
+
+            @TestMetadata("inPropertyFromSuperClass.kt")
+            public void testInPropertyFromSuperClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperClass.kt");
+            }
+
+            @TestMetadata("inPropertyFromSuperSuperClass.kt")
+            public void testInPropertyFromSuperSuperClass() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperSuperClass.kt");
+            }
+
+            @TestMetadata("kt4176.kt")
+            public void testKt4176() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureOuterProperty/kt4176.kt");
+            }
+
+            @TestMetadata("kt4656.kt")
+            public void testKt4656() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/captureOuterProperty/kt4656.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/closures/capturedVarsOptimization")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CapturedVarsOptimization extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception {
+                KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCapturedVarsOptimization() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("capturedInCrossinline.kt")
+            public void testCapturedInCrossinline() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/capturedInCrossinline.kt");
+            }
+
+            @TestMetadata("capturedInInlineOnlyAssign.kt")
+            public void testCapturedInInlineOnlyAssign() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/capturedInInlineOnlyAssign.kt");
+            }
+
+            @TestMetadata("capturedInInlineOnlyCAO.kt")
+            public void testCapturedInInlineOnlyCAO() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/capturedInInlineOnlyCAO.kt");
+            }
+
+            @TestMetadata("capturedInInlineOnlyIncrDecr.kt")
+            public void testCapturedInInlineOnlyIncrDecr() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/capturedInInlineOnlyIncrDecr.kt");
+            }
+
+            @TestMetadata("capturedInInlineOnlyIndexedCAO.kt")
+            public void testCapturedInInlineOnlyIndexedCAO() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/capturedInInlineOnlyIndexedCAO.kt");
+            }
+
+            @TestMetadata("capturedVarsOfSize2.kt")
+            public void testCapturedVarsOfSize2() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/capturedVarsOfSize2.kt");
+            }
+
+            @TestMetadata("kt17200.kt")
+            public void testKt17200() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/kt17200.kt");
+            }
+
+            @TestMetadata("sharedSlotsWithCapturedVars.kt")
+            public void testSharedSlotsWithCapturedVars() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/closures/closureInsideClosure")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ClosureInsideClosure extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInClosureInsideClosure() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/closureInsideClosure"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("localFunInsideLocalFun.kt")
+            public void testLocalFunInsideLocalFun() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFun.kt");
+            }
+
+            @TestMetadata("localFunInsideLocalFunDifferentSignatures.kt")
+            public void testLocalFunInsideLocalFunDifferentSignatures() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFunDifferentSignatures.kt");
+            }
+
+            @TestMetadata("threeLevels.kt")
+            public void testThreeLevels() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevels.kt");
+            }
+
+            @TestMetadata("threeLevelsDifferentSignatures.kt")
+            public void testThreeLevelsDifferentSignatures() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevelsDifferentSignatures.kt");
+            }
+
+            @TestMetadata("varAsFunInsideLocalFun.kt")
+            public void testVarAsFunInsideLocalFun() throws Exception {
+                runTest("compiler/testData/codegen/box/closures/closureInsideClosure/varAsFunInsideLocalFun.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/collectionLiterals")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class CollectionLiterals extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInCollectionLiterals() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/collectionLiterals"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/collections")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Collections extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        @TestMetadata("addCollectionStubWithCovariantOverride.kt")
+        public void testAddCollectionStubWithCovariantOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/collections/addCollectionStubWithCovariantOverride.kt");
+        }
+
+        public void testAllFilesPresentInCollections() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/collections"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("removeClash.kt")
+        public void testRemoveClash() throws Exception {
+            runTest("compiler/testData/codegen/box/collections/removeClash.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/compatibility")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Compatibility extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInCompatibility() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compatibility"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("privateCompanionObject.kt")
+        public void testPrivateCompanionObject() throws Exception {
+            runTest("compiler/testData/codegen/box/compatibility/privateCompanionObject.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/constants")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Constants extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInConstants() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/constants"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("comparisonFalse.kt")
+        public void testComparisonFalse() throws Exception {
+            runTest("compiler/testData/codegen/box/constants/comparisonFalse.kt");
+        }
+
+        @TestMetadata("constantsInWhen.kt")
+        public void testConstantsInWhen() throws Exception {
+            runTest("compiler/testData/codegen/box/constants/constantsInWhen.kt");
+        }
+
+        @TestMetadata("long.kt")
+        public void testLong() throws Exception {
+            runTest("compiler/testData/codegen/box/constants/long.kt");
+        }
+
+        @TestMetadata("privateConst.kt")
+        public void testPrivateConst() throws Exception {
+            runTest("compiler/testData/codegen/box/constants/privateConst.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/constructorCall")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ConstructorCall extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInConstructorCall() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/constructorCall"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/controlStructures")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ControlStructures extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInControlStructures() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "tryCatchInExpressions");
+        }
+
+        @TestMetadata("bottles.kt")
+        public void testBottles() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/bottles.kt");
+        }
+
+        @TestMetadata("breakInWhen.kt")
+        public void testBreakInWhen() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/breakInWhen.kt");
+        }
+
+        @TestMetadata("compareBoxedIntegerToZero.kt")
+        public void testCompareBoxedIntegerToZero() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/compareBoxedIntegerToZero.kt");
+        }
+
+        @TestMetadata("conditionOfEmptyIf.kt")
+        public void testConditionOfEmptyIf() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/conditionOfEmptyIf.kt");
+        }
+
+        @TestMetadata("continueInForCondition.kt")
+        public void testContinueInForCondition() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/continueInForCondition.kt");
+        }
+
+        @TestMetadata("continueInWhen.kt")
+        public void testContinueInWhen() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/continueInWhen.kt");
+        }
+
+        @TestMetadata("continueInWhile.kt")
+        public void testContinueInWhile() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/continueInWhile.kt");
+        }
+
+        @TestMetadata("doWhile.kt")
+        public void testDoWhile() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/doWhile.kt");
+        }
+
+        @TestMetadata("doWhileFib.kt")
+        public void testDoWhileFib() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/doWhileFib.kt");
+        }
+
+        @TestMetadata("doWhileWithContinue.kt")
+        public void testDoWhileWithContinue() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/doWhileWithContinue.kt");
+        }
+
+        @TestMetadata("emptyDoWhile.kt")
+        public void testEmptyDoWhile() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/emptyDoWhile.kt");
+        }
+
+        @TestMetadata("emptyFor.kt")
+        public void testEmptyFor() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/emptyFor.kt");
+        }
+
+        @TestMetadata("emptyWhile.kt")
+        public void testEmptyWhile() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/emptyWhile.kt");
+        }
+
+        @TestMetadata("factorialTest.kt")
+        public void testFactorialTest() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/factorialTest.kt");
+        }
+
+        @TestMetadata("forInCharSequenceMut.kt")
+        public void testForInCharSequenceMut() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/forInCharSequenceMut.kt");
+        }
+
+        @TestMetadata("forInSmartCastToArray.kt")
+        public void testForInSmartCastToArray() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt");
+        }
+
+        @TestMetadata("forLoopMemberExtensionAll.kt")
+        public void testForLoopMemberExtensionAll() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionAll.kt");
+        }
+
+        @TestMetadata("forLoopMemberExtensionHasNext.kt")
+        public void testForLoopMemberExtensionHasNext() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionHasNext.kt");
+        }
+
+        @TestMetadata("forNullableCharInString.kt")
+        public void testForNullableCharInString() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/forNullableCharInString.kt");
+        }
+
+        @TestMetadata("ifConst1.kt")
+        public void testIfConst1() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/ifConst1.kt");
+        }
+
+        @TestMetadata("ifConst2.kt")
+        public void testIfConst2() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/ifConst2.kt");
+        }
+
+        @TestMetadata("ifIncompatibleBranches.kt")
+        public void testIfIncompatibleBranches() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/ifIncompatibleBranches.kt");
+        }
+
+        @TestMetadata("inRangeConditionsInWhen.kt")
+        public void testInRangeConditionsInWhen() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/inRangeConditionsInWhen.kt");
+        }
+
+        @TestMetadata("kt12908.kt")
+        public void testKt12908() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt12908.kt");
+        }
+
+        @TestMetadata("kt12908_2.kt")
+        public void testKt12908_2() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt12908_2.kt");
+        }
+
+        @TestMetadata("kt1441.kt")
+        public void testKt1441() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt1441.kt");
+        }
+
+        @TestMetadata("kt17110.kt")
+        public void testKt17110() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt17110.kt");
+        }
+
+        @TestMetadata("kt1742.kt")
+        public void testKt1742() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt1742.kt");
+        }
+
+        @TestMetadata("kt17590.kt")
+        public void testKt17590() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt17590.kt");
+        }
+
+        @TestMetadata("kt17590_long.kt")
+        public void testKt17590_long() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt17590_long.kt");
+        }
+
+        @TestMetadata("kt1899.kt")
+        public void testKt1899() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt1899.kt");
+        }
+
+        @TestMetadata("kt2147.kt")
+        public void testKt2147() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt2147.kt");
+        }
+
+        @TestMetadata("kt2291.kt")
+        public void testKt2291() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt2291.kt");
+        }
+
+        @TestMetadata("kt2416.kt")
+        public void testKt2416() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt2416.kt");
+        }
+
+        @TestMetadata("kt299.kt")
+        public void testKt299() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt299.kt");
+        }
+
+        @TestMetadata("kt3087.kt")
+        public void testKt3087() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt3087.kt");
+        }
+
+        @TestMetadata("kt3203_1.kt")
+        public void testKt3203_1() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt3203_1.kt");
+        }
+
+        @TestMetadata("kt3203_2.kt")
+        public void testKt3203_2() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt3203_2.kt");
+        }
+
+        @TestMetadata("kt3273.kt")
+        public void testKt3273() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt3273.kt");
+        }
+
+        @TestMetadata("kt3280.kt")
+        public void testKt3280() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt3280.kt");
+        }
+
+        @TestMetadata("kt416.kt")
+        public void testKt416() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt416.kt");
+        }
+
+        @TestMetadata("kt42455.kt")
+        public void testKt42455() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt42455.kt");
+        }
+
+        @TestMetadata("kt772.kt")
+        public void testKt772() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt772.kt");
+        }
+
+        @TestMetadata("kt773.kt")
+        public void testKt773() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt773.kt");
+        }
+
+        @TestMetadata("kt870.kt")
+        public void testKt870() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt870.kt");
+        }
+
+        @TestMetadata("kt9022Return.kt")
+        public void testKt9022Return() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt9022Return.kt");
+        }
+
+        @TestMetadata("kt9022Throw.kt")
+        public void testKt9022Throw() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt9022Throw.kt");
+        }
+
+        @TestMetadata("kt958.kt")
+        public void testKt958() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/kt958.kt");
+        }
+
+        @TestMetadata("longRange.kt")
+        public void testLongRange() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/longRange.kt");
+        }
+
+        @TestMetadata("parameterWithNameForFunctionType.kt")
+        public void testParameterWithNameForFunctionType() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/parameterWithNameForFunctionType.kt");
+        }
+
+        @TestMetadata("quicksort.kt")
+        public void testQuicksort() throws Exception {
+            runTest("compiler/testData/codegen/box/controlStructures/quicksort.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BreakContinueInExpressions extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBreakContinueInExpressions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("breakInDoWhile.kt")
+            public void testBreakInDoWhile() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakInDoWhile.kt");
+            }
+
+            @TestMetadata("breakInExpr.kt")
+            public void testBreakInExpr() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakInExpr.kt");
+            }
+
+            @TestMetadata("continueInDoWhile.kt")
+            public void testContinueInDoWhile() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/continueInDoWhile.kt");
+            }
+
+            @TestMetadata("continueInExpr.kt")
+            public void testContinueInExpr() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/continueInExpr.kt");
+            }
+
+            @TestMetadata("inlineWithStack.kt")
+            public void testInlineWithStack() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlineWithStack.kt");
+            }
+
+            @TestMetadata("innerLoopWithStack.kt")
+            public void testInnerLoopWithStack() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/innerLoopWithStack.kt");
+            }
+
+            @TestMetadata("kt14581.kt")
+            public void testKt14581() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt14581.kt");
+            }
+
+            @TestMetadata("kt16713.kt")
+            public void testKt16713() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713.kt");
+            }
+
+            @TestMetadata("kt16713_2.kt")
+            public void testKt16713_2() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713_2.kt");
+            }
+
+            @TestMetadata("kt17384.kt")
+            public void testKt17384() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt17384.kt");
+            }
+
+            @TestMetadata("kt9022And.kt")
+            public void testKt9022And() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt9022And.kt");
+            }
+
+            @TestMetadata("kt9022Or.kt")
+            public void testKt9022Or() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt9022Or.kt");
+            }
+
+            @TestMetadata("pathologicalDoWhile.kt")
+            public void testPathologicalDoWhile() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/pathologicalDoWhile.kt");
+            }
+
+            @TestMetadata("whileTrueBreak.kt")
+            public void testWhileTrueBreak() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/whileTrueBreak.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/controlStructures/forInArray")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInArray extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInArray() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/forInArray"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("forInArraySpecializedToUntil.kt")
+            public void testForInArraySpecializedToUntil() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInArray/forInArraySpecializedToUntil.kt");
+            }
+
+            @TestMetadata("forInArrayWithArrayPropertyUpdatedInLoopBody.kt")
+            public void testForInArrayWithArrayPropertyUpdatedInLoopBody() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInArray/forInArrayWithArrayPropertyUpdatedInLoopBody.kt");
+            }
+
+            @TestMetadata("forInArrayWithArrayVarUpdatedInLoopBody13.kt")
+            public void testForInArrayWithArrayVarUpdatedInLoopBody13() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody13.kt");
+            }
+
+            @TestMetadata("forInDoubleArrayWithUpcast.kt")
+            public void testForInDoubleArrayWithUpcast() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInArray/forInDoubleArrayWithUpcast.kt");
+            }
+
+            @TestMetadata("forInFieldUpdatedInLoopBody.kt")
+            public void testForInFieldUpdatedInLoopBody() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInArray/forInFieldUpdatedInLoopBody.kt");
+            }
+
+            @TestMetadata("forIntArray.kt")
+            public void testForIntArray() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInArray/forIntArray.kt");
+            }
+
+            @TestMetadata("forNullableIntArray.kt")
+            public void testForNullableIntArray() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInArray/forNullableIntArray.kt");
+            }
+
+            @TestMetadata("forPrimitiveIntArray.kt")
+            public void testForPrimitiveIntArray() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInArray/forPrimitiveIntArray.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/controlStructures/forInArrayWithIndex")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInArrayWithIndex extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInArrayWithIndex() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/forInArrayWithIndex"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInCharSequenceWithIndex extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInCharSequenceWithIndex() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("forInEmptyStringWithIndex.kt")
+            public void testForInEmptyStringWithIndex() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInEmptyStringWithIndex.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/controlStructures/forInIterableWithIndex")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInIterableWithIndex extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInIterableWithIndex() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/forInIterableWithIndex"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInSequenceWithIndex extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInSequenceWithIndex() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/controlStructures/returnsNothing")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ReturnsNothing extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInReturnsNothing() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/returnsNothing"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("ifElse.kt")
+            public void testIfElse() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/returnsNothing/ifElse.kt");
+            }
+
+            @TestMetadata("propertyGetter.kt")
+            public void testPropertyGetter() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/returnsNothing/propertyGetter.kt");
+            }
+
+            @TestMetadata("when.kt")
+            public void testWhen() throws Exception {
+                runTest("compiler/testData/codegen/box/controlStructures/returnsNothing/when.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/dataClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class DataClasses extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInDataClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/dataClasses"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("arrayParams.kt")
+        public void testArrayParams() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/arrayParams.kt");
+        }
+
+        @TestMetadata("changingVarParam.kt")
+        public void testChangingVarParam() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/changingVarParam.kt");
+        }
+
+        @TestMetadata("genericParam.kt")
+        public void testGenericParam() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/genericParam.kt");
+        }
+
+        @TestMetadata("mixedParams.kt")
+        public void testMixedParams() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/mixedParams.kt");
+        }
+
+        @TestMetadata("multiDeclaration.kt")
+        public void testMultiDeclaration() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/multiDeclaration.kt");
+        }
+
+        @TestMetadata("multiDeclarationFor.kt")
+        public void testMultiDeclarationFor() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/multiDeclarationFor.kt");
+        }
+
+        @TestMetadata("nonTrivialFinalMemberInSuperClass.kt")
+        public void testNonTrivialFinalMemberInSuperClass() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/nonTrivialFinalMemberInSuperClass.kt");
+        }
+
+        @TestMetadata("nonTrivialMemberInSuperClass.kt")
+        public void testNonTrivialMemberInSuperClass() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/nonTrivialMemberInSuperClass.kt");
+        }
+
+        @TestMetadata("privateValParams.kt")
+        public void testPrivateValParams() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/privateValParams.kt");
+        }
+
+        @TestMetadata("twoValParams.kt")
+        public void testTwoValParams() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/twoValParams.kt");
+        }
+
+        @TestMetadata("twoVarParams.kt")
+        public void testTwoVarParams() throws Exception {
+            runTest("compiler/testData/codegen/box/dataClasses/twoVarParams.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/dataClasses/copy")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Copy extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCopy() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/dataClasses/copy"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("constructorWithDefaultParam.kt")
+            public void testConstructorWithDefaultParam() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/copy/constructorWithDefaultParam.kt");
+            }
+
+            @TestMetadata("copyInObjectNestedDataClass.kt")
+            public void testCopyInObjectNestedDataClass() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/copy/copyInObjectNestedDataClass.kt");
+            }
+
+            @TestMetadata("kt12708.kt")
+            public void testKt12708() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/copy/kt12708.kt");
+            }
+
+            @TestMetadata("kt3033.kt")
+            public void testKt3033() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/copy/kt3033.kt");
+            }
+
+            @TestMetadata("valInConstructorParams.kt")
+            public void testValInConstructorParams() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/copy/valInConstructorParams.kt");
+            }
+
+            @TestMetadata("varInConstructorParams.kt")
+            public void testVarInConstructorParams() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/copy/varInConstructorParams.kt");
+            }
+
+            @TestMetadata("withGenericParameter.kt")
+            public void testWithGenericParameter() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/copy/withGenericParameter.kt");
+            }
+
+            @TestMetadata("withSecondaryConstructor.kt")
+            public void testWithSecondaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/copy/withSecondaryConstructor.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/dataClasses/equals")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Equals extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEquals() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/dataClasses/equals"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("alreadyDeclared.kt")
+            public void testAlreadyDeclared() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/equals/alreadyDeclared.kt");
+            }
+
+            @TestMetadata("genericarray.kt")
+            public void testGenericarray() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/equals/genericarray.kt");
+            }
+
+            @TestMetadata("intarray.kt")
+            public void testIntarray() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/equals/intarray.kt");
+            }
+
+            @TestMetadata("null.kt")
+            public void testNull() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/equals/null.kt");
+            }
+
+            @TestMetadata("nullother.kt")
+            public void testNullother() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/equals/nullother.kt");
+            }
+
+            @TestMetadata("sameinstance.kt")
+            public void testSameinstance() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/equals/sameinstance.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/dataClasses/hashCode")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class HashCode extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInHashCode() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/dataClasses/hashCode"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("alreadyDeclared.kt")
+            public void testAlreadyDeclared() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/alreadyDeclared.kt");
+            }
+
+            @TestMetadata("boolean.kt")
+            public void testBoolean() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/boolean.kt");
+            }
+
+            @TestMetadata("byte.kt")
+            public void testByte() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/byte.kt");
+            }
+
+            @TestMetadata("char.kt")
+            public void testChar() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/char.kt");
+            }
+
+            @TestMetadata("double.kt")
+            public void testDouble() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/double.kt");
+            }
+
+            @TestMetadata("float.kt")
+            public void testFloat() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/float.kt");
+            }
+
+            @TestMetadata("genericNull.kt")
+            public void testGenericNull() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/genericNull.kt");
+            }
+
+            @TestMetadata("int.kt")
+            public void testInt() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/int.kt");
+            }
+
+            @TestMetadata("long.kt")
+            public void testLong() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/long.kt");
+            }
+
+            @TestMetadata("null.kt")
+            public void testNull() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/null.kt");
+            }
+
+            @TestMetadata("short.kt")
+            public void testShort() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/hashCode/short.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/dataClasses/toString")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ToString extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInToString() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/dataClasses/toString"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("alreadyDeclared.kt")
+            public void testAlreadyDeclared() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/toString/alreadyDeclared.kt");
+            }
+
+            @TestMetadata("changingVarParam.kt")
+            public void testChangingVarParam() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/toString/changingVarParam.kt");
+            }
+
+            @TestMetadata("genericParam.kt")
+            public void testGenericParam() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/toString/genericParam.kt");
+            }
+
+            @TestMetadata("mixedParams.kt")
+            public void testMixedParams() throws Exception {
+                runTest("compiler/testData/codegen/box/dataClasses/toString/mixedParams.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/defaultArguments")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class DefaultArguments extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInDefaultArguments() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("callDefaultFromInitializer.kt")
+        public void testCallDefaultFromInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/callDefaultFromInitializer.kt");
+        }
+
+        @TestMetadata("complexInheritance.kt")
+        public void testComplexInheritance() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/complexInheritance.kt");
+        }
+
+        @TestMetadata("implementedByFake.kt")
+        public void testImplementedByFake() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/implementedByFake.kt");
+        }
+
+        @TestMetadata("implementedByFake2.kt")
+        public void testImplementedByFake2() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/implementedByFake2.kt");
+        }
+
+        @TestMetadata("implementedByFake3.kt")
+        public void testImplementedByFake3() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/implementedByFake3.kt");
+        }
+
+        @TestMetadata("inheritedFromInterfaceViaAbstractSuperclass.kt")
+        public void testInheritedFromInterfaceViaAbstractSuperclass() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/inheritedFromInterfaceViaAbstractSuperclass.kt");
+        }
+
+        @TestMetadata("kt6382.kt")
+        public void testKt6382() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/kt6382.kt");
+        }
+
+        @TestMetadata("protected.kt")
+        public void testProtected() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/protected.kt");
+        }
+
+        @TestMetadata("referenceAsArg.kt")
+        public void testReferenceAsArg() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/referenceAsArg.kt");
+        }
+
+        @TestMetadata("simpleFromOtherFile.kt")
+        public void testSimpleFromOtherFile() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/simpleFromOtherFile.kt");
+        }
+
+        @TestMetadata("useThisInLambda.kt")
+        public void testUseThisInLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/defaultArguments/useThisInLambda.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/defaultArguments/constructor")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Constructor extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInConstructor() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/constructor"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("annotation.kt")
+            public void testAnnotation() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/annotation.kt");
+            }
+
+            @TestMetadata("annotationWithEmptyArray.kt")
+            public void testAnnotationWithEmptyArray() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/annotationWithEmptyArray.kt");
+            }
+
+            @TestMetadata("defArgs1.kt")
+            public void testDefArgs1() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1.kt");
+            }
+
+            @TestMetadata("defArgs1InnerClass.kt")
+            public void testDefArgs1InnerClass() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1InnerClass.kt");
+            }
+
+            @TestMetadata("defArgs2.kt")
+            public void testDefArgs2() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/defArgs2.kt");
+            }
+
+            @TestMetadata("doubleDefArgs1InnerClass.kt")
+            public void testDoubleDefArgs1InnerClass() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/doubleDefArgs1InnerClass.kt");
+            }
+
+            @TestMetadata("enum.kt")
+            public void testEnum() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/enum.kt");
+            }
+
+            @TestMetadata("enumWithOneDefArg.kt")
+            public void testEnumWithOneDefArg() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt");
+            }
+
+            @TestMetadata("enumWithTwoDefArgs.kt")
+            public void testEnumWithTwoDefArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt");
+            }
+
+            @TestMetadata("enumWithTwoDoubleDefArgs.kt")
+            public void testEnumWithTwoDoubleDefArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt");
+            }
+
+            @TestMetadata("innerClass32Args.kt")
+            public void testInnerClass32Args() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/innerClass32Args.kt");
+            }
+
+            @TestMetadata("kt2852.kt")
+            public void testKt2852() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/kt2852.kt");
+            }
+
+            @TestMetadata("kt30517.kt")
+            public void testKt30517() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/kt30517.kt");
+            }
+
+            @TestMetadata("kt3060.kt")
+            public void testKt3060() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt");
+            }
+
+            @TestMetadata("objectExpressionDelegatingToSecondaryConstructor.kt")
+            public void testObjectExpressionDelegatingToSecondaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/constructor/objectExpressionDelegatingToSecondaryConstructor.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/defaultArguments/convention")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Convention extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInConvention() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/convention"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("incWithDefaultInGetter.kt")
+            public void testIncWithDefaultInGetter() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/convention/incWithDefaultInGetter.kt");
+            }
+
+            @TestMetadata("incWithDefaults.kt")
+            public void testIncWithDefaults() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/convention/incWithDefaults.kt");
+            }
+
+            @TestMetadata("kt16520.kt")
+            public void testKt16520() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/convention/kt16520.kt");
+            }
+
+            @TestMetadata("kt9140.kt")
+            public void testKt9140() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/convention/kt9140.kt");
+            }
+
+            @TestMetadata("plusAssignWithDefaultInGetter.kt")
+            public void testPlusAssignWithDefaultInGetter() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/convention/plusAssignWithDefaultInGetter.kt");
+            }
+
+            @TestMetadata("plusAssignWithDefaults.kt")
+            public void testPlusAssignWithDefaults() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/convention/plusAssignWithDefaults.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/defaultArguments/function")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Function extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            @TestMetadata("abstractClass.kt")
+            public void testAbstractClass() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt");
+            }
+
+            public void testAllFilesPresentInFunction() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/function"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("complexInheritance.kt")
+            public void testComplexInheritance() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/complexInheritance.kt");
+            }
+
+            @TestMetadata("covariantOverride.kt")
+            public void testCovariantOverride() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/covariantOverride.kt");
+            }
+
+            @TestMetadata("covariantOverrideGeneric.kt")
+            public void testCovariantOverrideGeneric() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/covariantOverrideGeneric.kt");
+            }
+
+            @TestMetadata("extensionFunctionManyArgs.kt")
+            public void testExtensionFunctionManyArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/extensionFunctionManyArgs.kt");
+            }
+
+            @TestMetadata("extentionFunction.kt")
+            public void testExtentionFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunction.kt");
+            }
+
+            @TestMetadata("extentionFunctionDouble.kt")
+            public void testExtentionFunctionDouble() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDouble.kt");
+            }
+
+            @TestMetadata("extentionFunctionDoubleTwoArgs.kt")
+            public void testExtentionFunctionDoubleTwoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDoubleTwoArgs.kt");
+            }
+
+            @TestMetadata("extentionFunctionInClassObject.kt")
+            public void testExtentionFunctionInClassObject() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt");
+            }
+
+            @TestMetadata("extentionFunctionInObject.kt")
+            public void testExtentionFunctionInObject() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInObject.kt");
+            }
+
+            @TestMetadata("extentionFunctionWithOneDefArg.kt")
+            public void testExtentionFunctionWithOneDefArg() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionWithOneDefArg.kt");
+            }
+
+            @TestMetadata("funInTrait.kt")
+            public void testFunInTrait() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt");
+            }
+
+            @TestMetadata("innerExtentionFunction.kt")
+            public void testInnerExtentionFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunction.kt");
+            }
+
+            @TestMetadata("innerExtentionFunctionDouble.kt")
+            public void testInnerExtentionFunctionDouble() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDouble.kt");
+            }
+
+            @TestMetadata("innerExtentionFunctionDoubleTwoArgs.kt")
+            public void testInnerExtentionFunctionDoubleTwoArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.kt");
+            }
+
+            @TestMetadata("innerExtentionFunctionManyArgs.kt")
+            public void testInnerExtentionFunctionManyArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionManyArgs.kt");
+            }
+
+            @TestMetadata("kt15971.kt")
+            public void testKt15971() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/kt15971.kt");
+            }
+
+            @TestMetadata("kt15971_2.kt")
+            public void testKt15971_2() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/kt15971_2.kt");
+            }
+
+            @TestMetadata("kt15971_3.kt")
+            public void testKt15971_3() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/kt15971_3.kt");
+            }
+
+            @TestMetadata("kt36188.kt")
+            public void testKt36188() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/kt36188.kt");
+            }
+
+            @TestMetadata("kt36188_2.kt")
+            public void testKt36188_2() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/kt36188_2.kt");
+            }
+
+            @TestMetadata("kt5232.kt")
+            public void testKt5232() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/kt5232.kt");
+            }
+
+            @TestMetadata("memberFunctionManyArgs.kt")
+            public void testMemberFunctionManyArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/memberFunctionManyArgs.kt");
+            }
+
+            @TestMetadata("mixingNamedAndPositioned.kt")
+            public void testMixingNamedAndPositioned() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt");
+            }
+
+            @TestMetadata("topLevelManyArgs.kt")
+            public void testTopLevelManyArgs() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/topLevelManyArgs.kt");
+            }
+
+            @TestMetadata("trait.kt")
+            public void testTrait() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/function/trait.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/defaultArguments/private")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Private extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInPrivate() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/private"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("memberExtensionFunction.kt")
+            public void testMemberExtensionFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/private/memberExtensionFunction.kt");
+            }
+
+            @TestMetadata("memberFunction.kt")
+            public void testMemberFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/private/memberFunction.kt");
+            }
+
+            @TestMetadata("primaryConstructor.kt")
+            public void testPrimaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/private/primaryConstructor.kt");
+            }
+
+            @TestMetadata("secondaryConstructor.kt")
+            public void testSecondaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/private/secondaryConstructor.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/defaultArguments/signature")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Signature extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInSignature() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/signature"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("kt2789.kt")
+            public void testKt2789() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/signature/kt2789.kt");
+            }
+
+            @TestMetadata("kt9428.kt")
+            public void testKt9428() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/signature/kt9428.kt");
+            }
+
+            @TestMetadata("kt9924.kt")
+            public void testKt9924() throws Exception {
+                runTest("compiler/testData/codegen/box/defaultArguments/signature/kt9924.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/delegation")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Delegation extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInDelegation() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/delegation"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("delegationWithPrivateConstructor.kt")
+        public void testDelegationWithPrivateConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/delegation/delegationWithPrivateConstructor.kt");
+        }
+
+        @TestMetadata("genericProperty.kt")
+        public void testGenericProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/delegation/genericProperty.kt");
+        }
+
+        @TestMetadata("hiddenSuperOverrideIn1.0.kt")
+        public void testHiddenSuperOverrideIn1_0() throws Exception {
+            runTest("compiler/testData/codegen/box/delegation/hiddenSuperOverrideIn1.0.kt");
+        }
+
+        @TestMetadata("kt8154.kt")
+        public void testKt8154() throws Exception {
+            runTest("compiler/testData/codegen/box/delegation/kt8154.kt");
+        }
+
+        @TestMetadata("withDefaultParameters.kt")
+        public void testWithDefaultParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/destructuringDeclInLambdaParam")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class DestructuringDeclInLambdaParam extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInDestructuringDeclInLambdaParam() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/destructuringDeclInLambdaParam"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("extensionComponents.kt")
+        public void testExtensionComponents() throws Exception {
+            runTest("compiler/testData/codegen/box/destructuringDeclInLambdaParam/extensionComponents.kt");
+        }
+
+        @TestMetadata("generic.kt")
+        public void testGeneric() throws Exception {
+            runTest("compiler/testData/codegen/box/destructuringDeclInLambdaParam/generic.kt");
+        }
+
+        @TestMetadata("inline.kt")
+        public void testInline() throws Exception {
+            runTest("compiler/testData/codegen/box/destructuringDeclInLambdaParam/inline.kt");
+        }
+
+        @TestMetadata("otherParameters.kt")
+        public void testOtherParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/destructuringDeclInLambdaParam/otherParameters.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/destructuringDeclInLambdaParam/simple.kt");
+        }
+
+        @TestMetadata("underscoreNames.kt")
+        public void testUnderscoreNames() throws Exception {
+            runTest("compiler/testData/codegen/box/destructuringDeclInLambdaParam/underscoreNames.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/diagnostics")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Diagnostics extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInDiagnostics() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/diagnostics"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/diagnostics/functions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Functions extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInFunctions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/inference")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Inference extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInference() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/inference"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("kt6176.kt")
+                public void testKt6176() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Invoke extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInvoke() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class OnObjects extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInOnObjects() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("invokeOnClassObject1.kt")
+                    public void testInvokeOnClassObject1() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt");
+                    }
+
+                    @TestMetadata("invokeOnClassObject2.kt")
+                    public void testInvokeOnClassObject2() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt");
+                    }
+
+                    @TestMetadata("invokeOnClassObjectOfNestedClass1.kt")
+                    public void testInvokeOnClassObjectOfNestedClass1() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt");
+                    }
+
+                    @TestMetadata("invokeOnClassObjectOfNestedClass2.kt")
+                    public void testInvokeOnClassObjectOfNestedClass2() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt");
+                    }
+
+                    @TestMetadata("invokeOnEnum1.kt")
+                    public void testInvokeOnEnum1() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt");
+                    }
+
+                    @TestMetadata("invokeOnEnum2.kt")
+                    public void testInvokeOnEnum2() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt");
+                    }
+
+                    @TestMetadata("invokeOnImportedEnum1.kt")
+                    public void testInvokeOnImportedEnum1() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt");
+                    }
+
+                    @TestMetadata("invokeOnImportedEnum2.kt")
+                    public void testInvokeOnImportedEnum2() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt");
+                    }
+
+                    @TestMetadata("invokeOnObject1.kt")
+                    public void testInvokeOnObject1() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt");
+                    }
+
+                    @TestMetadata("invokeOnObject2.kt")
+                    public void testInvokeOnObject2() throws Exception {
+                        runTest("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt");
+                    }
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class TailRecursion extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInTailRecursion() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/tailRecursion"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("defaultArgs.kt")
+                public void testDefaultArgs() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt");
+                }
+
+                @TestMetadata("defaultArgs2.kt")
+                public void testDefaultArgs2() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs2.kt");
+                }
+
+                @TestMetadata("defaultArgsWithSideEffects.kt")
+                public void testDefaultArgsWithSideEffects() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsWithSideEffects.kt");
+                }
+
+                @TestMetadata("defaultArgsWithSideEffects2.kt")
+                public void testDefaultArgsWithSideEffects2() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsWithSideEffects2.kt");
+                }
+
+                @TestMetadata("extensionTailCall.kt")
+                public void testExtensionTailCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt");
+                }
+
+                @TestMetadata("functionWithoutAnnotation.kt")
+                public void testFunctionWithoutAnnotation() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt");
+                }
+
+                @TestMetadata("infixCall.kt")
+                public void testInfixCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt");
+                }
+
+                @TestMetadata("infixRecursiveCall.kt")
+                public void testInfixRecursiveCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt");
+                }
+
+                @TestMetadata("realIteratorFoldl.kt")
+                public void testRealIteratorFoldl() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt");
+                }
+
+                @TestMetadata("recursiveInnerFunction.kt")
+                public void testRecursiveInnerFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt");
+                }
+
+                @TestMetadata("returnInParentheses.kt")
+                public void testReturnInParentheses() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt");
+                }
+
+                @TestMetadata("sum.kt")
+                public void testSum() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt");
+                }
+
+                @TestMetadata("tailCallInParentheses.kt")
+                public void testTailCallInParentheses() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt");
+                }
+
+                @TestMetadata("whenWithIs.kt")
+                public void testWhenWithIs() throws Exception {
+                    runTest("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt");
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/diagnostics/vararg")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Vararg extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInVararg() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/vararg"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("kt4172.kt")
+            public void testKt4172() throws Exception {
+                runTest("compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/elvis")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Elvis extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInElvis() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/elvis"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("genericNull.kt")
+        public void testGenericNull() throws Exception {
+            runTest("compiler/testData/codegen/box/elvis/genericNull.kt");
+        }
+
+        @TestMetadata("kt6694ExactAnnotationForElvis.kt")
+        public void testKt6694ExactAnnotationForElvis() throws Exception {
+            runTest("compiler/testData/codegen/box/elvis/kt6694ExactAnnotationForElvis.kt");
+        }
+
+        @TestMetadata("nullNullOk.kt")
+        public void testNullNullOk() throws Exception {
+            runTest("compiler/testData/codegen/box/elvis/nullNullOk.kt");
+        }
+
+        @TestMetadata("primitive.kt")
+        public void testPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/elvis/primitive.kt");
+        }
+
+        @TestMetadata("withReturn.kt")
+        public void testWithReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/elvis/withReturn.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/enum")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Enum extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        @TestMetadata("abstractMethodInEnum.kt")
+        public void testAbstractMethodInEnum() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/abstractMethodInEnum.kt");
+        }
+
+        @TestMetadata("abstractNestedClass.kt")
+        public void testAbstractNestedClass() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/abstractNestedClass.kt");
+        }
+
+        public void testAllFilesPresentInEnum() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/enum"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("asReturnExpression.kt")
+        public void testAsReturnExpression() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/asReturnExpression.kt");
+        }
+
+        @TestMetadata("companionObjectInEnum.kt")
+        public void testCompanionObjectInEnum() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/companionObjectInEnum.kt");
+        }
+
+        @TestMetadata("constructorWithReordering.kt")
+        public void testConstructorWithReordering() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/constructorWithReordering.kt");
+        }
+
+        @TestMetadata("deepInnerClassInEnumEntryClass.kt")
+        public void testDeepInnerClassInEnumEntryClass() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass.kt");
+        }
+
+        @TestMetadata("deepInnerClassInEnumEntryClass2.kt")
+        public void testDeepInnerClassInEnumEntryClass2() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass2.kt");
+        }
+
+        @TestMetadata("emptyConstructor.kt")
+        public void testEmptyConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/emptyConstructor.kt");
+        }
+
+        @TestMetadata("enumConstructorParameterClashWithDefaults.kt")
+        public void testEnumConstructorParameterClashWithDefaults() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumConstructorParameterClashWithDefaults.kt");
+        }
+
+        @TestMetadata("enumEntryMembers.kt")
+        public void testEnumEntryMembers() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumEntryMembers.kt");
+        }
+
+        @TestMetadata("enumEntryReferenceFromInnerClassConstructor1.kt")
+        public void testEnumEntryReferenceFromInnerClassConstructor1() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor1.kt");
+        }
+
+        @TestMetadata("enumEntryReferenceFromInnerClassConstructor2.kt")
+        public void testEnumEntryReferenceFromInnerClassConstructor2() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor2.kt");
+        }
+
+        @TestMetadata("enumEntryReferenceFromInnerClassConstructor3.kt")
+        public void testEnumEntryReferenceFromInnerClassConstructor3() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor3.kt");
+        }
+
+        @TestMetadata("enumInheritedFromTrait.kt")
+        public void testEnumInheritedFromTrait() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt");
+        }
+
+        @TestMetadata("enumMultiModule.kt")
+        public void testEnumMultiModule() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumMultiModule.kt");
+        }
+
+        @TestMetadata("enumShort.kt")
+        public void testEnumShort() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumShort.kt");
+        }
+
+        @TestMetadata("enumWithLambdaParameter.kt")
+        public void testEnumWithLambdaParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt");
+        }
+
+        @TestMetadata("inPackage.kt")
+        public void testInPackage() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/inPackage.kt");
+        }
+
+        @TestMetadata("inclassobj.kt")
+        public void testInclassobj() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/inclassobj.kt");
+        }
+
+        @TestMetadata("inner.kt")
+        public void testInner() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/inner.kt");
+        }
+
+        @TestMetadata("innerClassInEnumEntryClass.kt")
+        public void testInnerClassInEnumEntryClass() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/innerClassInEnumEntryClass.kt");
+        }
+
+        @TestMetadata("innerClassMethodInEnumEntryClass.kt")
+        public void testInnerClassMethodInEnumEntryClass() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass.kt");
+        }
+
+        @TestMetadata("innerClassMethodInEnumEntryClass2.kt")
+        public void testInnerClassMethodInEnumEntryClass2() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass2.kt");
+        }
+
+        @TestMetadata("innerWithExistingClassObject.kt")
+        public void testInnerWithExistingClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt");
+        }
+
+        @TestMetadata("kt1119.kt")
+        public void testKt1119() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt1119.kt");
+        }
+
+        @TestMetadata("kt18731.kt")
+        public void testKt18731() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt18731.kt");
+        }
+
+        @TestMetadata("kt18731_2.kt")
+        public void testKt18731_2() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt18731_2.kt");
+        }
+
+        @TestMetadata("kt20651.kt")
+        public void testKt20651() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt20651.kt");
+        }
+
+        @TestMetadata("kt20651_inlineLambda.kt")
+        public void testKt20651_inlineLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt20651_inlineLambda.kt");
+        }
+
+        @TestMetadata("kt20651a.kt")
+        public void testKt20651a() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt20651a.kt");
+        }
+
+        @TestMetadata("kt20651b.kt")
+        public void testKt20651b() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt20651b.kt");
+        }
+
+        @TestMetadata("kt2350.kt")
+        public void testKt2350() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt2350.kt");
+        }
+
+        @TestMetadata("kt38996.kt")
+        public void testKt38996() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt38996.kt");
+        }
+
+        @TestMetadata("kt7257.kt")
+        public void testKt7257() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt7257.kt");
+        }
+
+        @TestMetadata("kt7257_anonObjectInit.kt")
+        public void testKt7257_anonObjectInit() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt7257_anonObjectInit.kt");
+        }
+
+        @TestMetadata("kt7257_anonObjectMethod.kt")
+        public void testKt7257_anonObjectMethod() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt7257_anonObjectMethod.kt");
+        }
+
+        @TestMetadata("kt7257_explicitReceiver.kt")
+        public void testKt7257_explicitReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt7257_explicitReceiver.kt");
+        }
+
+        @TestMetadata("kt7257_fullyQualifiedReceiver.kt")
+        public void testKt7257_fullyQualifiedReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt7257_fullyQualifiedReceiver.kt");
+        }
+
+        @TestMetadata("kt7257_namedLocalFun.kt")
+        public void testKt7257_namedLocalFun() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt7257_namedLocalFun.kt");
+        }
+
+        @TestMetadata("kt7257_notInline.kt")
+        public void testKt7257_notInline() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt7257_notInline.kt");
+        }
+
+        @TestMetadata("kt9711.kt")
+        public void testKt9711() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt9711.kt");
+        }
+
+        @TestMetadata("kt9711_2.kt")
+        public void testKt9711_2() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/kt9711_2.kt");
+        }
+
+        @TestMetadata("manyDefaultParameters.kt")
+        public void testManyDefaultParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/manyDefaultParameters.kt");
+        }
+
+        @TestMetadata("objectInEnum.kt")
+        public void testObjectInEnum() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/objectInEnum.kt");
+        }
+
+        @TestMetadata("ordinal.kt")
+        public void testOrdinal() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/ordinal.kt");
+        }
+
+        @TestMetadata("refToThis.kt")
+        public void testRefToThis() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/refToThis.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/simple.kt");
+        }
+
+        @TestMetadata("superCallInEnumLiteral.kt")
+        public void testSuperCallInEnumLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt");
+        }
+
+        @TestMetadata("toString.kt")
+        public void testToString() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/toString.kt");
+        }
+
+        @TestMetadata("whenInObject.kt")
+        public void testWhenInObject() throws Exception {
+            runTest("compiler/testData/codegen/box/enum/whenInObject.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/enum/defaultCtor")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class DefaultCtor extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInDefaultCtor() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/enum/defaultCtor"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("constructorWithDefaultArguments.kt")
+            public void testConstructorWithDefaultArguments() throws Exception {
+                runTest("compiler/testData/codegen/box/enum/defaultCtor/constructorWithDefaultArguments.kt");
+            }
+
+            @TestMetadata("constructorWithVararg.kt")
+            public void testConstructorWithVararg() throws Exception {
+                runTest("compiler/testData/codegen/box/enum/defaultCtor/constructorWithVararg.kt");
+            }
+
+            @TestMetadata("entryClassConstructorWithDefaultArguments.kt")
+            public void testEntryClassConstructorWithDefaultArguments() throws Exception {
+                runTest("compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithDefaultArguments.kt");
+            }
+
+            @TestMetadata("entryClassConstructorWithVarargs.kt")
+            public void testEntryClassConstructorWithVarargs() throws Exception {
+                runTest("compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithVarargs.kt");
+            }
+
+            @TestMetadata("secondaryConstructorWithDefaultArguments.kt")
+            public void testSecondaryConstructorWithDefaultArguments() throws Exception {
+                runTest("compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithDefaultArguments.kt");
+            }
+
+            @TestMetadata("secondaryConstructorWithVararg.kt")
+            public void testSecondaryConstructorWithVararg() throws Exception {
+                runTest("compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithVararg.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/evaluate")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Evaluate extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInEvaluate() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/evaluate"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("kt9443.kt")
+        public void testKt9443() throws Exception {
+            runTest("compiler/testData/codegen/box/evaluate/kt9443.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/exclExcl")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ExclExcl extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInExclExcl() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/exclExcl"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("primitive.kt")
+        public void testPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/exclExcl/primitive.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/extensionFunctions")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ExtensionFunctions extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInExtensionFunctions() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/extensionFunctions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("executionOrder.kt")
+        public void testExecutionOrder() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/executionOrder.kt");
+        }
+
+        @TestMetadata("kt1061.kt")
+        public void testKt1061() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt1061.kt");
+        }
+
+        @TestMetadata("kt1249.kt")
+        public void testKt1249() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt1249.kt");
+        }
+
+        @TestMetadata("kt1290.kt")
+        public void testKt1290() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt1290.kt");
+        }
+
+        @TestMetadata("kt13312.kt")
+        public void testKt13312() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt13312.kt");
+        }
+
+        @TestMetadata("kt1776.kt")
+        public void testKt1776() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt1776.kt");
+        }
+
+        @TestMetadata("kt23675.kt")
+        public void testKt23675() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt23675.kt");
+        }
+
+        @TestMetadata("kt3285.kt")
+        public void testKt3285() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt3285.kt");
+        }
+
+        @TestMetadata("kt3298.kt")
+        public void testKt3298() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt3298.kt");
+        }
+
+        @TestMetadata("kt3646.kt")
+        public void testKt3646() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt3646.kt");
+        }
+
+        @TestMetadata("kt3969.kt")
+        public void testKt3969() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt3969.kt");
+        }
+
+        @TestMetadata("kt4228.kt")
+        public void testKt4228() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt4228.kt");
+        }
+
+        @TestMetadata("kt5467.kt")
+        public void testKt5467() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/kt5467.kt");
+        }
+
+        @TestMetadata("nested2.kt")
+        public void testNested2() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/nested2.kt");
+        }
+
+        @TestMetadata("shared.kt")
+        public void testShared() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/shared.kt");
+        }
+
+        @TestMetadata("thisMethodInObjectLiteral.kt")
+        public void testThisMethodInObjectLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt");
+        }
+
+        @TestMetadata("virtual.kt")
+        public void testVirtual() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionFunctions/virtual.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/extensionProperties")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ExtensionProperties extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        @TestMetadata("accessorForPrivateSetter.kt")
+        public void testAccessorForPrivateSetter() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/accessorForPrivateSetter.kt");
+        }
+
+        public void testAllFilesPresentInExtensionProperties() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/extensionProperties"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("genericValForPrimitiveType.kt")
+        public void testGenericValForPrimitiveType() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/genericValForPrimitiveType.kt");
+        }
+
+        @TestMetadata("genericVarForPrimitiveType.kt")
+        public void testGenericVarForPrimitiveType() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/genericVarForPrimitiveType.kt");
+        }
+
+        @TestMetadata("inClass.kt")
+        public void testInClass() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/inClass.kt");
+        }
+
+        @TestMetadata("inClassLongTypeInReceiver.kt")
+        public void testInClassLongTypeInReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/inClassLongTypeInReceiver.kt");
+        }
+
+        @TestMetadata("inClassWithGetter.kt")
+        public void testInClassWithGetter() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt");
+        }
+
+        @TestMetadata("inClassWithPrivateGetter.kt")
+        public void testInClassWithPrivateGetter() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt");
+        }
+
+        @TestMetadata("inClassWithPrivateSetter.kt")
+        public void testInClassWithPrivateSetter() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateSetter.kt");
+        }
+
+        @TestMetadata("inClassWithSetter.kt")
+        public void testInClassWithSetter() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/inClassWithSetter.kt");
+        }
+
+        @TestMetadata("kt9897.kt")
+        public void testKt9897() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/kt9897.kt");
+        }
+
+        @TestMetadata("kt9897_topLevel.kt")
+        public void testKt9897_topLevel() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/kt9897_topLevel.kt");
+        }
+
+        @TestMetadata("nonAbstractInInterface.kt")
+        public void testNonAbstractInInterface() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/nonAbstractInInterface.kt");
+        }
+
+        @TestMetadata("topLevel.kt")
+        public void testTopLevel() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/topLevel.kt");
+        }
+
+        @TestMetadata("topLevelLongTypeInReceiver.kt")
+        public void testTopLevelLongTypeInReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionProperties/topLevelLongTypeInReceiver.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/external")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class External extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInExternal() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/external"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/fakeOverride")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FakeOverride extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFakeOverride() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/fakeOverride"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("diamondFunction.kt")
+        public void testDiamondFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/diamondFunction.kt");
+        }
+
+        @TestMetadata("function.kt")
+        public void testFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/function.kt");
+        }
+
+        @TestMetadata("privateFakeOverrides0.kt")
+        public void testPrivateFakeOverrides0() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/privateFakeOverrides0.kt");
+        }
+
+        @TestMetadata("privateFakeOverrides1.kt")
+        public void testPrivateFakeOverrides1() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/privateFakeOverrides1.kt");
+        }
+
+        @TestMetadata("propertyGetter.kt")
+        public void testPropertyGetter() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/propertyGetter.kt");
+        }
+
+        @TestMetadata("propertySetter.kt")
+        public void testPropertySetter() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/fieldRename")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FieldRename extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFieldRename() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/fieldRename"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("constructorAndClassObject.kt")
+        public void testConstructorAndClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt");
+        }
+
+        @TestMetadata("genericPropertyWithItself.kt")
+        public void testGenericPropertyWithItself() throws Exception {
+            runTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/fullJdk")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FullJdk extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFullJdk() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/fullJdk"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/fullJdk/native")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Native extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInNative() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/fullJdk/native"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/fullJdk/regressions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Regressions extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInRegressions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/fullJdk/regressions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/funInterface")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FunInterface extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFunInterface() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/funInterface"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("basicFunInterface.kt")
+        public void testBasicFunInterface() throws Exception {
+            runTest("compiler/testData/codegen/box/funInterface/basicFunInterface.kt");
+        }
+
+        @TestMetadata("basicFunInterfaceConversion.kt")
+        public void testBasicFunInterfaceConversion() throws Exception {
+            runTest("compiler/testData/codegen/box/funInterface/basicFunInterfaceConversion.kt");
+        }
+
+        @TestMetadata("funConversionInVararg.kt")
+        public void testFunConversionInVararg() throws Exception {
+            runTest("compiler/testData/codegen/box/funInterface/funConversionInVararg.kt");
+        }
+
+        @TestMetadata("partialSam.kt")
+        public void testPartialSam() throws Exception {
+            runTest("compiler/testData/codegen/box/funInterface/partialSam.kt");
+        }
+
+        @TestMetadata("primitiveConversions.kt")
+        public void testPrimitiveConversions() throws Exception {
+            runTest("compiler/testData/codegen/box/funInterface/primitiveConversions.kt");
+        }
+
+        @TestMetadata("receiverEvaluatedOnce.kt")
+        public void testReceiverEvaluatedOnce() throws Exception {
+            runTest("compiler/testData/codegen/box/funInterface/receiverEvaluatedOnce.kt");
+        }
+
+        @TestMetadata("samConstructorExplicitInvocation.kt")
+        public void testSamConstructorExplicitInvocation() throws Exception {
+            runTest("compiler/testData/codegen/box/funInterface/samConstructorExplicitInvocation.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/funInterface/equality")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Equality extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEquality() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/funInterface/equality"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("simpleLambdas.kt")
+            public void testSimpleLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/funInterface/equality/simpleLambdas.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/functions")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Functions extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFunctions() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("defaultargs.kt")
+        public void testDefaultargs() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/defaultargs.kt");
+        }
+
+        @TestMetadata("defaultargs1.kt")
+        public void testDefaultargs1() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/defaultargs1.kt");
+        }
+
+        @TestMetadata("defaultargs2.kt")
+        public void testDefaultargs2() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/defaultargs2.kt");
+        }
+
+        @TestMetadata("defaultargs3.kt")
+        public void testDefaultargs3() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/defaultargs3.kt");
+        }
+
+        @TestMetadata("defaultargs4.kt")
+        public void testDefaultargs4() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/defaultargs4.kt");
+        }
+
+        @TestMetadata("defaultargs5.kt")
+        public void testDefaultargs5() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/defaultargs5.kt");
+        }
+
+        @TestMetadata("defaultargs6.kt")
+        public void testDefaultargs6() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/defaultargs6.kt");
+        }
+
+        @TestMetadata("defaultargs7.kt")
+        public void testDefaultargs7() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/defaultargs7.kt");
+        }
+
+        @TestMetadata("ea33909.kt")
+        public void testEa33909() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/ea33909.kt");
+        }
+
+        @TestMetadata("fakeDescriptorWithSeveralOverridenOne.kt")
+        public void testFakeDescriptorWithSeveralOverridenOne() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt");
+        }
+
+        @TestMetadata("infixRecursiveCall.kt")
+        public void testInfixRecursiveCall() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/infixRecursiveCall.kt");
+        }
+
+        @TestMetadata("kt1038.kt")
+        public void testKt1038() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt1038.kt");
+        }
+
+        @TestMetadata("kt1199.kt")
+        public void testKt1199() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt1199.kt");
+        }
+
+        @TestMetadata("kt1413.kt")
+        public void testKt1413() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt1413.kt");
+        }
+
+        @TestMetadata("kt1649_1.kt")
+        public void testKt1649_1() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt1649_1.kt");
+        }
+
+        @TestMetadata("kt2270.kt")
+        public void testKt2270() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt2270.kt");
+        }
+
+        @TestMetadata("kt2271.kt")
+        public void testKt2271() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt2271.kt");
+        }
+
+        @TestMetadata("kt2280.kt")
+        public void testKt2280() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt2280.kt");
+        }
+
+        @TestMetadata("kt2481.kt")
+        public void testKt2481() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt2481.kt");
+        }
+
+        @TestMetadata("kt2716.kt")
+        public void testKt2716() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt2716.kt");
+        }
+
+        @TestMetadata("kt2739.kt")
+        public void testKt2739() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt2739.kt");
+        }
+
+        @TestMetadata("kt2929.kt")
+        public void testKt2929() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt2929.kt");
+        }
+
+        @TestMetadata("kt3313.kt")
+        public void testKt3313() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt3313.kt");
+        }
+
+        @TestMetadata("kt3573.kt")
+        public void testKt3573() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt3573.kt");
+        }
+
+        @TestMetadata("kt3724.kt")
+        public void testKt3724() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt3724.kt");
+        }
+
+        @TestMetadata("kt395.kt")
+        public void testKt395() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt395.kt");
+        }
+
+        @TestMetadata("kt785.kt")
+        public void testKt785() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt785.kt");
+        }
+
+        @TestMetadata("kt873.kt")
+        public void testKt873() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/kt873.kt");
+        }
+
+        @TestMetadata("localFunction.kt")
+        public void testLocalFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/localFunction.kt");
+        }
+
+        @TestMetadata("localReturnInsideFunctionExpression.kt")
+        public void testLocalReturnInsideFunctionExpression() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/localReturnInsideFunctionExpression.kt");
+        }
+
+        @TestMetadata("nothisnoclosure.kt")
+        public void testNothisnoclosure() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
+        }
+
+        @TestMetadata("prefixRecursiveCall.kt")
+        public void testPrefixRecursiveCall() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt");
+        }
+
+        @TestMetadata("recursiveCompareTo.kt")
+        public void testRecursiveCompareTo() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/recursiveCompareTo.kt");
+        }
+
+        @TestMetadata("recursiveIncrementCall.kt")
+        public void testRecursiveIncrementCall() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
+        }
+
+        @TestMetadata("typeParameterAsUpperBound.kt")
+        public void testTypeParameterAsUpperBound() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParameterAsUpperBound.kt");
+        }
+
+        @TestMetadata("typeParametersInLocalFunction.kt")
+        public void testTypeParametersInLocalFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/functions/typeParametersInLocalFunction.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/functions/bigArity")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BigArity extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBigArity() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/bigArity"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/functions/functionExpression")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class FunctionExpression extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInFunctionExpression() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/functionExpression"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("functionExpression.kt")
+            public void testFunctionExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/functionExpression/functionExpression.kt");
+            }
+
+            @TestMetadata("functionExpressionWithThisReference.kt")
+            public void testFunctionExpressionWithThisReference() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReference.kt");
+            }
+
+            @TestMetadata("functionExpressionWithThisReferenceNI.kt")
+            public void testFunctionExpressionWithThisReferenceNI() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReferenceNI.kt");
+            }
+
+            @TestMetadata("functionLiteralExpression.kt")
+            public void testFunctionLiteralExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/functionExpression/functionLiteralExpression.kt");
+            }
+
+            @TestMetadata("insideGenericLambda.kt")
+            public void testInsideGenericLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/functionExpression/insideGenericLambda.kt");
+            }
+
+            @TestMetadata("underscoreParameters.kt")
+            public void testUnderscoreParameters() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/functionExpression/underscoreParameters.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/functions/invoke")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Invoke extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInInvoke() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("castFunctionToExtension.kt")
+            public void testCastFunctionToExtension() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/castFunctionToExtension.kt");
+            }
+
+            @TestMetadata("extensionInvokeOnExpr.kt")
+            public void testExtensionInvokeOnExpr() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt");
+            }
+
+            @TestMetadata("implicitInvokeInCompanionObjectWithFunctionalArgument.kt")
+            public void testImplicitInvokeInCompanionObjectWithFunctionalArgument() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/implicitInvokeInCompanionObjectWithFunctionalArgument.kt");
+            }
+
+            @TestMetadata("implicitInvokeWithFunctionLiteralArgument.kt")
+            public void testImplicitInvokeWithFunctionLiteralArgument() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/implicitInvokeWithFunctionLiteralArgument.kt");
+            }
+
+            @TestMetadata("invoke.kt")
+            public void testInvoke() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/invoke.kt");
+            }
+
+            @TestMetadata("invokeOnExprByConvention.kt")
+            public void testInvokeOnExprByConvention() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/invokeOnExprByConvention.kt");
+            }
+
+            @TestMetadata("kt3189.kt")
+            public void testKt3189() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/kt3189.kt");
+            }
+
+            @TestMetadata("kt3450getAndInvoke.kt")
+            public void testKt3450getAndInvoke() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/kt3450getAndInvoke.kt");
+            }
+
+            @TestMetadata("kt3631invokeOnString.kt")
+            public void testKt3631invokeOnString() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/kt3631invokeOnString.kt");
+            }
+
+            @TestMetadata("kt3772.kt")
+            public void testKt3772() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/kt3772.kt");
+            }
+
+            @TestMetadata("kt3821invokeOnThis.kt")
+            public void testKt3821invokeOnThis() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/functions/localFunctions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class LocalFunctions extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInLocalFunctions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("boundTypeParameterInSupertype.kt")
+            public void testBoundTypeParameterInSupertype() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt");
+            }
+
+            @TestMetadata("boundTypeParameterInVararg.kt")
+            public void testBoundTypeParameterInVararg() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInVararg.kt");
+            }
+
+            @TestMetadata("callBetweenLocalFunctions.kt")
+            public void testCallBetweenLocalFunctions() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/callBetweenLocalFunctions.kt");
+            }
+
+            @TestMetadata("callInlineLocalInLambda.kt")
+            public void testCallInlineLocalInLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/callInlineLocalInLambda.kt");
+            }
+
+            @TestMetadata("captureUpperBoundedTypeParameter.kt")
+            public void testCaptureUpperBoundedTypeParameter() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/captureUpperBoundedTypeParameter.kt");
+            }
+
+            @TestMetadata("definedWithinLambda.kt")
+            public void testDefinedWithinLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/definedWithinLambda.kt");
+            }
+
+            @TestMetadata("definedWithinLambdaInnerUsage1.kt")
+            public void testDefinedWithinLambdaInnerUsage1() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/definedWithinLambdaInnerUsage1.kt");
+            }
+
+            @TestMetadata("definedWithinLambdaInnerUsage2.kt")
+            public void testDefinedWithinLambdaInnerUsage2() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/definedWithinLambdaInnerUsage2.kt");
+            }
+
+            @TestMetadata("kt2895.kt")
+            public void testKt2895() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt2895.kt");
+            }
+
+            @TestMetadata("kt3308.kt")
+            public void testKt3308() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt3308.kt");
+            }
+
+            @TestMetadata("kt3978.kt")
+            public void testKt3978() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt3978.kt");
+            }
+
+            @TestMetadata("kt3978_2.kt")
+            public void testKt3978_2() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt3978_2.kt");
+            }
+
+            @TestMetadata("kt4119.kt")
+            public void testKt4119() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt4119.kt");
+            }
+
+            @TestMetadata("kt4119_2.kt")
+            public void testKt4119_2() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt4119_2.kt");
+            }
+
+            @TestMetadata("kt4514.kt")
+            public void testKt4514() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt");
+            }
+
+            @TestMetadata("kt4783.kt")
+            public void testKt4783() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt4783.kt");
+            }
+
+            @TestMetadata("kt4784.kt")
+            public void testKt4784() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt4784.kt");
+            }
+
+            @TestMetadata("kt4989.kt")
+            public void testKt4989() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/kt4989.kt");
+            }
+
+            @TestMetadata("localFunctionInConstructor.kt")
+            public void testLocalFunctionInConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt");
+            }
+
+            @TestMetadata("localFunctionVsLocalVariable.kt")
+            public void testLocalFunctionVsLocalVariable() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/localFunctionVsLocalVariable.kt");
+            }
+
+            @TestMetadata("nameClash.kt")
+            public void testNameClash() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/nameClash.kt");
+            }
+
+            @TestMetadata("nameClashAcrossDifferentContainers.kt")
+            public void testNameClashAcrossDifferentContainers() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/nameClashAcrossDifferentContainers.kt");
+            }
+
+            @TestMetadata("overloadedLocalFunWithoutClosure.kt")
+            public void testOverloadedLocalFunWithoutClosure() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/overloadedLocalFunWithoutClosure.kt");
+            }
+
+            @TestMetadata("overloadedLocalFunction.kt")
+            public void testOverloadedLocalFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/overloadedLocalFunction.kt");
+            }
+
+            @TestMetadata("overloadedLocalFunction1.kt")
+            public void testOverloadedLocalFunction1() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/overloadedLocalFunction1.kt");
+            }
+
+            @TestMetadata("overloadedLocalFunction2.kt")
+            public void testOverloadedLocalFunction2() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/overloadedLocalFunction2.kt");
+            }
+
+            @TestMetadata("overloadedLocalFunction3.kt")
+            public void testOverloadedLocalFunction3() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/overloadedLocalFunction3.kt");
+            }
+
+            @TestMetadata("parameterAsDefaultValue.kt")
+            public void testParameterAsDefaultValue() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/localFunctions/parameterAsDefaultValue.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/hashPMap")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class HashPMap extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInHashPMap() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/hashPMap"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/ieee754")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Ieee754 extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInIeee754() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ieee754"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("anyToReal.kt")
+        public void testAnyToReal() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/anyToReal.kt");
+        }
+
+        @TestMetadata("asComparableToDouble.kt")
+        public void testAsComparableToDouble() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/asComparableToDouble.kt");
+        }
+
+        @TestMetadata("asComparableToDouble_properIeeeComparisons.kt")
+        public void testAsComparableToDouble_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/asComparableToDouble_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("comparableToTWithT_properIeeeComparisons.kt")
+        public void testComparableToTWithT_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/comparableToTWithT_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("comparableTypeCast.kt")
+        public void testComparableTypeCast() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/comparableTypeCast.kt");
+        }
+
+        @TestMetadata("dataClass.kt")
+        public void testDataClass() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/dataClass.kt");
+        }
+
+        @TestMetadata("differentTypesComparison.kt")
+        public void testDifferentTypesComparison() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/differentTypesComparison.kt");
+        }
+
+        @TestMetadata("equalsDouble_properIeeeComparisons.kt")
+        public void testEqualsDouble_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/equalsDouble_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("equalsFloat_properIeeeComparisons.kt")
+        public void testEqualsFloat_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/equalsFloat_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("equalsNullableDouble_properIeeeComparisons.kt")
+        public void testEqualsNullableDouble_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/equalsNullableDouble_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("equalsNullableFloat_properIeeeComparisons.kt")
+        public void testEqualsNullableFloat_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/equalsNullableFloat_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("explicitCompareCall.kt")
+        public void testExplicitCompareCall() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/explicitCompareCall.kt");
+        }
+
+        @TestMetadata("explicitEqualsCall.kt")
+        public void testExplicitEqualsCall() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/explicitEqualsCall.kt");
+        }
+
+        @TestMetadata("generic.kt")
+        public void testGeneric() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/generic.kt");
+        }
+
+        @TestMetadata("greaterDouble_properIeeeComparisons.kt")
+        public void testGreaterDouble_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/greaterDouble_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("greaterFloat_properIeeeComparisons.kt")
+        public void testGreaterFloat_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/greaterFloat_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("inline.kt")
+        public void testInline() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/inline.kt");
+        }
+
+        @TestMetadata("lessDouble_properIeeeAndNewInference.kt")
+        public void testLessDouble_properIeeeAndNewInference() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/lessDouble_properIeeeAndNewInference.kt");
+        }
+
+        @TestMetadata("lessDouble_properIeeeComparisons.kt")
+        public void testLessDouble_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/lessDouble_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("lessFloat_properIeeeComparisons.kt")
+        public void testLessFloat_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/lessFloat_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("nullableAnyToReal.kt")
+        public void testNullableAnyToReal() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/nullableAnyToReal.kt");
+        }
+
+        @TestMetadata("nullableDoubleEquals.kt")
+        public void testNullableDoubleEquals() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/nullableDoubleEquals.kt");
+        }
+
+        @TestMetadata("nullableDoubleEqualsLV13.kt")
+        public void testNullableDoubleEqualsLV13() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/nullableDoubleEqualsLV13.kt");
+        }
+
+        @TestMetadata("nullableDoubleNotEquals.kt")
+        public void testNullableDoubleNotEquals() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/nullableDoubleNotEquals.kt");
+        }
+
+        @TestMetadata("nullableFloatEquals.kt")
+        public void testNullableFloatEquals() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/nullableFloatEquals.kt");
+        }
+
+        @TestMetadata("nullableFloatNotEquals.kt")
+        public void testNullableFloatNotEquals() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/nullableFloatNotEquals.kt");
+        }
+
+        @TestMetadata("nullableIntEquals.kt")
+        public void testNullableIntEquals() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/nullableIntEquals.kt");
+        }
+
+        @TestMetadata("safeCall.kt")
+        public void testSafeCall() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/safeCall.kt");
+        }
+
+        @TestMetadata("smartCastOnWhenSubjectAfterCheckInBranch_properIeeeComparisons.kt")
+        public void testSmartCastOnWhenSubjectAfterCheckInBranch_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/smartCastOnWhenSubjectAfterCheckInBranch_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("smartCastToDifferentTypesWithNumericPromotion_properIeeeComparisons.kt")
+        public void testSmartCastToDifferentTypesWithNumericPromotion_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/smartCastToDifferentTypesWithNumericPromotion_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("smartCastToDifferentTypes_properIeeeComparisons.kt")
+        public void testSmartCastToDifferentTypes_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/smartCastToDifferentTypes_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("smartCastToDoubleAndComparableToDouble.kt")
+        public void testSmartCastToDoubleAndComparableToDouble() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/smartCastToDoubleAndComparableToDouble.kt");
+        }
+
+        @TestMetadata("whenNoSubject_properIeeeComparisons.kt")
+        public void testWhenNoSubject_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/whenNoSubject_properIeeeComparisons.kt");
+        }
+
+        @TestMetadata("whenNullableSmartCast.kt")
+        public void testWhenNullableSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/whenNullableSmartCast.kt");
+        }
+
+        @TestMetadata("when_properIeeeComparisons.kt")
+        public void testWhen_properIeeeComparisons() throws Exception {
+            runTest("compiler/testData/codegen/box/ieee754/when_properIeeeComparisons.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/increment")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Increment extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInIncrement() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/increment"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("argumentWithSideEffects.kt")
+        public void testArgumentWithSideEffects() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/argumentWithSideEffects.kt");
+        }
+
+        @TestMetadata("arrayElement.kt")
+        public void testArrayElement() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/arrayElement.kt");
+        }
+
+        @TestMetadata("assignPlusOnSmartCast.kt")
+        public void testAssignPlusOnSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/assignPlusOnSmartCast.kt");
+        }
+
+        @TestMetadata("augmentedAssignmentWithComplexRhs.kt")
+        public void testAugmentedAssignmentWithComplexRhs() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/augmentedAssignmentWithComplexRhs.kt");
+        }
+
+        @TestMetadata("classNaryGetSet.kt")
+        public void testClassNaryGetSet() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/classNaryGetSet.kt");
+        }
+
+        @TestMetadata("classVarargGetSet.kt")
+        public void testClassVarargGetSet() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/classVarargGetSet.kt");
+        }
+
+        @TestMetadata("classVarargGetSetEvaluationOrder.kt")
+        public void testClassVarargGetSetEvaluationOrder() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/classVarargGetSetEvaluationOrder.kt");
+        }
+
+        @TestMetadata("classWithGetSet.kt")
+        public void testClassWithGetSet() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/classWithGetSet.kt");
+        }
+
+        @TestMetadata("extOnLong.kt")
+        public void testExtOnLong() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/extOnLong.kt");
+        }
+
+        @TestMetadata("genericClassWithGetSet.kt")
+        public void testGenericClassWithGetSet() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/genericClassWithGetSet.kt");
+        }
+
+        @TestMetadata("kt36956.kt")
+        public void testKt36956() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/kt36956.kt");
+        }
+
+        @TestMetadata("memberExtOnLong.kt")
+        public void testMemberExtOnLong() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/memberExtOnLong.kt");
+        }
+
+        @TestMetadata("nullable.kt")
+        public void testNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/nullable.kt");
+        }
+
+        @TestMetadata("postfixIncrementDoubleSmartCast.kt")
+        public void testPostfixIncrementDoubleSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/postfixIncrementDoubleSmartCast.kt");
+        }
+
+        @TestMetadata("postfixIncrementOnClass.kt")
+        public void testPostfixIncrementOnClass() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/postfixIncrementOnClass.kt");
+        }
+
+        @TestMetadata("postfixIncrementOnClassSmartCast.kt")
+        public void testPostfixIncrementOnClassSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/postfixIncrementOnClassSmartCast.kt");
+        }
+
+        @TestMetadata("postfixIncrementOnShortSmartCast.kt")
+        public void testPostfixIncrementOnShortSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/postfixIncrementOnShortSmartCast.kt");
+        }
+
+        @TestMetadata("postfixIncrementOnSmartCast.kt")
+        public void testPostfixIncrementOnSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/postfixIncrementOnSmartCast.kt");
+        }
+
+        @TestMetadata("postfixNullableClassIncrement.kt")
+        public void testPostfixNullableClassIncrement() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/postfixNullableClassIncrement.kt");
+        }
+
+        @TestMetadata("postfixNullableIncrement.kt")
+        public void testPostfixNullableIncrement() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/postfixNullableIncrement.kt");
+        }
+
+        @TestMetadata("prefixIncrementOnClass.kt")
+        public void testPrefixIncrementOnClass() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/prefixIncrementOnClass.kt");
+        }
+
+        @TestMetadata("prefixIncrementOnClassSmartCast.kt")
+        public void testPrefixIncrementOnClassSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/prefixIncrementOnClassSmartCast.kt");
+        }
+
+        @TestMetadata("prefixIncrementOnSmartCast.kt")
+        public void testPrefixIncrementOnSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/prefixIncrementOnSmartCast.kt");
+        }
+
+        @TestMetadata("prefixNullableClassIncrement.kt")
+        public void testPrefixNullableClassIncrement() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/prefixNullableClassIncrement.kt");
+        }
+
+        @TestMetadata("prefixNullableIncrement.kt")
+        public void testPrefixNullableIncrement() throws Exception {
+            runTest("compiler/testData/codegen/box/increment/prefixNullableIncrement.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/inference")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Inference extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInference() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("approximateNonTopLevelCapturedTypes.kt")
+        public void testApproximateNonTopLevelCapturedTypes() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/approximateNonTopLevelCapturedTypes.kt");
+        }
+
+        @TestMetadata("capturedStarProjection.kt")
+        public void testCapturedStarProjection() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/capturedStarProjection.kt");
+        }
+
+        @TestMetadata("earlyReturnInsideCrossinlineLambda.kt")
+        public void testEarlyReturnInsideCrossinlineLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/earlyReturnInsideCrossinlineLambda.kt");
+        }
+
+        @TestMetadata("inferenceWithTypeVariableInsideCapturedType.kt")
+        public void testInferenceWithTypeVariableInsideCapturedType() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/inferenceWithTypeVariableInsideCapturedType.kt");
+        }
+
+        @TestMetadata("kt10822.kt")
+        public void testKt10822() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/kt10822.kt");
+        }
+
+        @TestMetadata("kt38664.kt")
+        public void testKt38664() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/kt38664.kt");
+        }
+
+        @TestMetadata("kt42130.kt")
+        public void testKt42130() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/kt42130.kt");
+        }
+
+        @TestMetadata("lambdasWithExtensionFunctionType.kt")
+        public void testLambdasWithExtensionFunctionType() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/lambdasWithExtensionFunctionType.kt");
+        }
+
+        @TestMetadata("lastExpressionOfLambdaWithNothingConstraint.kt")
+        public void testLastExpressionOfLambdaWithNothingConstraint() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/lastExpressionOfLambdaWithNothingConstraint.kt");
+        }
+
+        @TestMetadata("mapCollectChainWithNullResult.kt")
+        public void testMapCollectChainWithNullResult() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/mapCollectChainWithNullResult.kt");
+        }
+
+        @TestMetadata("noCoercionToUniForNullableLambdaReturnType.kt")
+        public void testNoCoercionToUniForNullableLambdaReturnType() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/noCoercionToUniForNullableLambdaReturnType.kt");
+        }
+
+        @TestMetadata("recursiveConstraintInsideTypeArgumentWithStarProjection.kt")
+        public void testRecursiveConstraintInsideTypeArgumentWithStarProjection() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/recursiveConstraintInsideTypeArgumentWithStarProjection.kt");
+        }
+
+        @TestMetadata("unsafeVarianceCodegen.kt")
+        public void testUnsafeVarianceCodegen() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/inlineClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class InlineClasses extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInlineClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("annotatedMemberExtensionProperty.kt")
+        public void testAnnotatedMemberExtensionProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/annotatedMemberExtensionProperty.kt");
+        }
+
+        @TestMetadata("anySuperCall.kt")
+        public void testAnySuperCall() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/anySuperCall.kt");
+        }
+
+        @TestMetadata("boundCallableReferencePassedToInlineFunction.kt")
+        public void testBoundCallableReferencePassedToInlineFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
+        }
+
+        @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
+        public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
+        }
+
+        @TestMetadata("boxNullableValueOfInlineClassWithPrimitiveUnderlyingType.kt")
+        public void testBoxNullableValueOfInlineClassWithPrimitiveUnderlyingType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithPrimitiveUnderlyingType.kt");
+        }
+
+        @TestMetadata("boxResultInlineClassOfConstructorCall.kt")
+        public void testBoxResultInlineClassOfConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxResultInlineClassOfConstructorCall.kt");
+        }
+
+        @TestMetadata("bridgeForFunctionReturningInlineClass.kt")
+        public void testBridgeForFunctionReturningInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/bridgeForFunctionReturningInlineClass.kt");
+        }
+
+        @TestMetadata("bridgeGenerationWithInlineClassOverAny.kt")
+        public void testBridgeGenerationWithInlineClassOverAny() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/bridgeGenerationWithInlineClassOverAny.kt");
+        }
+
+        @TestMetadata("bridgesWhenInlineClassImplementsGenericInterface.kt")
+        public void testBridgesWhenInlineClassImplementsGenericInterface() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/bridgesWhenInlineClassImplementsGenericInterface.kt");
+        }
+
+        @TestMetadata("callComputablePropertyInsideInlineClass.kt")
+        public void testCallComputablePropertyInsideInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/callComputablePropertyInsideInlineClass.kt");
+        }
+
+        @TestMetadata("castInsideWhenExpression.kt")
+        public void testCastInsideWhenExpression() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/castInsideWhenExpression.kt");
+        }
+
+        @TestMetadata("checkBoxUnboxOfArgumentsOnInlinedFunctions.kt")
+        public void testCheckBoxUnboxOfArgumentsOnInlinedFunctions() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkBoxUnboxOfArgumentsOnInlinedFunctions.kt");
+        }
+
+        @TestMetadata("checkBoxingAfterAssertionOperator.kt")
+        public void testCheckBoxingAfterAssertionOperator() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkBoxingAfterAssertionOperator.kt");
+        }
+
+        @TestMetadata("checkBoxingForNonLocalAndLabeledReturns.kt")
+        public void testCheckBoxingForNonLocalAndLabeledReturns() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkBoxingForNonLocalAndLabeledReturns.kt");
+        }
+
+        @TestMetadata("checkBoxingFromReturnTypeForInlineClasses.kt")
+        public void testCheckBoxingFromReturnTypeForInlineClasses() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkBoxingFromReturnTypeForInlineClasses.kt");
+        }
+
+        @TestMetadata("checkBoxingOnFunctionCalls.kt")
+        public void testCheckBoxingOnFunctionCalls() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkBoxingOnFunctionCalls.kt");
+        }
+
+        @TestMetadata("checkBoxingOnLocalVariableAssignments.kt")
+        public void testCheckBoxingOnLocalVariableAssignments() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkBoxingOnLocalVariableAssignments.kt");
+        }
+
+        @TestMetadata("checkBoxingUnboxingForInheritedTypeSpecializedFunctions.kt")
+        public void testCheckBoxingUnboxingForInheritedTypeSpecializedFunctions() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkBoxingUnboxingForInheritedTypeSpecializedFunctions.kt");
+        }
+
+        @TestMetadata("checkCallingMembersInsideInlineClass.kt")
+        public void testCheckCallingMembersInsideInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkCallingMembersInsideInlineClass.kt");
+        }
+
+        @TestMetadata("checkCastToInlineClass.kt")
+        public void testCheckCastToInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkCastToInlineClass.kt");
+        }
+
+        @TestMetadata("checkForInstanceOfInlineClass.kt")
+        public void testCheckForInstanceOfInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkForInstanceOfInlineClass.kt");
+        }
+
+        @TestMetadata("checkLambdaWithInlineClassesInFunctionalType.kt")
+        public void testCheckLambdaWithInlineClassesInFunctionalType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkLambdaWithInlineClassesInFunctionalType.kt");
+        }
+
+        @TestMetadata("checkUnboxingResultFromTypeVariable.kt")
+        public void testCheckUnboxingResultFromTypeVariable() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/checkUnboxingResultFromTypeVariable.kt");
+        }
+
+        @TestMetadata("computablePropertyInsideInlineClass.kt")
+        public void testComputablePropertyInsideInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/computablePropertyInsideInlineClass.kt");
+        }
+
+        @TestMetadata("conformToComparableAndCallInterfaceMethod.kt")
+        public void testConformToComparableAndCallInterfaceMethod() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/conformToComparableAndCallInterfaceMethod.kt");
+        }
+
+        @TestMetadata("correctBoxingForBranchExpressions.kt")
+        public void testCorrectBoxingForBranchExpressions() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt");
+        }
+
+        @TestMetadata("createInlineClassInArgumentPosition.kt")
+        public void testCreateInlineClassInArgumentPosition() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/createInlineClassInArgumentPosition.kt");
+        }
+
+        @TestMetadata("crossinlineWithInlineClassInParameter.kt")
+        public void testCrossinlineWithInlineClassInParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/crossinlineWithInlineClassInParameter.kt");
+        }
+
+        @TestMetadata("defaultFunctionsFromAnyForInlineClass.kt")
+        public void testDefaultFunctionsFromAnyForInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
+        }
+
+        @TestMetadata("defaultInterfaceMethodsInInlineClass.kt")
+        public void testDefaultInterfaceMethodsInInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
+        }
+
+        @TestMetadata("defaultWithInlineClassArgument.kt")
+        public void testDefaultWithInlineClassArgument() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/defaultWithInlineClassArgument.kt");
+        }
+
+        @TestMetadata("elvisWithInlineClassAndNullConstant.kt")
+        public void testElvisWithInlineClassAndNullConstant() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/elvisWithInlineClassAndNullConstant.kt");
+        }
+
+        @TestMetadata("emptyConstructorForInlineClass.kt")
+        public void testEmptyConstructorForInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/emptyConstructorForInlineClass.kt");
+        }
+
+        @TestMetadata("equalityChecksInlineClassNonNull.kt")
+        public void testEqualityChecksInlineClassNonNull() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksInlineClassNonNull.kt");
+        }
+
+        @TestMetadata("equalityChecksMixedNullability.kt")
+        public void testEqualityChecksMixedNullability() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksMixedNullability.kt");
+        }
+
+        @TestMetadata("equalityChecksNegatedInlineClassNonNull.kt")
+        public void testEqualityChecksNegatedInlineClassNonNull() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksNegatedInlineClassNonNull.kt");
+        }
+
+        @TestMetadata("equalityChecksNegatedNonNull.kt")
+        public void testEqualityChecksNegatedNonNull() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksNegatedNonNull.kt");
+        }
+
+        @TestMetadata("equalityChecksNegatedNullable.kt")
+        public void testEqualityChecksNegatedNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksNegatedNullable.kt");
+        }
+
+        @TestMetadata("equalityChecksNegatedPrimitive.kt")
+        public void testEqualityChecksNegatedPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksNegatedPrimitive.kt");
+        }
+
+        @TestMetadata("equalityChecksNonNull.kt")
+        public void testEqualityChecksNonNull() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksNonNull.kt");
+        }
+
+        @TestMetadata("equalityChecksNullable.kt")
+        public void testEqualityChecksNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksNullable.kt");
+        }
+
+        @TestMetadata("equalityChecksPrimitive.kt")
+        public void testEqualityChecksPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalityChecksPrimitive.kt");
+        }
+
+        @TestMetadata("equalsCallsLeftArgument.kt")
+        public void testEqualsCallsLeftArgument() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalsCallsLeftArgument.kt");
+        }
+
+        @TestMetadata("equalsOperatorWithGenericCall.kt")
+        public void testEqualsOperatorWithGenericCall() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/equalsOperatorWithGenericCall.kt");
+        }
+
+        @TestMetadata("extLambdaInInlineClassFun.kt")
+        public void testExtLambdaInInlineClassFun() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/extLambdaInInlineClassFun.kt");
+        }
+
+        @TestMetadata("extLambdaInInlineClassFun2.kt")
+        public void testExtLambdaInInlineClassFun2() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/extLambdaInInlineClassFun2.kt");
+        }
+
+        @TestMetadata("fieldNameClash.kt")
+        public void testFieldNameClash() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/fieldNameClash.kt");
+        }
+
+        @TestMetadata("genericInlineClassSynthMembers.kt")
+        public void testGenericInlineClassSynthMembers() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/genericInlineClassSynthMembers.kt");
+        }
+
+        @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
+        public void testInlineClassAsLastExpressionInInLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
+        }
+
+        @TestMetadata("inlineClassEqualityShouldUseTotalOrderForFloatingPointData.kt")
+        public void testInlineClassEqualityShouldUseTotalOrderForFloatingPointData() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualityShouldUseTotalOrderForFloatingPointData.kt");
+        }
+
+        @TestMetadata("inlineClassFunctionInvoke.kt")
+        public void testInlineClassFunctionInvoke() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassFunctionInvoke.kt");
+        }
+
+        @TestMetadata("inlineClassInStringTemplate.kt")
+        public void testInlineClassInStringTemplate() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassInStringTemplate.kt");
+        }
+
+        @TestMetadata("inlineClassValueCapturedInInlineLambda.kt")
+        public void testInlineClassValueCapturedInInlineLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassValueCapturedInInlineLambda.kt");
+        }
+
+        @TestMetadata("inlineClassValueCapturedInNonInlineLambda.kt")
+        public void testInlineClassValueCapturedInNonInlineLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassValueCapturedInNonInlineLambda.kt");
+        }
+
+        @TestMetadata("inlineClassValuesInsideStrings.kt")
+        public void testInlineClassValuesInsideStrings() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassValuesInsideStrings.kt");
+        }
+
+        @TestMetadata("inlineClassWithCustomEquals.kt")
+        public void testInlineClassWithCustomEquals() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassWithCustomEquals.kt");
+        }
+
+        @TestMetadata("inlineClassWithDefaultFunctionsFromAny.kt")
+        public void testInlineClassWithDefaultFunctionsFromAny() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassWithDefaultFunctionsFromAny.kt");
+        }
+
+        @TestMetadata("inlineClassesAsInlineFunParameters.kt")
+        public void testInlineClassesAsInlineFunParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassesAsInlineFunParameters.kt");
+        }
+
+        @TestMetadata("inlineClassesCheckCast.kt")
+        public void testInlineClassesCheckCast() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassesCheckCast.kt");
+        }
+
+        @TestMetadata("inlineClassesInInlineLambdaParameters.kt")
+        public void testInlineClassesInInlineLambdaParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassesInInlineLambdaParameters.kt");
+        }
+
+        @TestMetadata("inlineClassesRefTypesInInlineLambdaParameters.kt")
+        public void testInlineClassesRefTypesInInlineLambdaParameters() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassesRefTypesInInlineLambdaParameters.kt");
+        }
+
+        @TestMetadata("inlineExtLambdaInInlineClassFun.kt")
+        public void testInlineExtLambdaInInlineClassFun() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineExtLambdaInInlineClassFun.kt");
+        }
+
+        @TestMetadata("inlineExtLambdaInInlineClassFun2.kt")
+        public void testInlineExtLambdaInInlineClassFun2() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineExtLambdaInInlineClassFun2.kt");
+        }
+
+        @TestMetadata("inlineFunctionInsideInlineClass.kt")
+        public void testInlineFunctionInsideInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineFunctionInsideInlineClass.kt");
+        }
+
+        @TestMetadata("iterateOverArrayOfInlineClassValues.kt")
+        public void testIterateOverArrayOfInlineClassValues() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/iterateOverArrayOfInlineClassValues.kt");
+        }
+
+        @TestMetadata("iterateOverListOfInlineClassValues.kt")
+        public void testIterateOverListOfInlineClassValues() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/iterateOverListOfInlineClassValues.kt");
+        }
+
+        @TestMetadata("kt25246.kt")
+        public void testKt25246() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt25246.kt");
+        }
+
+        @TestMetadata("kt26103.kt")
+        public void testKt26103() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt26103.kt");
+        }
+
+        @TestMetadata("kt26103_contravariantUnderlyingType.kt")
+        public void testKt26103_contravariantUnderlyingType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt26103_contravariantUnderlyingType.kt");
+        }
+
+        @TestMetadata("kt26103_covariantUnderlyingType.kt")
+        public void testKt26103_covariantUnderlyingType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt26103_covariantUnderlyingType.kt");
+        }
+
+        @TestMetadata("kt26103_original.kt")
+        public void testKt26103_original() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt26103_original.kt");
+        }
+
+        @TestMetadata("kt27096.kt")
+        public void testKt27096() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27096.kt");
+        }
+
+        @TestMetadata("kt27096_enum.kt")
+        public void testKt27096_enum() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27096_enum.kt");
+        }
+
+        @TestMetadata("kt27096_functional.kt")
+        public void testKt27096_functional() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27096_functional.kt");
+        }
+
+        @TestMetadata("kt27096_innerClass.kt")
+        public void testKt27096_innerClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27096_innerClass.kt");
+        }
+
+        @TestMetadata("kt27096_nullablePrimitive.kt")
+        public void testKt27096_nullablePrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27096_nullablePrimitive.kt");
+        }
+
+        @TestMetadata("kt27096_nullableReference.kt")
+        public void testKt27096_nullableReference() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27096_nullableReference.kt");
+        }
+
+        @TestMetadata("kt27096_primitive.kt")
+        public void testKt27096_primitive() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27096_primitive.kt");
+        }
+
+        @TestMetadata("kt27096_reference.kt")
+        public void testKt27096_reference() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
+        }
+
+        @TestMetadata("kt27113a.kt")
+        public void testKt27113a() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27113a.kt");
+        }
+
+        @TestMetadata("kt27132.kt")
+        public void testKt27132() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
+        }
+
+        @TestMetadata("kt27140.kt")
+        public void testKt27140() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27140.kt");
+        }
+
+        @TestMetadata("kt27705.kt")
+        public void testKt27705() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27705.kt");
+        }
+
+        @TestMetadata("kt27706.kt")
+        public void testKt27706() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt27706.kt");
+        }
+
+        @TestMetadata("kt33119.kt")
+        public void testKt33119() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt33119.kt");
+        }
+
+        @TestMetadata("kt34268.kt")
+        public void testKt34268() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt34268.kt");
+        }
+
+        @TestMetadata("kt34902.kt")
+        public void testKt34902() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt34902.kt");
+        }
+
+        @TestMetadata("kt37998.kt")
+        public void testKt37998() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt37998.kt");
+        }
+
+        @TestMetadata("kt38680.kt")
+        public void testKt38680() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt38680.kt");
+        }
+
+        @TestMetadata("kt38680a.kt")
+        public void testKt38680a() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt38680a.kt");
+        }
+
+        @TestMetadata("kt38680b.kt")
+        public void testKt38680b() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/kt38680b.kt");
+        }
+
+        @TestMetadata("mangledDefaultParameterFunction.kt")
+        public void testMangledDefaultParameterFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunction.kt");
+        }
+
+        @TestMetadata("mangledSuperCalls.kt")
+        public void testMangledSuperCalls() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/mangledSuperCalls.kt");
+        }
+
+        @TestMetadata("noAssertionsOnInlineClassBasedOnNullableType.kt")
+        public void testNoAssertionsOnInlineClassBasedOnNullableType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/noAssertionsOnInlineClassBasedOnNullableType.kt");
+        }
+
+        @TestMetadata("noReturnTypeMangling.kt")
+        public void testNoReturnTypeMangling() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/noReturnTypeMangling.kt");
+        }
+
+        @TestMetadata("nullableEqeqNonNull.kt")
+        public void testNullableEqeqNonNull() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/nullableEqeqNonNull.kt");
+        }
+
+        @TestMetadata("nullableWrapperEquality.kt")
+        public void testNullableWrapperEquality() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt");
+        }
+
+        @TestMetadata("overridingFunCallingPrivateFun.kt")
+        public void testOverridingFunCallingPrivateFun() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt");
+        }
+
+        @TestMetadata("passInlineClassAsVararg.kt")
+        public void testPassInlineClassAsVararg() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/passInlineClassAsVararg.kt");
+        }
+
+        @TestMetadata("propertyLoweringOrder.kt")
+        public void testPropertyLoweringOrder() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/propertyLoweringOrder.kt");
+        }
+
+        @TestMetadata("referToPropertyInCompanionObjectOfInlineClass.kt")
+        public void testReferToPropertyInCompanionObjectOfInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/referToPropertyInCompanionObjectOfInlineClass.kt");
+        }
+
+        @TestMetadata("referToUnderlyingPropertyInsideInlineClass.kt")
+        public void testReferToUnderlyingPropertyInsideInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyInsideInlineClass.kt");
+        }
+
+        @TestMetadata("referToUnderlyingPropertyOfInlineClass.kt")
+        public void testReferToUnderlyingPropertyOfInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClass.kt");
+        }
+
+        @TestMetadata("resultInlining.kt")
+        public void testResultInlining() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/resultInlining.kt");
+        }
+
+        @TestMetadata("secondaryConstructorWithVararg.kt")
+        public void testSecondaryConstructorWithVararg() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/secondaryConstructorWithVararg.kt");
+        }
+
+        @TestMetadata("secondaryConstructorsInsideInlineClass.kt")
+        public void testSecondaryConstructorsInsideInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/secondaryConstructorsInsideInlineClass.kt");
+        }
+
+        @TestMetadata("secondaryConstructorsInsideInlineClassWithPrimitiveCarrierType.kt")
+        public void testSecondaryConstructorsInsideInlineClassWithPrimitiveCarrierType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/secondaryConstructorsInsideInlineClassWithPrimitiveCarrierType.kt");
+        }
+
+        @TestMetadata("smartCastOnThisOfInlineClassType.kt")
+        public void testSmartCastOnThisOfInlineClassType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt");
+        }
+
+        @TestMetadata("stringPlus.kt")
+        public void testStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/stringPlus.kt");
+        }
+
+        @TestMetadata("toStringCallingPrivateFun.kt")
+        public void testToStringCallingPrivateFun() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
+        }
+
+        @TestMetadata("toStringOfUnboxedNullable.kt")
+        public void testToStringOfUnboxedNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/toStringOfUnboxedNullable.kt");
+        }
+
+        @TestMetadata("typeChecksForInlineClasses.kt")
+        public void testTypeChecksForInlineClasses() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/typeChecksForInlineClasses.kt");
+        }
+
+        @TestMetadata("UIntSafeAsInt.kt")
+        public void testUIntSafeAsInt() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/UIntSafeAsInt.kt");
+        }
+
+        @TestMetadata("unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
+        public void testUnboxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
+        }
+
+        @TestMetadata("unboxNullableValueOfInlineClassWithPrimitiveUnderlyingType.kt")
+        public void testUnboxNullableValueOfInlineClassWithPrimitiveUnderlyingType() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithPrimitiveUnderlyingType.kt");
+        }
+
+        @TestMetadata("unboxReceiverOnCallingMethodFromInlineClass.kt")
+        public void testUnboxReceiverOnCallingMethodFromInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/unboxReceiverOnCallingMethodFromInlineClass.kt");
+        }
+
+        @TestMetadata("useInlineClassesInsideElvisOperator.kt")
+        public void testUseInlineClassesInsideElvisOperator() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/useInlineClassesInsideElvisOperator.kt");
+        }
+
+        @TestMetadata("useInlineFunctionInsideInlineClass.kt")
+        public void testUseInlineFunctionInsideInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/useInlineFunctionInsideInlineClass.kt");
+        }
+
+        @TestMetadata("useThisInsideInlineClass.kt")
+        public void testUseThisInsideInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/useThisInsideInlineClass.kt");
+        }
+
+        @TestMetadata("whenWithSubject.kt")
+        public void testWhenWithSubject() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/whenWithSubject.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BoxReturnValueInLambda extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBoxReturnValueInLambda() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("boxAny.kt")
+            public void testBoxAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxAny.kt");
+            }
+
+            @TestMetadata("boxFunLiteralAny.kt")
+            public void testBoxFunLiteralAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxFunLiteralAny.kt");
+            }
+
+            @TestMetadata("boxInt.kt")
+            public void testBoxInt() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxInt.kt");
+            }
+
+            @TestMetadata("boxNullableAny.kt")
+            public void testBoxNullableAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxNullableAny.kt");
+            }
+
+            @TestMetadata("boxNullableAnyNull.kt")
+            public void testBoxNullableAnyNull() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxNullableAnyNull.kt");
+            }
+
+            @TestMetadata("boxNullableInt.kt")
+            public void testBoxNullableInt() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxNullableInt.kt");
+            }
+
+            @TestMetadata("boxNullableIntNull.kt")
+            public void testBoxNullableIntNull() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxNullableIntNull.kt");
+            }
+
+            @TestMetadata("boxNullableString.kt")
+            public void testBoxNullableString() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxNullableString.kt");
+            }
+
+            @TestMetadata("boxNullableStringNull.kt")
+            public void testBoxNullableStringNull() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxNullableStringNull.kt");
+            }
+
+            @TestMetadata("boxString.kt")
+            public void testBoxString() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueInLambda/boxString.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BoxReturnValueOnOverride extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBoxReturnValueOnOverride() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("covariantOverrideChainErasedToAny.kt")
+            public void testCovariantOverrideChainErasedToAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToAny.kt");
+            }
+
+            @TestMetadata("covariantOverrideChainErasedToNullableAny.kt")
+            public void testCovariantOverrideChainErasedToNullableAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToNullableAny.kt");
+            }
+
+            @TestMetadata("covariantOverrideErasedToAny.kt")
+            public void testCovariantOverrideErasedToAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToAny.kt");
+            }
+
+            @TestMetadata("covariantOverrideErasedToInterface.kt")
+            public void testCovariantOverrideErasedToInterface() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToInterface.kt");
+            }
+
+            @TestMetadata("covariantOverrideErasedToPrimitive.kt")
+            public void testCovariantOverrideErasedToPrimitive() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToPrimitive.kt");
+            }
+
+            @TestMetadata("covariantOverrideUnrelatedInterfaces.kt")
+            public void testCovariantOverrideUnrelatedInterfaces() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideUnrelatedInterfaces.kt");
+            }
+
+            @TestMetadata("genericOverride.kt")
+            public void testGenericOverride() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverride.kt");
+            }
+
+            @TestMetadata("genericOverrideSpecialized.kt")
+            public void testGenericOverrideSpecialized() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverrideSpecialized.kt");
+            }
+
+            @TestMetadata("inlineClassInOverriddenReturnTypes.kt")
+            public void testInlineClassInOverriddenReturnTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/inlineClassInOverriddenReturnTypes.kt");
+            }
+
+            @TestMetadata("kt28483.kt")
+            public void testKt28483() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt28483.kt");
+            }
+
+            @TestMetadata("overrideGenericWithInlineClass.kt")
+            public void testOverrideGenericWithInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt");
+            }
+
+            @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt")
+            public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");
+            }
+
+            @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAny.kt")
+            public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAny.kt");
+            }
+
+            @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAnyNull.kt")
+            public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAnyNull() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAnyNull.kt");
+            }
+
+            @TestMetadata("overrideNullableInlineClassWithNonNullAny.kt")
+            public void testOverrideNullableInlineClassWithNonNullAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullAny.kt");
+            }
+
+            @TestMetadata("overrideNullableInlineClassWithNonNullNullableAny.kt")
+            public void testOverrideNullableInlineClassWithNonNullNullableAny() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAny.kt");
+            }
+
+            @TestMetadata("overrideNullableInlineClassWithNonNullNullableAnyNull.kt")
+            public void testOverrideNullableInlineClassWithNonNullNullableAnyNull() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAnyNull.kt");
+            }
+
+            @TestMetadata("relatedReturnTypes1a.kt")
+            public void testRelatedReturnTypes1a() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1a.kt");
+            }
+
+            @TestMetadata("relatedReturnTypes1b.kt")
+            public void testRelatedReturnTypes1b() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1b.kt");
+            }
+
+            @TestMetadata("relatedReturnTypes2a.kt")
+            public void testRelatedReturnTypes2a() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2a.kt");
+            }
+
+            @TestMetadata("relatedReturnTypes2b.kt")
+            public void testRelatedReturnTypes2b() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2b.kt");
+            }
+
+            @TestMetadata("unrelatedGenerics.kt")
+            public void testUnrelatedGenerics() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/unrelatedGenerics.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/callableReferences")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CallableReferences extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCallableReferences() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/callableReferences"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("constructorWithInlineClassParameters.kt")
+            public void testConstructorWithInlineClassParameters() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/callableReferences/constructorWithInlineClassParameters.kt");
+            }
+
+            @TestMetadata("funWithInlineClassParameters.kt")
+            public void testFunWithInlineClassParameters() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/callableReferences/funWithInlineClassParameters.kt");
+            }
+
+            @TestMetadata("inlineClassExtensionFun.kt")
+            public void testInlineClassExtensionFun() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassExtensionFun.kt");
+            }
+
+            @TestMetadata("inlineClassMemberFun.kt")
+            public void testInlineClassMemberFun() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassMemberFun.kt");
+            }
+
+            @TestMetadata("inlineClassPrimaryConstructor.kt")
+            public void testInlineClassPrimaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/callableReferences/inlineClassPrimaryConstructor.kt");
+            }
+
+            @TestMetadata("kt37986.kt")
+            public void testKt37986() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/callableReferences/kt37986.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ContextsAndAccessors extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            @TestMetadata("accessPrivateInlineClassCompanionMethod.kt")
+            public void testAccessPrivateInlineClassCompanionMethod() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassCompanionMethod.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassCompanionMethod2.kt")
+            public void testAccessPrivateInlineClassCompanionMethod2() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassCompanionMethod2.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassConstructorFromCompanion.kt")
+            public void testAccessPrivateInlineClassConstructorFromCompanion() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromCompanion.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassConstructorFromLambda.kt")
+            public void testAccessPrivateInlineClassConstructorFromLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromLambda.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassMethodFromCompanion.kt")
+            public void testAccessPrivateInlineClassMethodFromCompanion() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromCompanion.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassMethodFromCompanion2.kt")
+            public void testAccessPrivateInlineClassMethodFromCompanion2() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromCompanion2.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassMethodFromInlineLambda.kt")
+            public void testAccessPrivateInlineClassMethodFromInlineLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromInlineLambda.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassMethodFromInlineLambda2.kt")
+            public void testAccessPrivateInlineClassMethodFromInlineLambda2() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromInlineLambda2.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassMethodFromLambda.kt")
+            public void testAccessPrivateInlineClassMethodFromLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromLambda.kt");
+            }
+
+            @TestMetadata("accessPrivateInlineClassMethodFromLambda2.kt")
+            public void testAccessPrivateInlineClassMethodFromLambda2() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromLambda2.kt");
+            }
+
+            public void testAllFilesPresentInContextsAndAccessors() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("captureInlineClassInstanceInLambda.kt")
+            public void testCaptureInlineClassInstanceInLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/captureInlineClassInstanceInLambda.kt");
+            }
+
+            @TestMetadata("captureInlineClassInstanceInLambda2.kt")
+            public void testCaptureInlineClassInstanceInLambda2() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/captureInlineClassInstanceInLambda2.kt");
+            }
+
+            @TestMetadata("captureInlineClassInstanceInObject.kt")
+            public void testCaptureInlineClassInstanceInObject() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/captureInlineClassInstanceInObject.kt");
+            }
+
+            @TestMetadata("inlineLambdaInInlineClassFun.kt")
+            public void testInlineLambdaInInlineClassFun() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/inlineLambdaInInlineClassFun.kt");
+            }
+
+            @TestMetadata("kt26858.kt")
+            public void testKt26858() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/kt26858.kt");
+            }
+
+            @TestMetadata("kt30780.kt")
+            public void testKt30780() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/kt30780.kt");
+            }
+
+            @TestMetadata("lambdaInInlineClassFun.kt")
+            public void testLambdaInInlineClassFun() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/lambdaInInlineClassFun.kt");
+            }
+
+            @TestMetadata("objectInInlineClassFun.kt")
+            public void testObjectInInlineClassFun() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/objectInInlineClassFun.kt");
+            }
+
+            @TestMetadata("toPrivateCompanionFun.kt")
+            public void testToPrivateCompanionFun() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/toPrivateCompanionFun.kt");
+            }
+
+            @TestMetadata("toPrivateCompanionVal.kt")
+            public void testToPrivateCompanionVal() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/toPrivateCompanionVal.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/defaultParameterValues")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class DefaultParameterValues extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInDefaultParameterValues() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/defaultParameterValues"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("defaultConstructorParameterValuesOfInlineClassType.kt")
+            public void testDefaultConstructorParameterValuesOfInlineClassType() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultConstructorParameterValuesOfInlineClassType.kt");
+            }
+
+            @TestMetadata("defaultInterfaceFunParameterValuesOfInlineClassType.kt")
+            public void testDefaultInterfaceFunParameterValuesOfInlineClassType() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultInterfaceFunParameterValuesOfInlineClassType.kt");
+            }
+
+            @TestMetadata("defaultParameterValuesOfInlineClassType.kt")
+            public void testDefaultParameterValuesOfInlineClassType() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultParameterValuesOfInlineClassType.kt");
+            }
+
+            @TestMetadata("defaultParameterValuesOfInlineClassTypeBoxing.kt")
+            public void testDefaultParameterValuesOfInlineClassTypeBoxing() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultParameterValuesOfInlineClassTypeBoxing.kt");
+            }
+
+            @TestMetadata("defaultValueOfInlineClassTypeInInlineFun.kt")
+            public void testDefaultValueOfInlineClassTypeInInlineFun() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultValueOfInlineClassTypeInInlineFun.kt");
+            }
+
+            @TestMetadata("defaultValueOfInlineClassTypeInInlineFunInInlineClass.kt")
+            public void testDefaultValueOfInlineClassTypeInInlineFunInInlineClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultValueOfInlineClassTypeInInlineFunInInlineClass.kt");
+            }
+
+            @TestMetadata("inlineClassFun.kt")
+            public void testInlineClassFun() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/inlineClassFun.kt");
+            }
+
+            @TestMetadata("inlineClassPrimaryConstructor.kt")
+            public void testInlineClassPrimaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/inlineClassPrimaryConstructor.kt");
+            }
+
+            @TestMetadata("inlineClassPrimaryConstructorWithInlineClassValue.kt")
+            public void testInlineClassPrimaryConstructorWithInlineClassValue() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/inlineClassPrimaryConstructorWithInlineClassValue.kt");
+            }
+
+            @TestMetadata("inlineClassSecondaryConstructor.kt")
+            public void testInlineClassSecondaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/inlineClassSecondaryConstructor.kt");
+            }
+
+            @TestMetadata("kt27416.kt")
+            public void testKt27416() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/kt27416.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/functionNameMangling")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class FunctionNameMangling extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInFunctionNameMangling() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/functionNameMangling"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("anonymousObjectInFunctionWithMangledName.kt")
+            public void testAnonymousObjectInFunctionWithMangledName() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/anonymousObjectInFunctionWithMangledName.kt");
+            }
+
+            @TestMetadata("extensionFunctionsDoNotClash.kt")
+            public void testExtensionFunctionsDoNotClash() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/extensionFunctionsDoNotClash.kt");
+            }
+
+            @TestMetadata("functionsWithDifferentNullabilityDoNotClash.kt")
+            public void testFunctionsWithDifferentNullabilityDoNotClash() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/functionsWithDifferentNullabilityDoNotClash.kt");
+            }
+
+            @TestMetadata("genericFunctionsDoNotClash.kt")
+            public void testGenericFunctionsDoNotClash() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/genericFunctionsDoNotClash.kt");
+            }
+
+            @TestMetadata("localClassInFunctionWithMangledName.kt")
+            public void testLocalClassInFunctionWithMangledName() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/localClassInFunctionWithMangledName.kt");
+            }
+
+            @TestMetadata("mangledFunctionsCanBeOverridden.kt")
+            public void testMangledFunctionsCanBeOverridden() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/mangledFunctionsCanBeOverridden.kt");
+            }
+
+            @TestMetadata("mangledFunctionsDoNotClash.kt")
+            public void testMangledFunctionsDoNotClash() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/mangledFunctionsDoNotClash.kt");
+            }
+
+            @TestMetadata("mixedSignatureFunctionsDoNotClash.kt")
+            public void testMixedSignatureFunctionsDoNotClash() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/mixedSignatureFunctionsDoNotClash.kt");
+            }
+
+            @TestMetadata("overridingMethodInGenericClass.kt")
+            public void testOverridingMethodInGenericClass() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/overridingMethodInGenericClass.kt");
+            }
+
+            @TestMetadata("overridingMethodInGenericClass2.kt")
+            public void testOverridingMethodInGenericClass2() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/overridingMethodInGenericClass2.kt");
+            }
+
+            @TestMetadata("propertySetterWithInlineClassTypeArgument.kt")
+            public void testPropertySetterWithInlineClassTypeArgument() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/propertySetterWithInlineClassTypeArgument.kt");
+            }
+
+            @TestMetadata("syntheticAccessorForFunctionWithMangledName.kt")
+            public void testSyntheticAccessorForFunctionWithMangledName() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/syntheticAccessorForFunctionWithMangledName.kt");
+            }
+
+            @TestMetadata("syntheticAccessorsForPropertyOfInlineClassType.kt")
+            public void testSyntheticAccessorsForPropertyOfInlineClassType() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/functionNameMangling/syntheticAccessorsForPropertyOfInlineClassType.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/hiddenConstructor")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class HiddenConstructor extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInHiddenConstructor() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/hiddenConstructor"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("constructorReferencedFromOtherFile1.kt")
+            public void testConstructorReferencedFromOtherFile1() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/constructorReferencedFromOtherFile1.kt");
+            }
+
+            @TestMetadata("constructorReferencedFromOtherFile2.kt")
+            public void testConstructorReferencedFromOtherFile2() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/constructorReferencedFromOtherFile2.kt");
+            }
+
+            @TestMetadata("constructorWithDefaultParameters.kt")
+            public void testConstructorWithDefaultParameters() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/constructorWithDefaultParameters.kt");
+            }
+
+            @TestMetadata("delegatingSuperConstructorCall.kt")
+            public void testDelegatingSuperConstructorCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/delegatingSuperConstructorCall.kt");
+            }
+
+            @TestMetadata("delegatingSuperConstructorCallInSecondaryConstructor.kt")
+            public void testDelegatingSuperConstructorCallInSecondaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/delegatingSuperConstructorCallInSecondaryConstructor.kt");
+            }
+
+            @TestMetadata("delegatingThisConstructorCall.kt")
+            public void testDelegatingThisConstructorCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/delegatingThisConstructorCall.kt");
+            }
+
+            @TestMetadata("enumClassConstructor.kt")
+            public void testEnumClassConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/enumClassConstructor.kt");
+            }
+
+            @TestMetadata("innerClassConstructor.kt")
+            public void testInnerClassConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/innerClassConstructor.kt");
+            }
+
+            @TestMetadata("primaryConstructor.kt")
+            public void testPrimaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/primaryConstructor.kt");
+            }
+
+            @TestMetadata("privateConstructor.kt")
+            public void testPrivateConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/privateConstructor.kt");
+            }
+
+            @TestMetadata("sealedClassConstructor.kt")
+            public void testSealedClassConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/sealedClassConstructor.kt");
+            }
+
+            @TestMetadata("secondaryConstructor.kt")
+            public void testSecondaryConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/hiddenConstructor/secondaryConstructor.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/interfaceDelegation")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class InterfaceDelegation extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInInterfaceDelegation() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/interfaceDelegation"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("interfaceImplementationByDelegation.kt")
+            public void testInterfaceImplementationByDelegation() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceDelegation/interfaceImplementationByDelegation.kt");
+            }
+
+            @TestMetadata("memberExtValDelegationWithInlineClassParameterTypes.kt")
+            public void testMemberExtValDelegationWithInlineClassParameterTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberExtValDelegationWithInlineClassParameterTypes.kt");
+            }
+
+            @TestMetadata("memberExtVarDelegationWithInlineClassParameterTypes.kt")
+            public void testMemberExtVarDelegationWithInlineClassParameterTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberExtVarDelegationWithInlineClassParameterTypes.kt");
+            }
+
+            @TestMetadata("memberFunDelegatedToInlineClassInt.kt")
+            public void testMemberFunDelegatedToInlineClassInt() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberFunDelegatedToInlineClassInt.kt");
+            }
+
+            @TestMetadata("memberFunDelegatedToInlineClassLong.kt")
+            public void testMemberFunDelegatedToInlineClassLong() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberFunDelegatedToInlineClassLong.kt");
+            }
+
+            @TestMetadata("memberFunDelegationToInlineClassWithInlineClassParameterTypes.kt")
+            public void testMemberFunDelegationToInlineClassWithInlineClassParameterTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberFunDelegationToInlineClassWithInlineClassParameterTypes.kt");
+            }
+
+            @TestMetadata("memberFunDelegationWithInlineClassParameterTypes.kt")
+            public void testMemberFunDelegationWithInlineClassParameterTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberFunDelegationWithInlineClassParameterTypes.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class InterfaceMethodCalls extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInInterfaceMethodCalls() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("complexGenericMethodWithInlineClassOverride.kt")
+            public void testComplexGenericMethodWithInlineClassOverride() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/complexGenericMethodWithInlineClassOverride.kt");
+            }
+
+            @TestMetadata("complexGenericMethodWithInlineClassOverride2.kt")
+            public void testComplexGenericMethodWithInlineClassOverride2() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/complexGenericMethodWithInlineClassOverride2.kt");
+            }
+
+            @TestMetadata("complexGenericMethodWithInlineClassOverride3.kt")
+            public void testComplexGenericMethodWithInlineClassOverride3() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/complexGenericMethodWithInlineClassOverride3.kt");
+            }
+
+            @TestMetadata("defaultInterfaceExtensionFunCall.kt")
+            public void testDefaultInterfaceExtensionFunCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceExtensionFunCall.kt");
+            }
+
+            @TestMetadata("defaultInterfaceMethodCall.kt")
+            public void testDefaultInterfaceMethodCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceMethodCall.kt");
+            }
+
+            @TestMetadata("genericDefaultInterfaceExtensionFunCall.kt")
+            public void testGenericDefaultInterfaceExtensionFunCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceExtensionFunCall.kt");
+            }
+
+            @TestMetadata("genericDefaultInterfaceMethodCall.kt")
+            public void testGenericDefaultInterfaceMethodCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceMethodCall.kt");
+            }
+
+            @TestMetadata("genericInterfaceMethodCall.kt")
+            public void testGenericInterfaceMethodCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericInterfaceMethodCall.kt");
+            }
+
+            @TestMetadata("genericMethodWithInlineClassOverride.kt")
+            public void testGenericMethodWithInlineClassOverride() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericMethodWithInlineClassOverride.kt");
+            }
+
+            @TestMetadata("interfaceSuperCall.kt")
+            public void testInterfaceSuperCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/interfaceSuperCall.kt");
+            }
+
+            @TestMetadata("overriddenDefaultInterfaceMethodCall.kt")
+            public void testOverriddenDefaultInterfaceMethodCall() throws Exception {
+                runTest("compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/overriddenDefaultInterfaceMethodCall.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/propertyDelegation")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class PropertyDelegation extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInPropertyDelegation() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/propertyDelegation"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class UnboxGenericParameter extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInUnboxGenericParameter() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class FunInterface extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInFunInterface() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("any.kt")
+                public void testAny() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/any.kt");
+                }
+
+                @TestMetadata("anyN.kt")
+                public void testAnyN() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/anyN.kt");
+                }
+
+                @TestMetadata("iface.kt")
+                public void testIface() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/iface.kt");
+                }
+
+                @TestMetadata("ifaceChild.kt")
+                public void testIfaceChild() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/ifaceChild.kt");
+                }
+
+                @TestMetadata("primitive.kt")
+                public void testPrimitive() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/primitive.kt");
+                }
+
+                @TestMetadata("result.kt")
+                public void testResult() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/result.kt");
+                }
+
+                @TestMetadata("string.kt")
+                public void testString() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/string.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Lambda extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInLambda() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("any.kt")
+                public void testAny() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/any.kt");
+                }
+
+                @TestMetadata("anyN.kt")
+                public void testAnyN() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/anyN.kt");
+                }
+
+                @TestMetadata("iface.kt")
+                public void testIface() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/iface.kt");
+                }
+
+                @TestMetadata("ifaceChild.kt")
+                public void testIfaceChild() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/ifaceChild.kt");
+                }
+
+                @TestMetadata("primitive.kt")
+                public void testPrimitive() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/primitive.kt");
+                }
+
+                @TestMetadata("result.kt")
+                public void testResult() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/result.kt");
+                }
+
+                @TestMetadata("string.kt")
+                public void testString() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/lambda/string.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class ObjectLiteral extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInObjectLiteral() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("any.kt")
+                public void testAny() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/any.kt");
+                }
+
+                @TestMetadata("anyN.kt")
+                public void testAnyN() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/anyN.kt");
+                }
+
+                @TestMetadata("iface.kt")
+                public void testIface() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/iface.kt");
+                }
+
+                @TestMetadata("ifaceChild.kt")
+                public void testIfaceChild() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/ifaceChild.kt");
+                }
+
+                @TestMetadata("primitive.kt")
+                public void testPrimitive() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/primitive.kt");
+                }
+
+                @TestMetadata("result.kt")
+                public void testResult() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/result.kt");
+                }
+
+                @TestMetadata("string.kt")
+                public void testString() throws Exception {
+                    runTest("compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/objectLiteral/string.kt");
+                }
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/innerNested")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class InnerNested extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInnerNested() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerNested"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("createNestedClass.kt")
+        public void testCreateNestedClass() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/createNestedClass.kt");
+        }
+
+        @TestMetadata("createdNestedInOuterMember.kt")
+        public void testCreatedNestedInOuterMember() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/createdNestedInOuterMember.kt");
+        }
+
+        @TestMetadata("extensionFun.kt")
+        public void testExtensionFun() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/extensionFun.kt");
+        }
+
+        @TestMetadata("extensionToNested.kt")
+        public void testExtensionToNested() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/extensionToNested.kt");
+        }
+
+        @TestMetadata("importNestedClass.kt")
+        public void testImportNestedClass() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/importNestedClass.kt");
+        }
+
+        @TestMetadata("innerGeneric.kt")
+        public void testInnerGeneric() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerGeneric.kt");
+        }
+
+        @TestMetadata("innerImplicitParameter.kt")
+        public void testInnerImplicitParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerImplicitParameter.kt");
+        }
+
+        @TestMetadata("innerLabeledThis.kt")
+        public void testInnerLabeledThis() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerLabeledThis.kt");
+        }
+
+        @TestMetadata("innerSimple.kt")
+        public void testInnerSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
+        }
+
+        @TestMetadata("innerWithDefaultArgument.kt")
+        public void testInnerWithDefaultArgument() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
+        }
+
+        @TestMetadata("innerWithDefaultInner.kt")
+        public void testInnerWithDefaultInner() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
+        }
+
+        @TestMetadata("kt3132.kt")
+        public void testKt3132() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
+        }
+
+        @TestMetadata("kt3927.kt")
+        public void testKt3927() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/kt3927.kt");
+        }
+
+        @TestMetadata("kt5363.kt")
+        public void testKt5363() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/kt5363.kt");
+        }
+
+        @TestMetadata("kt6804.kt")
+        public void testKt6804() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/kt6804.kt");
+        }
+
+        @TestMetadata("nestedClassInObject.kt")
+        public void testNestedClassInObject() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/nestedClassInObject.kt");
+        }
+
+        @TestMetadata("nestedClassObject.kt")
+        public void testNestedClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/nestedClassObject.kt");
+        }
+
+        @TestMetadata("nestedEnumConstant.kt")
+        public void testNestedEnumConstant() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt");
+        }
+
+        @TestMetadata("nestedGeneric.kt")
+        public void testNestedGeneric() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/nestedGeneric.kt");
+        }
+
+        @TestMetadata("nestedInPackage.kt")
+        public void testNestedInPackage() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/nestedInPackage.kt");
+        }
+
+        @TestMetadata("nestedInnerClass.kt")
+        public void testNestedInnerClass() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/nestedInnerClass.kt");
+        }
+
+        @TestMetadata("nestedObjects.kt")
+        public void testNestedObjects() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/nestedObjects.kt");
+        }
+
+        @TestMetadata("nestedSimple.kt")
+        public void testNestedSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/nestedSimple.kt");
+        }
+
+        @TestMetadata("passingOuterRef.kt")
+        public void testPassingOuterRef() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/passingOuterRef.kt");
+        }
+
+        @TestMetadata("protectedNestedClass.kt")
+        public void testProtectedNestedClass() throws Exception {
+            runTest("compiler/testData/codegen/box/innerNested/protectedNestedClass.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class SuperConstructorCall extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInSuperConstructorCall() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerNested/superConstructorCall"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("deepInnerHierarchy.kt")
+            public void testDeepInnerHierarchy() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/deepInnerHierarchy.kt");
+            }
+
+            @TestMetadata("deepLocalHierarchy.kt")
+            public void testDeepLocalHierarchy() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt");
+            }
+
+            @TestMetadata("innerExtendsInnerViaSecondaryConstuctor.kt")
+            public void testInnerExtendsInnerViaSecondaryConstuctor() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt");
+            }
+
+            @TestMetadata("innerExtendsInnerWithProperOuterCapture.kt")
+            public void testInnerExtendsInnerWithProperOuterCapture() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt");
+            }
+
+            @TestMetadata("kt11833_1.kt")
+            public void testKt11833_1() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_1.kt");
+            }
+
+            @TestMetadata("kt11833_2.kt")
+            public void testKt11833_2() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_2.kt");
+            }
+
+            @TestMetadata("localClassOuterDiffersFromInnerOuter.kt")
+            public void testLocalClassOuterDiffersFromInnerOuter() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt");
+            }
+
+            @TestMetadata("localExtendsInner.kt")
+            public void testLocalExtendsInner() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsInner.kt");
+            }
+
+            @TestMetadata("localExtendsLocalWithClosure.kt")
+            public void testLocalExtendsLocalWithClosure() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt");
+            }
+
+            @TestMetadata("localWithClosureExtendsLocalWithClosure.kt")
+            public void testLocalWithClosureExtendsLocalWithClosure() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt");
+            }
+
+            @TestMetadata("objectExtendsClassDefaultArgument.kt")
+            public void testObjectExtendsClassDefaultArgument() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.kt");
+            }
+
+            @TestMetadata("objectExtendsClassVararg.kt")
+            public void testObjectExtendsClassVararg() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassVararg.kt");
+            }
+
+            @TestMetadata("objectExtendsInner.kt")
+            public void testObjectExtendsInner() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInner.kt");
+            }
+
+            @TestMetadata("objectExtendsInnerDefaultArgument.kt")
+            public void testObjectExtendsInnerDefaultArgument() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.kt");
+            }
+
+            @TestMetadata("objectExtendsInnerOfLocalVarargAndDefault.kt")
+            public void testObjectExtendsInnerOfLocalVarargAndDefault() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt");
+            }
+
+            @TestMetadata("objectExtendsInnerOfLocalWithCapture.kt")
+            public void testObjectExtendsInnerOfLocalWithCapture() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt");
+            }
+
+            @TestMetadata("objectExtendsLocalCaptureInSuperCall.kt")
+            public void testObjectExtendsLocalCaptureInSuperCall() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt");
+            }
+
+            @TestMetadata("objectExtendsLocalWithClosure.kt")
+            public void testObjectExtendsLocalWithClosure() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalWithClosure.kt");
+            }
+
+            @TestMetadata("objectExtendsLocal_kt16858.kt")
+            public void testObjectExtendsLocal_kt16858() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocal_kt16858.kt");
+            }
+
+            @TestMetadata("objectOuterDiffersFromInnerOuter.kt")
+            public void testObjectOuterDiffersFromInnerOuter() throws Exception {
+                runTest("compiler/testData/codegen/box/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/instructions")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Instructions extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInstructions() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/instructions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/instructions/swap")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Swap extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInSwap() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/instructions/swap"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("swapRefToSharedVarInt.kt")
+            public void testSwapRefToSharedVarInt() throws Exception {
+                runTest("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarInt.kt");
+            }
+
+            @TestMetadata("swapRefToSharedVarLong.kt")
+            public void testSwapRefToSharedVarLong() throws Exception {
+                runTest("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarLong.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/intrinsics")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Intrinsics extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInIntrinsics() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/intrinsics"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("charToInt.kt")
+        public void testCharToInt() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/charToInt.kt");
+        }
+
+        @TestMetadata("ea35953.kt")
+        public void testEa35953() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/ea35953.kt");
+        }
+
+        @TestMetadata("incWithLabel.kt")
+        public void testIncWithLabel() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/incWithLabel.kt");
+        }
+
+        @TestMetadata("kt10131.kt")
+        public void testKt10131() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/kt10131.kt");
+        }
+
+        @TestMetadata("kt10131a.kt")
+        public void testKt10131a() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/kt10131a.kt");
+        }
+
+        @TestMetadata("kt12125.kt")
+        public void testKt12125() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/kt12125.kt");
+        }
+
+        @TestMetadata("kt12125_2.kt")
+        public void testKt12125_2() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/kt12125_2.kt");
+        }
+
+        @TestMetadata("kt12125_inc.kt")
+        public void testKt12125_inc() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/kt12125_inc.kt");
+        }
+
+        @TestMetadata("kt12125_inc_2.kt")
+        public void testKt12125_inc_2() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/kt12125_inc_2.kt");
+        }
+
+        @TestMetadata("longRangeWithExplicitDot.kt")
+        public void testLongRangeWithExplicitDot() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt");
+        }
+
+        @TestMetadata("nonShortCircuitAnd.kt")
+        public void testNonShortCircuitAnd() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/nonShortCircuitAnd.kt");
+        }
+
+        @TestMetadata("nullPlusString.kt")
+        public void testNullPlusString() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/nullPlusString.kt");
+        }
+
+        @TestMetadata("prefixIncDec.kt")
+        public void testPrefixIncDec() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt");
+        }
+
+        @TestMetadata("throwableParamOrder.kt")
+        public void testThrowableParamOrder() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/throwableParamOrder.kt");
+        }
+
+        @TestMetadata("tostring.kt")
+        public void testTostring() throws Exception {
+            runTest("compiler/testData/codegen/box/intrinsics/tostring.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/ir")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Ir extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInIr() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ir"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("anonymousObjectInsideElvis.kt")
+        public void testAnonymousObjectInsideElvis() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/anonymousObjectInsideElvis.kt");
+        }
+
+        @TestMetadata("classInitializers.kt")
+        public void testClassInitializers() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/classInitializers.kt");
+        }
+
+        @TestMetadata("enumClass.kt")
+        public void testEnumClass() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/enumClass.kt");
+        }
+
+        @TestMetadata("enumClass2.kt")
+        public void testEnumClass2() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/enumClass2.kt");
+        }
+
+        @TestMetadata("enumClass3.kt")
+        public void testEnumClass3() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/enumClass3.kt");
+        }
+
+        @TestMetadata("fileClassInitializers.kt")
+        public void testFileClassInitializers() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/fileClassInitializers.kt");
+        }
+
+        @TestMetadata("genericCompanion.kt")
+        public void testGenericCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/genericCompanion.kt");
+        }
+
+        @TestMetadata("hashCodeOnGenericSubstitutedWithPrimitive.kt")
+        public void testHashCodeOnGenericSubstitutedWithPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/hashCodeOnGenericSubstitutedWithPrimitive.kt");
+        }
+
+        @TestMetadata("kt40083.kt")
+        public void testKt40083() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/kt40083.kt");
+        }
+
+        @TestMetadata("kt41765.kt")
+        public void testKt41765() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/kt41765.kt");
+        }
+
+        @TestMetadata("objectClass.kt")
+        public void testObjectClass() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/objectClass.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/ir/simple.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ir/closureConversion")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ClosureConversion extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInClosureConversion() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ir/closureConversion"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("closureConversion1.kt")
+            public void testClosureConversion1() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/closureConversion/closureConversion1.kt");
+            }
+
+            @TestMetadata("closureConversion2.kt")
+            public void testClosureConversion2() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/closureConversion/closureConversion2.kt");
+            }
+
+            @TestMetadata("closureConversion3.kt")
+            public void testClosureConversion3() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/closureConversion/closureConversion3.kt");
+            }
+
+            @TestMetadata("closureConversion4.kt")
+            public void testClosureConversion4() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/closureConversion/closureConversion4.kt");
+            }
+
+            @TestMetadata("innerClass1.kt")
+            public void testInnerClass1() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/closureConversion/innerClass1.kt");
+            }
+
+            @TestMetadata("innerClass2.kt")
+            public void testInnerClass2() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/closureConversion/innerClass2.kt");
+            }
+
+            @TestMetadata("mutable1.kt")
+            public void testMutable1() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/closureConversion/mutable1.kt");
+            }
+
+            @TestMetadata("mutablePrimitives.kt")
+            public void testMutablePrimitives() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/closureConversion/mutablePrimitives.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ir/primitiveNumberComparisons")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class PrimitiveNumberComparisons extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInPrimitiveNumberComparisons() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ir/primitiveNumberComparisons"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("comparableToDouble.kt")
+            public void testComparableToDouble() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/primitiveNumberComparisons/comparableToDouble.kt");
+            }
+
+            @TestMetadata("doubleEqeq.kt")
+            public void testDoubleEqeq() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/primitiveNumberComparisons/doubleEqeq.kt");
+            }
+
+            @TestMetadata("floatEqeq.kt")
+            public void testFloatEqeq() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/primitiveNumberComparisons/floatEqeq.kt");
+            }
+
+            @TestMetadata("mixedNumberTypes.kt")
+            public void testMixedNumberTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/primitiveNumberComparisons/mixedNumberTypes.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ir/serializationRegressions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class SerializationRegressions extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInSerializationRegressions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ir/serializationRegressions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("innerClassInEnumEntryClass.kt")
+            public void testInnerClassInEnumEntryClass() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt");
+            }
+
+            @TestMetadata("useImportedMember.kt")
+            public void testUseImportedMember() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/serializationRegressions/useImportedMember.kt");
+            }
+
+            @TestMetadata("varAsFunctionCall.kt")
+            public void testVarAsFunctionCall() throws Exception {
+                runTest("compiler/testData/codegen/box/ir/serializationRegressions/varAsFunctionCall.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/javaInterop")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JavaInterop extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJavaInterop() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/javaInterop/generics")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Generics extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInGenerics() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/generics"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class NotNullAssertions extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInNotNullAssertions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/notNullAssertions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class EnhancedNullability extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInEnhancedNullability() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class NullCheckOnLambdaReturnValue extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInNullCheckOnLambdaReturnValue() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullCheckOnLambdaReturnValue"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/javaInterop/objectMethods")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ObjectMethods extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInObjectMethods() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/objectMethods"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/jdk")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Jdk extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJdk() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jdk"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/jvm8")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Jvm8 extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJvm8() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/jvm8/defaults")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Defaults extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInDefaults() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/allCompatibility")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class AllCompatibility extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInAllCompatibility() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/allCompatibility"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class DelegationBy extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInDelegationBy() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Compatibility extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInCompatibility() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class DelegationBy extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInDelegationBy() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/delegationBy"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class NoDefaultImpls extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInNoDefaultImpls() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class DelegationBy extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInDelegationBy() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/specialization")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class Specialization extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInSpecialization() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/specialization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class NoDelegation extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInNoDelegation() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/reflection")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Reflection extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInReflection() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/reflection"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/jvm8/interfaceFlag")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class InterfaceFlag extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInInterfaceFlag() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/interfaceFlag"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/jvm8/javaDefaults")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class JavaDefaults extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInJavaDefaults() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/javaDefaults"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/jvmField")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmField extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJvmField() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmField"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/jvmName")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmName extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJvmName() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmName"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/jvmName/fileFacades")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class FileFacades extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInFileFacades() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmName/fileFacades"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/jvmOverloads")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmOverloads extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJvmOverloads() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmOverloads"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/jvmPackageName")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmPackageName extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJvmPackageName() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmPackageName"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/jvmStatic")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmStatic extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJvmStatic() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmStatic"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/labels")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Labels extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInLabels() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/labels"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("controlLabelClashesWithFuncitonName.kt")
+        public void testControlLabelClashesWithFuncitonName() throws Exception {
+            runTest("compiler/testData/codegen/box/labels/controlLabelClashesWithFuncitonName.kt");
+        }
+
+        @TestMetadata("infixCallLabelling.kt")
+        public void testInfixCallLabelling() throws Exception {
+            runTest("compiler/testData/codegen/box/labels/infixCallLabelling.kt");
+        }
+
+        @TestMetadata("labeledDeclarations.kt")
+        public void testLabeledDeclarations() throws Exception {
+            runTest("compiler/testData/codegen/box/labels/labeledDeclarations.kt");
+        }
+
+        @TestMetadata("propertyAccessor.kt")
+        public void testPropertyAccessor() throws Exception {
+            runTest("compiler/testData/codegen/box/labels/propertyAccessor.kt");
+        }
+
+        @TestMetadata("propertyAccessorFunctionLiteral.kt")
+        public void testPropertyAccessorFunctionLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/labels/propertyAccessorFunctionLiteral.kt");
+        }
+
+        @TestMetadata("propertyAccessorInnerExtensionFun.kt")
+        public void testPropertyAccessorInnerExtensionFun() throws Exception {
+            runTest("compiler/testData/codegen/box/labels/propertyAccessorInnerExtensionFun.kt");
+        }
+
+        @TestMetadata("propertyAccessorObject.kt")
+        public void testPropertyAccessorObject() throws Exception {
+            runTest("compiler/testData/codegen/box/labels/propertyAccessorObject.kt");
+        }
+
+        @TestMetadata("propertyInClassAccessor.kt")
+        public void testPropertyInClassAccessor() throws Exception {
+            runTest("compiler/testData/codegen/box/labels/propertyInClassAccessor.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/lazyCodegen")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class LazyCodegen extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInLazyCodegen() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/lazyCodegen"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("ifElse.kt")
+        public void testIfElse() throws Exception {
+            runTest("compiler/testData/codegen/box/lazyCodegen/ifElse.kt");
+        }
+
+        @TestMetadata("increment.kt")
+        public void testIncrement() throws Exception {
+            runTest("compiler/testData/codegen/box/lazyCodegen/increment.kt");
+        }
+
+        @TestMetadata("safeAssign.kt")
+        public void testSafeAssign() throws Exception {
+            runTest("compiler/testData/codegen/box/lazyCodegen/safeAssign.kt");
+        }
+
+        @TestMetadata("safeAssignComplex.kt")
+        public void testSafeAssignComplex() throws Exception {
+            runTest("compiler/testData/codegen/box/lazyCodegen/safeAssignComplex.kt");
+        }
+
+        @TestMetadata("toString.kt")
+        public void testToString() throws Exception {
+            runTest("compiler/testData/codegen/box/lazyCodegen/toString.kt");
+        }
+
+        @TestMetadata("when.kt")
+        public void testWhen() throws Exception {
+            runTest("compiler/testData/codegen/box/lazyCodegen/when.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Optimizations extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInOptimizations() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/lazyCodegen/optimizations"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("negateConstantCompare.kt")
+            public void testNegateConstantCompare() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/negateConstantCompare.kt");
+            }
+
+            @TestMetadata("negateFalse.kt")
+            public void testNegateFalse() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalse.kt");
+            }
+
+            @TestMetadata("negateFalseVar.kt")
+            public void testNegateFalseVar() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalseVar.kt");
+            }
+
+            @TestMetadata("negateFalseVarChain.kt")
+            public void testNegateFalseVarChain() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalseVarChain.kt");
+            }
+
+            @TestMetadata("negateObjectComp.kt")
+            public void testNegateObjectComp() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/negateObjectComp.kt");
+            }
+
+            @TestMetadata("negateObjectComp2.kt")
+            public void testNegateObjectComp2() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/negateObjectComp2.kt");
+            }
+
+            @TestMetadata("negateTrue.kt")
+            public void testNegateTrue() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/negateTrue.kt");
+            }
+
+            @TestMetadata("negateTrueVar.kt")
+            public void testNegateTrueVar() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/negateTrueVar.kt");
+            }
+
+            @TestMetadata("noOptimization.kt")
+            public void testNoOptimization() throws Exception {
+                runTest("compiler/testData/codegen/box/lazyCodegen/optimizations/noOptimization.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/localClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class LocalClasses extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInLocalClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/localClasses"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("anonymousObjectInExtension.kt")
+        public void testAnonymousObjectInExtension() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInExtension.kt");
+        }
+
+        @TestMetadata("anonymousObjectInInitializer.kt")
+        public void testAnonymousObjectInInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt");
+        }
+
+        @TestMetadata("anonymousObjectInParameterInitializer.kt")
+        public void testAnonymousObjectInParameterInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
+        }
+
+        @TestMetadata("closureOfInnerLocalClass.kt")
+        public void testClosureOfInnerLocalClass() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
+        }
+
+        @TestMetadata("closureOfLambdaInLocalClass.kt")
+        public void testClosureOfLambdaInLocalClass() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/closureOfLambdaInLocalClass.kt");
+        }
+
+        @TestMetadata("inExtensionFunction.kt")
+        public void testInExtensionFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/inExtensionFunction.kt");
+        }
+
+        @TestMetadata("inExtensionProperty.kt")
+        public void testInExtensionProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/inExtensionProperty.kt");
+        }
+
+        @TestMetadata("inLocalExtensionFunction.kt")
+        public void testInLocalExtensionFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/inLocalExtensionFunction.kt");
+        }
+
+        @TestMetadata("inLocalExtensionProperty.kt")
+        public void testInLocalExtensionProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/inLocalExtensionProperty.kt");
+        }
+
+        @TestMetadata("innerClassInLocalClass.kt")
+        public void testInnerClassInLocalClass() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/innerClassInLocalClass.kt");
+        }
+
+        @TestMetadata("innerOfLocalCaptureExtensionReceiver.kt")
+        public void testInnerOfLocalCaptureExtensionReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt");
+        }
+
+        @TestMetadata("kt2700.kt")
+        public void testKt2700() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
+        }
+
+        @TestMetadata("kt2873.kt")
+        public void testKt2873() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt2873.kt");
+        }
+
+        @TestMetadata("kt3210.kt")
+        public void testKt3210() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt3210.kt");
+        }
+
+        @TestMetadata("kt3389.kt")
+        public void testKt3389() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt3389.kt");
+        }
+
+        @TestMetadata("kt3584.kt")
+        public void testKt3584() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt3584.kt");
+        }
+
+        @TestMetadata("kt4174.kt")
+        public void testKt4174() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt4174.kt");
+        }
+
+        @TestMetadata("localClass.kt")
+        public void testLocalClass() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/localClass.kt");
+        }
+
+        @TestMetadata("localClassCaptureExtensionReceiver.kt")
+        public void testLocalClassCaptureExtensionReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/localClassCaptureExtensionReceiver.kt");
+        }
+
+        @TestMetadata("localClassInInitializer.kt")
+        public void testLocalClassInInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/localClassInInitializer.kt");
+        }
+
+        @TestMetadata("localClassInParameterInitializer.kt")
+        public void testLocalClassInParameterInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/localClassInParameterInitializer.kt");
+        }
+
+        @TestMetadata("localDataClass.kt")
+        public void testLocalDataClass() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/localDataClass.kt");
+        }
+
+        @TestMetadata("localExtendsInnerAndReferencesOuterMember.kt")
+        public void testLocalExtendsInnerAndReferencesOuterMember() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/localExtendsInnerAndReferencesOuterMember.kt");
+        }
+
+        @TestMetadata("noclosure.kt")
+        public void testNoclosure() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/noclosure.kt");
+        }
+
+        @TestMetadata("object.kt")
+        public void testObject() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/object.kt");
+        }
+
+        @TestMetadata("ownClosureOfInnerLocalClass.kt")
+        public void testOwnClosureOfInnerLocalClass() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/ownClosureOfInnerLocalClass.kt");
+        }
+
+        @TestMetadata("recaptureVarCapturedInLocalClass1.kt")
+        public void testRecaptureVarCapturedInLocalClass1() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass1.kt");
+        }
+
+        @TestMetadata("recaptureVarCapturedInLocalClass2.kt")
+        public void testRecaptureVarCapturedInLocalClass2() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass2.kt");
+        }
+
+        @TestMetadata("recaptureVarCapturedInLocalClass3.kt")
+        public void testRecaptureVarCapturedInLocalClass3() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass3.kt");
+        }
+
+        @TestMetadata("subclassingExtensionReceiverClass.kt")
+        public void testSubclassingExtensionReceiverClass() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/subclassingExtensionReceiverClass.kt");
+        }
+
+        @TestMetadata("withclosure.kt")
+        public void testWithclosure() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/withclosure.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/mangling")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Mangling extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInMangling() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/mangling"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("internal.kt")
+        public void testInternal() throws Exception {
+            runTest("compiler/testData/codegen/box/mangling/internal.kt");
+        }
+
+        @TestMetadata("internalOverride.kt")
+        public void testInternalOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/mangling/internalOverride.kt");
+        }
+
+        @TestMetadata("internalOverrideSuperCall.kt")
+        public void testInternalOverrideSuperCall() throws Exception {
+            runTest("compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt");
+        }
+
+        @TestMetadata("publicOverride.kt")
+        public void testPublicOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/mangling/publicOverride.kt");
+        }
+
+        @TestMetadata("publicOverrideSuperCall.kt")
+        public void testPublicOverrideSuperCall() throws Exception {
+            runTest("compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/mixedNamedPosition")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class MixedNamedPosition extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInMixedNamedPosition() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/mixedNamedPosition"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("defaults.kt")
+        public void testDefaults() throws Exception {
+            runTest("compiler/testData/codegen/box/mixedNamedPosition/defaults.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/mixedNamedPosition/simple.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/multiDecl")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class MultiDecl extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInMultiDecl() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("ComplexInitializer.kt")
+        public void testComplexInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/ComplexInitializer.kt");
+        }
+
+        @TestMetadata("returnInElvis.kt")
+        public void testReturnInElvis() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/returnInElvis.kt");
+        }
+
+        @TestMetadata("SimpleVals.kt")
+        public void testSimpleVals() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/SimpleVals.kt");
+        }
+
+        @TestMetadata("SimpleValsExtensions.kt")
+        public void testSimpleValsExtensions() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/SimpleValsExtensions.kt");
+        }
+
+        @TestMetadata("SimpleVarsExtensions.kt")
+        public void testSimpleVarsExtensions() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/SimpleVarsExtensions.kt");
+        }
+
+        @TestMetadata("UnderscoreNames.kt")
+        public void testUnderscoreNames() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/UnderscoreNames.kt");
+        }
+
+        @TestMetadata("ValCapturedInFunctionLiteral.kt")
+        public void testValCapturedInFunctionLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/ValCapturedInFunctionLiteral.kt");
+        }
+
+        @TestMetadata("ValCapturedInLocalFunction.kt")
+        public void testValCapturedInLocalFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/ValCapturedInLocalFunction.kt");
+        }
+
+        @TestMetadata("ValCapturedInObjectLiteral.kt")
+        public void testValCapturedInObjectLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/ValCapturedInObjectLiteral.kt");
+        }
+
+        @TestMetadata("VarCapturedInFunctionLiteral.kt")
+        public void testVarCapturedInFunctionLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/VarCapturedInFunctionLiteral.kt");
+        }
+
+        @TestMetadata("VarCapturedInLocalFunction.kt")
+        public void testVarCapturedInLocalFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/VarCapturedInLocalFunction.kt");
+        }
+
+        @TestMetadata("VarCapturedInObjectLiteral.kt")
+        public void testVarCapturedInObjectLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/multiDecl/VarCapturedInObjectLiteral.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForIterator extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForIterator() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class LongIterator extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInLongIterator() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator/longIterator"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForRange extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForRange() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("MultiDeclFor.kt")
+            public void testMultiDeclFor() throws Exception {
+                runTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt");
+            }
+
+            @TestMetadata("MultiDeclForComponentExtensions.kt")
+            public void testMultiDeclForComponentExtensions() throws Exception {
+                runTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt");
+            }
+
+            @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+            public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                runTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensions.kt");
+            }
+
+            @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+            public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+            }
+
+            @TestMetadata("MultiDeclForValCaptured.kt")
+            public void testMultiDeclForValCaptured() throws Exception {
+                runTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForValCaptured.kt");
+            }
+
+            @TestMetadata("UnderscoreNames.kt")
+            public void testUnderscoreNames() throws Exception {
+                runTest("compiler/testData/codegen/box/multiDecl/forRange/UnderscoreNames.kt");
+            }
+
+            @TestMetadata("UnderscoreNamesDontCallComponent.kt")
+            public void testUnderscoreNamesDontCallComponent() throws Exception {
+                runTest("compiler/testData/codegen/box/multiDecl/forRange/UnderscoreNamesDontCallComponent.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class ExplicitRangeTo extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInExplicitRangeTo() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("MultiDeclFor.kt")
+                public void testMultiDeclFor() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensions.kt")
+                public void testMultiDeclForComponentExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                }
+
+                @TestMetadata("MultiDeclForValCaptured.kt")
+                public void testMultiDeclForValCaptured() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.kt");
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class Int extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInInt() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("MultiDeclForComponentExtensions.kt")
+                    public void testMultiDeclForComponentExtensions() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensions.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                    public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                    public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                    public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class Long extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInLong() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("MultiDeclForComponentExtensions.kt")
+                    public void testMultiDeclForComponentExtensions() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensions.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                    public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                    public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                    public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    }
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class ExplicitRangeToWithDot extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("MultiDeclFor.kt")
+                public void testMultiDeclFor() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensions.kt")
+                public void testMultiDeclForComponentExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                }
+
+                @TestMetadata("MultiDeclForValCaptured.kt")
+                public void testMultiDeclForValCaptured() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.kt");
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class Int extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInInt() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("MultiDeclForComponentExtensions.kt")
+                    public void testMultiDeclForComponentExtensions() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensions.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                    public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                    public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                    public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class Long extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInLong() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("MultiDeclForComponentExtensions.kt")
+                    public void testMultiDeclForComponentExtensions() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensions.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                    public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                    public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.kt");
+                    }
+
+                    @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                    public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    }
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/int")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Int extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInInt() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/int"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensions.kt")
+                public void testMultiDeclForComponentExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/long")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Long extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInLong() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/long"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensions.kt")
+                public void testMultiDeclForComponentExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.kt");
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                }
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/multifileClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class MultifileClasses extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInMultifileClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multifileClasses"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/multifileClasses/optimized")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Optimized extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInOptimized() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multifileClasses/optimized"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/multiplatform")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Multiplatform extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInMultiplatform() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("optionalExpectation.kt")
+        public void testOptionalExpectation() throws Exception {
+            runTest("compiler/testData/codegen/box/multiplatform/optionalExpectation.kt");
+        }
+
+        @TestMetadata("starImportOfExpectEnumWithActualTypeAlias.kt")
+        public void testStarImportOfExpectEnumWithActualTypeAlias() throws Exception {
+            runTest("compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/multiplatform/defaultArguments")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class DefaultArguments extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInDefaultArguments() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/defaultArguments"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("bothInExpectAndActual.kt")
+            public void testBothInExpectAndActual() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual.kt");
+            }
+
+            @TestMetadata("bothInExpectAndActual2.kt")
+            public void testBothInExpectAndActual2() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual2.kt");
+            }
+
+            @TestMetadata("constructor.kt")
+            public void testConstructor() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/constructor.kt");
+            }
+
+            @TestMetadata("delegatedExpectedInterface.kt")
+            public void testDelegatedExpectedInterface() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/delegatedExpectedInterface.kt");
+            }
+
+            @TestMetadata("extensionReceiverValue.kt")
+            public void testExtensionReceiverValue() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/extensionReceiverValue.kt");
+            }
+
+            @TestMetadata("function.kt")
+            public void testFunction() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/function.kt");
+            }
+
+            @TestMetadata("functionFromOtherModule.kt")
+            public void testFunctionFromOtherModule() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/functionFromOtherModule.kt");
+            }
+
+            @TestMetadata("inheritedFromCommonClass.kt")
+            public void testInheritedFromCommonClass() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromCommonClass.kt");
+            }
+
+            @TestMetadata("inheritedFromExpectedClass.kt")
+            public void testInheritedFromExpectedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedClass.kt");
+            }
+
+            @TestMetadata("inheritedFromExpectedInterface.kt")
+            public void testInheritedFromExpectedInterface() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedInterface.kt");
+            }
+
+            @TestMetadata("inheritedFromExpectedMethod.kt")
+            public void testInheritedFromExpectedMethod() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedMethod.kt");
+            }
+
+            @TestMetadata("inheritedInExpectedDeclarations.kt")
+            public void testInheritedInExpectedDeclarations() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedInExpectedDeclarations.kt");
+            }
+
+            @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt")
+            public void testInheritedViaAnotherInterfaceIndirectly() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt");
+            }
+
+            @TestMetadata("inlineFunctionWithDefaultLambda.kt")
+            public void testInlineFunctionWithDefaultLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/inlineFunctionWithDefaultLambda.kt");
+            }
+
+            @TestMetadata("kt23239.kt")
+            public void testKt23239() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/kt23239.kt");
+            }
+
+            @TestMetadata("kt23739.kt")
+            public void testKt23739() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/kt23739.kt");
+            }
+
+            @TestMetadata("parametersInArgumentValues.kt")
+            public void testParametersInArgumentValues() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/parametersInArgumentValues.kt");
+            }
+
+            @TestMetadata("typeAlias.kt")
+            public void testTypeAlias() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/typeAlias.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/multiplatform/multiModule")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MultiModule extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMultiModule() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/multiModule"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("expectActualLink.kt")
+            public void testExpectActualLink() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/multiModule/expectActualLink.kt");
+            }
+
+            @TestMetadata("expectActualMemberLink.kt")
+            public void testExpectActualMemberLink() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/multiModule/expectActualMemberLink.kt");
+            }
+
+            @TestMetadata("expectActualTypealiasLink.kt")
+            public void testExpectActualTypealiasLink() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/multiModule/expectActualTypealiasLink.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/nonLocalReturns")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class NonLocalReturns extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInNonLocalReturns() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/nonLocalReturns"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("kt9644let.kt")
+        public void testKt9644let() throws Exception {
+            runTest("compiler/testData/codegen/box/nonLocalReturns/kt9644let.kt");
+        }
+
+        @TestMetadata("localReturnInsideProperty.kt")
+        public void testLocalReturnInsideProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/nonLocalReturns/localReturnInsideProperty.kt");
+        }
+
+        @TestMetadata("returnInsideTwoLambdas.kt")
+        public void testReturnInsideTwoLambdas() throws Exception {
+            runTest("compiler/testData/codegen/box/nonLocalReturns/returnInsideTwoLambdas.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/nothingValue")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class NothingValue extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInNothingValue() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/nothingValue"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("inNestedCall.kt")
+        public void testInNestedCall() throws Exception {
+            runTest("compiler/testData/codegen/box/nothingValue/inNestedCall.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/nullCheckOptimization")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class NullCheckOptimization extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInNullCheckOptimization() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/nullCheckOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("isNullable.kt")
+        public void testIsNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/nullCheckOptimization/isNullable.kt");
+        }
+
+        @TestMetadata("kt22410.kt")
+        public void testKt22410() throws Exception {
+            runTest("compiler/testData/codegen/box/nullCheckOptimization/kt22410.kt");
+        }
+
+        @TestMetadata("kt7774.kt")
+        public void testKt7774() throws Exception {
+            runTest("compiler/testData/codegen/box/nullCheckOptimization/kt7774.kt");
+        }
+
+        @TestMetadata("primitiveCheckWithSideEffect.kt")
+        public void testPrimitiveCheckWithSideEffect() throws Exception {
+            runTest("compiler/testData/codegen/box/nullCheckOptimization/primitiveCheckWithSideEffect.kt");
+        }
+
+        @TestMetadata("trivialInstanceOf.kt")
+        public void testTrivialInstanceOf() throws Exception {
+            runTest("compiler/testData/codegen/box/nullCheckOptimization/trivialInstanceOf.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/objectIntrinsics")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ObjectIntrinsics extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInObjectIntrinsics() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/objectIntrinsics"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/objects")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Objects extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInObjects() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/objects"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("anonymousObjectPropertyInitialization.kt")
+        public void testAnonymousObjectPropertyInitialization() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/anonymousObjectPropertyInitialization.kt");
+        }
+
+        @TestMetadata("anonymousObjectReturnsFromTopLevelFun.kt")
+        public void testAnonymousObjectReturnsFromTopLevelFun() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/anonymousObjectReturnsFromTopLevelFun.kt");
+        }
+
+        @TestMetadata("classCallsProtectedInheritedByCompanion.kt")
+        public void testClassCallsProtectedInheritedByCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/classCallsProtectedInheritedByCompanion.kt");
+        }
+
+        @TestMetadata("classCompanion.kt")
+        public void testClassCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/classCompanion.kt");
+        }
+
+        @TestMetadata("compoundAssignmentToArrayAccessToExtensionPropertyImportedFromObject.kt")
+        public void testCompoundAssignmentToArrayAccessToExtensionPropertyImportedFromObject() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/compoundAssignmentToArrayAccessToExtensionPropertyImportedFromObject.kt");
+        }
+
+        @TestMetadata("compoundAssignmentToArrayAccessToPropertyImportedFromObject.kt")
+        public void testCompoundAssignmentToArrayAccessToPropertyImportedFromObject() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/compoundAssignmentToArrayAccessToPropertyImportedFromObject.kt");
+        }
+
+        @TestMetadata("compoundAssignmentToExtensionPropertyImportedFromObject.kt")
+        public void testCompoundAssignmentToExtensionPropertyImportedFromObject() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/compoundAssignmentToExtensionPropertyImportedFromObject.kt");
+        }
+
+        @TestMetadata("compoundAssignmentToObjectFromCall.kt")
+        public void testCompoundAssignmentToObjectFromCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/compoundAssignmentToObjectFromCall.kt");
+        }
+
+        @TestMetadata("compoundAssignmentToPropertyImportedFromObject.kt")
+        public void testCompoundAssignmentToPropertyImportedFromObject() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/compoundAssignmentToPropertyImportedFromObject.kt");
+        }
+
+        @TestMetadata("compoundAssignmentToPropertyWithQualifier.kt")
+        public void testCompoundAssignmentToPropertyWithQualifier() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/compoundAssignmentToPropertyWithQualifier.kt");
+        }
+
+        @TestMetadata("flist.kt")
+        public void testFlist() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/flist.kt");
+        }
+
+        @TestMetadata("initializationOrder.kt")
+        public void testInitializationOrder() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/initializationOrder.kt");
+        }
+
+        @TestMetadata("initializerBlockResetToDefault.kt")
+        public void testInitializerBlockResetToDefault() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/initializerBlockResetToDefault.kt");
+        }
+
+        @TestMetadata("interfaceCompanion.kt")
+        public void testInterfaceCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/interfaceCompanion.kt");
+        }
+
+        @TestMetadata("interfaceCompanionObjectReference.kt")
+        public void testInterfaceCompanionObjectReference() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/interfaceCompanionObjectReference.kt");
+        }
+
+        @TestMetadata("kt11117.kt")
+        public void testKt11117() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt11117.kt");
+        }
+
+        @TestMetadata("kt1186.kt")
+        public void testKt1186() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt1186.kt");
+        }
+
+        @TestMetadata("kt1600.kt")
+        public void testKt1600() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt1600.kt");
+        }
+
+        @TestMetadata("kt18982.kt")
+        public void testKt18982() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt18982.kt");
+        }
+
+        @TestMetadata("kt2398.kt")
+        public void testKt2398() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt2398.kt");
+        }
+
+        @TestMetadata("kt2663.kt")
+        public void testKt2663() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt2663.kt");
+        }
+
+        @TestMetadata("kt2663_3.kt")
+        public void testKt2663_3() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt2663_3.kt");
+        }
+
+        @TestMetadata("kt2675.kt")
+        public void testKt2675() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt2675.kt");
+        }
+
+        @TestMetadata("kt2719.kt")
+        public void testKt2719() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt2719.kt");
+        }
+
+        @TestMetadata("kt2822.kt")
+        public void testKt2822() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt2822.kt");
+        }
+
+        @TestMetadata("kt3684.kt")
+        public void testKt3684() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt3684.kt");
+        }
+
+        @TestMetadata("kt4086.kt")
+        public void testKt4086() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt4086.kt");
+        }
+
+        @TestMetadata("kt694.kt")
+        public void testKt694() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/kt694.kt");
+        }
+
+        @TestMetadata("methodOnObject.kt")
+        public void testMethodOnObject() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/methodOnObject.kt");
+        }
+
+        @TestMetadata("nestedDerivedClassCallsProtectedFromCompanion.kt")
+        public void testNestedDerivedClassCallsProtectedFromCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/nestedDerivedClassCallsProtectedFromCompanion.kt");
+        }
+
+        @TestMetadata("nestedObjectWithSuperclass.kt")
+        public void testNestedObjectWithSuperclass() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt");
+        }
+
+        @TestMetadata("object.kt")
+        public void testObject() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/object.kt");
+        }
+
+        @TestMetadata("objectExtendsInnerAndReferencesOuterMember.kt")
+        public void testObjectExtendsInnerAndReferencesOuterMember() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/objectExtendsInnerAndReferencesOuterMember.kt");
+        }
+
+        @TestMetadata("objectInLocalAnonymousObject.kt")
+        public void testObjectInLocalAnonymousObject() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/objectInLocalAnonymousObject.kt");
+        }
+
+        @TestMetadata("objectInitialization_kt5523.kt")
+        public void testObjectInitialization_kt5523() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/objectInitialization_kt5523.kt");
+        }
+
+        @TestMetadata("objectLiteral.kt")
+        public void testObjectLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/objectLiteral.kt");
+        }
+
+        @TestMetadata("objectLiteralInClass.kt")
+        public void testObjectLiteralInClass() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/objectLiteralInClass.kt");
+        }
+
+        @TestMetadata("objectLiteralInClosure.kt")
+        public void testObjectLiteralInClosure() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/objectLiteralInClosure.kt");
+        }
+
+        @TestMetadata("objectWithSuperclass.kt")
+        public void testObjectWithSuperclass() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/objectWithSuperclass.kt");
+        }
+
+        @TestMetadata("objectWithSuperclassAndTrait.kt")
+        public void testObjectWithSuperclassAndTrait() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt");
+        }
+
+        @TestMetadata("privateExtensionFromInitializer_kt4543.kt")
+        public void testPrivateExtensionFromInitializer_kt4543() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/privateExtensionFromInitializer_kt4543.kt");
+        }
+
+        @TestMetadata("privateFunctionFromClosureInInitializer_kt5582.kt")
+        public void testPrivateFunctionFromClosureInInitializer_kt5582() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/privateFunctionFromClosureInInitializer_kt5582.kt");
+        }
+
+        @TestMetadata("receiverInConstructor.kt")
+        public void testReceiverInConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/receiverInConstructor.kt");
+        }
+
+        @TestMetadata("safeAccess.kt")
+        public void testSafeAccess() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/safeAccess.kt");
+        }
+
+        @TestMetadata("selfReferenceToCompanionObjectInAnonymousObjectInSuperConstructorCall.kt")
+        public void testSelfReferenceToCompanionObjectInAnonymousObjectInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToCompanionObjectInAnonymousObjectInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("selfReferenceToCompanionObjectInInlineLambdaInConstructorBody.kt")
+        public void testSelfReferenceToCompanionObjectInInlineLambdaInConstructorBody() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToCompanionObjectInInlineLambdaInConstructorBody.kt");
+        }
+
+        @TestMetadata("selfReferenceToCompanionObjectInInlineLambdaInSuperConstructorCall.kt")
+        public void testSelfReferenceToCompanionObjectInInlineLambdaInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToCompanionObjectInInlineLambdaInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("selfReferenceToCompanionObjectInLambdaInSuperConstructorCall.kt")
+        public void testSelfReferenceToCompanionObjectInLambdaInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToCompanionObjectInLambdaInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("selfReferenceToInterfaceCompanionObjectInAnonymousObjectInSuperConstructorCall.kt")
+        public void testSelfReferenceToInterfaceCompanionObjectInAnonymousObjectInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToInterfaceCompanionObjectInAnonymousObjectInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("selfReferenceToInterfaceCompanionObjectInInlineLambdaInConstructorBody.kt")
+        public void testSelfReferenceToInterfaceCompanionObjectInInlineLambdaInConstructorBody() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToInterfaceCompanionObjectInInlineLambdaInConstructorBody.kt");
+        }
+
+        @TestMetadata("selfReferenceToInterfaceCompanionObjectInInlineLambdaInSuperConstructorCall.kt")
+        public void testSelfReferenceToInterfaceCompanionObjectInInlineLambdaInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToInterfaceCompanionObjectInInlineLambdaInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("selfReferenceToInterfaceCompanionObjectInLambdaInSuperConstructorCall.kt")
+        public void testSelfReferenceToInterfaceCompanionObjectInLambdaInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToInterfaceCompanionObjectInLambdaInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("selfReferenceToObjectInAnonymousObjectInSuperConstructorCall.kt")
+        public void testSelfReferenceToObjectInAnonymousObjectInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToObjectInAnonymousObjectInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("selfReferenceToObjectInInlineLambdaInConstructorBody.kt")
+        public void testSelfReferenceToObjectInInlineLambdaInConstructorBody() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToObjectInInlineLambdaInConstructorBody.kt");
+        }
+
+        @TestMetadata("selfReferenceToObjectInInlineLambdaInSuperConstructorCall.kt")
+        public void testSelfReferenceToObjectInInlineLambdaInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToObjectInInlineLambdaInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("selfReferenceToObjectInLambdaInSuperConstructorCall.kt")
+        public void testSelfReferenceToObjectInLambdaInSuperConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/selfReferenceToObjectInLambdaInSuperConstructorCall.kt");
+        }
+
+        @TestMetadata("simpleObject.kt")
+        public void testSimpleObject() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
+        }
+
+        @TestMetadata("thisInConstructor.kt")
+        public void testThisInConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
+        }
+
+        @TestMetadata("thisRefToObjectInNestedClassConstructorCall.kt")
+        public void testThisRefToObjectInNestedClassConstructorCall() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/thisRefToObjectInNestedClassConstructorCall.kt");
+        }
+
+        @TestMetadata("useAnonymousObjectAsIterator.kt")
+        public void testUseAnonymousObjectAsIterator() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
+        }
+
+        @TestMetadata("useImportedMember.kt")
+        public void testUseImportedMember() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
+        }
+
+        @TestMetadata("useImportedMemberFromCompanion.kt")
+        public void testUseImportedMemberFromCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useImportedMemberFromCompanion.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/objects/companionObjectAccess")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CompanionObjectAccess extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCompanionObjectAccess() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/objects/companionObjectAccess"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("kt27117.kt")
+            public void testKt27117() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/kt27117.kt");
+            }
+
+            @TestMetadata("kt27117_lv12.kt")
+            public void testKt27117_lv12() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/kt27117_lv12.kt");
+            }
+
+            @TestMetadata("kt27117_lv13.kt")
+            public void testKt27117_lv13() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/kt27117_lv13.kt");
+            }
+
+            @TestMetadata("kt27121.kt")
+            public void testKt27121() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/kt27121.kt");
+            }
+
+            @TestMetadata("kt27121_lv12.kt")
+            public void testKt27121_lv12() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/kt27121_lv12.kt");
+            }
+
+            @TestMetadata("kt27121_lv13.kt")
+            public void testKt27121_lv13() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/kt27121_lv13.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectAccessedFromAnonymousObjectInNestedClass.kt")
+            public void testPrivateCompanionObjectAccessedFromAnonymousObjectInNestedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromAnonymousObjectInNestedClass.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectAccessedFromInitBlock.kt")
+            public void testPrivateCompanionObjectAccessedFromInitBlock() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromInitBlock.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectAccessedFromInitBlockOfNestedClass.kt")
+            public void testPrivateCompanionObjectAccessedFromInitBlockOfNestedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromInitBlockOfNestedClass.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectAccessedFromInlineLambdaInNestedClass.kt")
+            public void testPrivateCompanionObjectAccessedFromInlineLambdaInNestedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromInlineLambdaInNestedClass.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectAccessedFromLambdaInNestedClass.kt")
+            public void testPrivateCompanionObjectAccessedFromLambdaInNestedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromLambdaInNestedClass.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectAccessedFromMethodInlinedInNestedClass.kt")
+            public void testPrivateCompanionObjectAccessedFromMethodInlinedInNestedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromMethodInlinedInNestedClass.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectAccessedFromNestedClass.kt")
+            public void testPrivateCompanionObjectAccessedFromNestedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromNestedClass.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectAccessedFromNestedClassSeveralTimes.kt")
+            public void testPrivateCompanionObjectAccessedFromNestedClassSeveralTimes() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromNestedClassSeveralTimes.kt");
+            }
+
+            @TestMetadata("privateCompanionObjectUsedInNestedClass.kt")
+            public void testPrivateCompanionObjectUsedInNestedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectUsedInNestedClass.kt");
+            }
+
+            @TestMetadata("protectedCompanionObjectAccessedFromNestedClass.kt")
+            public void testProtectedCompanionObjectAccessedFromNestedClass() throws Exception {
+                runTest("compiler/testData/codegen/box/objects/companionObjectAccess/protectedCompanionObjectAccessedFromNestedClass.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class MultipleCompanionsWithAccessors extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                @TestMetadata("accessFromInlineLambda.kt")
+                public void testAccessFromInlineLambda() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/accessFromInlineLambda.kt");
+                }
+
+                public void testAllFilesPresentInMultipleCompanionsWithAccessors() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("anonymousObjectInPropertyInitializer.kt")
+                public void testAnonymousObjectInPropertyInitializer() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/anonymousObjectInPropertyInitializer.kt");
+                }
+
+                @TestMetadata("fromAnonymousObjectInNestedClass.kt")
+                public void testFromAnonymousObjectInNestedClass() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/fromAnonymousObjectInNestedClass.kt");
+                }
+
+                @TestMetadata("fromInitBlock.kt")
+                public void testFromInitBlock() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/fromInitBlock.kt");
+                }
+
+                @TestMetadata("fromInitBlockOfNestedClass.kt")
+                public void testFromInitBlockOfNestedClass() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/fromInitBlockOfNestedClass.kt");
+                }
+
+                @TestMetadata("fromInlineLambdaInNestedClass.kt")
+                public void testFromInlineLambdaInNestedClass() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/fromInlineLambdaInNestedClass.kt");
+                }
+
+                @TestMetadata("inheritedProtectedCompanionAndOwnPrivateCompanion.kt")
+                public void testInheritedProtectedCompanionAndOwnPrivateCompanion() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/inheritedProtectedCompanionAndOwnPrivateCompanion.kt");
+                }
+
+                @TestMetadata("inheritedProtectedCompanionsReferencedByName.kt")
+                public void testInheritedProtectedCompanionsReferencedByName() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/inheritedProtectedCompanionsReferencedByName.kt");
+                }
+
+                @TestMetadata("lambdaInPropertyInitializer.kt")
+                public void testLambdaInPropertyInitializer() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/lambdaInPropertyInitializer.kt");
+                }
+
+                @TestMetadata("twoInheritedProtectedCompanions.kt")
+                public void testTwoInheritedProtectedCompanions() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/twoInheritedProtectedCompanions.kt");
+                }
+
+                @TestMetadata("withCompanionObjectBase.kt")
+                public void testWithCompanionObjectBase() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/withCompanionObjectBase.kt");
+                }
+
+                @TestMetadata("withMultipleNestedCompanionObjectBases.kt")
+                public void testWithMultipleNestedCompanionObjectBases() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/withMultipleNestedCompanionObjectBases.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class PrimitiveCompanion extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInPrimitiveCompanion() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("byteCompanionObject.kt")
+                public void testByteCompanionObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/byteCompanionObject.kt");
+                }
+
+                @TestMetadata("charCompanionObject.kt")
+                public void testCharCompanionObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/charCompanionObject.kt");
+                }
+
+                @TestMetadata("doubleCompanionObject.kt")
+                public void testDoubleCompanionObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/doubleCompanionObject.kt");
+                }
+
+                @TestMetadata("floatCompanionObject.kt")
+                public void testFloatCompanionObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/floatCompanionObject.kt");
+                }
+
+                @TestMetadata("intCompanionObject.kt")
+                public void testIntCompanionObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/intCompanionObject.kt");
+                }
+
+                @TestMetadata("longCompanionObject.kt")
+                public void testLongCompanionObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/longCompanionObject.kt");
+                }
+
+                @TestMetadata("shortCompanionObject.kt")
+                public void testShortCompanionObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/shortCompanionObject.kt");
+                }
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/operatorConventions")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class OperatorConventions extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInOperatorConventions() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("annotatedAssignment.kt")
+        public void testAnnotatedAssignment() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/annotatedAssignment.kt");
+        }
+
+        @TestMetadata("assignmentOperations.kt")
+        public void testAssignmentOperations() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt");
+        }
+
+        @TestMetadata("augmentedAssignmentInInitializer.kt")
+        public void testAugmentedAssignmentInInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/augmentedAssignmentInInitializer.kt");
+        }
+
+        @TestMetadata("augmentedAssignmentWithArrayLHS.kt")
+        public void testAugmentedAssignmentWithArrayLHS() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/augmentedAssignmentWithArrayLHS.kt");
+        }
+
+        @TestMetadata("genericArrayAccessCall.kt")
+        public void testGenericArrayAccessCall() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/genericArrayAccessCall.kt");
+        }
+
+        @TestMetadata("incDecOnObject.kt")
+        public void testIncDecOnObject() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/incDecOnObject.kt");
+        }
+
+        @TestMetadata("infixFunctionOverBuiltinMember.kt")
+        public void testInfixFunctionOverBuiltinMember() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/infixFunctionOverBuiltinMember.kt");
+        }
+
+        @TestMetadata("kt14201.kt")
+        public void testKt14201() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/kt14201.kt");
+        }
+
+        @TestMetadata("kt14201_2.kt")
+        public void testKt14201_2() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/kt14201_2.kt");
+        }
+
+        @TestMetadata("kt20387.kt")
+        public void testKt20387() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/kt20387.kt");
+        }
+
+        @TestMetadata("kt4152.kt")
+        public void testKt4152() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/kt4152.kt");
+        }
+
+        @TestMetadata("kt4987.kt")
+        public void testKt4987() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/kt4987.kt");
+        }
+
+        @TestMetadata("nestedMaps.kt")
+        public void testNestedMaps() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/nestedMaps.kt");
+        }
+
+        @TestMetadata("operatorSetLambda.kt")
+        public void testOperatorSetLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/operatorSetLambda.kt");
+        }
+
+        @TestMetadata("overloadedSet.kt")
+        public void testOverloadedSet() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/overloadedSet.kt");
+        }
+
+        @TestMetadata("plusExplicit.kt")
+        public void testPlusExplicit() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/plusExplicit.kt");
+        }
+
+        @TestMetadata("remAssignmentOperation.kt")
+        public void testRemAssignmentOperation() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/remAssignmentOperation.kt");
+        }
+
+        @TestMetadata("remOverModOperation.kt")
+        public void testRemOverModOperation() throws Exception {
+            runTest("compiler/testData/codegen/box/operatorConventions/remOverModOperation.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/operatorConventions/compareTo")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CompareTo extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCompareTo() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions/compareTo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("boolean.kt")
+            public void testBoolean() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/boolean.kt");
+            }
+
+            @TestMetadata("comparable.kt")
+            public void testComparable() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt");
+            }
+
+            @TestMetadata("customCompareTo.kt")
+            public void testCustomCompareTo() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/customCompareTo.kt");
+            }
+
+            @TestMetadata("doubleInt.kt")
+            public void testDoubleInt() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/doubleInt.kt");
+            }
+
+            @TestMetadata("doubleLong.kt")
+            public void testDoubleLong() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/doubleLong.kt");
+            }
+
+            @TestMetadata("extensionArray.kt")
+            public void testExtensionArray() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt");
+            }
+
+            @TestMetadata("extensionObject.kt")
+            public void testExtensionObject() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/extensionObject.kt");
+            }
+
+            @TestMetadata("intDouble.kt")
+            public void testIntDouble() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/intDouble.kt");
+            }
+
+            @TestMetadata("intLong.kt")
+            public void testIntLong() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/intLong.kt");
+            }
+
+            @TestMetadata("longDouble.kt")
+            public void testLongDouble() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/longDouble.kt");
+            }
+
+            @TestMetadata("longInt.kt")
+            public void testLongInt() throws Exception {
+                runTest("compiler/testData/codegen/box/operatorConventions/compareTo/longInt.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/optimizations")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Optimizations extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInOptimizations() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/optimizations"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/package")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Package extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPackage() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/package"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("boxPrimitiveTypeInClinit.kt")
+        public void testBoxPrimitiveTypeInClinit() throws Exception {
+            runTest("compiler/testData/codegen/box/package/boxPrimitiveTypeInClinit.kt");
+        }
+
+        @TestMetadata("checkCast.kt")
+        public void testCheckCast() throws Exception {
+            runTest("compiler/testData/codegen/box/package/checkCast.kt");
+        }
+
+        @TestMetadata("incrementProperty.kt")
+        public void testIncrementProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/package/incrementProperty.kt");
+        }
+
+        @TestMetadata("nullablePrimitiveNoFieldInitializer.kt")
+        public void testNullablePrimitiveNoFieldInitializer() throws Exception {
+            runTest("compiler/testData/codegen/box/package/nullablePrimitiveNoFieldInitializer.kt");
+        }
+
+        @TestMetadata("packageLocalClassNotImportedWithDefaultImport.kt")
+        public void testPackageLocalClassNotImportedWithDefaultImport() throws Exception {
+            runTest("compiler/testData/codegen/box/package/packageLocalClassNotImportedWithDefaultImport.kt");
+        }
+
+        @TestMetadata("packageQualifiedMethod.kt")
+        public void testPackageQualifiedMethod() throws Exception {
+            runTest("compiler/testData/codegen/box/package/packageQualifiedMethod.kt");
+        }
+
+        @TestMetadata("privateMembersInImportList.kt")
+        public void testPrivateMembersInImportList() throws Exception {
+            runTest("compiler/testData/codegen/box/package/privateMembersInImportList.kt");
+        }
+
+        @TestMetadata("privateTopLevelPropAndVarInInner.kt")
+        public void testPrivateTopLevelPropAndVarInInner() throws Exception {
+            runTest("compiler/testData/codegen/box/package/privateTopLevelPropAndVarInInner.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/polymorphicSignature")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PolymorphicSignature extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPolymorphicSignature() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/polymorphicSignature"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/primitiveTypes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PrimitiveTypes extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPrimitiveTypes() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/primitiveTypes"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("comparisonWithNullCallsFun.kt")
+        public void testComparisonWithNullCallsFun() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/comparisonWithNullCallsFun.kt");
+        }
+
+        @TestMetadata("conversions.kt")
+        public void testConversions() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/conversions.kt");
+        }
+
+        @TestMetadata("ea35963.kt")
+        public void testEa35963() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/ea35963.kt");
+        }
+
+        @TestMetadata("equalsHashCodeToString.kt")
+        public void testEqualsHashCodeToString() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/equalsHashCodeToString.kt");
+        }
+
+        @TestMetadata("incrementByteCharShort.kt")
+        public void testIncrementByteCharShort() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/incrementByteCharShort.kt");
+        }
+
+        @TestMetadata("intLiteralIsNotNull.kt")
+        public void testIntLiteralIsNotNull() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/intLiteralIsNotNull.kt");
+        }
+
+        @TestMetadata("kt1054.kt")
+        public void testKt1054() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt1054.kt");
+        }
+
+        @TestMetadata("kt1055.kt")
+        public void testKt1055() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt1055.kt");
+        }
+
+        @TestMetadata("kt1093.kt")
+        public void testKt1093() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt1093.kt");
+        }
+
+        @TestMetadata("kt13023.kt")
+        public void testKt13023() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt13023.kt");
+        }
+
+        @TestMetadata("kt14868.kt")
+        public void testKt14868() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt14868.kt");
+        }
+
+        @TestMetadata("kt1508.kt")
+        public void testKt1508() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt1508.kt");
+        }
+
+        @TestMetadata("kt1634.kt")
+        public void testKt1634() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt1634.kt");
+        }
+
+        @TestMetadata("kt16732.kt")
+        public void testKt16732() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt16732.kt");
+        }
+
+        @TestMetadata("kt2251.kt")
+        public void testKt2251() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt2251.kt");
+        }
+
+        @TestMetadata("kt2269.kt")
+        public void testKt2269() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt2269.kt");
+        }
+
+        @TestMetadata("kt2269NotOptimizable.kt")
+        public void testKt2269NotOptimizable() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt2269NotOptimizable.kt");
+        }
+
+        @TestMetadata("kt2275.kt")
+        public void testKt2275() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt2275.kt");
+        }
+
+        @TestMetadata("kt239.kt")
+        public void testKt239() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt239.kt");
+        }
+
+        @TestMetadata("kt242.kt")
+        public void testKt242() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt242.kt");
+        }
+
+        @TestMetadata("kt248.kt")
+        public void testKt248() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt248.kt");
+        }
+
+        @TestMetadata("kt2768.kt")
+        public void testKt2768() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt2768.kt");
+        }
+
+        @TestMetadata("kt2794.kt")
+        public void testKt2794() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt2794.kt");
+        }
+
+        @TestMetadata("kt3078.kt")
+        public void testKt3078() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt3078.kt");
+        }
+
+        @TestMetadata("kt3517.kt")
+        public void testKt3517() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt3517.kt");
+        }
+
+        @TestMetadata("kt3576.kt")
+        public void testKt3576() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt3576.kt");
+        }
+
+        @TestMetadata("kt3613.kt")
+        public void testKt3613() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt3613.kt");
+        }
+
+        @TestMetadata("kt37505.kt")
+        public void testKt37505() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt37505.kt");
+        }
+
+        @TestMetadata("kt4097.kt")
+        public void testKt4097() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt4097.kt");
+        }
+
+        @TestMetadata("kt4098.kt")
+        public void testKt4098() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt4098.kt");
+        }
+
+        @TestMetadata("kt4210.kt")
+        public void testKt4210() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt4210.kt");
+        }
+
+        @TestMetadata("kt4251.kt")
+        public void testKt4251() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt4251.kt");
+        }
+
+        @TestMetadata("kt446.kt")
+        public void testKt446() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt446.kt");
+        }
+
+        @TestMetadata("kt518.kt")
+        public void testKt518() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt518.kt");
+        }
+
+        @TestMetadata("kt6590_identityEquals.kt")
+        public void testKt6590_identityEquals() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt6590_identityEquals.kt");
+        }
+
+        @TestMetadata("kt665.kt")
+        public void testKt665() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt665.kt");
+        }
+
+        @TestMetadata("kt711.kt")
+        public void testKt711() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt711.kt");
+        }
+
+        @TestMetadata("kt737.kt")
+        public void testKt737() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt737.kt");
+        }
+
+        @TestMetadata("kt828.kt")
+        public void testKt828() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt828.kt");
+        }
+
+        @TestMetadata("kt877.kt")
+        public void testKt877() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt877.kt");
+        }
+
+        @TestMetadata("kt882.kt")
+        public void testKt882() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt882.kt");
+        }
+
+        @TestMetadata("kt887.kt")
+        public void testKt887() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/kt887.kt");
+        }
+
+        @TestMetadata("nullableAsIndex.kt")
+        public void testNullableAsIndex() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/nullableAsIndex.kt");
+        }
+
+        @TestMetadata("nullableCharBoolean.kt")
+        public void testNullableCharBoolean() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/nullableCharBoolean.kt");
+        }
+
+        @TestMetadata("numberEqualsHashCodeToString.kt")
+        public void testNumberEqualsHashCodeToString() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/numberEqualsHashCodeToString.kt");
+        }
+
+        @TestMetadata("rangeTo.kt")
+        public void testRangeTo() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/rangeTo.kt");
+        }
+
+        @TestMetadata("unboxComparable.kt")
+        public void testUnboxComparable() throws Exception {
+            runTest("compiler/testData/codegen/box/primitiveTypes/unboxComparable.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/primitiveTypes/equalityWithObject")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class EqualityWithObject extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEqualityWithObject() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/primitiveTypes/equalityWithObject"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("boxedEqPrimitiveEvaluationOrder.kt")
+            public void testBoxedEqPrimitiveEvaluationOrder() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/boxedEqPrimitiveEvaluationOrder.kt");
+            }
+
+            @TestMetadata("boxedLongEqualsLong.kt")
+            public void testBoxedLongEqualsLong() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/boxedLongEqualsLong.kt");
+            }
+
+            @TestMetadata("intEqualsNull.kt")
+            public void testIntEqualsNull() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNull.kt");
+            }
+
+            @TestMetadata("intEqualsNullableInt.kt")
+            public void testIntEqualsNullableInt() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableInt.kt");
+            }
+
+            @TestMetadata("intEqualsNullableIntWithSmartCasts.kt")
+            public void testIntEqualsNullableIntWithSmartCasts() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
+            }
+
+            @TestMetadata("kt42281.kt")
+            public void testKt42281() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
+            }
+
+            @TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
+            public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
+            }
+
+            @TestMetadata("whenIntAsNullableAny.kt")
+            public void testWhenIntAsNullableAny() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/whenIntAsNullableAny.kt");
+            }
+
+            @TestMetadata("whenNullableBoxed.kt")
+            public void testWhenNullableBoxed() throws Exception {
+                runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/whenNullableBoxed.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Generated extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInGenerated() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("boxedEqPrimitiveBoolean.kt")
+                public void testBoxedEqPrimitiveBoolean() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/boxedEqPrimitiveBoolean.kt");
+                }
+
+                @TestMetadata("boxedEqPrimitiveByte.kt")
+                public void testBoxedEqPrimitiveByte() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/boxedEqPrimitiveByte.kt");
+                }
+
+                @TestMetadata("boxedEqPrimitiveChar.kt")
+                public void testBoxedEqPrimitiveChar() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/boxedEqPrimitiveChar.kt");
+                }
+
+                @TestMetadata("boxedEqPrimitiveInt.kt")
+                public void testBoxedEqPrimitiveInt() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/boxedEqPrimitiveInt.kt");
+                }
+
+                @TestMetadata("boxedEqPrimitiveLong.kt")
+                public void testBoxedEqPrimitiveLong() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/boxedEqPrimitiveLong.kt");
+                }
+
+                @TestMetadata("boxedEqPrimitiveShort.kt")
+                public void testBoxedEqPrimitiveShort() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/boxedEqPrimitiveShort.kt");
+                }
+
+                @TestMetadata("primitiveEqBoxedBoolean.kt")
+                public void testPrimitiveEqBoxedBoolean() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqBoxedBoolean.kt");
+                }
+
+                @TestMetadata("primitiveEqBoxedByte.kt")
+                public void testPrimitiveEqBoxedByte() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqBoxedByte.kt");
+                }
+
+                @TestMetadata("primitiveEqBoxedChar.kt")
+                public void testPrimitiveEqBoxedChar() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqBoxedChar.kt");
+                }
+
+                @TestMetadata("primitiveEqBoxedInt.kt")
+                public void testPrimitiveEqBoxedInt() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqBoxedInt.kt");
+                }
+
+                @TestMetadata("primitiveEqBoxedLong.kt")
+                public void testPrimitiveEqBoxedLong() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqBoxedLong.kt");
+                }
+
+                @TestMetadata("primitiveEqBoxedShort.kt")
+                public void testPrimitiveEqBoxedShort() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqBoxedShort.kt");
+                }
+
+                @TestMetadata("primitiveEqObjectBoolean.kt")
+                public void testPrimitiveEqObjectBoolean() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectBoolean.kt");
+                }
+
+                @TestMetadata("primitiveEqObjectByte.kt")
+                public void testPrimitiveEqObjectByte() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectByte.kt");
+                }
+
+                @TestMetadata("primitiveEqObjectChar.kt")
+                public void testPrimitiveEqObjectChar() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectChar.kt");
+                }
+
+                @TestMetadata("primitiveEqObjectInt.kt")
+                public void testPrimitiveEqObjectInt() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectInt.kt");
+                }
+
+                @TestMetadata("primitiveEqObjectLong.kt")
+                public void testPrimitiveEqObjectLong() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectLong.kt");
+                }
+
+                @TestMetadata("primitiveEqObjectShort.kt")
+                public void testPrimitiveEqObjectShort() throws Exception {
+                    runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectShort.kt");
+                }
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/private")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Private extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPrivate() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/private"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("arrayConvention.kt")
+        public void testArrayConvention() throws Exception {
+            runTest("compiler/testData/codegen/box/private/arrayConvention.kt");
+        }
+
+        @TestMetadata("kt9855.kt")
+        public void testKt9855() throws Exception {
+            runTest("compiler/testData/codegen/box/private/kt9855.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/privateConstructors")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PrivateConstructors extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPrivateConstructors() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/privateConstructors"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("base.kt")
+        public void testBase() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/base.kt");
+        }
+
+        @TestMetadata("captured.kt")
+        public void testCaptured() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/captured.kt");
+        }
+
+        @TestMetadata("companion.kt")
+        public void testCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/companion.kt");
+        }
+
+        @TestMetadata("inline.kt")
+        public void testInline() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/inline.kt");
+        }
+
+        @TestMetadata("inner.kt")
+        public void testInner() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/inner.kt");
+        }
+
+        @TestMetadata("kt4860.kt")
+        public void testKt4860() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/kt4860.kt");
+        }
+
+        @TestMetadata("secondary.kt")
+        public void testSecondary() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/secondary.kt");
+        }
+
+        @TestMetadata("withArguments.kt")
+        public void testWithArguments() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/withArguments.kt");
+        }
+
+        @TestMetadata("withDefault.kt")
+        public void testWithDefault() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/withDefault.kt");
+        }
+
+        @TestMetadata("withLinkedClasses.kt")
+        public void testWithLinkedClasses() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/withLinkedClasses.kt");
+        }
+
+        @TestMetadata("withLinkedObjects.kt")
+        public void testWithLinkedObjects() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/withLinkedObjects.kt");
+        }
+
+        @TestMetadata("withVarargs.kt")
+        public void testWithVarargs() throws Exception {
+            runTest("compiler/testData/codegen/box/privateConstructors/withVarargs.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/properties")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Properties extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        @TestMetadata("accessToPrivateProperty.kt")
+        public void testAccessToPrivateProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/accessToPrivateProperty.kt");
+        }
+
+        @TestMetadata("accessorForProtectedPropertyWithPrivateSetter.kt")
+        public void testAccessorForProtectedPropertyWithPrivateSetter() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/accessorForProtectedPropertyWithPrivateSetter.kt");
+        }
+
+        @TestMetadata("accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.kt")
+        public void testAccessorForProtectedPropertyWithPrivateSetterInObjectLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.kt");
+        }
+
+        @TestMetadata("accessorForProtectedPropertyWithPrivateSetterViaSuper.kt")
+        public void testAccessorForProtectedPropertyWithPrivateSetterViaSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/accessorForProtectedPropertyWithPrivateSetterViaSuper.kt");
+        }
+
+        @TestMetadata("accessorForProtectedPropertyWithPrivateSetterWithIntermediateClass.kt")
+        public void testAccessorForProtectedPropertyWithPrivateSetterWithIntermediateClass() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/accessorForProtectedPropertyWithPrivateSetterWithIntermediateClass.kt");
+        }
+
+        public void testAllFilesPresentInProperties() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/properties"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("classArtificialFieldInsideNested.kt")
+        public void testClassArtificialFieldInsideNested() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/classArtificialFieldInsideNested.kt");
+        }
+
+        @TestMetadata("classFieldInsideLambda.kt")
+        public void testClassFieldInsideLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/classFieldInsideLambda.kt");
+        }
+
+        @TestMetadata("classFieldInsideLocalInSetter.kt")
+        public void testClassFieldInsideLocalInSetter() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/classFieldInsideLocalInSetter.kt");
+        }
+
+        @TestMetadata("classFieldInsideNested.kt")
+        public void testClassFieldInsideNested() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/classFieldInsideNested.kt");
+        }
+
+        @TestMetadata("classFieldInsideNestedLambda.kt")
+        public void testClassFieldInsideNestedLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/classFieldInsideNestedLambda.kt");
+        }
+
+        @TestMetadata("classFieldInsideNestedNestedLambda.kt")
+        public void testClassFieldInsideNestedNestedLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/classFieldInsideNestedNestedLambda.kt");
+        }
+
+        @TestMetadata("classObjectProperties.kt")
+        public void testClassObjectProperties() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/classObjectProperties.kt");
+        }
+
+        @TestMetadata("classPrivateArtificialFieldInsideNested.kt")
+        public void testClassPrivateArtificialFieldInsideNested() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/classPrivateArtificialFieldInsideNested.kt");
+        }
+
+        @TestMetadata("companionFieldInsideLambda.kt")
+        public void testCompanionFieldInsideLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/companionFieldInsideLambda.kt");
+        }
+
+        @TestMetadata("companionPrivateField.kt")
+        public void testCompanionPrivateField() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/companionPrivateField.kt");
+        }
+
+        @TestMetadata("companionPrivateFieldInsideLambda.kt")
+        public void testCompanionPrivateFieldInsideLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/companionPrivateFieldInsideLambda.kt");
+        }
+
+        @TestMetadata("field.kt")
+        public void testField() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/field.kt");
+        }
+
+        @TestMetadata("fieldInClass.kt")
+        public void testFieldInClass() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/fieldInClass.kt");
+        }
+
+        @TestMetadata("fieldInsideField.kt")
+        public void testFieldInsideField() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/fieldInsideField.kt");
+        }
+
+        @TestMetadata("fieldInsideLambda.kt")
+        public void testFieldInsideLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/fieldInsideLambda.kt");
+        }
+
+        @TestMetadata("fieldInsideNested.kt")
+        public void testFieldInsideNested() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/fieldInsideNested.kt");
+        }
+
+        @TestMetadata("fieldSimple.kt")
+        public void testFieldSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/fieldSimple.kt");
+        }
+
+        @TestMetadata("generalAccess.kt")
+        public void testGeneralAccess() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/generalAccess.kt");
+        }
+
+        @TestMetadata("genericWithSameName.kt")
+        public void testGenericWithSameName() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/genericWithSameName.kt");
+        }
+
+        @TestMetadata("initOrderMultiModule.kt")
+        public void testInitOrderMultiModule() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/initOrderMultiModule.kt");
+        }
+
+        @TestMetadata("kt10715.kt")
+        public void testKt10715() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt10715.kt");
+        }
+
+        @TestMetadata("kt10729.kt")
+        public void testKt10729() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt10729.kt");
+        }
+
+        @TestMetadata("kt1165.kt")
+        public void testKt1165() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt1165.kt");
+        }
+
+        @TestMetadata("kt1168.kt")
+        public void testKt1168() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt1168.kt");
+        }
+
+        @TestMetadata("kt1170.kt")
+        public void testKt1170() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt1170.kt");
+        }
+
+        @TestMetadata("kt1417.kt")
+        public void testKt1417() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt1417.kt");
+        }
+
+        @TestMetadata("kt1714_minimal.kt")
+        public void testKt1714_minimal() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt1714_minimal.kt");
+        }
+
+        @TestMetadata("kt1892.kt")
+        public void testKt1892() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt1892.kt");
+        }
+
+        @TestMetadata("kt2331.kt")
+        public void testKt2331() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt2331.kt");
+        }
+
+        @TestMetadata("kt257.kt")
+        public void testKt257() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt257.kt");
+        }
+
+        @TestMetadata("kt2655.kt")
+        public void testKt2655() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt2655.kt");
+        }
+
+        @TestMetadata("kt2786.kt")
+        public void testKt2786() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt2786.kt");
+        }
+
+        @TestMetadata("kt2892.kt")
+        public void testKt2892() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt2892.kt");
+        }
+
+        @TestMetadata("kt3118.kt")
+        public void testKt3118() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt3118.kt");
+        }
+
+        @TestMetadata("kt3524.kt")
+        public void testKt3524() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt3524.kt");
+        }
+
+        @TestMetadata("kt3551.kt")
+        public void testKt3551() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt3551.kt");
+        }
+
+        @TestMetadata("kt3556.kt")
+        public void testKt3556() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt3556.kt");
+        }
+
+        @TestMetadata("kt3930.kt")
+        public void testKt3930() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt3930.kt");
+        }
+
+        @TestMetadata("kt4140.kt")
+        public void testKt4140() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt4140.kt");
+        }
+
+        @TestMetadata("kt4252.kt")
+        public void testKt4252() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt4252.kt");
+        }
+
+        @TestMetadata("kt4252_2.kt")
+        public void testKt4252_2() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt4252_2.kt");
+        }
+
+        @TestMetadata("kt4340.kt")
+        public void testKt4340() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt4340.kt");
+        }
+
+        @TestMetadata("kt4373.kt")
+        public void testKt4373() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt4373.kt");
+        }
+
+        @TestMetadata("kt613.kt")
+        public void testKt613() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt613.kt");
+        }
+
+        @TestMetadata("kt8928.kt")
+        public void testKt8928() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt8928.kt");
+        }
+
+        @TestMetadata("kt9603.kt")
+        public void testKt9603() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/kt9603.kt");
+        }
+
+        @TestMetadata("primitiveOverrideDefaultAccessor.kt")
+        public void testPrimitiveOverrideDefaultAccessor() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/primitiveOverrideDefaultAccessor.kt");
+        }
+
+        @TestMetadata("privateAccessorOfOverriddenProperty.kt")
+        public void testPrivateAccessorOfOverriddenProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/privateAccessorOfOverriddenProperty.kt");
+        }
+
+        @TestMetadata("privatePropertyInConstructor.kt")
+        public void testPrivatePropertyInConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/privatePropertyInConstructor.kt");
+        }
+
+        @TestMetadata("privatePropertyWithoutBackingField.kt")
+        public void testPrivatePropertyWithoutBackingField() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/privatePropertyWithoutBackingField.kt");
+        }
+
+        @TestMetadata("sideEffectInTopLevelInitializerMultiModule.kt")
+        public void testSideEffectInTopLevelInitializerMultiModule() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/sideEffectInTopLevelInitializerMultiModule.kt");
+        }
+
+        @TestMetadata("twoAnnotatedExtensionPropertiesWithoutBackingFields.kt")
+        public void testTwoAnnotatedExtensionPropertiesWithoutBackingFields() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.kt");
+        }
+
+        @TestMetadata("typeInferredFromGetter.kt")
+        public void testTypeInferredFromGetter() throws Exception {
+            runTest("compiler/testData/codegen/box/properties/typeInferredFromGetter.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/properties/const")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Const extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInConst() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/properties/const"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("anotherFile.kt")
+            public void testAnotherFile() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/const/anotherFile.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/properties/lateinit")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Lateinit extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            @TestMetadata("accessor.kt")
+            public void testAccessor() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/accessor.kt");
+            }
+
+            public void testAllFilesPresentInLateinit() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("nameClash.kt")
+            public void testNameClash() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/nameClash.kt");
+            }
+
+            @TestMetadata("override.kt")
+            public void testOverride() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/override.kt");
+            }
+
+            @TestMetadata("privateSetter.kt")
+            public void testPrivateSetter() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/privateSetter.kt");
+            }
+
+            @TestMetadata("privateSetterFromLambda.kt")
+            public void testPrivateSetterFromLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/privateSetterFromLambda.kt");
+            }
+
+            @TestMetadata("privateSetterViaSubclass.kt")
+            public void testPrivateSetterViaSubclass() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/privateSetterViaSubclass.kt");
+            }
+
+            @TestMetadata("simpleVar.kt")
+            public void testSimpleVar() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/simpleVar.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class IsInitializedAndDeinitialize extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInIsInitializedAndDeinitialize() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("companionObjectField.kt")
+                public void testCompanionObjectField() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/companionObjectField.kt");
+                }
+
+                @TestMetadata("emptyLhs.kt")
+                public void testEmptyLhs() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/emptyLhs.kt");
+                }
+
+                @TestMetadata("innerSubclass.kt")
+                public void testInnerSubclass() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/innerSubclass.kt");
+                }
+
+                @TestMetadata("isInitializedMultiFile.kt")
+                public void testIsInitializedMultiFile() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt");
+                }
+
+                @TestMetadata("nonInlineLambda.kt")
+                public void testNonInlineLambda() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/nonInlineLambda.kt");
+                }
+
+                @TestMetadata("propertyImportedFromObject.kt")
+                public void testPropertyImportedFromObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/propertyImportedFromObject.kt");
+                }
+
+                @TestMetadata("sideEffects.kt")
+                public void testSideEffects() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/sideEffects.kt");
+                }
+
+                @TestMetadata("topLevelProperty.kt")
+                public void testTopLevelProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelProperty.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/properties/lateinit/local")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Local extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInLocal() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit/local"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("capturedLocalLateinit.kt")
+                public void testCapturedLocalLateinit() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/local/capturedLocalLateinit.kt");
+                }
+
+                @TestMetadata("localLateinit.kt")
+                public void testLocalLateinit() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/local/localLateinit.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class TopLevel extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                @TestMetadata("accessorForTopLevelLateinit.kt")
+                public void testAccessorForTopLevelLateinit() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorForTopLevelLateinit.kt");
+                }
+
+                public void testAllFilesPresentInTopLevel() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit/topLevel"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("topLevelLateinit.kt")
+                public void testTopLevelLateinit() throws Exception {
+                    runTest("compiler/testData/codegen/box/properties/lateinit/topLevel/topLevelLateinit.kt");
+                }
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/publishedApi")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PublishedApi extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPublishedApi() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/publishedApi"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/publishedApi/simple.kt");
+        }
+
+        @TestMetadata("topLevel.kt")
+        public void testTopLevel() throws Exception {
+            runTest("compiler/testData/codegen/box/publishedApi/topLevel.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/ranges")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Ranges extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInRanges() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "stepped/unsigned");
+        }
+
+        @TestMetadata("forByteProgressionWithIntIncrement.kt")
+        public void testForByteProgressionWithIntIncrement() throws Exception {
+            runTest("compiler/testData/codegen/box/ranges/forByteProgressionWithIntIncrement.kt");
+        }
+
+        @TestMetadata("forInRangeLiteralWithMixedTypeBounds.kt")
+        public void testForInRangeLiteralWithMixedTypeBounds() throws Exception {
+            runTest("compiler/testData/codegen/box/ranges/forInRangeLiteralWithMixedTypeBounds.kt");
+        }
+
+        @TestMetadata("forInRangeWithImplicitReceiver.kt")
+        public void testForInRangeWithImplicitReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/ranges/forInRangeWithImplicitReceiver.kt");
+        }
+
+        @TestMetadata("forInStringVarUpdatedInLoopBody.kt")
+        public void testForInStringVarUpdatedInLoopBody() throws Exception {
+            runTest("compiler/testData/codegen/box/ranges/forInStringVarUpdatedInLoopBody.kt");
+        }
+
+        @TestMetadata("forIntRange.kt")
+        public void testForIntRange() throws Exception {
+            runTest("compiler/testData/codegen/box/ranges/forIntRange.kt");
+        }
+
+        @TestMetadata("forNullableIntInRangeWithImplicitReceiver.kt")
+        public void testForNullableIntInRangeWithImplicitReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/ranges/forNullableIntInRangeWithImplicitReceiver.kt");
+        }
+
+        @TestMetadata("kt37370a.kt")
+        public void testKt37370a() throws Exception {
+            runTest("compiler/testData/codegen/box/ranges/kt37370a.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/contains")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Contains extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInContains() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/contains"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("comparisonWithRangeBoundEliminated.kt")
+            public void testComparisonWithRangeBoundEliminated() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/comparisonWithRangeBoundEliminated.kt");
+            }
+
+            @TestMetadata("genericCharInRangeLiteral.kt")
+            public void testGenericCharInRangeLiteral() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/genericCharInRangeLiteral.kt");
+            }
+
+            @TestMetadata("inArray.kt")
+            public void testInArray() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inArray.kt");
+            }
+
+            @TestMetadata("inCustomObjectRange.kt")
+            public void testInCustomObjectRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inCustomObjectRange.kt");
+            }
+
+            @TestMetadata("inDoubleRangeLiteralVsComparableRangeLiteral.kt")
+            public void testInDoubleRangeLiteralVsComparableRangeLiteral() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inDoubleRangeLiteralVsComparableRangeLiteral.kt");
+            }
+
+            @TestMetadata("inFloatingPointRangeWithNaNBound.kt")
+            public void testInFloatingPointRangeWithNaNBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inFloatingPointRangeWithNaNBound.kt");
+            }
+
+            @TestMetadata("inIterable.kt")
+            public void testInIterable() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inIterable.kt");
+            }
+
+            @TestMetadata("inNonMatchingRange.kt")
+            public void testInNonMatchingRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inNonMatchingRange.kt");
+            }
+
+            @TestMetadata("inPrimitiveRange.kt")
+            public void testInPrimitiveRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inPrimitiveRange.kt");
+            }
+
+            @TestMetadata("inRangeLiteralComposition.kt")
+            public void testInRangeLiteralComposition() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inRangeLiteralComposition.kt");
+            }
+
+            @TestMetadata("inUntil.kt")
+            public void testInUntil() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inUntil.kt");
+            }
+
+            @TestMetadata("inUntilMaxValue.kt")
+            public void testInUntilMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inUntilMaxValue.kt");
+            }
+
+            @TestMetadata("inUntilMinValue.kt")
+            public void testInUntilMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inUntilMinValue.kt");
+            }
+
+            @TestMetadata("inUntilMinValueNonConst.kt")
+            public void testInUntilMinValueNonConst() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/inUntilMinValueNonConst.kt");
+            }
+
+            @TestMetadata("nullableInPrimitiveRange.kt")
+            public void testNullableInPrimitiveRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/nullableInPrimitiveRange.kt");
+            }
+
+            @TestMetadata("rangeContainsString.kt")
+            public void testRangeContainsString() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/rangeContainsString.kt");
+            }
+
+            @TestMetadata("userDefinedContainsExtension.kt")
+            public void testUserDefinedContainsExtension() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/contains/userDefinedContainsExtension.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/ranges/contains/generated")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Generated extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInGenerated() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/contains/generated"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("arrayIndices.kt")
+                public void testArrayIndices() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/arrayIndices.kt");
+                }
+
+                @TestMetadata("charRangeLiteral.kt")
+                public void testCharRangeLiteral() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/charRangeLiteral.kt");
+                }
+
+                @TestMetadata("charSequenceIndices.kt")
+                public void testCharSequenceIndices() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/charSequenceIndices.kt");
+                }
+
+                @TestMetadata("charUntil.kt")
+                public void testCharUntil() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/charUntil.kt");
+                }
+
+                @TestMetadata("collectionIndices.kt")
+                public void testCollectionIndices() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/collectionIndices.kt");
+                }
+
+                @TestMetadata("doubleRangeLiteral.kt")
+                public void testDoubleRangeLiteral() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/doubleRangeLiteral.kt");
+                }
+
+                @TestMetadata("floatRangeLiteral.kt")
+                public void testFloatRangeLiteral() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/floatRangeLiteral.kt");
+                }
+
+                @TestMetadata("intRangeLiteral.kt")
+                public void testIntRangeLiteral() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/intRangeLiteral.kt");
+                }
+
+                @TestMetadata("intUntil.kt")
+                public void testIntUntil() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/intUntil.kt");
+                }
+
+                @TestMetadata("longRangeLiteral.kt")
+                public void testLongRangeLiteral() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/longRangeLiteral.kt");
+                }
+
+                @TestMetadata("longUntil.kt")
+                public void testLongUntil() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/contains/generated/longUntil.kt");
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/evaluationOrder")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class EvaluationOrder extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEvaluationOrder() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/evaluationOrder"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/ranges/evaluationOrder/stepped")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Stepped extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInStepped() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/evaluationOrder/stepped"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class ForInDownTo extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInForInDownTo() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class ForInRangeLiteral extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInForInRangeLiteral() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class ForInUntil extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInForInUntil() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/expression")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Expression extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInExpression() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/expression"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/forInDownTo")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInDownTo extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInDownTo() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/forInDownTo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("forIntInDownTo.kt")
+            public void testForIntInDownTo() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInDownTo/forIntInDownTo.kt");
+            }
+
+            @TestMetadata("forIntInDownToWithNonConstBounds.kt")
+            public void testForIntInDownToWithNonConstBounds() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInDownTo/forIntInDownToWithNonConstBounds.kt");
+            }
+
+            @TestMetadata("forIntInNonOptimizedDownTo.kt")
+            public void testForIntInNonOptimizedDownTo() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInDownTo/forIntInNonOptimizedDownTo.kt");
+            }
+
+            @TestMetadata("forLongInDownTo.kt")
+            public void testForLongInDownTo() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInDownTo/forLongInDownTo.kt");
+            }
+
+            @TestMetadata("forNullableIntInDownTo.kt")
+            public void testForNullableIntInDownTo() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInDownTo/forNullableIntInDownTo.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/forInIndices")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInIndices extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInIndices() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/forInIndices"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("forInCharSequenceIndices.kt")
+            public void testForInCharSequenceIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forInCharSequenceIndices.kt");
+            }
+
+            @TestMetadata("forInCharSequenceTypeParameterIndices.kt")
+            public void testForInCharSequenceTypeParameterIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forInCharSequenceTypeParameterIndices.kt");
+            }
+
+            @TestMetadata("forInCollectionImplicitReceiverIndices.kt")
+            public void testForInCollectionImplicitReceiverIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forInCollectionImplicitReceiverIndices.kt");
+            }
+
+            @TestMetadata("forInCollectionIndices.kt")
+            public void testForInCollectionIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forInCollectionIndices.kt");
+            }
+
+            @TestMetadata("forInCollectionTypeParameterIndices.kt")
+            public void testForInCollectionTypeParameterIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forInCollectionTypeParameterIndices.kt");
+            }
+
+            @TestMetadata("forInNonOptimizedIndices.kt")
+            public void testForInNonOptimizedIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forInNonOptimizedIndices.kt");
+            }
+
+            @TestMetadata("forInObjectArrayIndices.kt")
+            public void testForInObjectArrayIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forInObjectArrayIndices.kt");
+            }
+
+            @TestMetadata("forInPrimitiveArrayIndices.kt")
+            public void testForInPrimitiveArrayIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forInPrimitiveArrayIndices.kt");
+            }
+
+            @TestMetadata("forNullableIntInArrayIndices.kt")
+            public void testForNullableIntInArrayIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forNullableIntInArrayIndices.kt");
+            }
+
+            @TestMetadata("forNullableIntInCollectionIndices.kt")
+            public void testForNullableIntInCollectionIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/forNullableIntInCollectionIndices.kt");
+            }
+
+            @TestMetadata("indexOfLast.kt")
+            public void testIndexOfLast() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/indexOfLast.kt");
+            }
+
+            @TestMetadata("kt12983_forInGenericArrayIndices.kt")
+            public void testKt12983_forInGenericArrayIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt12983_forInGenericArrayIndices.kt");
+            }
+
+            @TestMetadata("kt12983_forInGenericCollectionIndices.kt")
+            public void testKt12983_forInGenericCollectionIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt12983_forInGenericCollectionIndices.kt");
+            }
+
+            @TestMetadata("kt12983_forInSpecificArrayIndices.kt")
+            public void testKt12983_forInSpecificArrayIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt12983_forInSpecificArrayIndices.kt");
+            }
+
+            @TestMetadata("kt12983_forInSpecificCollectionIndices.kt")
+            public void testKt12983_forInSpecificCollectionIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt12983_forInSpecificCollectionIndices.kt");
+            }
+
+            @TestMetadata("kt13241_Array.kt")
+            public void testKt13241_Array() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Array.kt");
+            }
+
+            @TestMetadata("kt13241_CharSequence.kt")
+            public void testKt13241_CharSequence() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_CharSequence.kt");
+            }
+
+            @TestMetadata("kt13241_Collection.kt")
+            public void testKt13241_Collection() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt13241_Collection.kt");
+            }
+
+            @TestMetadata("kt43159_ArrayUpperBound.kt")
+            public void testKt43159_ArrayUpperBound() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/forInProgressionWithIndex")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInProgressionWithIndex extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInProgressionWithIndex() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/forInProgressionWithIndex"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/forInReversed")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInReversed extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInReversed() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/forInReversed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("forInReversedArrayIndices.kt")
+            public void testForInReversedArrayIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedArrayIndices.kt");
+            }
+
+            @TestMetadata("forInReversedCharSequenceIndices.kt")
+            public void testForInReversedCharSequenceIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedCharSequenceIndices.kt");
+            }
+
+            @TestMetadata("forInReversedCollectionIndices.kt")
+            public void testForInReversedCollectionIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedCollectionIndices.kt");
+            }
+
+            @TestMetadata("forInReversedDownTo.kt")
+            public void testForInReversedDownTo() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedDownTo.kt");
+            }
+
+            @TestMetadata("forInReversedEmptyRange.kt")
+            public void testForInReversedEmptyRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedEmptyRange.kt");
+            }
+
+            @TestMetadata("forInReversedEmptyRangeLiteral.kt")
+            public void testForInReversedEmptyRangeLiteral() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedEmptyRangeLiteral.kt");
+            }
+
+            @TestMetadata("forInReversedEmptyRangeLiteralWithNonConstBounds.kt")
+            public void testForInReversedEmptyRangeLiteralWithNonConstBounds() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedEmptyRangeLiteralWithNonConstBounds.kt");
+            }
+
+            @TestMetadata("forInReversedRange.kt")
+            public void testForInReversedRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedRange.kt");
+            }
+
+            @TestMetadata("forInReversedRangeLiteral.kt")
+            public void testForInReversedRangeLiteral() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedRangeLiteral.kt");
+            }
+
+            @TestMetadata("forInReversedRangeLiteralWithNonConstBounds.kt")
+            public void testForInReversedRangeLiteralWithNonConstBounds() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedRangeLiteralWithNonConstBounds.kt");
+            }
+
+            @TestMetadata("forInReversedReversedArrayIndices.kt")
+            public void testForInReversedReversedArrayIndices() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedReversedArrayIndices.kt");
+            }
+
+            @TestMetadata("forInReversedReversedDownTo.kt")
+            public void testForInReversedReversedDownTo() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedReversedDownTo.kt");
+            }
+
+            @TestMetadata("ForInReversedReversedRange.kt")
+            public void testForInReversedReversedRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/ForInReversedReversedRange.kt");
+            }
+
+            @TestMetadata("forInReversedReversedReversedRange.kt")
+            public void testForInReversedReversedReversedRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedReversedReversedRange.kt");
+            }
+
+            @TestMetadata("forInReversedReversedUntil.kt")
+            public void testForInReversedReversedUntil() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedReversedUntil.kt");
+            }
+
+            @TestMetadata("forInReversedReversedUntilWithNonConstBounds.kt")
+            public void testForInReversedReversedUntilWithNonConstBounds() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedReversedUntilWithNonConstBounds.kt");
+            }
+
+            @TestMetadata("forInReversedUntil.kt")
+            public void testForInReversedUntil() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedUntil.kt");
+            }
+
+            @TestMetadata("forInReversedUntilWithNonConstBounds.kt")
+            public void testForInReversedUntilWithNonConstBounds() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInReversed/forInReversedUntilWithNonConstBounds.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/forInUntil")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForInUntil extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForInUntil() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/forInUntil"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("forInUntilChar.kt")
+            public void testForInUntilChar() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilChar.kt");
+            }
+
+            @TestMetadata("forInUntilCharMaxValue.kt")
+            public void testForInUntilCharMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilCharMaxValue.kt");
+            }
+
+            @TestMetadata("forInUntilCharMinValue.kt")
+            public void testForInUntilCharMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilCharMinValue.kt");
+            }
+
+            @TestMetadata("forInUntilCharMinValueNonConst.kt")
+            public void testForInUntilCharMinValueNonConst() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilCharMinValueNonConst.kt");
+            }
+
+            @TestMetadata("forInUntilInt.kt")
+            public void testForInUntilInt() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilInt.kt");
+            }
+
+            @TestMetadata("forInUntilIntMaxValue.kt")
+            public void testForInUntilIntMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilIntMaxValue.kt");
+            }
+
+            @TestMetadata("forInUntilIntMinValue.kt")
+            public void testForInUntilIntMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilIntMinValue.kt");
+            }
+
+            @TestMetadata("forInUntilIntMinValueNonConst.kt")
+            public void testForInUntilIntMinValueNonConst() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilIntMinValueNonConst.kt");
+            }
+
+            @TestMetadata("forInUntilLesserInt.kt")
+            public void testForInUntilLesserInt() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilLesserInt.kt");
+            }
+
+            @TestMetadata("forInUntilLong.kt")
+            public void testForInUntilLong() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilLong.kt");
+            }
+
+            @TestMetadata("forInUntilLongMaxValue.kt")
+            public void testForInUntilLongMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilLongMaxValue.kt");
+            }
+
+            @TestMetadata("forInUntilLongMinValue.kt")
+            public void testForInUntilLongMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilLongMinValue.kt");
+            }
+
+            @TestMetadata("forInUntilLongMinValueNonConst.kt")
+            public void testForInUntilLongMinValueNonConst() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forInUntilLongMinValueNonConst.kt");
+            }
+
+            @TestMetadata("forIntInIntUntilSmartcastInt.kt")
+            public void testForIntInIntUntilSmartcastInt() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/forIntInIntUntilSmartcastInt.kt");
+            }
+
+            @TestMetadata("kt42533.kt")
+            public void testKt42533() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/forWithPossibleOverflow")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ForWithPossibleOverflow extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInForWithPossibleOverflow() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/forWithPossibleOverflow"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("forInDownToCharMinValue.kt")
+            public void testForInDownToCharMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInDownToCharMinValue.kt");
+            }
+
+            @TestMetadata("forInDownToCharMinValueReversed.kt")
+            public void testForInDownToCharMinValueReversed() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInDownToCharMinValueReversed.kt");
+            }
+
+            @TestMetadata("forInDownToIntMinValue.kt")
+            public void testForInDownToIntMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInDownToIntMinValue.kt");
+            }
+
+            @TestMetadata("forInDownToIntMinValueReversed.kt")
+            public void testForInDownToIntMinValueReversed() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInDownToIntMinValueReversed.kt");
+            }
+
+            @TestMetadata("forInDownToLongMinValue.kt")
+            public void testForInDownToLongMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInDownToLongMinValue.kt");
+            }
+
+            @TestMetadata("forInDownToLongMinValueReversed.kt")
+            public void testForInDownToLongMinValueReversed() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInDownToLongMinValueReversed.kt");
+            }
+
+            @TestMetadata("forInRangeToCharMaxValue.kt")
+            public void testForInRangeToCharMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInRangeToCharMaxValue.kt");
+            }
+
+            @TestMetadata("forInRangeToCharMaxValueReversed.kt")
+            public void testForInRangeToCharMaxValueReversed() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInRangeToCharMaxValueReversed.kt");
+            }
+
+            @TestMetadata("forInRangeToIntMaxValue.kt")
+            public void testForInRangeToIntMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInRangeToIntMaxValue.kt");
+            }
+
+            @TestMetadata("forInRangeToIntMaxValueReversed.kt")
+            public void testForInRangeToIntMaxValueReversed() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInRangeToIntMaxValueReversed.kt");
+            }
+
+            @TestMetadata("forInRangeToLongMaxValue.kt")
+            public void testForInRangeToLongMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInRangeToLongMaxValue.kt");
+            }
+
+            @TestMetadata("forInRangeToLongMaxValueReversed.kt")
+            public void testForInRangeToLongMaxValueReversed() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInRangeToLongMaxValueReversed.kt");
+            }
+
+            @TestMetadata("forInUntilIntMinValueReversed.kt")
+            public void testForInUntilIntMinValueReversed() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/forWithPossibleOverflow/forInUntilIntMinValueReversed.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/javaInterop")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class JavaInterop extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInJavaInterop() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/javaInterop"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/ranges/javaInterop/withIndex")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class WithIndex extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInWithIndex() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/javaInterop/withIndex"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/literal")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Literal extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInLiteral() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/literal"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/nullableLoopParameter")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class NullableLoopParameter extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInNullableLoopParameter() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/nullableLoopParameter"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("progressionExpression.kt")
+            public void testProgressionExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/nullableLoopParameter/progressionExpression.kt");
+            }
+
+            @TestMetadata("rangeExpression.kt")
+            public void testRangeExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/nullableLoopParameter/rangeExpression.kt");
+            }
+
+            @TestMetadata("rangeLiteral.kt")
+            public void testRangeLiteral() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/nullableLoopParameter/rangeLiteral.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/stepped")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Stepped extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInStepped() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "unsigned");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Expression extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInExpression() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/downTo")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class DownTo extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInDownTo() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/downTo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class NestedStep extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInNestedStep() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/downTo/nestedStep"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class Reversed extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInReversed() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/downTo/reversed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/rangeTo")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class RangeTo extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInRangeTo() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/rangeTo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class NestedStep extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInNestedStep() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/nestedStep"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class Reversed extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInReversed() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/rangeTo/reversed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/until")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class Until extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInUntil() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/until"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class NestedStep extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInNestedStep() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/until/nestedStep"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/expression/until/reversed")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class Reversed extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInReversed() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/expression/until/reversed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Literal extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInLiteral() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/downTo")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class DownTo extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInDownTo() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/downTo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class NestedStep extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInNestedStep() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/downTo/nestedStep"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class Reversed extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInReversed() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/downTo/reversed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/rangeTo")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class RangeTo extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInRangeTo() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/rangeTo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class NestedStep extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInNestedStep() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/nestedStep"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class Reversed extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInReversed() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/rangeTo/reversed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+                }
+
+                @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/until")
+                @TestDataPath("$PROJECT_ROOT")
+                @RunWith(JUnit3RunnerWithInners.class)
+                public static class Until extends AbstractIrCodegenBoxWasmTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                    }
+
+                    public void testAllFilesPresentInUntil() throws Exception {
+                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/until"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class NestedStep extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInNestedStep() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/until/nestedStep"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+
+                    @TestMetadata("compiler/testData/codegen/box/ranges/stepped/literal/until/reversed")
+                    @TestDataPath("$PROJECT_ROOT")
+                    @RunWith(JUnit3RunnerWithInners.class)
+                    public static class Reversed extends AbstractIrCodegenBoxWasmTest {
+                        private void runTest(String testDataFilePath) throws Exception {
+                            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                        }
+
+                        public void testAllFilesPresentInReversed() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/stepped/literal/until/reversed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                        }
+                    }
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/ranges/unsigned")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Unsigned extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInUnsigned() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/unsigned"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("inMixedUnsignedRange.kt")
+            public void testInMixedUnsignedRange() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt");
+            }
+
+            @TestMetadata("kt35004.kt")
+            public void testKt35004() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/unsigned/kt35004.kt");
+            }
+
+            @TestMetadata("kt36953_continue.kt")
+            public void testKt36953_continue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/unsigned/kt36953_continue.kt");
+            }
+
+            @TestMetadata("outOfBoundsInMixedContains.kt")
+            public void testOutOfBoundsInMixedContains() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt");
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/ranges/unsigned/expression")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Expression extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInExpression() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/unsigned/expression"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/ranges/unsigned/literal")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Literal extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInLiteral() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/unsigned/literal"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class NullableLoopParameter extends AbstractIrCodegenBoxWasmTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInNullableLoopParameter() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+                }
+
+                @TestMetadata("progressionExpression.kt")
+                public void testProgressionExpression() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt");
+                }
+
+                @TestMetadata("rangeExpression.kt")
+                public void testRangeExpression() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt");
+                }
+
+                @TestMetadata("rangeLiteral.kt")
+                public void testRangeLiteral() throws Exception {
+                    runTest("compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt");
+                }
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/regressions")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Regressions extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInRegressions() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/regressions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("arrayLengthNPE.kt")
+        public void testArrayLengthNPE() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/arrayLengthNPE.kt");
+        }
+
+        @TestMetadata("commonSupertypeContravariant.kt")
+        public void testCommonSupertypeContravariant() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/commonSupertypeContravariant.kt");
+        }
+
+        @TestMetadata("commonSupertypeContravariant2.kt")
+        public void testCommonSupertypeContravariant2() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/commonSupertypeContravariant2.kt");
+        }
+
+        @TestMetadata("dontCaptureTypesWithTypeVariables.kt")
+        public void testDontCaptureTypesWithTypeVariables() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/dontCaptureTypesWithTypeVariables.kt");
+        }
+
+        @TestMetadata("doubleMerge.kt")
+        public void testDoubleMerge() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/doubleMerge.kt");
+        }
+
+        @TestMetadata("floatMerge.kt")
+        public void testFloatMerge() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/floatMerge.kt");
+        }
+
+        @TestMetadata("functionLiteralAsLastExpressionInBlock.kt")
+        public void testFunctionLiteralAsLastExpressionInBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/functionLiteralAsLastExpressionInBlock.kt");
+        }
+
+        @TestMetadata("hashCodeNPE.kt")
+        public void testHashCodeNPE() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/hashCodeNPE.kt");
+        }
+
+        @TestMetadata("internalTopLevelOtherPackage.kt")
+        public void testInternalTopLevelOtherPackage() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/internalTopLevelOtherPackage.kt");
+        }
+
+        @TestMetadata("intersectionOfEqualTypes.kt")
+        public void testIntersectionOfEqualTypes() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/intersectionOfEqualTypes.kt");
+        }
+
+        @TestMetadata("kt10143.kt")
+        public void testKt10143() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt10143.kt");
+        }
+
+        @TestMetadata("kt10934.kt")
+        public void testKt10934() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt10934.kt");
+        }
+
+        @TestMetadata("kt13381.kt")
+        public void testKt13381() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt13381.kt");
+        }
+
+        @TestMetadata("kt14447.kt")
+        public void testKt14447() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt14447.kt");
+        }
+
+        @TestMetadata("kt15196.kt")
+        public void testKt15196() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt15196.kt");
+        }
+
+        @TestMetadata("kt1528.kt")
+        public void testKt1528() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt1528.kt");
+        }
+
+        @TestMetadata("kt1779.kt")
+        public void testKt1779() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt1779.kt");
+        }
+
+        @TestMetadata("kt1845.kt")
+        public void testKt1845() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt1845.kt");
+        }
+
+        @TestMetadata("kt2060.kt")
+        public void testKt2060() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt2060.kt");
+        }
+
+        @TestMetadata("kt2210.kt")
+        public void testKt2210() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt2210.kt");
+        }
+
+        @TestMetadata("kt2246.kt")
+        public void testKt2246() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt2246.kt");
+        }
+
+        @TestMetadata("kt24913.kt")
+        public void testKt24913() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt24913.kt");
+        }
+
+        @TestMetadata("kt2509.kt")
+        public void testKt2509() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt2509.kt");
+        }
+
+        @TestMetadata("kt32949.kt")
+        public void testKt32949() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt32949.kt");
+        }
+
+        @TestMetadata("kt33638.kt")
+        public void testKt33638() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt33638.kt");
+        }
+
+        @TestMetadata("kt3421.kt")
+        public void testKt3421() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt3421.kt");
+        }
+
+        @TestMetadata("kt3587.kt")
+        public void testKt3587() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt3587.kt");
+        }
+
+        @TestMetadata("kt35914.kt")
+        public void testKt35914() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt35914.kt");
+        }
+
+        @TestMetadata("kt3850.kt")
+        public void testKt3850() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt3850.kt");
+        }
+
+        @TestMetadata("kt3903.kt")
+        public void testKt3903() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt3903.kt");
+        }
+
+        @TestMetadata("kt39088.kt")
+        public void testKt39088() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt39088.kt");
+        }
+
+        @TestMetadata("kt4142.kt")
+        public void testKt4142() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt4142.kt");
+        }
+
+        @TestMetadata("kt4281.kt")
+        public void testKt4281() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt4281.kt");
+        }
+
+        @TestMetadata("kt5395.kt")
+        public void testKt5395() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt5395.kt");
+        }
+
+        @TestMetadata("kt5786_privateWithDefault.kt")
+        public void testKt5786_privateWithDefault() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt5786_privateWithDefault.kt");
+        }
+
+        @TestMetadata("kt6434_2.kt")
+        public void testKt6434_2() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt6434_2.kt");
+        }
+
+        @TestMetadata("kt7401.kt")
+        public void testKt7401() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt7401.kt");
+        }
+
+        @TestMetadata("kt998.kt")
+        public void testKt998() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/kt998.kt");
+        }
+
+        @TestMetadata("lambdaAsLastExpressionInLambda.kt")
+        public void testLambdaAsLastExpressionInLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/lambdaAsLastExpressionInLambda.kt");
+        }
+
+        @TestMetadata("lambdaPostponeConstruction.kt")
+        public void testLambdaPostponeConstruction() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/lambdaPostponeConstruction.kt");
+        }
+
+        @TestMetadata("lambdaWrongReturnType.kt")
+        public void testLambdaWrongReturnType() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/lambdaWrongReturnType.kt");
+        }
+
+        @TestMetadata("noAssertionsWhenNullableTypeParameterReplacedWithIntersectionType.kt")
+        public void testNoAssertionsWhenNullableTypeParameterReplacedWithIntersectionType() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/noAssertionsWhenNullableTypeParameterReplacedWithIntersectionType.kt");
+        }
+
+        @TestMetadata("noCapturingForTypesWithTypeVariables.kt")
+        public void testNoCapturingForTypesWithTypeVariables() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/noCapturingForTypesWithTypeVariables.kt");
+        }
+
+        @TestMetadata("noResolutionRecursion.kt")
+        public void testNoResolutionRecursion() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/noResolutionRecursion.kt");
+        }
+
+        @TestMetadata("nullabilityForCommonCapturedSupertypes.kt")
+        public void testNullabilityForCommonCapturedSupertypes() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/nullabilityForCommonCapturedSupertypes.kt");
+        }
+
+        @TestMetadata("nullableAfterExclExcl.kt")
+        public void testNullableAfterExclExcl() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/nullableAfterExclExcl.kt");
+        }
+
+        @TestMetadata("objectCaptureOuterConstructorProperty.kt")
+        public void testObjectCaptureOuterConstructorProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/objectCaptureOuterConstructorProperty.kt");
+        }
+
+        @TestMetadata("supertypeDepth.kt")
+        public void testSupertypeDepth() throws Exception {
+            runTest("compiler/testData/codegen/box/regressions/supertypeDepth.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/reified")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Reified extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInReified() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reified"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("instanceof.kt")
+        public void testInstanceof() throws Exception {
+            runTest("compiler/testData/codegen/box/reified/instanceof.kt");
+        }
+
+        @TestMetadata("newArrayInt.kt")
+        public void testNewArrayInt() throws Exception {
+            runTest("compiler/testData/codegen/box/reified/newArrayInt.kt");
+        }
+
+        @TestMetadata("recursiveNewArray.kt")
+        public void testRecursiveNewArray() throws Exception {
+            runTest("compiler/testData/codegen/box/reified/recursiveNewArray.kt");
+        }
+
+        @TestMetadata("reifiedChain.kt")
+        public void testReifiedChain() throws Exception {
+            runTest("compiler/testData/codegen/box/reified/reifiedChain.kt");
+        }
+
+        @TestMetadata("reifiedIntersectionType.kt")
+        public void testReifiedIntersectionType() throws Exception {
+            runTest("compiler/testData/codegen/box/reified/reifiedIntersectionType.kt");
+        }
+
+        @TestMetadata("safecast.kt")
+        public void testSafecast() throws Exception {
+            runTest("compiler/testData/codegen/box/reified/safecast.kt");
+        }
+
+        @TestMetadata("sameIndexRecursive.kt")
+        public void testSameIndexRecursive() throws Exception {
+            runTest("compiler/testData/codegen/box/reified/sameIndexRecursive.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/reified/arraysReification")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ArraysReification extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInArraysReification() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reified/arraysReification"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("jaggedArray.kt")
+            public void testJaggedArray() throws Exception {
+                runTest("compiler/testData/codegen/box/reified/arraysReification/jaggedArray.kt");
+            }
+
+            @TestMetadata("jaggedDeep.kt")
+            public void testJaggedDeep() throws Exception {
+                runTest("compiler/testData/codegen/box/reified/arraysReification/jaggedDeep.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/safeCall")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SafeCall extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSafeCall() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/safeCall"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("genericNull.kt")
+        public void testGenericNull() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/genericNull.kt");
+        }
+
+        @TestMetadata("kt1572.kt")
+        public void testKt1572() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/kt1572.kt");
+        }
+
+        @TestMetadata("kt245.kt")
+        public void testKt245() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/kt245.kt");
+        }
+
+        @TestMetadata("kt247.kt")
+        public void testKt247() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/kt247.kt");
+        }
+
+        @TestMetadata("kt3430.kt")
+        public void testKt3430() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/kt3430.kt");
+        }
+
+        @TestMetadata("kt4733.kt")
+        public void testKt4733() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/kt4733.kt");
+        }
+
+        @TestMetadata("primitive.kt")
+        public void testPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/primitive.kt");
+        }
+
+        @TestMetadata("primitiveEqSafeCall.kt")
+        public void testPrimitiveEqSafeCall() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/primitiveEqSafeCall.kt");
+        }
+
+        @TestMetadata("primitiveNotEqSafeCall.kt")
+        public void testPrimitiveNotEqSafeCall() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/primitiveNotEqSafeCall.kt");
+        }
+
+        @TestMetadata("safeCallEqPrimitive.kt")
+        public void testSafeCallEqPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/safeCallEqPrimitive.kt");
+        }
+
+        @TestMetadata("safeCallNotEqPrimitive.kt")
+        public void testSafeCallNotEqPrimitive() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/safeCallNotEqPrimitive.kt");
+        }
+
+        @TestMetadata("safeCallOnLong.kt")
+        public void testSafeCallOnLong() throws Exception {
+            runTest("compiler/testData/codegen/box/safeCall/safeCallOnLong.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/sam")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Sam extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSam() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/sam/constructors")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Constructors extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInConstructors() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam/constructors"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/sam/equality")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Equality extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEquality() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam/equality"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/sealed")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Sealed extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSealed() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sealed"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("objects.kt")
+        public void testObjects() throws Exception {
+            runTest("compiler/testData/codegen/box/sealed/objects.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/sealed/simple.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/secondaryConstructors")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SecondaryConstructors extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        @TestMetadata("accessToCompanion.kt")
+        public void testAccessToCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/accessToCompanion.kt");
+        }
+
+        @TestMetadata("accessToNestedObject.kt")
+        public void testAccessToNestedObject() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/accessToNestedObject.kt");
+        }
+
+        public void testAllFilesPresentInSecondaryConstructors() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/secondaryConstructors"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("basicNoPrimaryManySinks.kt")
+        public void testBasicNoPrimaryManySinks() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryManySinks.kt");
+        }
+
+        @TestMetadata("basicNoPrimaryOneSink.kt")
+        public void testBasicNoPrimaryOneSink() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryOneSink.kt");
+        }
+
+        @TestMetadata("basicPrimary.kt")
+        public void testBasicPrimary() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/basicPrimary.kt");
+        }
+
+        @TestMetadata("callFromLocalSubClass.kt")
+        public void testCallFromLocalSubClass() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/callFromLocalSubClass.kt");
+        }
+
+        @TestMetadata("callFromPrimaryWithNamedArgs.kt")
+        public void testCallFromPrimaryWithNamedArgs() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/callFromPrimaryWithNamedArgs.kt");
+        }
+
+        @TestMetadata("callFromPrimaryWithOptionalArgs.kt")
+        public void testCallFromPrimaryWithOptionalArgs() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/callFromPrimaryWithOptionalArgs.kt");
+        }
+
+        @TestMetadata("callFromSubClass.kt")
+        public void testCallFromSubClass() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/callFromSubClass.kt");
+        }
+
+        @TestMetadata("clashingDefaultConstructors.kt")
+        public void testClashingDefaultConstructors() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/clashingDefaultConstructors.kt");
+        }
+
+        @TestMetadata("dataClasses.kt")
+        public void testDataClasses() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/dataClasses.kt");
+        }
+
+        @TestMetadata("defaultArgs.kt")
+        public void testDefaultArgs() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/defaultArgs.kt");
+        }
+
+        @TestMetadata("defaultParametersNotDuplicated.kt")
+        public void testDefaultParametersNotDuplicated() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/defaultParametersNotDuplicated.kt");
+        }
+
+        @TestMetadata("delegateWithComplexExpression.kt")
+        public void testDelegateWithComplexExpression() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/delegateWithComplexExpression.kt");
+        }
+
+        @TestMetadata("delegatedThisWithLambda.kt")
+        public void testDelegatedThisWithLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/delegatedThisWithLambda.kt");
+        }
+
+        @TestMetadata("delegationWithPrimary.kt")
+        public void testDelegationWithPrimary() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt");
+        }
+
+        @TestMetadata("enums.kt")
+        public void testEnums() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/enums.kt");
+        }
+
+        @TestMetadata("generics.kt")
+        public void testGenerics() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/generics.kt");
+        }
+
+        @TestMetadata("inlineIntoTwoConstructors.kt")
+        public void testInlineIntoTwoConstructors() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/inlineIntoTwoConstructors.kt");
+        }
+
+        @TestMetadata("innerClasses.kt")
+        public void testInnerClasses() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/innerClasses.kt");
+        }
+
+        @TestMetadata("innerClassesInheritance.kt")
+        public void testInnerClassesInheritance() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/innerClassesInheritance.kt");
+        }
+
+        @TestMetadata("localClasses.kt")
+        public void testLocalClasses() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/localClasses.kt");
+        }
+
+        @TestMetadata("superCallPrimary.kt")
+        public void testSuperCallPrimary() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/superCallPrimary.kt");
+        }
+
+        @TestMetadata("superCallSecondary.kt")
+        public void testSuperCallSecondary() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/superCallSecondary.kt");
+        }
+
+        @TestMetadata("withoutPrimarySimple.kt")
+        public void testWithoutPrimarySimple() throws Exception {
+            runTest("compiler/testData/codegen/box/secondaryConstructors/withoutPrimarySimple.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/signatureAnnotations")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SignatureAnnotations extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSignatureAnnotations() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/signatureAnnotations"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/smap")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Smap extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSmap() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/smap"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/smartCasts")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SmartCasts extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSmartCasts() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/smartCasts"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("falseSmartCast.kt")
+        public void testFalseSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/falseSmartCast.kt");
+        }
+
+        @TestMetadata("genericIntersection.kt")
+        public void testGenericIntersection() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/genericIntersection.kt");
+        }
+
+        @TestMetadata("genericSet.kt")
+        public void testGenericSet() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/genericSet.kt");
+        }
+
+        @TestMetadata("implicitExtensionReceiver.kt")
+        public void testImplicitExtensionReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/implicitExtensionReceiver.kt");
+        }
+
+        @TestMetadata("implicitMemberReceiver.kt")
+        public void testImplicitMemberReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/implicitMemberReceiver.kt");
+        }
+
+        @TestMetadata("implicitReceiver.kt")
+        public void testImplicitReceiver() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/implicitReceiver.kt");
+        }
+
+        @TestMetadata("implicitReceiverInWhen.kt")
+        public void testImplicitReceiverInWhen() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/implicitReceiverInWhen.kt");
+        }
+
+        @TestMetadata("implicitToGrandSon.kt")
+        public void testImplicitToGrandSon() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt");
+        }
+
+        @TestMetadata("kt17725.kt")
+        public void testKt17725() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/kt17725.kt");
+        }
+
+        @TestMetadata("kt19100.kt")
+        public void testKt19100() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/kt19100.kt");
+        }
+
+        @TestMetadata("smartCastInsideIf.kt")
+        public void testSmartCastInsideIf() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/smartCastInsideIf.kt");
+        }
+
+        @TestMetadata("whenSmartCast.kt")
+        public void testWhenSmartCast() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/whenSmartCast.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/specialBuiltins")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SpecialBuiltins extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSpecialBuiltins() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/specialBuiltins"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("bridgeNotEmptyMap.kt")
+        public void testBridgeNotEmptyMap() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/bridgeNotEmptyMap.kt");
+        }
+
+        @TestMetadata("emptyList.kt")
+        public void testEmptyList() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/emptyList.kt");
+        }
+
+        @TestMetadata("emptyMap.kt")
+        public void testEmptyMap() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/emptyMap.kt");
+        }
+
+        @TestMetadata("emptyStringMap.kt")
+        public void testEmptyStringMap() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/emptyStringMap.kt");
+        }
+
+        @TestMetadata("exceptionCause.kt")
+        public void testExceptionCause() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/exceptionCause.kt");
+        }
+
+        @TestMetadata("irrelevantRemoveAtOverride.kt")
+        public void testIrrelevantRemoveAtOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/irrelevantRemoveAtOverride.kt");
+        }
+
+        @TestMetadata("maps.kt")
+        public void testMaps() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/maps.kt");
+        }
+
+        @TestMetadata("noSpecialBridgeInSuperClass.kt")
+        public void testNoSpecialBridgeInSuperClass() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.kt");
+        }
+
+        @TestMetadata("notEmptyListAny.kt")
+        public void testNotEmptyListAny() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/notEmptyListAny.kt");
+        }
+
+        @TestMetadata("notEmptyMap.kt")
+        public void testNotEmptyMap() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/notEmptyMap.kt");
+        }
+
+        @TestMetadata("redundantStubForSize.kt")
+        public void testRedundantStubForSize() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/redundantStubForSize.kt");
+        }
+
+        @TestMetadata("removeAtTwoSpecialBridges.kt")
+        public void testRemoveAtTwoSpecialBridges() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/removeAtTwoSpecialBridges.kt");
+        }
+
+        @TestMetadata("throwableCause.kt")
+        public void testThrowableCause() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/throwableCause.kt");
+        }
+
+        @TestMetadata("valuesInsideEnum.kt")
+        public void testValuesInsideEnum() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/valuesInsideEnum.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/statics")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Statics extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInStatics() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/statics"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("anonymousInitializerIObject.kt")
+        public void testAnonymousInitializerIObject() throws Exception {
+            runTest("compiler/testData/codegen/box/statics/anonymousInitializerIObject.kt");
+        }
+
+        @TestMetadata("anonymousInitializerInClassObject.kt")
+        public void testAnonymousInitializerInClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/statics/anonymousInitializerInClassObject.kt");
+        }
+
+        @TestMetadata("incInClassObject.kt")
+        public void testIncInClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/statics/incInClassObject.kt");
+        }
+
+        @TestMetadata("incInObject.kt")
+        public void testIncInObject() throws Exception {
+            runTest("compiler/testData/codegen/box/statics/incInObject.kt");
+        }
+
+        @TestMetadata("inheritedPropertyInClassObject.kt")
+        public void testInheritedPropertyInClassObject() throws Exception {
+            runTest("compiler/testData/codegen/box/statics/inheritedPropertyInClassObject.kt");
+        }
+
+        @TestMetadata("inheritedPropertyInObject.kt")
+        public void testInheritedPropertyInObject() throws Exception {
+            runTest("compiler/testData/codegen/box/statics/inheritedPropertyInObject.kt");
+        }
+
+        @TestMetadata("kt8089.kt")
+        public void testKt8089() throws Exception {
+            runTest("compiler/testData/codegen/box/statics/kt8089.kt");
+        }
+
+        @TestMetadata("syntheticAccessor.kt")
+        public void testSyntheticAccessor() throws Exception {
+            runTest("compiler/testData/codegen/box/statics/syntheticAccessor.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/storeStackBeforeInline")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class StoreStackBeforeInline extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInStoreStackBeforeInline() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/storeStackBeforeInline"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("differentTypes.kt")
+        public void testDifferentTypes() throws Exception {
+            runTest("compiler/testData/codegen/box/storeStackBeforeInline/differentTypes.kt");
+        }
+
+        @TestMetadata("primitiveMerge.kt")
+        public void testPrimitiveMerge() throws Exception {
+            runTest("compiler/testData/codegen/box/storeStackBeforeInline/primitiveMerge.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/storeStackBeforeInline/simple.kt");
+        }
+
+        @TestMetadata("unreachableMarker.kt")
+        public void testUnreachableMarker() throws Exception {
+            runTest("compiler/testData/codegen/box/storeStackBeforeInline/unreachableMarker.kt");
+        }
+
+        @TestMetadata("withLambda.kt")
+        public void testWithLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/storeStackBeforeInline/withLambda.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/strings")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Strings extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInStrings() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/strings"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("ea35743.kt")
+        public void testEa35743() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/ea35743.kt");
+        }
+
+        @TestMetadata("forInString.kt")
+        public void testForInString() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/forInString.kt");
+        }
+
+        @TestMetadata("interpolation.kt")
+        public void testInterpolation() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/interpolation.kt");
+        }
+
+        @TestMetadata("kt3571.kt")
+        public void testKt3571() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/kt3571.kt");
+        }
+
+        @TestMetadata("kt3652.kt")
+        public void testKt3652() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/kt3652.kt");
+        }
+
+        @TestMetadata("kt5956.kt")
+        public void testKt5956() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/kt5956.kt");
+        }
+
+        @TestMetadata("kt881.kt")
+        public void testKt881() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/kt881.kt");
+        }
+
+        @TestMetadata("kt894.kt")
+        public void testKt894() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/kt894.kt");
+        }
+
+        @TestMetadata("multilineStringsWithTemplates.kt")
+        public void testMultilineStringsWithTemplates() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/multilineStringsWithTemplates.kt");
+        }
+
+        @TestMetadata("nestedConcat.kt")
+        public void testNestedConcat() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/nestedConcat.kt");
+        }
+
+        @TestMetadata("rawStrings.kt")
+        public void testRawStrings() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/rawStrings.kt");
+        }
+
+        @TestMetadata("rawStringsWithManyQuotes.kt")
+        public void testRawStringsWithManyQuotes() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/rawStringsWithManyQuotes.kt");
+        }
+
+        @TestMetadata("simpleStringPlus.kt")
+        public void testSimpleStringPlus() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/simpleStringPlus.kt");
+        }
+
+        @TestMetadata("singleConcatNullable.kt")
+        public void testSingleConcatNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/singleConcatNullable.kt");
+        }
+
+        @TestMetadata("stringPlusOverride.kt")
+        public void testStringPlusOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/strings/stringPlusOverride.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/super")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Super extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSuper() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/super"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("basicmethodSuperTrait.kt")
+        public void testBasicmethodSuperTrait() throws Exception {
+            runTest("compiler/testData/codegen/box/super/basicmethodSuperTrait.kt");
+        }
+
+        @TestMetadata("basicproperty.kt")
+        public void testBasicproperty() throws Exception {
+            runTest("compiler/testData/codegen/box/super/basicproperty.kt");
+        }
+
+        @TestMetadata("enclosedFun.kt")
+        public void testEnclosedFun() throws Exception {
+            runTest("compiler/testData/codegen/box/super/enclosedFun.kt");
+        }
+
+        @TestMetadata("enclosedVar.kt")
+        public void testEnclosedVar() throws Exception {
+            runTest("compiler/testData/codegen/box/super/enclosedVar.kt");
+        }
+
+        @TestMetadata("innerClassLabeledSuper.kt")
+        public void testInnerClassLabeledSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/super/innerClassLabeledSuper.kt");
+        }
+
+        @TestMetadata("innerClassLabeledSuper2.kt")
+        public void testInnerClassLabeledSuper2() throws Exception {
+            runTest("compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt");
+        }
+
+        @TestMetadata("innerClassLabeledSuperProperty.kt")
+        public void testInnerClassLabeledSuperProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty.kt");
+        }
+
+        @TestMetadata("innerClassLabeledSuperProperty2.kt")
+        public void testInnerClassLabeledSuperProperty2() throws Exception {
+            runTest("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty2.kt");
+        }
+
+        @TestMetadata("innerClassQualifiedFunctionCall.kt")
+        public void testInnerClassQualifiedFunctionCall() throws Exception {
+            runTest("compiler/testData/codegen/box/super/innerClassQualifiedFunctionCall.kt");
+        }
+
+        @TestMetadata("innerClassQualifiedPropertyAccess.kt")
+        public void testInnerClassQualifiedPropertyAccess() throws Exception {
+            runTest("compiler/testData/codegen/box/super/innerClassQualifiedPropertyAccess.kt");
+        }
+
+        @TestMetadata("interfaceHashCode.kt")
+        public void testInterfaceHashCode() throws Exception {
+            runTest("compiler/testData/codegen/box/super/interfaceHashCode.kt");
+        }
+
+        @TestMetadata("kt14243.kt")
+        public void testKt14243() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt14243.kt");
+        }
+
+        @TestMetadata("kt14243_2.kt")
+        public void testKt14243_2() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt14243_2.kt");
+        }
+
+        @TestMetadata("kt14243_class.kt")
+        public void testKt14243_class() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt14243_class.kt");
+        }
+
+        @TestMetadata("kt14243_prop.kt")
+        public void testKt14243_prop() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt14243_prop.kt");
+        }
+
+        @TestMetadata("kt3492ClassFun.kt")
+        public void testKt3492ClassFun() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt3492ClassFun.kt");
+        }
+
+        @TestMetadata("kt3492ClassProperty.kt")
+        public void testKt3492ClassProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt3492ClassProperty.kt");
+        }
+
+        @TestMetadata("kt3492TraitFun.kt")
+        public void testKt3492TraitFun() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt3492TraitFun.kt");
+        }
+
+        @TestMetadata("kt3492TraitProperty.kt")
+        public void testKt3492TraitProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt3492TraitProperty.kt");
+        }
+
+        @TestMetadata("kt4173.kt")
+        public void testKt4173() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt4173.kt");
+        }
+
+        @TestMetadata("kt4173_2.kt")
+        public void testKt4173_2() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt4173_2.kt");
+        }
+
+        @TestMetadata("kt4173_3.kt")
+        public void testKt4173_3() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt4173_3.kt");
+        }
+
+        @TestMetadata("kt4982.kt")
+        public void testKt4982() throws Exception {
+            runTest("compiler/testData/codegen/box/super/kt4982.kt");
+        }
+
+        @TestMetadata("multipleSuperTraits.kt")
+        public void testMultipleSuperTraits() throws Exception {
+            runTest("compiler/testData/codegen/box/super/multipleSuperTraits.kt");
+        }
+
+        @TestMetadata("superCallToNonGenericImplThroughGenericDefaultImpls.kt")
+        public void testSuperCallToNonGenericImplThroughGenericDefaultImpls() throws Exception {
+            runTest("compiler/testData/codegen/box/super/superCallToNonGenericImplThroughGenericDefaultImpls.kt");
+        }
+
+        @TestMetadata("traitproperty.kt")
+        public void testTraitproperty() throws Exception {
+            runTest("compiler/testData/codegen/box/super/traitproperty.kt");
+        }
+
+        @TestMetadata("unqualifiedSuper.kt")
+        public void testUnqualifiedSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/super/unqualifiedSuper.kt");
+        }
+
+        @TestMetadata("unqualifiedSuperWithDeeperHierarchies.kt")
+        public void testUnqualifiedSuperWithDeeperHierarchies() throws Exception {
+            runTest("compiler/testData/codegen/box/super/unqualifiedSuperWithDeeperHierarchies.kt");
+        }
+
+        @TestMetadata("unqualifiedSuperWithMethodsOfAny.kt")
+        public void testUnqualifiedSuperWithMethodsOfAny() throws Exception {
+            runTest("compiler/testData/codegen/box/super/unqualifiedSuperWithMethodsOfAny.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/super/superConstructor")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class SuperConstructor extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInSuperConstructor() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/super/superConstructor"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("kt17464_arrayOf.kt")
+            public void testKt17464_arrayOf() throws Exception {
+                runTest("compiler/testData/codegen/box/super/superConstructor/kt17464_arrayOf.kt");
+            }
+
+            @TestMetadata("kt18356.kt")
+            public void testKt18356() throws Exception {
+                runTest("compiler/testData/codegen/box/super/superConstructor/kt18356.kt");
+            }
+
+            @TestMetadata("objectExtendsInner.kt")
+            public void testObjectExtendsInner() throws Exception {
+                runTest("compiler/testData/codegen/box/super/superConstructor/objectExtendsInner.kt");
+            }
+
+            @TestMetadata("objectExtendsLocalInner.kt")
+            public void testObjectExtendsLocalInner() throws Exception {
+                runTest("compiler/testData/codegen/box/super/superConstructor/objectExtendsLocalInner.kt");
+            }
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/synchronized")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Synchronized extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSynchronized() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/synchronized"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/syntheticAccessors")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SyntheticAccessors extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        @TestMetadata("accessorForAbstractProtected.kt")
+        public void testAccessorForAbstractProtected() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/accessorForAbstractProtected.kt");
+        }
+
+        @TestMetadata("accessorForGenericConstructor.kt")
+        public void testAccessorForGenericConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/accessorForGenericConstructor.kt");
+        }
+
+        @TestMetadata("accessorForGenericMethod.kt")
+        public void testAccessorForGenericMethod() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/accessorForGenericMethod.kt");
+        }
+
+        @TestMetadata("accessorForGenericMethodWithDefaults.kt")
+        public void testAccessorForGenericMethodWithDefaults() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/accessorForGenericMethodWithDefaults.kt");
+        }
+
+        @TestMetadata("accessorForProtected.kt")
+        public void testAccessorForProtected() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/accessorForProtected.kt");
+        }
+
+        @TestMetadata("accessorForProtectedInvokeVirtual.kt")
+        public void testAccessorForProtectedInvokeVirtual() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/accessorForProtectedInvokeVirtual.kt");
+        }
+
+        public void testAllFilesPresentInSyntheticAccessors() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/syntheticAccessors"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("inline.kt")
+        public void testInline() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/inline.kt");
+        }
+
+        @TestMetadata("inlineInOtherClass.kt")
+        public void testInlineInOtherClass() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/inlineInOtherClass.kt");
+        }
+
+        @TestMetadata("kt10047.kt")
+        public void testKt10047() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/kt10047.kt");
+        }
+
+        @TestMetadata("kt21258_indirect.kt")
+        public void testKt21258_indirect() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/kt21258_indirect.kt");
+        }
+
+        @TestMetadata("kt21258_simple.kt")
+        public void testKt21258_simple() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/kt21258_simple.kt");
+        }
+
+        @TestMetadata("kt9717.kt")
+        public void testKt9717() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/kt9717.kt");
+        }
+
+        @TestMetadata("kt9717DifferentPackages.kt")
+        public void testKt9717DifferentPackages() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/kt9717DifferentPackages.kt");
+        }
+
+        @TestMetadata("kt9958.kt")
+        public void testKt9958() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/kt9958.kt");
+        }
+
+        @TestMetadata("kt9958Interface.kt")
+        public void testKt9958Interface() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/kt9958Interface.kt");
+        }
+
+        @TestMetadata("protectedFromLambda.kt")
+        public void testProtectedFromLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/protectedFromLambda.kt");
+        }
+
+        @TestMetadata("superCallFromMultipleSubclasses.kt")
+        public void testSuperCallFromMultipleSubclasses() throws Exception {
+            runTest("compiler/testData/codegen/box/syntheticAccessors/superCallFromMultipleSubclasses.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/throws")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Throws extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInThrows() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/throws"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/topLevelPrivate")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TopLevelPrivate extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTopLevelPrivate() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/topLevelPrivate"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("privateInInlineNested.kt")
+        public void testPrivateInInlineNested() throws Exception {
+            runTest("compiler/testData/codegen/box/topLevelPrivate/privateInInlineNested.kt");
+        }
+
+        @TestMetadata("syntheticAccessor.kt")
+        public void testSyntheticAccessor() throws Exception {
+            runTest("compiler/testData/codegen/box/topLevelPrivate/syntheticAccessor.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/trailingComma")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TrailingComma extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTrailingComma() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/trailingComma"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("noDisambiguation.kt")
+        public void testNoDisambiguation() throws Exception {
+            runTest("compiler/testData/codegen/box/trailingComma/noDisambiguation.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/traits")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Traits extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        @TestMetadata("abstractClassWithFakeOverride.kt")
+        public void testAbstractClassWithFakeOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/abstractClassWithFakeOverride.kt");
+        }
+
+        public void testAllFilesPresentInTraits() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("diamondPropertyAccessors.kt")
+        public void testDiamondPropertyAccessors() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/diamondPropertyAccessors.kt");
+        }
+
+        @TestMetadata("doubleDiamond.kt")
+        public void testDoubleDiamond() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/doubleDiamond.kt");
+        }
+
+        @TestMetadata("genericMethod.kt")
+        public void testGenericMethod() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/genericMethod.kt");
+        }
+
+        @TestMetadata("indirectlyInheritPropertyGetter.kt")
+        public void testIndirectlyInheritPropertyGetter() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/indirectlyInheritPropertyGetter.kt");
+        }
+
+        @TestMetadata("inheritedFun.kt")
+        public void testInheritedFun() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/inheritedFun.kt");
+        }
+
+        @TestMetadata("inheritedVar.kt")
+        public void testInheritedVar() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/inheritedVar.kt");
+        }
+
+        @TestMetadata("interfaceWithNonAbstractFunIndirect.kt")
+        public void testInterfaceWithNonAbstractFunIndirect() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/interfaceWithNonAbstractFunIndirect.kt");
+        }
+
+        @TestMetadata("interfaceWithNonAbstractFunIndirectGeneric.kt")
+        public void testInterfaceWithNonAbstractFunIndirectGeneric() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/interfaceWithNonAbstractFunIndirectGeneric.kt");
+        }
+
+        @TestMetadata("kt1936.kt")
+        public void testKt1936() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt1936.kt");
+        }
+
+        @TestMetadata("kt1936_1.kt")
+        public void testKt1936_1() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt1936_1.kt");
+        }
+
+        @TestMetadata("kt2260.kt")
+        public void testKt2260() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt2260.kt");
+        }
+
+        @TestMetadata("kt2541.kt")
+        public void testKt2541() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt2541.kt");
+        }
+
+        @TestMetadata("kt3315.kt")
+        public void testKt3315() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt3315.kt");
+        }
+
+        @TestMetadata("kt3500.kt")
+        public void testKt3500() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt3500.kt");
+        }
+
+        @TestMetadata("kt3579.kt")
+        public void testKt3579() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt3579.kt");
+        }
+
+        @TestMetadata("kt3579_2.kt")
+        public void testKt3579_2() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt3579_2.kt");
+        }
+
+        @TestMetadata("kt36973.kt")
+        public void testKt36973() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt36973.kt");
+        }
+
+        @TestMetadata("kt5393.kt")
+        public void testKt5393() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt5393.kt");
+        }
+
+        @TestMetadata("kt5393_property.kt")
+        public void testKt5393_property() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/kt5393_property.kt");
+        }
+
+        @TestMetadata("multiple.kt")
+        public void testMultiple() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/multiple.kt");
+        }
+
+        @TestMetadata("privateInterfaceMethod.kt")
+        public void testPrivateInterfaceMethod() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/privateInterfaceMethod.kt");
+        }
+
+        @TestMetadata("receiverOfIntersectionType.kt")
+        public void testReceiverOfIntersectionType() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/receiverOfIntersectionType.kt");
+        }
+
+        @TestMetadata("syntheticAccessor.kt")
+        public void testSyntheticAccessor() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/syntheticAccessor.kt");
+        }
+
+        @TestMetadata("traitImplDelegationWithCovariantOverride.kt")
+        public void testTraitImplDelegationWithCovariantOverride() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/traitImplDelegationWithCovariantOverride.kt");
+        }
+
+        @TestMetadata("traitImplDiamond.kt")
+        public void testTraitImplDiamond() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/traitImplDiamond.kt");
+        }
+
+        @TestMetadata("traitImplGenericDelegation.kt")
+        public void testTraitImplGenericDelegation() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/traitImplGenericDelegation.kt");
+        }
+
+        @TestMetadata("traitWithPrivateExtension.kt")
+        public void testTraitWithPrivateExtension() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/traitWithPrivateExtension.kt");
+        }
+
+        @TestMetadata("traitWithPrivateMember.kt")
+        public void testTraitWithPrivateMember() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/traitWithPrivateMember.kt");
+        }
+
+        @TestMetadata("traitWithPrivateMemberAccessFromLambda.kt")
+        public void testTraitWithPrivateMemberAccessFromLambda() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/traitWithPrivateMemberAccessFromLambda.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/typeInfo")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TypeInfo extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTypeInfo() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/typeInfo"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("ifOrWhenSpecialCall.kt")
+        public void testIfOrWhenSpecialCall() throws Exception {
+            runTest("compiler/testData/codegen/box/typeInfo/ifOrWhenSpecialCall.kt");
+        }
+
+        @TestMetadata("implicitSmartCastThis.kt")
+        public void testImplicitSmartCastThis() throws Exception {
+            runTest("compiler/testData/codegen/box/typeInfo/implicitSmartCastThis.kt");
+        }
+
+        @TestMetadata("inheritance.kt")
+        public void testInheritance() throws Exception {
+            runTest("compiler/testData/codegen/box/typeInfo/inheritance.kt");
+        }
+
+        @TestMetadata("kt2811.kt")
+        public void testKt2811() throws Exception {
+            runTest("compiler/testData/codegen/box/typeInfo/kt2811.kt");
+        }
+
+        @TestMetadata("primitiveTypeInfo.kt")
+        public void testPrimitiveTypeInfo() throws Exception {
+            runTest("compiler/testData/codegen/box/typeInfo/primitiveTypeInfo.kt");
+        }
+
+        @TestMetadata("smartCastThis.kt")
+        public void testSmartCastThis() throws Exception {
+            runTest("compiler/testData/codegen/box/typeInfo/smartCastThis.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/typeMapping")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TypeMapping extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTypeMapping() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/typeMapping"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("kt2831.kt")
+        public void testKt2831() throws Exception {
+            runTest("compiler/testData/codegen/box/typeMapping/kt2831.kt");
+        }
+
+        @TestMetadata("kt3286.kt")
+        public void testKt3286() throws Exception {
+            runTest("compiler/testData/codegen/box/typeMapping/kt3286.kt");
+        }
+
+        @TestMetadata("nothing.kt")
+        public void testNothing() throws Exception {
+            runTest("compiler/testData/codegen/box/typeMapping/nothing.kt");
+        }
+
+        @TestMetadata("nullNothing.kt")
+        public void testNullNothing() throws Exception {
+            runTest("compiler/testData/codegen/box/typeMapping/nullNothing.kt");
+        }
+
+        @TestMetadata("nullableNothing.kt")
+        public void testNullableNothing() throws Exception {
+            runTest("compiler/testData/codegen/box/typeMapping/nullableNothing.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/typealias")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Typealias extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTypealias() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/typealias"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("enumEntryQualifier.kt")
+        public void testEnumEntryQualifier() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/enumEntryQualifier.kt");
+        }
+
+        @TestMetadata("genericTypeAliasConstructor.kt")
+        public void testGenericTypeAliasConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor.kt");
+        }
+
+        @TestMetadata("genericTypeAliasConstructor2.kt")
+        public void testGenericTypeAliasConstructor2() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
+        }
+
+        @TestMetadata("innerClassTypeAliasConstructor.kt")
+        public void testInnerClassTypeAliasConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/innerClassTypeAliasConstructor.kt");
+        }
+
+        @TestMetadata("innerClassTypeAliasConstructorInSupertypes.kt")
+        public void testInnerClassTypeAliasConstructorInSupertypes() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/innerClassTypeAliasConstructorInSupertypes.kt");
+        }
+
+        @TestMetadata("kt15109.kt")
+        public void testKt15109() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/kt15109.kt");
+        }
+
+        @TestMetadata("objectLiteralConstructor.kt")
+        public void testObjectLiteralConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/objectLiteralConstructor.kt");
+        }
+
+        @TestMetadata("privateInKlib.kt")
+        public void testPrivateInKlib() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/privateInKlib.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/simple.kt");
+        }
+
+        @TestMetadata("typeAliasCompanion.kt")
+        public void testTypeAliasCompanion() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasCompanion.kt");
+        }
+
+        @TestMetadata("typeAliasConstructor.kt")
+        public void testTypeAliasConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasConstructor.kt");
+        }
+
+        @TestMetadata("typeAliasConstructorAccessor.kt")
+        public void testTypeAliasConstructorAccessor() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasConstructorAccessor.kt");
+        }
+
+        @TestMetadata("typeAliasConstructorForArray.kt")
+        public void testTypeAliasConstructorForArray() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasConstructorForArray.kt");
+        }
+
+        @TestMetadata("typeAliasConstructorInSuperCall.kt")
+        public void testTypeAliasConstructorInSuperCall() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasConstructorInSuperCall.kt");
+        }
+
+        @TestMetadata("typeAliasInAnonymousObjectType.kt")
+        public void testTypeAliasInAnonymousObjectType() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasInAnonymousObjectType.kt");
+        }
+
+        @TestMetadata("typeAliasObject.kt")
+        public void testTypeAliasObject() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasObject.kt");
+        }
+
+        @TestMetadata("typeAliasObjectCallable.kt")
+        public void testTypeAliasObjectCallable() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasObjectCallable.kt");
+        }
+
+        @TestMetadata("typeAliasSecondaryConstructor.kt")
+        public void testTypeAliasSecondaryConstructor() throws Exception {
+            runTest("compiler/testData/codegen/box/typealias/typeAliasSecondaryConstructor.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/unaryOp")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class UnaryOp extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInUnaryOp() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/unaryOp"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("call.kt")
+        public void testCall() throws Exception {
+            runTest("compiler/testData/codegen/box/unaryOp/call.kt");
+        }
+
+        @TestMetadata("callNullable.kt")
+        public void testCallNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/unaryOp/callNullable.kt");
+        }
+
+        @TestMetadata("callWithCommonType.kt")
+        public void testCallWithCommonType() throws Exception {
+            runTest("compiler/testData/codegen/box/unaryOp/callWithCommonType.kt");
+        }
+
+        @TestMetadata("intrinsic.kt")
+        public void testIntrinsic() throws Exception {
+            runTest("compiler/testData/codegen/box/unaryOp/intrinsic.kt");
+        }
+
+        @TestMetadata("intrinsicNullable.kt")
+        public void testIntrinsicNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/unaryOp/intrinsicNullable.kt");
+        }
+
+        @TestMetadata("longOverflow.kt")
+        public void testLongOverflow() throws Exception {
+            runTest("compiler/testData/codegen/box/unaryOp/longOverflow.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/unit")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Unit extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInUnit() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/unit"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("ifElse.kt")
+        public void testIfElse() throws Exception {
+            runTest("compiler/testData/codegen/box/unit/ifElse.kt");
+        }
+
+        @TestMetadata("nullableUnitInWhen1.kt")
+        public void testNullableUnitInWhen1() throws Exception {
+            runTest("compiler/testData/codegen/box/unit/nullableUnitInWhen1.kt");
+        }
+
+        @TestMetadata("nullableUnitInWhen2.kt")
+        public void testNullableUnitInWhen2() throws Exception {
+            runTest("compiler/testData/codegen/box/unit/nullableUnitInWhen2.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/unsignedTypes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class UnsignedTypes extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInUnsignedTypes() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/unsignedTypes"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("boxConstValOfUnsignedType.kt")
+        public void testBoxConstValOfUnsignedType() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/boxConstValOfUnsignedType.kt");
+        }
+
+        @TestMetadata("boxedUnsignedEqualsZero.kt")
+        public void testBoxedUnsignedEqualsZero() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/boxedUnsignedEqualsZero.kt");
+        }
+
+        @TestMetadata("checkBasicUnsignedLiterals.kt")
+        public void testCheckBasicUnsignedLiterals() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt");
+        }
+
+        @TestMetadata("equalsImplForInlineClassWrappingNullableInlineClass.kt")
+        public void testEqualsImplForInlineClassWrappingNullableInlineClass() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/equalsImplForInlineClassWrappingNullableInlineClass.kt");
+        }
+
+        @TestMetadata("forInUnsignedRangeWithCoercion.kt")
+        public void testForInUnsignedRangeWithCoercion() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt");
+        }
+
+        @TestMetadata("inUnsignedRange.kt")
+        public void testInUnsignedRange() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt");
+        }
+
+        @TestMetadata("inUnsignedRangeLiteral.kt")
+        public void testInUnsignedRangeLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt");
+        }
+
+        @TestMetadata("inUnsignedUntil.kt")
+        public void testInUnsignedUntil() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt");
+        }
+
+        @TestMetadata("iterateOverListOfBoxedUnsignedValues.kt")
+        public void testIterateOverListOfBoxedUnsignedValues() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt");
+        }
+
+        @TestMetadata("literalEqualsNullableUnsigned.kt")
+        public void testLiteralEqualsNullableUnsigned() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt");
+        }
+
+        @TestMetadata("nullableUnsignedEqualsLiteral.kt")
+        public void testNullableUnsignedEqualsLiteral() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/nullableUnsignedEqualsLiteral.kt");
+        }
+
+        @TestMetadata("unsignedIntCompare.kt")
+        public void testUnsignedIntCompare() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedIntCompare.kt");
+        }
+
+        @TestMetadata("unsignedIntDivide.kt")
+        public void testUnsignedIntDivide() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt");
+        }
+
+        @TestMetadata("unsignedIntRemainder.kt")
+        public void testUnsignedIntRemainder() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt");
+        }
+
+        @TestMetadata("unsignedIntToString.kt")
+        public void testUnsignedIntToString() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedIntToString.kt");
+        }
+
+        @TestMetadata("unsignedLiteralsForMaxLongValue.kt")
+        public void testUnsignedLiteralsForMaxLongValue() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsForMaxLongValue.kt");
+        }
+
+        @TestMetadata("unsignedLiteralsWithSignedOverflow.kt")
+        public void testUnsignedLiteralsWithSignedOverflow() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsWithSignedOverflow.kt");
+        }
+
+        @TestMetadata("unsignedLongCompare.kt")
+        public void testUnsignedLongCompare() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedLongCompare.kt");
+        }
+
+        @TestMetadata("unsignedLongDivide.kt")
+        public void testUnsignedLongDivide() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt");
+        }
+
+        @TestMetadata("unsignedLongRemainder.kt")
+        public void testUnsignedLongRemainder() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt");
+        }
+
+        @TestMetadata("unsignedRangeIterator.kt")
+        public void testUnsignedRangeIterator() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedRangeIterator.kt");
+        }
+
+        @TestMetadata("unsignedToSignedConversion.kt")
+        public void testUnsignedToSignedConversion() throws Exception {
+            runTest("compiler/testData/codegen/box/unsignedTypes/unsignedToSignedConversion.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/vararg")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Vararg extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInVararg() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("evaluationOrder.kt")
+        public void testEvaluationOrder() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/evaluationOrder.kt");
+        }
+
+        @TestMetadata("kt1978.kt")
+        public void testKt1978() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/kt1978.kt");
+        }
+
+        @TestMetadata("kt796_797.kt")
+        public void testKt796_797() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/kt796_797.kt");
+        }
+
+        @TestMetadata("referenceToContainsFromVarargParameter.kt")
+        public void testReferenceToContainsFromVarargParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/referenceToContainsFromVarargParameter.kt");
+        }
+
+        @TestMetadata("singleAssignmentToVarargsInFunction.kt")
+        public void testSingleAssignmentToVarargsInFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt");
+        }
+
+        @TestMetadata("varargsAndFunctionLiterals.kt")
+        public void testVarargsAndFunctionLiterals() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt");
+        }
+    }
+
+    @TestMetadata("compiler/testData/codegen/box/when")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class When extends AbstractIrCodegenBoxWasmTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInWhen() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/when"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+        }
+
+        @TestMetadata("callProperty.kt")
+        public void testCallProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/when/callProperty.kt");
+        }
+
+        @TestMetadata("edgeCases.kt")
+        public void testEdgeCases() throws Exception {
+            runTest("compiler/testData/codegen/box/when/edgeCases.kt");
+        }
+
+        @TestMetadata("emptyWhen.kt")
+        public void testEmptyWhen() throws Exception {
+            runTest("compiler/testData/codegen/box/when/emptyWhen.kt");
+        }
+
+        @TestMetadata("exhaustiveBoolean.kt")
+        public void testExhaustiveBoolean() throws Exception {
+            runTest("compiler/testData/codegen/box/when/exhaustiveBoolean.kt");
+        }
+
+        @TestMetadata("exhaustiveBreakContinue.kt")
+        public void testExhaustiveBreakContinue() throws Exception {
+            runTest("compiler/testData/codegen/box/when/exhaustiveBreakContinue.kt");
+        }
+
+        @TestMetadata("exhaustiveWhenInitialization.kt")
+        public void testExhaustiveWhenInitialization() throws Exception {
+            runTest("compiler/testData/codegen/box/when/exhaustiveWhenInitialization.kt");
+        }
+
+        @TestMetadata("exhaustiveWhenReturn.kt")
+        public void testExhaustiveWhenReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/when/exhaustiveWhenReturn.kt");
+        }
+
+        @TestMetadata("implicitExhaustiveAndReturn.kt")
+        public void testImplicitExhaustiveAndReturn() throws Exception {
+            runTest("compiler/testData/codegen/box/when/implicitExhaustiveAndReturn.kt");
+        }
+
+        @TestMetadata("kt2457.kt")
+        public void testKt2457() throws Exception {
+            runTest("compiler/testData/codegen/box/when/kt2457.kt");
+        }
+
+        @TestMetadata("kt2466.kt")
+        public void testKt2466() throws Exception {
+            runTest("compiler/testData/codegen/box/when/kt2466.kt");
+        }
+
+        @TestMetadata("kt5307.kt")
+        public void testKt5307() throws Exception {
+            runTest("compiler/testData/codegen/box/when/kt5307.kt");
+        }
+
+        @TestMetadata("longInRange.kt")
+        public void testLongInRange() throws Exception {
+            runTest("compiler/testData/codegen/box/when/longInRange.kt");
+        }
+
+        @TestMetadata("matchNotNullAgainstNullable.kt")
+        public void testMatchNotNullAgainstNullable() throws Exception {
+            runTest("compiler/testData/codegen/box/when/matchNotNullAgainstNullable.kt");
+        }
+
+        @TestMetadata("multipleEntries.kt")
+        public void testMultipleEntries() throws Exception {
+            runTest("compiler/testData/codegen/box/when/multipleEntries.kt");
+        }
+
+        @TestMetadata("noElseCoerceToUnit.kt")
+        public void testNoElseCoerceToUnit() throws Exception {
+            runTest("compiler/testData/codegen/box/when/noElseCoerceToUnit.kt");
+        }
+
+        @TestMetadata("noElseExhaustive.kt")
+        public void testNoElseExhaustive() throws Exception {
+            runTest("compiler/testData/codegen/box/when/noElseExhaustive.kt");
+        }
+
+        @TestMetadata("noElseExhaustiveStatement.kt")
+        public void testNoElseExhaustiveStatement() throws Exception {
+            runTest("compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt");
+        }
+
+        @TestMetadata("noElseInStatement.kt")
+        public void testNoElseInStatement() throws Exception {
+            runTest("compiler/testData/codegen/box/when/noElseInStatement.kt");
+        }
+
+        @TestMetadata("noElseNoMatch.kt")
+        public void testNoElseNoMatch() throws Exception {
+            runTest("compiler/testData/codegen/box/when/noElseNoMatch.kt");
+        }
+
+        @TestMetadata("nullableWhen.kt")
+        public void testNullableWhen() throws Exception {
+            runTest("compiler/testData/codegen/box/when/nullableWhen.kt");
+        }
+
+        @TestMetadata("sealedWhenInitialization.kt")
+        public void testSealedWhenInitialization() throws Exception {
+            runTest("compiler/testData/codegen/box/when/sealedWhenInitialization.kt");
+        }
+
+        @TestMetadata("switchBreakNoLabel.kt")
+        public void testSwitchBreakNoLabel() throws Exception {
+            runTest("compiler/testData/codegen/box/when/switchBreakNoLabel.kt");
+        }
+
+        @TestMetadata("switchOptimizationDuplicates.kt")
+        public void testSwitchOptimizationDuplicates() throws Exception {
+            runTest("compiler/testData/codegen/box/when/switchOptimizationDuplicates.kt");
+        }
+
+        @TestMetadata("switchOptimizationSingleStatementCase.kt")
+        public void testSwitchOptimizationSingleStatementCase() throws Exception {
+            runTest("compiler/testData/codegen/box/when/switchOptimizationSingleStatementCase.kt");
+        }
+
+        @TestMetadata("typeDisjunction.kt")
+        public void testTypeDisjunction() throws Exception {
+            runTest("compiler/testData/codegen/box/when/typeDisjunction.kt");
+        }
+
+        @TestMetadata("whenSafeCallSubjectEvaluatedOnce.kt")
+        public void testWhenSafeCallSubjectEvaluatedOnce() throws Exception {
+            runTest("compiler/testData/codegen/box/when/whenSafeCallSubjectEvaluatedOnce.kt");
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/when/enumOptimization")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class EnumOptimization extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEnumOptimization() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/when/enumOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("bigEnum.kt")
+            public void testBigEnum() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/bigEnum.kt");
+            }
+
+            @TestMetadata("differentEnumClasses.kt")
+            public void testDifferentEnumClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses.kt");
+            }
+
+            @TestMetadata("differentEnumClasses2.kt")
+            public void testDifferentEnumClasses2() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses2.kt");
+            }
+
+            @TestMetadata("duplicatingItems.kt")
+            public void testDuplicatingItems() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/duplicatingItems.kt");
+            }
+
+            @TestMetadata("enumInsideClassObject.kt")
+            public void testEnumInsideClassObject() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/enumInsideClassObject.kt");
+            }
+
+            @TestMetadata("expression.kt")
+            public void testExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/expression.kt");
+            }
+
+            @TestMetadata("functionLiteralInTopLevel.kt")
+            public void testFunctionLiteralInTopLevel() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/functionLiteralInTopLevel.kt");
+            }
+
+            @TestMetadata("kt14597.kt")
+            public void testKt14597() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/kt14597.kt");
+            }
+
+            @TestMetadata("kt14597_full.kt")
+            public void testKt14597_full() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/kt14597_full.kt");
+            }
+
+            @TestMetadata("kt14802.kt")
+            public void testKt14802() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/kt14802.kt");
+            }
+
+            @TestMetadata("kt15806.kt")
+            public void testKt15806() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/kt15806.kt");
+            }
+
+            @TestMetadata("manyWhensWithinClass.kt")
+            public void testManyWhensWithinClass() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/manyWhensWithinClass.kt");
+            }
+
+            @TestMetadata("nonConstantEnum.kt")
+            public void testNonConstantEnum() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/nonConstantEnum.kt");
+            }
+
+            @TestMetadata("nullIsTheFirstEntry.kt")
+            public void testNullIsTheFirstEntry() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/nullIsTheFirstEntry.kt");
+            }
+
+            @TestMetadata("nullability.kt")
+            public void testNullability() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/nullability.kt");
+            }
+
+            @TestMetadata("nullableEnum.kt")
+            public void testNullableEnum() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/nullableEnum.kt");
+            }
+
+            @TestMetadata("subjectAny.kt")
+            public void testSubjectAny() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/subjectAny.kt");
+            }
+
+            @TestMetadata("withoutElse.kt")
+            public void testWithoutElse() throws Exception {
+                runTest("compiler/testData/codegen/box/when/enumOptimization/withoutElse.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/when/stringOptimization")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class StringOptimization extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInStringOptimization() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/when/stringOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("duplicatingItems.kt")
+            public void testDuplicatingItems() throws Exception {
+                runTest("compiler/testData/codegen/box/when/stringOptimization/duplicatingItems.kt");
+            }
+
+            @TestMetadata("duplicatingItemsSameHashCode.kt")
+            public void testDuplicatingItemsSameHashCode() throws Exception {
+                runTest("compiler/testData/codegen/box/when/stringOptimization/duplicatingItemsSameHashCode.kt");
+            }
+
+            @TestMetadata("duplicatingItemsSameHashCode2.kt")
+            public void testDuplicatingItemsSameHashCode2() throws Exception {
+                runTest("compiler/testData/codegen/box/when/stringOptimization/duplicatingItemsSameHashCode2.kt");
+            }
+
+            @TestMetadata("duplicatingItemsSameHashCode3.kt")
+            public void testDuplicatingItemsSameHashCode3() throws Exception {
+                runTest("compiler/testData/codegen/box/when/stringOptimization/duplicatingItemsSameHashCode3.kt");
+            }
+
+            @TestMetadata("expression.kt")
+            public void testExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/when/stringOptimization/expression.kt");
+            }
+
+            @TestMetadata("nullability.kt")
+            public void testNullability() throws Exception {
+                runTest("compiler/testData/codegen/box/when/stringOptimization/nullability.kt");
+            }
+
+            @TestMetadata("sameHashCode.kt")
+            public void testSameHashCode() throws Exception {
+                runTest("compiler/testData/codegen/box/when/stringOptimization/sameHashCode.kt");
+            }
+
+            @TestMetadata("statement.kt")
+            public void testStatement() throws Exception {
+                runTest("compiler/testData/codegen/box/when/stringOptimization/statement.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/when/whenSubjectVariable")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class WhenSubjectVariable extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInWhenSubjectVariable() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/when/whenSubjectVariable"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("captureSubjectVariable.kt")
+            public void testCaptureSubjectVariable() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/captureSubjectVariable.kt");
+            }
+
+            @TestMetadata("equalityWithSubjectVariable.kt")
+            public void testEqualityWithSubjectVariable() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/equalityWithSubjectVariable.kt");
+            }
+
+            @TestMetadata("ieee754Equality.kt")
+            public void testIeee754Equality() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/ieee754Equality.kt");
+            }
+
+            @TestMetadata("ieee754EqualityWithSmartCast.kt")
+            public void testIeee754EqualityWithSmartCast() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/ieee754EqualityWithSmartCast.kt");
+            }
+
+            @TestMetadata("isCheckOnSubjectVariable.kt")
+            public void testIsCheckOnSubjectVariable() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/isCheckOnSubjectVariable.kt");
+            }
+
+            @TestMetadata("kt27161.kt")
+            public void testKt27161() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/kt27161.kt");
+            }
+
+            @TestMetadata("kt27161_int.kt")
+            public void testKt27161_int() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_int.kt");
+            }
+
+            @TestMetadata("kt27161_nested.kt")
+            public void testKt27161_nested() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested.kt");
+            }
+
+            @TestMetadata("kt27161_nested2.kt")
+            public void testKt27161_nested2() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested2.kt");
+            }
+
+            @TestMetadata("kt27161_string.kt")
+            public void testKt27161_string() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_string.kt");
+            }
+
+            @TestMetadata("rangeCheckOnSubjectVariable.kt")
+            public void testRangeCheckOnSubjectVariable() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/rangeCheckOnSubjectVariable.kt");
+            }
+
+            @TestMetadata("subjectExpressionIsEvaluatedOnce.kt")
+            public void testSubjectExpressionIsEvaluatedOnce() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/subjectExpressionIsEvaluatedOnce.kt");
+            }
+
+            @TestMetadata("whenByEnum.kt")
+            public void testWhenByEnum() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/whenByEnum.kt");
+            }
+
+            @TestMetadata("whenByNullableEnum.kt")
+            public void testWhenByNullableEnum() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/whenByNullableEnum.kt");
+            }
+
+            @TestMetadata("whenByString.kt")
+            public void testWhenByString() throws Exception {
+                runTest("compiler/testData/codegen/box/when/whenSubjectVariable/whenByString.kt");
+            }
+        }
+    }
+}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrWasmBoxWasmTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrWasmBoxWasmTestGenerated.java
deleted file mode 100644
index 63a61e70700..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrWasmBoxWasmTestGenerated.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.js.test.wasm.semantics;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("js/js.translator/testData/wasmBox")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class IrWasmBoxWasmTestGenerated extends AbstractIrWasmBoxWasmTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInWasmBox() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-    }
-
-    @TestMetadata("basicTypes.kt")
-    public void testBasicTypes() throws Exception {
-        runTest("js/js.translator/testData/wasmBox/basicTypes.kt");
-    }
-
-    @TestMetadata("primitivesOperatos.kt")
-    public void testPrimitivesOperatos() throws Exception {
-        runTest("js/js.translator/testData/wasmBox/primitivesOperatos.kt");
-    }
-
-    @TestMetadata("js/js.translator/testData/wasmBox/number")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Number extends AbstractIrWasmBoxWasmTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInNumber() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/number"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-        }
-
-        @TestMetadata("assignmentIntOverflow.kt")
-        public void testAssignmentIntOverflow() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/assignmentIntOverflow.kt");
-        }
-
-        @TestMetadata("byteAndShortConversions.kt")
-        public void testByteAndShortConversions() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/byteAndShortConversions.kt");
-        }
-
-        @TestMetadata("conversionsWithTruncation.kt")
-        public void testConversionsWithTruncation() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/conversionsWithTruncation.kt");
-        }
-
-        @TestMetadata("conversionsWithoutTruncation.kt")
-        public void testConversionsWithoutTruncation() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/conversionsWithoutTruncation.kt");
-        }
-
-        @TestMetadata("division.kt")
-        public void testDivision() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/division.kt");
-        }
-
-        @TestMetadata("doubleConversions.kt")
-        public void testDoubleConversions() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/doubleConversions.kt");
-        }
-
-        @TestMetadata("hashCode.kt")
-        public void testHashCode() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/hashCode.kt");
-        }
-
-        @TestMetadata("hexadecimalConstant.kt")
-        public void testHexadecimalConstant() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/hexadecimalConstant.kt");
-        }
-
-        @TestMetadata("incDecOptimization.kt")
-        public void testIncDecOptimization() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/incDecOptimization.kt");
-        }
-
-        @TestMetadata("intConversions.kt")
-        public void testIntConversions() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/intConversions.kt");
-        }
-
-        @TestMetadata("intDivFloat.kt")
-        public void testIntDivFloat() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/intDivFloat.kt");
-        }
-
-        @TestMetadata("intIncDecOverflow.kt")
-        public void testIntIncDecOverflow() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/intIncDecOverflow.kt");
-        }
-
-        @TestMetadata("intOverflow.kt")
-        public void testIntOverflow() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/intOverflow.kt");
-        }
-
-        @TestMetadata("kt2342.kt")
-        public void testKt2342() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/kt2342.kt");
-        }
-
-        @TestMetadata("longBinaryOperations.kt")
-        public void testLongBinaryOperations() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longBinaryOperations.kt");
-        }
-
-        @TestMetadata("longBitOperations.kt")
-        public void testLongBitOperations() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longBitOperations.kt");
-        }
-
-        @TestMetadata("longCompareToIntrinsic.kt")
-        public void testLongCompareToIntrinsic() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longCompareToIntrinsic.kt");
-        }
-
-        @TestMetadata("longEqualsIntrinsic.kt")
-        public void testLongEqualsIntrinsic() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longEqualsIntrinsic.kt");
-        }
-
-        @TestMetadata("longHashCode.kt")
-        public void testLongHashCode() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longHashCode.kt");
-        }
-
-        @TestMetadata("longUnaryOperations.kt")
-        public void testLongUnaryOperations() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/longUnaryOperations.kt");
-        }
-
-        @TestMetadata("mixedTypesOverflow.kt")
-        public void testMixedTypesOverflow() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/mixedTypesOverflow.kt");
-        }
-
-        @TestMetadata("numberCompareTo.kt")
-        public void testNumberCompareTo() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/numberCompareTo.kt");
-        }
-
-        @TestMetadata("numberConversions.kt")
-        public void testNumberConversions() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/numberConversions.kt");
-        }
-
-        @TestMetadata("numberEquals.kt")
-        public void testNumberEquals() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/numberEquals.kt");
-        }
-
-        @TestMetadata("numberIncDec.kt")
-        public void testNumberIncDec() throws Exception {
-            runTest("js/js.translator/testData/wasmBox/number/numberIncDec.kt");
-        }
-    }
-
-    @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class PassedCommonTests extends AbstractIrWasmBoxWasmTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInPassedCommonTests() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class BoxingOptimization extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInBoxingOptimization() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("explicitEqualsOnDouble.kt")
-            public void testExplicitEqualsOnDouble() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization/explicitEqualsOnDouble.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/classes")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Classes extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInClasses() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/classes"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("kt2482.kt")
-            public void testKt2482() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/classes/kt2482.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/constants")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Constants extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInConstants() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/constants"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("float.kt")
-            public void testFloat() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/constants/float.kt");
-            }
-
-            @TestMetadata("long.kt")
-            public void testLong() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/constants/long.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class ControlStructures extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInControlStructures() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("ifConst1.kt")
-            public void testIfConst1() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst1.kt");
-            }
-
-            @TestMetadata("ifConst2.kt")
-            public void testIfConst2() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst2.kt");
-            }
-
-            @TestMetadata("kt1899.kt")
-            public void testKt1899() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/kt1899.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class ExtensionProperties extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInExtensionProperties() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("topLevel.kt")
-            public void testTopLevel() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties/topLevel.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/functions")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Functions extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInFunctions() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/functions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("kt2280.kt")
-            public void testKt2280() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/functions/kt2280.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/ieee754")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Ieee754 extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInIeee754() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/ieee754"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("lessDouble_properIeeeAndNewInference.kt")
-            public void testLessDouble_properIeeeAndNewInference() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/ieee754/lessDouble_properIeeeAndNewInference.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/ir")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Ir extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInIr() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/ir"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class ClosureConversion extends AbstractIrWasmBoxWasmTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInClosureConversion() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-                }
-
-                @TestMetadata("closureConversion1.kt")
-                public void testClosureConversion1() throws Exception {
-                    runTest("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion1.kt");
-                }
-
-                @TestMetadata("closureConversion3.kt")
-                public void testClosureConversion3() throws Exception {
-                    runTest("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion3.kt");
-                }
-
-                @TestMetadata("closureConversion4.kt")
-                public void testClosureConversion4() throws Exception {
-                    runTest("js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion4.kt");
-                }
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/labels")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Labels extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInLabels() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/labels"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("propertyAccessor.kt")
-            public void testPropertyAccessor() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/labels/propertyAccessor.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class LazyCodegen extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInLazyCodegen() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Optimizations extends AbstractIrWasmBoxWasmTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInOptimizations() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-                }
-
-                @TestMetadata("negateConstantCompare.kt")
-                public void testNegateConstantCompare() throws Exception {
-                    runTest("js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations/negateConstantCompare.kt");
-                }
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class OperatorConventions extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInOperatorConventions() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("annotatedAssignment.kt")
-            public void testAnnotatedAssignment() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/annotatedAssignment.kt");
-            }
-
-            @TestMetadata("infixFunctionOverBuiltinMember.kt")
-            public void testInfixFunctionOverBuiltinMember() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/infixFunctionOverBuiltinMember.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class PrimitiveTypes extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInPrimitiveTypes() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("ea35963.kt")
-            public void testEa35963() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/ea35963.kt");
-            }
-
-            @TestMetadata("incrementByteCharShort.kt")
-            public void testIncrementByteCharShort() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/incrementByteCharShort.kt");
-            }
-
-            @TestMetadata("kt1634.kt")
-            public void testKt1634() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt1634.kt");
-            }
-
-            @TestMetadata("kt3078.kt")
-            public void testKt3078() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt3078.kt");
-            }
-
-            @TestMetadata("kt6590_identityEquals.kt")
-            public void testKt6590_identityEquals() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt6590_identityEquals.kt");
-            }
-
-            @TestMetadata("kt737.kt")
-            public void testKt737() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt737.kt");
-            }
-
-            @TestMetadata("kt828.kt")
-            public void testKt828() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt828.kt");
-            }
-
-            @TestMetadata("kt877.kt")
-            public void testKt877() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt877.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/publishedApi")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class PublishedApi extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInPublishedApi() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/publishedApi"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("topLevel.kt")
-            public void testTopLevel() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/publishedApi/topLevel.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/unaryOp")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class UnaryOp extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInUnaryOp() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/unaryOp"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("intrinsic.kt")
-            public void testIntrinsic() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/unaryOp/intrinsic.kt");
-            }
-        }
-
-        @TestMetadata("js/js.translator/testData/wasmBox/passedCommonTests/when")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class When extends AbstractIrWasmBoxWasmTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInWhen() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/wasmBox/passedCommonTests/when"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-            }
-
-            @TestMetadata("noElseNoMatch.kt")
-            public void testNoElseNoMatch() throws Exception {
-                runTest("js/js.translator/testData/wasmBox/passedCommonTests/when/noElseNoMatch.kt");
-            }
-        }
-    }
-}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/abstractClassesForGeneratedWasmTests.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/abstractClassesForGeneratedWasmTests.kt
index a4535642435..85761c60c34 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/abstractClassesForGeneratedWasmTests.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/abstractClassesForGeneratedWasmTests.kt
@@ -5,11 +5,8 @@
 
 package org.jetbrains.kotlin.js.test.wasm.semantics
 
-import org.jetbrains.kotlin.js.test.BasicBoxTest
 import org.jetbrains.kotlin.js.test.BasicWasmBoxTest
 
-abstract class AbstractIrWasmBoxWasmTest : BasicWasmBoxTest(BasicBoxTest.TEST_DATA_DIR_PATH + "wasmBox", "wasmBox/")
-
 abstract class AbstractIrCodegenBoxWasmTest : BasicWasmBoxTest(
     "compiler/testData/codegen/box/",
     "codegen/wasmBox/"
diff --git a/js/js.translator/testData/wasmBox/basicTypes.kt b/js/js.translator/testData/wasmBox/basicTypes.kt
deleted file mode 100644
index 53fe93c582d..00000000000
--- a/js/js.translator/testData/wasmBox/basicTypes.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-
-fun foo(
-    x1: Int,
-    x2: Long,
-    x3: Float,
-    x4: Double
-): Int {
-    var mtmp1: Int = 0
-    var mtmp2: Long = 0L
-    var mtmp3: Float = 0f
-    var mtmp4: Double = 0.0
-    val tmp1 = x1
-    val tmp2 = x2
-    val tmp3 = x3
-    val tmp4 = x4
-    mtmp1 = x1
-    mtmp2 = x2
-    mtmp3 = x3
-    mtmp4 = x4
-    return mtmp1
-}
-
-var g1: Int = 0
-var g2: Long = 0L
-var g3: Float = 0f
-var g4: Double = 0.0
-fun fooUnit() {
-    g1 = 10
-    g2 = 10L
-    g3 = 10f
-    g4 = 10.0
-    g1 = g1
-    g2 = g2
-    g3 = g3
-    g4 = g4
-}
-
-fun box(): String {
-    fooUnit()
-    val res = foo(42, 100L, 100f, 100.0)
-    if (res == 42)
-        return "OK"
-    return "Fail"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/assignmentIntOverflow.kt b/js/js.translator/testData/wasmBox/number/assignmentIntOverflow.kt
deleted file mode 100644
index caeb9c2b2c8..00000000000
--- a/js/js.translator/testData/wasmBox/number/assignmentIntOverflow.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1282
-package foo
-
-fun bigValue() = 0x7FFFFFFC
-
-fun mediumValue() = 0x12345
-
-fun box(): String {
-    var v = bigValue()
-    v += 1
-    if (v != 0x7FFFFFFD) return "fail1"
-
-    v = bigValue()
-    v += 8
-    if (v != -0x7FFFFFFC) return "fail2"
-
-    v = mediumValue()
-    v *= 0x23456
-    if (v != -2112496338) return "fail3"
-
-    v = bigValue()
-    v *= bigValue()
-    if (v != 16) return "fail4"
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/byteAndShortConversions.kt b/js/js.translator/testData/wasmBox/number/byteAndShortConversions.kt
deleted file mode 100644
index 1e5d7d6dcb0..00000000000
--- a/js/js.translator/testData/wasmBox/number/byteAndShortConversions.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1284
-package foo
-
-fun testShortConversions(c: Short): Boolean {
-    if (c.toDouble() != 3.0) {
-        return false
-    }
-    if (c.toFloat() != 3.toFloat()) {
-        return false
-    }
-    if (c.toByte() != 3.toByte()) {
-        return false
-    }
-    if (c.toInt() != 3) {
-        return false
-    }
-    if (c.toShort() != 3.toShort()) {
-        return false
-    }
-    return true
-}
-
-fun testByteConversions(c: Byte): Boolean {
-    if (c.toDouble() != 3.0) {
-        return false
-    }
-    if (c.toFloat() != 3.toFloat()) {
-        return false
-    }
-    if (c.toByte() != 3.toByte()) {
-        return false
-    }
-    if (c.toInt() != 3) {
-        return false
-    }
-    if (c.toShort() != 3.toShort()) {
-        return false
-    }
-    return true
-}
-
-fun box(): String {
-    if (!testShortConversions(3)) return "fail: testShortConversions"
-    if (!testByteConversions(3)) return "fail: testByteConversions"
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/conversionsWithTruncation.kt b/js/js.translator/testData/wasmBox/number/conversionsWithTruncation.kt
deleted file mode 100644
index 9561aedda9e..00000000000
--- a/js/js.translator/testData/wasmBox/number/conversionsWithTruncation.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1227
-package foo
-
-// TODO: Floats to ints
-
-fun box(): String {
-
-//    assertEquals(65, 321.0.toByte())
-//    assertEquals(-56, 200.0.toByte())
-//
-//    assertEquals(65, 321.0f.toByte())
-//    assertEquals(-56, 200.0f.toByte())
-
-    assertEquals(65, 321L.toByte())
-    assertEquals(-56, 200L.toByte())
-
-    assertEquals(65, 321.toByte())
-    assertEquals(-56, 200.toByte())
-
-    assertEquals(65, (321.toShort()).toByte())
-    assertEquals(-56, (200.toShort()).toByte())
-
-//    assertEquals(-1, 65535.0.toShort())
-//    assertEquals(-1, 65535.0f.toShort())
-    assertEquals(-1, 65535L.toShort())
-    assertEquals(-1, 65535.toShort())
-
-//    assertEquals(65535, 65535.2.toInt())
-//    assertEquals(23, 23.6f.toInt())
-//    assertEquals(-12, -12.4.toShort())
-//    assertEquals(-12, -12.4.toByte())
-
-    assertEquals('\u0419', (-654311).toChar())
-//    assertEquals('\u0419', (-654311.0).toChar())
-//    assertEquals('\u0419', (-654311.0f).toChar())
-
-    // TODO: Long.toString
-    val longX: Long = 9223372034707292481L
-    //  assertEquals("9223372034707292481", longX.toString())
-
-    assertEquals(-2147483327, longX.toInt())
-    assertEquals(321, longX.toShort())
-    assertEquals(65, longX.toByte())
-    assertEquals('\u0141', longX.toChar())
-
-    val intX: Int = longX.toInt()
-    assertEquals(321, intX.toShort())
-    assertEquals(65, intX.toByte())
-
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/number/conversionsWithoutTruncation.kt b/js/js.translator/testData/wasmBox/number/conversionsWithoutTruncation.kt
deleted file mode 100644
index ab8c2836e65..00000000000
--- a/js/js.translator/testData/wasmBox/number/conversionsWithoutTruncation.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1293
-package foo
-
-//fun testForNumber(numberX: Number) {
-//    assertEquals(true, 65.0 == numberX.toDouble())
-//    assertEquals(true, 65.0f == numberX.toFloat())
-//    assertEquals(true, 65L == numberX.toLong())
-//    assertEquals(true, 65 == numberX.toInt())
-//    assertEquals(true, 65.toShort() == numberX.toShort())
-//    assertEquals(true, 65.toByte() == numberX.toByte())
-//    assertEquals(true, 'A' == numberX.toChar())
-//}
-
-fun box(): String {
-
-// TODO: Number is not supported yet
-//    testForNumber(65.0)
-//    testForNumber(65.0f)
-//    testForNumber(65L)
-//    testForNumber(65)
-//    testForNumber(65.toShort())
-//    testForNumber(65.toByte())
-
-    var doubleX: Double = 65.0
-    assertEquals(true, 65.0 == doubleX.toDouble())
-    assertEquals(true, 65.0f == doubleX.toFloat())
-    // TODO: Float to integer convertions are not supported yet
-    // assertEquals(true, 65L == doubleX.toLong())
-    // assertEquals(true, 65 == doubleX.toInt())
-    // assertEquals(true, 65.toShort() == doubleX.toShort())
-    // assertEquals(true, 65.toByte() == doubleX.toByte())
-    // assertEquals(true, 'A' == doubleX.toChar())
-
-    var floatX: Float = 65.0f
-    assertEquals(true, 65.0 == floatX.toDouble())
-    assertEquals(true, 65.0f == floatX.toFloat())
-    // TODO: Float to integer convertions are not supported yet
-//    assertEquals(true, 65L == floatX.toLong())
-//    assertEquals(true, 65 == floatX.toInt())
-//    assertEquals(true, 65.toShort() == floatX.toShort())
-//    assertEquals(true, 65.toByte() == floatX.toByte())
-//    assertEquals(true, 'A' == floatX.toChar())
-
-    val longX: Long = 65L
-    assertEquals(true, 65.0 == longX.toDouble())
-    assertEquals(true, 65.0f == longX.toFloat())
-    assertEquals(true, 65L == longX.toLong())
-    assertEquals(true, 65 == longX.toInt())
-    assertEquals(true, 65.toShort() == longX.toShort())
-    assertEquals(true, 65.toByte() == longX.toByte())
-    assertEquals(true, 'A' == longX.toChar())
-
-    val intX: Int = 65
-    assertEquals(true, 65.0 == intX.toDouble())
-    assertEquals(true, 65.0f == intX.toFloat())
-    assertEquals(true, 65L == intX.toLong())
-    assertEquals(true, 65 == intX.toInt())
-    assertEquals(true, 65.toShort() == intX.toShort())
-    assertEquals(true, 65.toByte() == intX.toByte())
-    assertEquals(true, 'A' == intX.toChar())
-
-    val shortX: Short = 65.toShort()
-    assertEquals(true, 65.0 == shortX.toDouble())
-    assertEquals(true, 65.0f == shortX.toFloat())
-    assertEquals(true, 65L == shortX.toLong())
-    assertEquals(true, 65 == shortX.toInt())
-    assertEquals(true, 65.toShort() == shortX.toShort())
-    assertEquals(true, 65.toByte() == shortX.toByte())
-    assertEquals(true, 'A' == shortX.toChar())
-
-    val byteX: Byte = 65.toByte()
-    assertEquals(true, 65.0 == byteX.toDouble())
-    assertEquals(true, 65.0f == byteX.toFloat())
-    assertEquals(true, 65L == byteX.toLong())
-    assertEquals(true, 65 == byteX.toInt())
-    assertEquals(true, 65.toShort() == byteX.toShort())
-    assertEquals(true, 65.toByte() == byteX.toByte())
-    assertEquals(true, 'A' == byteX.toChar())
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/division.kt b/js/js.translator/testData/wasmBox/number/division.kt
deleted file mode 100644
index 0073e310517..00000000000
--- a/js/js.translator/testData/wasmBox/number/division.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1280
-package foo
-
-fun box(): String {
-    if (3 / 4 != 0) {
-        return "fail11"
-    }
-    if (-5 / 4 != -1) {
-        return "fail2"
-    }
-    if ((3.0 / 4.0 - 0.75) > 0.01) {
-        return "fail3"
-    }
-    if ((-10.0 / 4.0 + 2.5) > 0.01) {
-        return "fail44"
-    }
-    val i1: Int = 5
-    val i2: Int = 2
-    if (i1 / i2 != 2) {
-        return "fail55"
-    }
-    val i3: Short = 5
-    val i4: Short = 2
-    if (i3 / i4 != 2) {
-        return "fail6"
-    }
-    val i5: Byte = 5
-    val i6: Byte = 2
-    if (i5 / i6 != 2) {
-        return "fail7"
-    }
-
-    val f1: Double = 5.0
-    val f2: Double = 2.0
-    if ((f1 / f2 - 2.5) > 0.01) {
-        return "fail8"
-    }
-
-    val f3: Float = 5.0.toFloat()
-    val f4: Float = 2.0.toFloat()
-    if ((f3 / f4 - 2.5.toFloat()) > 0.01) {
-        return "fail9"
-    }
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/number/doubleConversions.kt b/js/js.translator/testData/wasmBox/number/doubleConversions.kt
deleted file mode 100644
index 8adf7baa07b..00000000000
--- a/js/js.translator/testData/wasmBox/number/doubleConversions.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1222
-
-// IGNORE_BACKEND: WASM
-// TODO: Support floating-point to integer conversions
-package foo
-
-fun box(): String {
-    val c: Double = 3.6
-    if (c.toDouble() != 3.6) {
-        return "fail1"
-    }
-    if (c.toFloat() != 3.6.toFloat()) {
-        return "fail2"
-    }
-    if (c.toByte() != 3.toByte()) {
-        return "fail3"
-    }
-    if (c.toInt() != 3) {
-        return "fail4"
-    }
-    if (c.toShort() != 3.toShort()) {
-        return "fail5"
-    }
-
-    val cn: Double = -3.6
-    if (cn.toDouble() != -3.6) {
-        return "fail6"
-    }
-    if (cn.toFloat() != -3.6.toFloat()) {
-        return "fail7"
-    }
-    if (cn.toByte() != (-3).toByte()) {
-        return "fail8"
-    }
-    if (cn.toInt() != -3) {
-        return "fail9"
-    }
-    if (cn.toShort() != (-3).toShort()) {
-        return "fail10"
-    }
-
-    val f: Float = 3.6.toFloat()
-    if (f.toDouble() != 3.6) {
-        return "fail11"
-    }
-    if (f.toFloat() != 3.6.toFloat()) {
-        return "fail12"
-    }
-    if (f.toByte() != 3.toByte()) {
-        return "fail13"
-    }
-    if (f.toInt() != 3) {
-        return "fail14"
-    }
-    if (f.toShort() != 3.toShort()) {
-        return "fail15"
-    }
-
-    val fn: Float = -3.6.toFloat()
-    if (fn.toDouble() != -3.6) {
-        return "fail16"
-    }
-    if (fn.toFloat() != -3.6.toFloat()) {
-        return "fail17"
-    }
-    if (fn.toByte() != (-3).toByte()) {
-        return "fail18"
-    }
-    if (fn.toInt() != -3) {
-        return "fail19"
-    }
-    if (fn.toShort() != (-3).toShort()) {
-        return "fail20"
-    }
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/hashCode.kt b/js/js.translator/testData/wasmBox/number/hashCode.kt
deleted file mode 100644
index dc1024ff7d6..00000000000
--- a/js/js.translator/testData/wasmBox/number/hashCode.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-// TARGET_BACKEND: WASM
-// EXPECTED_REACHABLE_NODES: 1280
-
-// NOTE: Hash codes are the same as in Native and JVM
-
-fun box(): String {
-    var value = (3).hashCode()
-    if (value != 3) return "fail1"
-
-    value = (3.14).hashCode()
-    if (value != 300063655) return "fail2"
-
-    value = (3.14159).hashCode()
-    if (value != -1340954729) return "fail3"
-
-    value = (1e80).hashCode()
-    if (value != 24774576) return "fail4"
-
-    value = (1e81).hashCode()
-    if (value != -1007271154) return "fail5"
-
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/number/hexadecimalConstant.kt b/js/js.translator/testData/wasmBox/number/hexadecimalConstant.kt
deleted file mode 100644
index ab5058adc4c..00000000000
--- a/js/js.translator/testData/wasmBox/number/hexadecimalConstant.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1219
-package foo
-
-fun box(): String {
-    val i = 0x80000000 + 0x8000000
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/number/incDecOptimization.kt b/js/js.translator/testData/wasmBox/number/incDecOptimization.kt
deleted file mode 100644
index 408fba61b4d..00000000000
--- a/js/js.translator/testData/wasmBox/number/incDecOptimization.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1283
-// CHECK_VARS_COUNT: function=test count=1
-
-// TODO: Support classes
-
-fun test(): String {
-
-    var i = 23
-
-    var x = ++i
-    if (x != 24) return "fail1:"
-
-    i++
-    if (i != 25) return "fail2:"
-
-    // a.i++, used as expression, requires temporary variable
-
-    return "OK"
-}
-
-fun box(): String = test()
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/intConversions.kt b/js/js.translator/testData/wasmBox/number/intConversions.kt
deleted file mode 100644
index 462d400a40b..00000000000
--- a/js/js.translator/testData/wasmBox/number/intConversions.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1282
-package foo
-
-fun box(): String {
-    val c: Int = 3
-    if (c.toDouble() != 3.0) {
-        return "fail1"
-    }
-    if (c.toFloat() != 3.toFloat()) {
-        return "fail2"
-    }
-    if (c.toByte() != 3.toByte()) {
-        return "fail3"
-    }
-    if (c.toInt() != 3) {
-        return "fail4"
-    }
-    if (c.toShort() != 3.toShort()) {
-        return "fail5"
-    }
-    val c2: Int = -5
-    if (c2.toShort() != (-5).toShort()) {
-        return "fail6"
-    }
-    if (c2.toFloat() != -5.toFloat()) {
-        return "fail7"
-    }
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/intDivFloat.kt b/js/js.translator/testData/wasmBox/number/intDivFloat.kt
deleted file mode 100644
index 43ed02dc6a6..00000000000
--- a/js/js.translator/testData/wasmBox/number/intDivFloat.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1284
-// http://youtrack.jetbrains.com/issue/KT-5345
-// KT-5345 (Javascript) Type mismatch on Int / Float division
-// If any of Number operands is floating-point, the result should be float too.
-
-package foo
-
-fun box(): String {
-    assertEquals(0.5f, 1 / 2.0f, "Int / Float")
-
-    assertEquals(0.5, 1 / 2.0, "Int / Double")
-
-    assertEquals(0.5f, 1.toShort() / 2.0f, "Short / Float")
-    assertEquals(0.5, 1.toShort() / 2.0, "Short / Double")
-
-    assertEquals(0.5f, 1.toByte() / 2.0f, "Byte / Float")
-    assertEquals(0.5, 1.toByte() / 2.0, "Byte / Double")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/intIncDecOverflow.kt b/js/js.translator/testData/wasmBox/number/intIncDecOverflow.kt
deleted file mode 100644
index 2d5d9c45cf8..00000000000
--- a/js/js.translator/testData/wasmBox/number/intIncDecOverflow.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1282
-package foo
-
-
-fun box(): String {
-    var b: Byte = 0x7F
-    b++
-    if (b.toInt() != -0x80) return "fail1a"
-    b--
-    if (b.toInt() != 0x7F) return "fail1b"
-
-    var s: Short = 0x7FFF
-    s++
-    if (s.toInt() != -0x8000) return "fail2a"
-    s--
-    if (s.toInt() != 0x7FFF) return "fail2b"
-
-    var i: Int = 0x7FFFFFFF
-    i++
-    if (i != -0x80000000) return "fail3a"
-    i--
-    if (i != 0x7FFFFFFF) return "fail3b"
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/intOverflow.kt b/js/js.translator/testData/wasmBox/number/intOverflow.kt
deleted file mode 100644
index b2a46b414ae..00000000000
--- a/js/js.translator/testData/wasmBox/number/intOverflow.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1284
-package foo
-
-fun bigValue() = 0x7FFFFFFC
-
-fun mediumValue() = 0x12345
-
-fun four() = 4
-
-fun box(): String {
-    var v = bigValue() + 1
-    if (v != 0x7FFFFFFD) return "fail1"
-
-    v = bigValue() + 8
-    if (v != -0x7FFFFFFC) return "fail2"
-
-    v = bigValue() + four() + 4
-    if (v != -0x7FFFFFFC) return "fail3"
-
-    v = (bigValue() + four() - 4) shr 1
-    if (v != 0x3FFFFFFE) return "fail3"
-
-    v = mediumValue() * 0x23456
-    if (v != -2112496338) return "fail5"
-
-    v = bigValue() * bigValue()
-    if (v != 16) return "fail6"
-
-    v = -minInt()
-    if (v != -2147483648) return "fail7"
-
-    return "OK"
-}
-
-fun minInt() = -2147483648
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/kt2342.kt b/js/js.translator/testData/wasmBox/number/kt2342.kt
deleted file mode 100644
index a2d28963be9..00000000000
--- a/js/js.translator/testData/wasmBox/number/kt2342.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1281
-package foo
-
-fun test(a: Int, b: Int, expected: Int): Int {
-    val result = a / b
-    if (expected == result) return 100
-    return 25
-}
-
-fun box(): String {
-    var r = test(10, 3, 3)
-    if (r != 100) return "Fail1"
-
-    r = test(49, 6, 8)
-    if (r != 100) return "Fail 2"
-
-    if (2133 / 3 / 7 / (91 / 5) != 5) return "2133 / 3 / 7 / (91 / 5) != 5"
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/longBinaryOperations.kt b/js/js.translator/testData/wasmBox/number/longBinaryOperations.kt
deleted file mode 100644
index f29865078f7..00000000000
--- a/js/js.translator/testData/wasmBox/number/longBinaryOperations.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1230
-package foo
-
-fun fact(n: Int): Long = if (n == 1) 1L else n * fact(n - 1)
-
-// TODO: Support loops
-//fun fib(n: Int): Long {
-//    var a = 0L
-//    var b = 1L
-//    for (i in 2..n) {
-//        var tmp = a
-//        a = b
-//        b = b + tmp
-//    }
-//    return b
-//}
-
-fun box(): String {
-
-    assertEquals(30.0, 10L + 20.0)
-    assertEquals(30.0f, 10L + 20.0f)
-    assertEquals(30L, 10L + 20L)
-    assertEquals(30L, 10L + 20)
-    assertEquals(30L, 10L + 20.toShort())
-    assertEquals(30L, 10L + 20.toByte())
-
-    assertEquals(30.0, 20.0 + 10L)
-    assertEquals(30.0f, 20.0f + 10L)
-    assertEquals(20L, 10 + 10L)
-    assertEquals(20L, 10.toShort() + 10L)
-    assertEquals(20L, 10.toByte() + 10L)
-
-    assertEquals(20L, 30 - 10L)
-
-    assertEquals(100L, 10 * 10L)
-    assertEquals(100.0, 10.0 * 10L)
-
-    assertEquals(100L, 10L * 10)
-    assertEquals(100.0, 10L * 10.0)
-
-    assertEquals(100L, 1000L / 10)
-    assertEquals(100L, 1000 / 10L)
-
-    assertEquals(100.0, 1000L / 10.0)
-    assertEquals(100.0, 1000.0 / 10L)
-
-    assertEquals(2L, 100L % 7)
-    assertEquals(2L, 100 % 7L)
-
-    assertEquals(2432902008176640000L, fact(20))
-
-// TODO: Support loops
-//    assertEquals(12586269025L, fib(50))
-//    assertEquals(7540113804746346429L, fib(92))
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/longBitOperations.kt b/js/js.translator/testData/wasmBox/number/longBitOperations.kt
deleted file mode 100644
index b32b77bbea5..00000000000
--- a/js/js.translator/testData/wasmBox/number/longBitOperations.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1228
-package foo
-
-fun box(): String {
-
-    assertEquals(65536L, 1L shl 16)
-    assertEquals(1L, 65536L shr 16)
-
-    assertEquals(-1L, -1L shr 48)
-    assertEquals(65535L, -1L ushr 48)
-
-    assertEquals(-1L, 0L.inv())
-
-    assertEquals(0b1000L, 0b1100L and 0b1010L)
-    assertEquals(0b1110L, 0b1100L or 0b1010L)
-    assertEquals(0b0110L, 0b1100L xor 0b1010L)
-
-    assertEquals(0xab88ac0021L, 0xabcdef0123L and 0xefaabcdef1L)
-    assertEquals(0xefefffdff3L, 0xabcdef0123L or 0xefaabcdef1L)
-    assertEquals(0x446753dfd2L, 0xabcdef0123L xor 0xefaabcdef1L)
-    assertEquals(-737894400292, 0xabcdef0123L.inv())
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/longCompareToIntrinsic.kt b/js/js.translator/testData/wasmBox/number/longCompareToIntrinsic.kt
deleted file mode 100644
index 3e228384021..00000000000
--- a/js/js.translator/testData/wasmBox/number/longCompareToIntrinsic.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1226
-package foo
-
-fun box(): String {
-
-    assertEquals(true, 10.0 < 20L, "Double.compareTo(Long)")
-    assertEquals(true, 10.0 < 7540113804746346429L, "Double.compareTo(Long)")
-
-    assertEquals(true, 10.0f < 20L, "Float.compareTo(Long)")
-    assertEquals(true, 10.0f < 7540113804746346429L, "Float.compareTo(Long)")
-
-    assertEquals(true, 10L < 20L, "Long.compareTo(Long)")
-    assertEquals(true, 10 < 20L, "Int.compareTo(Long)")
-    assertEquals(true, 10 < 7540113804746346429L, "Int.compareTo(Long)")
-
-    assertEquals(true, 10.toShort() < 20L, "Short.compareTo(Long)")
-    assertEquals(true, 10.toShort() < 7540113804746346429L, "Short.compareTo(Long)")
-    assertEquals(true, 10.toByte() < 20L, "Byte.compareTo(Long)")
-    assertEquals(true, 10.toByte() < 7540113804746346429L, "Byte.compareTo(Long)")
-
-    assertEquals(true, 10L < 20.0, "Long.compareTo(Double)")
-    assertEquals(false, 7540113804746346429L < 20.0, "Long.compareTo(Double)")
-
-    assertEquals(true, 10L < 20.0f, "Long.compareTo(Float)")
-    assertEquals(true, 7540113804746346429L > 20.0f, "Long.compareTo(Float)")
-    assertEquals(false, 7540113804746346429L < 20.0f, "Long.compareTo(Float)")
-
-    assertEquals(true, 10L < 20, "Long.compareTo(Int)")
-    assertEquals(true, 7540113804746346429L > 20, "Long.compareTo(Int)")
-    assertEquals(false, 7540113804746346429L < 20, "Long.compareTo(Int)")
-
-    assertEquals(true, 10L < 20.toShort(), "Long.compareTo(Short)")
-    assertEquals(true, 7540113804746346429L > 20.toShort(), "Long.compareTo(Short)")
-    assertEquals(false, 7540113804746346429L < 20.toShort(), "Long.compareTo(Short)")
-
-    assertEquals(true, 10L < 20.toByte(), "Long.compareTo(Byte)")
-    assertEquals(true, 7540113804746346429L > 20.toByte(), "Long.compareTo(Byte)")
-    assertEquals(false, 7540113804746346429L < 20.toByte(), "Long.compareTo(Byte)")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/longEqualsIntrinsic.kt b/js/js.translator/testData/wasmBox/number/longEqualsIntrinsic.kt
deleted file mode 100644
index 7f826aa2688..00000000000
--- a/js/js.translator/testData/wasmBox/number/longEqualsIntrinsic.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1284
-package foo
-
-// WASM: TODO: Nullable types, Number, Any
-
-fun box(): String {
-    assertEquals(true, 10L == 10L, "Long == Long")
-    assertEquals(true, 10L != 11L, "Long != Long")
-
-//    val x1: Long? = 10L
-//    val x2: Long? = 10L
-//    assertEquals(false, x1 == null, "Long? == null")
-//    assertEquals(false, null == x1, "null == Long?")
-//    assertEquals(true, x1 == 10L, "Long? == Long")
-//    assertEquals(true, 10L == x1, "Long == Long?")
-//    assertEquals(true, x1 == x2, "Long? == Long?")
-
-//    val x3: Long? = null
-//    val x4: Long? = null
-//    assertEquals(true, x3 == null, "Long?(null) == null")
-//    assertEquals(true, null == x3, "null == Long?(null)")
-//    assertEquals(false, x3 == 10L, "Long?(null) == Long")
-//    assertEquals(false, 10L == x3, "Long == Long?(null)")
-//    assertEquals(false, x3 == x1, "Long?(null) == Long?")
-//    assertEquals(true, x3 == x4, "Long?(null) == Long?(null)")
-
-//    val number1: Number = 10L
-//    val number2: Number = 10L
-//    assertEquals(true, number1 == number2, "Number == Number")
-//    assertEquals(true, number1 == 10L, "Number == Long")
-//    assertEquals(true, number1 != 11L, "Number != Long")
-//    assertEquals(true, 10L == number1, "Long == Number")
-//    assertEquals(true, 11L != number1, "Long != Number")
-//
-//    val y1: Any = 10L
-//    var y2: Any = 10
-//    var y3: Any? = null
-//    assertEquals(true, y1 == 10L, "Any == Long")
-//    assertEquals(true, 10L == y1, "Long == Any 1")
-//    assertEquals(false, 10L == y2, "Long == Any 2")
-//    assertEquals(false, 10L == y3, "Long == Any?(null)")
-//    assertEquals(true, x3 == y3, "Long?(null) == Any?(null)")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/longHashCode.kt b/js/js.translator/testData/wasmBox/number/longHashCode.kt
deleted file mode 100644
index 149fa885d70..00000000000
--- a/js/js.translator/testData/wasmBox/number/longHashCode.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1284
-package foo
-
-fun box(): String {
-    var l1: Long = 0x12344478935690
-    var l2: Long = 0x12344478935698
-    var diff: Long = l2 - l1
-    l1 += (diff / 2)
-    l2 -= (diff / 2)
-
-    assertEquals(l1, l2, "When L1 == L2")
-    assertEquals(l1.hashCode(), l2.hashCode(), "L1.hashCode() == L2.hashCode()")
-
-//    var l3: Any = l2
-//    assertEquals(l1.hashCode(), l3.hashCode(), "Any(Long).hashCode()")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/longUnaryOperations.kt b/js/js.translator/testData/wasmBox/number/longUnaryOperations.kt
deleted file mode 100644
index daaa14cbec0..00000000000
--- a/js/js.translator/testData/wasmBox/number/longUnaryOperations.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1225
-package foo
-
-fun box(): String {
-
-    var x: Long = 2L
-    x++
-    assertEquals(3L, x)
-    ++x
-    assertEquals(4L, x)
-
-    var y = x++
-    assertEquals(4L, y)
-    assertEquals(5L, x)
-
-    y = ++x
-    assertEquals(6L, y)
-    assertEquals(6L, x)
-
-    x--
-    assertEquals(5L, x)
-    --x
-    assertEquals(4L, x)
-
-    y = +x
-    assertEquals(4L, y)
-
-    y = -x
-    assertEquals(-4L, y)
-
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/number/mixedTypesOverflow.kt b/js/js.translator/testData/wasmBox/number/mixedTypesOverflow.kt
deleted file mode 100644
index 157ca0c5896..00000000000
--- a/js/js.translator/testData/wasmBox/number/mixedTypesOverflow.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1284
-// IGNORE_BACKEND: JS
-package foo
-
-// TODO(WASM) Companions are not supported yet
-
-fun box(): String {
-    val byteOne = 1.toByte()
-    val shortOne = 1.toShort()
-    var v: Int
-
-    v = maxInt() + byteOne
-    if (v != minInt()) return "fail1"
-
-    v = minInt() - byteOne
-    if (v != maxInt()) return "fail2"
-
-    v = maxInt() + shortOne
-    if (v != minInt()) return "fail3"
-
-    v = minInt() - shortOne
-    if (v != maxInt()) return "fail4"
-
-    v = maxInt() * 127 // Byte.MAX_VALUE
-    if (v != 2147483521) return "fail5"
-
-    v = maxInt() * 32767 // Short.MAX_VALUE
-    if (v != 2147450881) return "fail6"
-
-    return "OK"
-}
-
-fun minInt() = -2147483648 // Int.MIN_VALUE
-fun maxInt() = 2147483647 // Int.MAX_VALUE
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/numberCompareTo.kt b/js/js.translator/testData/wasmBox/number/numberCompareTo.kt
deleted file mode 100644
index 6dbf88e40ee..00000000000
--- a/js/js.translator/testData/wasmBox/number/numberCompareTo.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1289
-package foo
-
-// TODO: Wasm global initialization is not supported
-//var global: String = ""
-//
-//fun id(s: String, value: Int): Int {
-//    global += s
-//    return value
-//}
-
-fun box(): String {
-
-    assertEquals(-1, 1.compareTo(2))
-    // assertEquals(-1, (1 as Comparable<Int>).compareTo(2))
-
-    assertEquals(-1, 1.compareTo(2L))
-    assertEquals(-1, 1.compareTo(2L))
-    assertEquals(-1, 1.compareTo(7540113804746346429L))
-    assertEquals(-1, 1.compareTo(2.toShort()))
-    assertEquals(-1, 1.compareTo(2.toByte()))
-    assertEquals(-1, 1.compareTo(2.0))
-    assertEquals(-1, 1.compareTo(2.0f))
-
-    assertEquals(1, 10.compareTo(2L))
-    assertEquals(1, 10.compareTo(2))
-    assertEquals(1, 10.compareTo(2.toShort()))
-    assertEquals(1, 10.compareTo(2.toByte()))
-    assertEquals(1, 10.compareTo(2.0))
-    assertEquals(1, 10.compareTo(2.0f))
-
-    assertEquals(0, 2.compareTo(2L))
-    assertEquals(0, 2.compareTo(2))
-    assertEquals(0, 2.compareTo(2.toShort()))
-    assertEquals(0, 2.compareTo(2.toByte()))
-    assertEquals(0, 2.compareTo(2.0))
-    assertEquals(0, 2.compareTo(2.0f))
-
-    assertEquals(-1, 1.toShort().compareTo(2L))
-    assertEquals(-1, 1.toShort().compareTo(7540113804746346429L))
-    assertEquals(-1, 1.toShort().compareTo(2))
-    assertEquals(-1, 1.toShort().compareTo(2.toShort()))
-    // assertEquals(-1, (1.toShort() as Comparable<Short>).compareTo(2.toShort()))
-    assertEquals(-1, 1.toShort().compareTo(2.toByte()))
-    assertEquals(-1, 1.toShort().compareTo(2.0))
-    assertEquals(-1, 1.toShort().compareTo(2.0f))
-
-    assertEquals(1, 10.toByte().compareTo(2L))
-    assertEquals(-1, 10.toByte().compareTo(7540113804746346429L))
-    assertEquals(1, 10.toByte().compareTo(2))
-    assertEquals(1, 10.toByte().compareTo(2.toShort()))
-    assertEquals(1, 10.toByte().compareTo(2.toByte()))
-    // assertEquals(1, (10.toByte() as Comparable<Byte>).compareTo(2.toByte()))
-    assertEquals(1, 10.toByte().compareTo(2.0))
-    assertEquals(1, 10.toByte().compareTo(2.0f))
-
-    assertEquals(0, 2.0.compareTo(2L))
-    assertEquals(-1, 2.0.compareTo(7540113804746346429L))
-    assertEquals(0, 2.0.compareTo(2))
-    assertEquals(0, 2.0.compareTo(2.toShort()))
-    assertEquals(0, 2.0.compareTo(2.toByte()))
-    assertEquals(0, 2.0.compareTo(2.0))
-    // assertEquals(0, (2.0 as Comparable<Double>).compareTo(2.0))
-    assertEquals(0, 2.0.compareTo(2.0f))
-
-    assertEquals(1, 3.0f.compareTo(2L))
-    assertEquals(-1, 3.0f.compareTo(7540113804746346429L))
-    assertEquals(1, 3.0f.compareTo(2))
-    assertEquals(1, 3.0f.compareTo(2.toShort()))
-    assertEquals(1, 3.0f.compareTo(2.toByte()))
-    assertEquals(1, 3.0f.compareTo(2.0))
-    assertEquals(1, 3.0f.compareTo(2.0f))
-    // assertEquals(1, (3.0f as Comparable<Float>).compareTo(2.0f))
-
-    assertEquals(1, 10L.compareTo(2L))
-    assertEquals(-1, 10L.compareTo(7540113804746346429L))
-    // assertEquals(1, (10L as Comparable<Long>).compareTo(2L))
-    assertEquals(1, 10L.compareTo(2))
-    assertEquals(1, 10L.compareTo(2.toShort()))
-    assertEquals(1, 10L.compareTo(2.toByte()))
-    assertEquals(1, 10L.compareTo(2.0))
-    assertEquals(1, 10L.compareTo(2.0f))
-
-    assertEquals(0, 'A'.compareTo('A'))
-
-    assertEquals(-1, 1L.compareTo(2L))
-    assertEquals(-1, 1L.compareTo(2))
-    assertEquals(-1, 1L.compareTo(2.toShort()))
-    assertEquals(-1, 1L.compareTo(2.toByte()))
-    assertEquals(-1, 1L.compareTo(2.0))
-    assertEquals(-1, 1L.compareTo(2.0f))
-
-    assertEquals(0, 7540113804746346429L.compareTo(7540113804746346429L))
-    assertEquals(1, 7540113804746346429L.compareTo(2L))
-    assertEquals(0, 2L.compareTo(2L))
-    assertEquals(0, 2L.compareTo(2))
-    assertEquals(0, 2L.compareTo(2.toShort()))
-    assertEquals(0, 2L.compareTo(2.toByte()))
-    assertEquals(0, 2L.compareTo(2.0))
-    assertEquals(0, 2L.compareTo(2.0f))
-
-    assertEquals(1, 10L.compareTo(2L))
-    assertEquals(1, 10L.compareTo(2))
-    assertEquals(1, 10L.compareTo(2.toShort()))
-    assertEquals(1, 10L.compareTo(2.toByte()))
-    assertEquals(1, 10L.compareTo(2.0))
-    assertEquals(1, 10L.compareTo(2.0f))
-
-    assertEquals(-1, 1L.compareTo(2L))
-    assertEquals(-1, 1L.compareTo(2))
-    assertEquals(-1, 1L.compareTo(2.toShort()))
-    assertEquals(-1, 1L.compareTo(2.toByte()))
-    assertEquals(-1, 1L.compareTo(2.0))
-    assertEquals(-1, 1L.compareTo(2.0f))
-
-    assertEquals(0, 2L.compareTo(2L))
-    assertEquals(0, 2L.compareTo(2))
-    assertEquals(0, 2L.compareTo(2.toShort()))
-    assertEquals(0, 2L.compareTo(2.toByte()))
-    assertEquals(0, 2L.compareTo(2.0))
-    assertEquals(0, 2L.compareTo(2.0f))
-
-//    assertEquals(1, id("A", 10).compareTo(id("B", 5)))
-//    assertEquals("AB", global)
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/numberConversions.kt b/js/js.translator/testData/wasmBox/number/numberConversions.kt
deleted file mode 100644
index 1e893912cc4..00000000000
--- a/js/js.translator/testData/wasmBox/number/numberConversions.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1289
-package foo
-
-fun testIntegerConversions(c: Byte): Boolean {
-    if (c.toDouble() != 3.0) {
-        return false
-    }
-    if (c.toFloat() != 3.toFloat()) {
-        return false
-    }
-    if (c.toByte() != 3.toByte()) {
-        return false
-    }
-    if (c.toInt() != 3) {
-        return false
-    }
-    if (c.toShort() != 3.toShort()) {
-        return false
-    }
-    return true
-}
-
-fun testIntegerConversions(c: Short): Boolean {
-    if (c.toDouble() != 3.0) {
-        return false
-    }
-    if (c.toFloat() != 3.toFloat()) {
-        return false
-    }
-    if (c.toByte() != 3.toByte()) {
-        return false
-    }
-    if (c.toInt() != 3) {
-        return false
-    }
-    if (c.toShort() != 3.toShort()) {
-        return false
-    }
-    return true
-}
-
-fun testIntegerConversions(c: Int): Boolean {
-    if (c.toDouble() != 3.0) {
-        return false
-    }
-    if (c.toFloat() != 3.toFloat()) {
-        return false
-    }
-    if (c.toByte() != 3.toByte()) {
-        return false
-    }
-    if (c.toInt() != 3) {
-        return false
-    }
-    if (c.toShort() != 3.toShort()) {
-        return false
-    }
-    return true
-}
-
-
-fun testFloatingPointConversions(c: Float): Boolean {
-// This is FALSE on JVM
-//    if (c.toDouble() != 3.6) {
-//        return false
-//    }
-    if (c.toFloat() != 3.6.toFloat()) {
-        return false
-    }
-    return true
-}
-
-fun testFloatingPointConversions(c: Double): Boolean {
-    if (c.toDouble() != 3.6) {
-        return false
-    }
-    if (c.toFloat() != 3.6.toFloat()) {
-        return false
-    }
-    return true
-}
-
-
-fun box(): String {
-    if (!testIntegerConversions(3)) return "fail: testIntegerConversions1"
-    if (!testFloatingPointConversions(3.6)) return "fail: testFloatingPointConversions1"
-    if (!testFloatingPointConversions(3.6.toFloat())) return "fail: testFloaintPointConversions2"
-    if (!testIntegerConversions(3.toByte())) return "fail: testIntegerConversions2"
-    if (!testIntegerConversions(3.toShort())) return "fail: testIntegerConversions3"
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/number/numberEquals.kt b/js/js.translator/testData/wasmBox/number/numberEquals.kt
deleted file mode 100644
index 704a14034e3..00000000000
--- a/js/js.translator/testData/wasmBox/number/numberEquals.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-// !LANGUAGE: +ProperIeee754Comparisons
-package foo
-
-
-//fun testNullable(): String {
-//    val undefined: Double? = js("undefined")
-//    val doubleNull: Double? = null
-//
-//    val plusZero: Double? = +0.0
-//    val minusZero: Double? = -0.0
-//
-//    if ((+0.0).equals(minusZero)) return "Total order fail"
-//    if (plusZero != minusZero) return "IEEE 754 equals fail"
-//
-//    if (plusZero == doubleNull) return "+0.0 != null fail"
-//    if (plusZero == undefined) return "+0.0 != undefined fail"
-//
-//    if (undefined != doubleNull) return "undefined == null fail"
-//    if (undefined != undefined) return "undefined = undefined fail"
-//    if (doubleNull != doubleNull) return "doubleNull = doubleNull fail"
-//
-//    // Double == Float
-//    val plusZeroAny: Any? = +0.0
-//    val minusZeroAny: Any? = -0.0f
-//
-//    if (plusZeroAny is Double && minusZeroAny is Float) {
-//        if  (plusZeroAny != minusZeroAny) return "IEEE 754 quals fail 2"
-//    }
-//
-//    return "OK"
-//}
-
-fun box(): String {
-    val plusZero: Double = +0.0
-    val minusZero: Double = -0.0
-
-    if (plusZero.equals(minusZero)) return "Total order fail"
-    if (plusZero != minusZero) return "IEEE 754 equals fail"
-
-    val plusZeroFloat: Float = +0.0f
-    val minusZeroFloat: Float = -0.0f
-
-    if (plusZeroFloat.equals(minusZeroFloat)) return "Total order fail 2"
-    if (plusZeroFloat != minusZeroFloat) return "IEEE 754 equals fail 2"
-
-//    if ((plusZero as Any) == (minusZero as Any)) return "Total order fail 4"
-//    if ((plusZeroFloat as Any) == (minusZeroFloat as Any)) return "Total order fail 5"
-//    if (plusZero == (minusZero as Any)) return "Total order fail 6"
-
-//    val nullableRes = testNullable()
-//    if (nullableRes != "OK")
-//        return "Nullable" + nullableRes
-
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/number/numberIncDec.kt b/js/js.translator/testData/wasmBox/number/numberIncDec.kt
deleted file mode 100644
index e0e7043bafc..00000000000
--- a/js/js.translator/testData/wasmBox/number/numberIncDec.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// EXPECTED_REACHABLE_NODES: 1282
-package foo
-
-fun box(): String {
-
-    assertEquals(100.inc(), 101)
-    assertEquals(100.dec(), 99)
-
-    var x = 100
-    assertEquals(x.inc(), 101)
-    assertEquals(x, 100)
-
-    assertEquals(x.dec(), 99)
-    assertEquals(x, 100)
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization/explicitEqualsOnDouble.kt b/js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization/explicitEqualsOnDouble.kt
deleted file mode 100644
index 8bd7cf0a228..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/boxingOptimization/explicitEqualsOnDouble.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-fun equals1(a: Double, b: Double) = a.equals(b)
-
-fun box(): String {
-    if ((-0.0).equals(0.0)) return "fail 0"
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/classes/kt2482.kt b/js/js.translator/testData/wasmBox/passedCommonTests/classes/kt2482.kt
deleted file mode 100644
index 6a614198741..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/classes/kt2482.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-public fun box() : String {
-    if ( 0 == 0 ) { // Does not crash if either this...
-        if ( 0 == 0 ) { // ...or this is changed to if ( true )
-            // Does not crash if the following is uncommented.
-            //println("foo")
-        }
-    }
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/constants/float.kt b/js/js.translator/testData/wasmBox/passedCommonTests/constants/float.kt
deleted file mode 100644
index 5c60d382df1..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/constants/float.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-fun box(): String {
-    if (1F != 1.toFloat()) return "fail 1"
-    if (1.0F != 1.0.toFloat()) return "fail 2"
-    if (1e1F != 1e1.toFloat()) return "fail 3"
-    if (1.0e1F != 1.0e1.toFloat()) return "fail 4"
-    if (1e-1F != 1e-1.toFloat()) return "fail 5"
-    if (1.0e-1F != 1.0e-1.toFloat()) return "fail 6"
-
-    if (1f != 1.toFloat()) return "fail 7"
-    if (1.0f != 1.0.toFloat()) return "fail 8"
-    if (1e1f != 1e1.toFloat()) return "fail 9"
-    if (1.0e1f != 1.0e1.toFloat()) return "fail 10"
-    if (1e-1f != 1e-1.toFloat()) return "fail 11"
-    if (1.0e-1f != 1.0e-1.toFloat()) return "fail 12"
-
-    return "OK"
-}
-
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/constants/long.kt b/js/js.translator/testData/wasmBox/passedCommonTests/constants/long.kt
deleted file mode 100644
index 7fa2eaf4f50..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/constants/long.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-fun box(): String {
-    if (1L != 1.toLong()) return "fail 1"
-    if (0x1L != 0x1.toLong()) return "fail 2"
-    if (0X1L != 0X1.toLong()) return "fail 3"
-    if (0b1L != 0b1.toLong()) return "fail 4"
-    if (0B1L != 0B1.toLong()) return "fail 5"
-
-    return "OK"
-}
-
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst1.kt b/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst1.kt
deleted file mode 100644
index dc74e46b215..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst1.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-fun foo(b: Boolean): String {
-    return if (b) {
-        "OK"
-    } else if (false) {
-        "fail: reached unreachable code at line 5"
-    } else if (true) {
-        "fail: reached unexpected code at line 7"
-    } else if (true) {
-        "fail: reached unreachable code at line 9"
-    } else if (b) {
-        "fail: reached unreachable code at line 11"
-    } else {
-        "fail: reached unreachable code at line 13"
-    }
-}
-
-fun box(): String {
-    return foo(true)
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst2.kt b/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst2.kt
deleted file mode 100644
index bdf1dbc57d2..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/ifConst2.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-fun foo(b: Boolean): String {
-    return if (b) {
-        "fail: reached unexpected code at line 3"
-    } else if (false) {
-        "fail: reached unreachable code at line 5"
-    } else if (true) {
-        "OK"
-    } else if (true) {
-        "fail: reached unreachable code at line 9"
-    } else if (b) {
-        "fail: reached unreachable code at line 11"
-    } else {
-        "fail: reached unreachable code at line 13"
-    }
-}
-
-fun box(): String {
-    return foo(false)
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/kt1899.kt b/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/kt1899.kt
deleted file mode 100644
index 92a38e1bd89..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/controlStructures/kt1899.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun box(): String {
-  if (1 != 0) {
-  }
-  return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties/topLevel.kt b/js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties/topLevel.kt
deleted file mode 100644
index df0abcea24e..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/extensionProperties/topLevel.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-val Int.foo: String
-        get() = "OK"
-
-fun box(): String {
-    return 1.foo
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/functions/kt2280.kt b/js/js.translator/testData/wasmBox/passedCommonTests/functions/kt2280.kt
deleted file mode 100644
index 79debb72bdf..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/functions/kt2280.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-fun box(): String {
-    fun rmrf(i: Int) {
-        if (i > 0) rmrf(i - 1)
-    }
-    rmrf(5)
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/ieee754/lessDouble_properIeeeAndNewInference.kt b/js/js.translator/testData/wasmBox/passedCommonTests/ieee754/lessDouble_properIeeeAndNewInference.kt
deleted file mode 100644
index d5f0f13e4ba..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/ieee754/lessDouble_properIeeeAndNewInference.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !LANGUAGE: +ProperIeee754Comparisons +NewInference
-
-fun box(): String {
-    if (-0.0 < 0.0) return "Fail 1"
-    if (-0.0 < 0) return "Fail 2"
-
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion1.kt b/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion1.kt
deleted file mode 100644
index 486df9872db..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion1.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-fun foo(x: String): String {
-    fun bar(y: String) = x + y
-    return bar("K")
-}
-
-fun box() = foo("O")
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion3.kt b/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion3.kt
deleted file mode 100644
index 7f0e7d4647b..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion3.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-fun foo(x: String): String {
-    fun bar(y: String): String {
-        fun qux(z: String): String =
-                x + y + z
-        return qux("")
-    }
-    return bar("K")
-}
-
-fun box(): String =
-        foo("O")
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion4.kt b/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion4.kt
deleted file mode 100644
index aa59458d534..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/ir/closureConversion/closureConversion4.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-fun String.foo(): String {
-    fun bar(y: String) = this + y
-    return bar("K")
-}
-
-fun box() = "O".foo()
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/labels/propertyAccessor.kt b/js/js.translator/testData/wasmBox/passedCommonTests/labels/propertyAccessor.kt
deleted file mode 100644
index b9973e82ddc..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/labels/propertyAccessor.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-val Int.getter: Int
-    get() {
-        return this@getter
-    }
-
-fun box(): String {
-    val i = 1
-    if (i.getter != 1) return "getter failed"
-
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations/negateConstantCompare.kt b/js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations/negateConstantCompare.kt
deleted file mode 100644
index f68757d7588..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/lazyCodegen/optimizations/negateConstantCompare.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-fun box(): String {
-    if (!(1 < 2)) {
-        return "fail"
-    }
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/annotatedAssignment.kt b/js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/annotatedAssignment.kt
deleted file mode 100644
index 2a2bc1b115b..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/annotatedAssignment.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-@Target(AnnotationTarget.EXPRESSION)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Annotation
-
-fun box(): String {
-    var v = 0
-    @Annotation v += 1 + 2
-    if (v != 3) return "fail1"
-
-    @Annotation v = 4
-    if (v != 4) return "fail2"
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/infixFunctionOverBuiltinMember.kt b/js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/infixFunctionOverBuiltinMember.kt
deleted file mode 100644
index d4ec1d41d6a..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/operatorConventions/infixFunctionOverBuiltinMember.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-infix fun Int.rem(other: Int) = 10
-infix operator fun Int.minus(other: Int): Int = 20
-
-fun box(): String {
-    val a = 5 rem 2
-    if (a != 10) return "fail 1"
-
-    val b = 5 minus 3
-    if (b != 20) return "fail 2"
-
-    val a1 = 5.rem(2)
-    if (a1 != 1) return "fail 3"
-
-    val b2 = 5.minus(3)
-    if (b2 != 2) return "fail 4"
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/ea35963.kt b/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/ea35963.kt
deleted file mode 100644
index bdd1b87f613..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/ea35963.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// IGNORE_BACKEND: WASM
-
-fun box(): String {
-    if (1 != 0) {
-        1
-    }
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/incrementByteCharShort.kt b/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/incrementByteCharShort.kt
deleted file mode 100644
index 59b3f12b2ef..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/incrementByteCharShort.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-fun byteArg(b: Byte) {}
-fun charArg(c: Char) {}
-fun shortArg(s: Short) {}
-
-fun box(): String {
-    var b = 42.toByte()
-    b++
-    ++b
-    byteArg(b)
-
-    var c = 'x'
-    c++
-    ++c
-    charArg(c)
-
-    var s = 239.toShort()
-    s++
-    ++s
-    shortArg(s)
-
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt1634.kt b/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt1634.kt
deleted file mode 100644
index 8cdc1a36907..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt1634.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun box(): String {
-    !true
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt3078.kt b/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt3078.kt
deleted file mode 100644
index cd834c89b2f..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt3078.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-fun box(): String {
-    if (1 >= 1.9) return "Fail #1"
-    if (1.compareTo(1.1) >= 0) return "Fail #2"
-    if (1.9 <= 1) return "Fail #3"
-    if (1.1.compareTo(1) <= 0) return "Fail #4"
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt6590_identityEquals.kt b/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt6590_identityEquals.kt
deleted file mode 100644
index f21a8f1f6a7..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt6590_identityEquals.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-fun box(): String {
-    val i: Int = 10000
-    if (!(i === i)) return "Fail int ==="
-    if (i !== i) return "Fail int !=="
-
-    val j: Long = 123L
-    if (!(j === j)) return "Fail long ==="
-    if (j !== j) return "Fail long !=="
-
-    val d: Double = 3.14
-    if (!(d === d)) return "Fail double ==="
-    if (d !== d) return "Fail double !=="
-
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt737.kt b/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt737.kt
deleted file mode 100644
index bdf9a4f5af7..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt737.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun box(): String {
-    if (3.compareTo(2) != 1) return "Fail #1"
-    if (5.toByte().compareTo(10.toLong()) >= 0) return "Fail #2"
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt828.kt b/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt828.kt
deleted file mode 100644
index 06e63bec23c..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt828.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package demo
-
-fun box() : String {
-    var res : Boolean = true
-    res = (res and false)
-    res = (res or false)
-    res = (res xor false)
-    res = (true and false)
-    res = (true or false)
-    res = (true xor false)
-    res = (!true)
-    res = (true && false)
-    res = (true || false)
-    return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt877.kt b/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt877.kt
deleted file mode 100644
index 094c5f88fae..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/primitiveTypes/kt877.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-fun box() : String {
-  var a : Int = -1
-  if((+a) != -1) return "fail 1"
-  a = 1
-  if((+a) != 1) return "fail 2"
-  if((+-1) != -1) return "fail 3"
-  if((-+a) != -1) return "fail 4"
-  return "OK"
-}
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/publishedApi/topLevel.kt b/js/js.translator/testData/wasmBox/passedCommonTests/publishedApi/topLevel.kt
deleted file mode 100644
index e2a33400e7d..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/publishedApi/topLevel.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// MODULE: lib
-// FILE: lib.kt
-@PublishedApi
-internal fun published() = "OK"
-
-inline fun test() = published()
-
-// MODULE: main(lib)
-// FILE: main.kt
-fun box() = test()
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/unaryOp/intrinsic.kt b/js/js.translator/testData/wasmBox/passedCommonTests/unaryOp/intrinsic.kt
deleted file mode 100644
index 30bd7d9d8f0..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/unaryOp/intrinsic.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-fun box(): String {
-    val a1: Byte = -1
-    val a2: Short = -1
-    val a3: Int = -1
-    val a4: Long = -1
-    val a5: Double = -1.0
-    val a6: Float = -1f
-
-    if (a1 != (-1).toByte()) return "fail 1"
-    if (a2 != (-1).toShort()) return "fail 2"
-    if (a3 != -1) return "fail 3"
-    if (a4 != -1L) return "fail 4"
-    if (a5 != -1.0) return "fail 5"
-    if (a6 != -1f) return "fail 6"
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/passedCommonTests/when/noElseNoMatch.kt b/js/js.translator/testData/wasmBox/passedCommonTests/when/noElseNoMatch.kt
deleted file mode 100644
index 2c4e803b07b..00000000000
--- a/js/js.translator/testData/wasmBox/passedCommonTests/when/noElseNoMatch.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-fun box(): String {
-    val x = 3
-    when (x) {
-        1 -> {}
-        2 -> {}
-    }
-    return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/wasmBox/primitivesOperatos.kt b/js/js.translator/testData/wasmBox/primitivesOperatos.kt
deleted file mode 100644
index b1bfdbda1f6..00000000000
--- a/js/js.translator/testData/wasmBox/primitivesOperatos.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-fun box(): String {
-    return "O" + "K"
-}
\ No newline at end of file
diff --git a/kotlin-native/COCOAPODS.md b/kotlin-native/COCOAPODS.md
index 4b84d581754..3481f465267 100644
--- a/kotlin-native/COCOAPODS.md
+++ b/kotlin-native/COCOAPODS.md
@@ -1,18 +1,16 @@
 # CocoaPods integration
 
-Kotlin/Native provides integration with the [CocoaPods dependency manager](https://cocoapods.org/). You can add
-dependencies on Pod libraries stored in the CocoaPods repository or locally as well as use a multiplatform project with 
+Kotlin/Native provides integration with the [CocoaPods dependency manager](https://cocoapods.org/). 
+You can add dependencies on Pod libraries as well as use a multiplatform project with 
 native targets as a CocoaPods dependency (Kotlin Pod).
 
 You can manage Pod dependencies directly in IntelliJ IDEA and enjoy all the additional features such as code highlighting 
-and completion. You can build the whole Kotlin project with Gradle and not ever have to switch to Xcode.
+and completion. You can build the whole Kotlin project with Gradle and not ever have to switch to Xcode. 
+
 Use Xcode only when you need to write Swift/Objective-C code or run your application on a simulator or device.
- 
-Depending on your project and purposes, you can add dependencies between:
-* [A Kotlin project and a Pod library from the CocoaPods repository](#add-a-dependency-on-a-pod-library-from-the-cocoapods-repository)
-* [A Kotlin project and a Pod library stored locally](#add-a-dependency-on-a-pod-library-stored-locally)
-* [A Kotlin Pod and an Xcode project with one target](#add-a-dependency-between-a-kotlin-pod-and-xcode-project-with-one-target) 
-or [several targets](#add-a-dependency-between-a-kotlin-pod-with-an-xcode-project-with-several-targets)
+To work correctly with Xcode, you should [update your Podfile](#update-podfile-for-xcode). 
+
+Depending on your project and purposes, you can add dependencies between [a Kotlin project and a Pod library](#add-dependencies-on-pod-libraries) as well as [a Kotlin Pod and an Xcode project](#use-a-kotlin-gradle-project-as-a-cocoapods-dependency). 
 
 >You can also add dependencies between a Kotlin Pod and multiple Xcode projects. However, in this case you need to add a 
 >dependency by calling `pod install` manually for each Xcode project. In other cases, it's done automatically.
@@ -82,9 +80,11 @@ or [several targets](#add-a-dependency-between-a-kotlin-pod-with-an-xcode-projec
     ```
     
     </div>
-    
+
 5. Re-import the project.
 
+6. Generate the [Gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html) to avoid compatibility issues during an Xcode build.
+
 When applied, the CocoaPods plugin does the following:
 
 * Adds both `debug` and `release` frameworks as output binaries for all macOS, iOS, tvOS, and watchOS targets.
@@ -96,39 +96,62 @@ the build process of an Xcode project.
 
 ## Add dependencies on Pod libraries
 
-You can add dependencies between a Kotlin project and Pod libraries [stored in the CocoaPods repository](#add-a-dependency-on-a-pod-library-from-the-cocoapods-repository) 
-and [stored locally](#add-a-dependency-on-a-pod-library-stored-locally).
+To add dependencies between a Kotlin project and a Pod library, you should [complete the initial configuration](#install-the-cocoapods-dependency-manager-and-plugin).
+This allows you to add dependencies on the following types of Pod libraries: 
+ * [A Pod library from the CocoaPods repository](#add-a-dependency-on-a-pod-library-from-the-cocoapods-repository) 
+ * [A Pod library stored locally](#add-a-dependency-on-a-pod-library-stored-locally)
+ * [A Pod library from a Git repository](#add-a-dependency-on-a-pod-library-from-the-git-repository)
+ * [A Pod library from an archive](#add-a-dependency-on-a-pod-library-from-an-archive)
+ * [A Pod library from a custom Podspec repository](#add-a-dependency-on-a-pod-library-from-a-custom-podspec-repository)
+ * [A Pod library with custom cinterop options](#add-a-dependency-on-a-pod-library-with-custom-cinterop-options)
+ * [A static Pod library](#add-a-dependency-on-a-static-pod-library)
 
-[Complete the initial configuration](#install-the-cocoapods-dependency-manager-and-plugin), and when you add a new 
-dependency and re-import the project in IntelliJ IDEA; the new dependency will be added automatically. There are no 
-additional steps required.
+A Kotlin project requires the `pod()` function call in `build.gradle.kts` (`build.gradle`) for adding a Pod dependency. Each dependency requires its own separate function call.
+You can specify the parameters for the dependency in the configuration block of the function.
+
+When you add a new dependency and re-import the project in IntelliJ IDEA, the new dependency will be added automatically.
+No additional steps are required.
+
+To use your Kotlin project with Xcode, you should [make changes in your project Podfile](#update-podfile-for-xcode).
 
 ### Add a dependency on a Pod library from the CocoaPods repository
 
-1. Add dependencies on a Pod library that you want to use from the CocoaPods repository with `pod()`  to `build.gradle.kts` 
-(`build.gradle`) of your project.  
-    > You can also add dependencies on subspecs.
-    {:.note}                                                                                                                                                              >
+You can add dependencies on a Pod library from the CocoaPods repository with `pod()` to `build.gradle.kts` 
+(`build.gradle`) of your project:
 
-    <div class="sample" markdown="1" theme="idea" data-highlight-only>
-    
-    ```kotlin
-    kotlin {
-        ios()
-    
-        cocoapods {
-            summary = "CocoaPods test library"
-            homepage = "https://github.com/JetBrains/kotlin"
-            pod("AFNetworking", "~> 4.0.0")
-            
-            pod("SDWebImage/MapKit")
-        }
-    }
-    ```
-    
-    </div>
+1. Specify the name of a Pod library in the `pod()` function. In the configuration block you can specify the version of the library using the `version` parameter. To use the latest version of the library, you can just omit this parameter all-together.
 
-2. Re-import the project.
+   > You can add dependencies on subspecs.
+   {:.note}
+
+2. Specify the minimum deployment target version for the Pod library.
+
+   > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
+   {:.note}
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+   
+   ```kotlin
+   kotlin {
+       ios()
+
+       cocoapods {
+
+           ios.deploymentTarget = "13.5"
+
+           summary = "CocoaPods test library"
+           homepage = "https://github.com/JetBrains/kotlin"
+
+           pod("AFNetworking") {
+                version = "~> 4.0.1"
+           }
+       }
+   }
+   ```
+   
+   </div>
+
+3. Re-import the project.
 
 To use these dependencies from the Kotlin code, import the packages `cocoapods.<library-name>`.
 
@@ -136,7 +159,6 @@ To use these dependencies from the Kotlin code, import the packages `cocoapods.<
 
 ```kotlin
 import cocoapods.AFNetworking.*
-import cocoapods.SDWebImage.*
 ```
 
 </div>
@@ -145,49 +167,455 @@ You can find a sample project [here](https://github.com/Kotlin/kotlin-with-cocoa
 
 ### Add a dependency on a Pod library stored locally
 
-1. Add a dependency on a Pod library stored locally with `pod()` to `build.gradle.kts` (`build.gradle`) of your
- project.  
-As the third parameter, specify the path to `Podspec` of the local Pod using `project.file(..)`.  
-    > You can add local dependencies on subspecs as well.  
-    > The `cocoapods` block can include dependencies to Pods stored locally and Pods from the CocoaPods repository at
-    > the same time.
-    {:.note}
+You can add a dependency on a Pod library stored locally with `pod()` to `build.gradle.kts` (`build.gradle`) of your project:
 
-    <div class="sample" markdown="1" theme="idea" data-highlight-only>
-    
-    ```kotlin
-    kotlin {
-        ios()
-    
-        cocoapods {
-            summary = "CocoaPods test library"
-            homepage = "https://github.com/JetBrains/kotlin"
-            pod("pod_dependency", "1.0", project.file("../pod_dependency/pod_dependency.podspec"))
-            pod("subspec_dependency/Core", "1.0", project.file("../subspec_dependency/subspec_dependency.podspec"))
-            
-            pod("AFNetworking", "~> 4.0.0")
-            pod("SDWebImage/MapKit")
-        }
-    }
-    ```
-    
-    </div>
+1. Specify the name of a Pod library in the `pod()` function. In the configuration block specify the path to the local Pod library: use the `path()` function in the `source` parameter value.
 
-2. Re-import the project.
+   > You can add local dependencies on subspecs as well.
+   > The `cocoapods` block can include dependencies to Pods stored locally and Pods from the CocoaPods repository at
+   > the same time.
+   {:.note}
 
-If you want to use dependencies on local pods from Kotlin code, import the corresponding packages.
+2. Specify the minimum deployment target version for the Pod library.
+
+   > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
+   {:.note}
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+   
+   ```kotlin
+   kotlin {
+       ios()
+
+       cocoapods {
+           summary = "CocoaPods test library"
+           homepage = "https://github.com/JetBrains/kotlin"
+
+           ios.deploymentTarget = "13.5"
+
+           pod("pod_dependency") {
+               version = "1.0"
+               source = path(project.file("../pod_dependency/pod_dependency.podspec"))
+           }
+           pod("subspec_dependency/Core") {
+               version = "1.0"
+               source = path(project.file("../subspec_dependency/subspec_dependency.podspec"))
+           }
+           pod("AFNetworking") {
+               version = "~> 4.0.1"
+           }
+       }
+   }
+   ```
+   
+   </div>
+   
+   > You can also specify the version of the library using `version` parameter in the configuration block.
+   > To use the latest version of the library, omit the parameter.
+   {:.note}
+
+3. Re-import the project.
+
+To use these dependencies from the Kotlin code, import the packages `cocoapods.<library-name>`.
 
 <div class="sample" markdown="1" theme="idea" data-highlight-only>
 
 ```kotlin
 import cocoapods.pod_dependency.*
 import cocoapods.subspec_dependency.*
+import cocoapods.AFNetworking.*
 ```
 
 </div>
 
 You can find a sample project [here](https://github.com/Kotlin/kotlin-with-cocoapods-sample).
- 
+
+### Add a dependency on a Pod library from the Git repository
+
+You can add dependencies on a Pod library from a custom Git repository with `pod()` to `build.gradle.kts` 
+(`build.gradle`) of your project: 
+
+1. Specify the name of a Pod library in the `pod()` function.
+In the configuration block specify the path to the git repository: use the `git()` function in the `source` parameter value.
+
+    Additionally, you can specify the following parameters in the block after `git()`:
+    * `commit` – to use a specific commit from the repository
+    * `tag` – to use a specific tag from the repository
+    * `branch` – to use a specific branch from the repository
+
+    The `git()` function prioritizes passed parameters in the following order: `commit`, `tag`, `branch`.
+    If you don't specify a parameter, the Kotlin plugin uses `HEAD` from the `master` branch.
+
+    > You can combine `branch`, `commit`, and `tag` parameters to get the specific version of a Pod.
+    {:.note}
+
+2. Specify the minimum deployment target version for the Pod library.
+
+   > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
+   {:.note}
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+   ```kotlin
+   kotlin {
+       ios()
+
+       cocoapods {
+           summary = "CocoaPods test library"
+           homepage = "https://github.com/JetBrains/kotlin"
+
+           ios.deploymentTarget = "13.5"
+
+           pod("AFNetworking") {
+               source = git("https://github.com/AFNetworking/AFNetworking") {
+                   tag = "4.0.0"
+              }
+           }
+
+           pod("JSONModel") {
+               source = git("https://github.com/jsonmodel/jsonmodel.git") {
+                   branch = "key-mapper-class"
+               }
+           }
+
+           pod("CocoaLumberjack") {
+               source = git("https://github.com/CocoaLumberjack/CocoaLumberjack.git") {
+                   commit = "3e7f595e3a459c39b917aacf9856cd2a48c4dbf3"
+               }
+           }
+       }
+   }
+   ```
+   
+   </div>
+
+
+3. Re-import the project.
+
+> To work correctly with Xcode, you should specify the path to the Podspec in your Podfile.
+> For example:
+>
+> <div class="sample" markdown="1" theme="idea" data-highlight-only>
+>
+> ```ruby
+> target 'ios-app' do
+>     # ... other pod depedencies ...
+>    pod 'JSONModel', :path => '../cocoapods/kotlin-with-cocoapods-sample/kotlin-library/build/cocoapods/externalSources/git/JSONModel'
+> end
+> ```
+> 
+> </div>
+>
+{:.note} 
+
+To use these dependencies from the Kotlin code, import the packages `cocoapods.<library-name>`.
+
+<div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+```kotlin
+import cocoapods.AFNetworking.*
+import cocoapods.JSONModel.*
+import cocoapods.CocoaLumberjack.*
+```
+
+</div>
+
+You can find a sample project [here](https://github.com/Kotlin/kotlin-with-cocoapods-sample).
+
+### Add a dependency on a Pod library from an archive
+
+You can add dependencies on a Pod library from `zip`, `tar`, or `jar` archive with `pod()` to `build.gradle.kts` 
+(`build.gradle`) of your project:
+
+1. Specify the name of a Pod library in the `pod()` function.
+In the configuration block specify the path to the archive: use the `url()` function with an arbitrary HTTP address in the `source` parameter value. 
+
+    Additionally, you can specify the boolean `flatten` parameter as a second argument for the `url()` function
+    This parameter indicates that all the Pod files are located in the root directory of the archive.
+
+2. Specify the minimum deployment target version for the Pod library.
+
+   > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
+   {:.note}
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+   ```kotlin
+   kotlin {
+       ios()
+
+       cocoapods {
+           summary = "CocoaPods test library"
+           homepage = "https://github.com/JetBrains/kotlin"
+
+           ios.deploymentTarget = "13.5"
+
+           pod("pod_dependency") {
+              source = url("https://github.com/Kotlin/kotlin-with-cocoapods-sample/raw/cocoapods-zip/cocoapodSourcesZip.zip", flatten = true)
+           }
+
+       }
+   }
+   ```
+   
+   </div>
+
+3. Re-import the project.
+
+> To work correctly with Xcode, you should specify the path to the Podspec in your Podfile.
+> For example:
+>
+> <div class="sample" markdown="1" theme="idea" data-highlight-only>
+>
+> ```ruby
+> target 'ios-app' do
+>     # ... other pod depedencies ...
+>    pod 'podspecWithFilesExample', :path => '../cocoapods/kotlin-with-cocoapods-sample/pod_dependency'
+> end
+> ```
+> 
+> </div>
+>
+{:.note} 
+
+To use these dependencies from the Kotlin code, import the packages `cocoapods.<library-name>`.
+
+<div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+```kotlin
+import cocoapods.pod_dependency.*
+```
+
+</div>
+
+You can find a sample project [here](https://github.com/Kotlin/kotlin-with-cocoapods-sample).
+
+### Add a dependency on a Pod library from a custom Podspec repository
+
+You can add dependencies on a Pod library from a custom Podspec repository with `pod()` and `specRepos` to `build.gradle.kts` 
+(`build.gradle`) of your project:
+
+1. Specify the HTTP address to the custom Podspec repository using the `url()` inside the `specRepos` block.
+
+2. Specify the name of a Pod library in the `pod()` function.
+
+3. Specify the minimum deployment target version for the Pod library.
+
+   > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
+   {:.note}
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+   ```kotlin
+   kotlin {
+       ios()
+
+       cocoapods {
+           summary = "CocoaPods test library"
+           homepage = "https://github.com/JetBrains/kotlin"
+
+           ios.deploymentTarget = "13.5"
+
+           specRepos {
+              url("https://github.com/Kotlin/kotlin-cocoapods-spec.git")
+           }
+           pod("example")
+
+       }
+   }
+   ```
+
+   </div>
+
+4. Re-import the project.
+
+> To work correctly with Xcode, you should specify the location of specs at the beginning of your Podfile.
+> For example, `source 'https://github.com/Kotlin/kotlin-cocoapods-spec.git'`
+>
+> You should also specify the path to the Podspec in your Podfile.
+> For example:
+>
+> <div class="sample" markdown="1" theme="idea" data-highlight-only>
+>
+> ```ruby
+> target 'ios-app' do
+>     # ... other pod depedencies ...
+>    pod 'podspecWithFilesExample', :path => '../cocoapods/kotlin-with-cocoapods-sample/pod_dependency'
+> end
+> ```
+> 
+> </div>
+>
+{:.note} 
+
+To use these dependencies from the Kotlin code, import the packages `cocoapods.<library-name>`.
+
+<div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+```kotlin
+import cocoapods.example.*
+```
+
+</div>
+
+You can find a sample project [here](https://github.com/Kotlin/kotlin-with-cocoapods-sample).
+
+### Add a dependency on a Pod library with custom cinterop options
+
+You can add dependencies on a Pod library with custom cinterop options with `pod()` to `build.gradle.kts` 
+(`build.gradle`) of your project:
+
+1. Specify the name of a Pod library in the `pod()` function.
+In the configuration block specify the cinterop options:
+
+    * `extraOpts` – to specify the list of options for a Pod library. For example, specific flags: `extraOpts = listOf("-compiler-option")`
+    * `packageName` – to specify the package name. If you specify this, you can import the library using the package name: `import <packageName>`.
+
+2. Specify the minimum deployment target version for the Pod library.
+
+   > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
+   {:.note}
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+   ```kotlin
+   kotlin {
+       ios()
+   
+       cocoapods {
+           summary = "CocoaPods test library"
+           homepage = "https://github.com/JetBrains/kotlin"
+
+           ios.deploymentTarget = "13.5"
+
+           useLibraries()
+   
+           pod("YandexMapKit") {
+               packageName = "YandexMK"
+           }
+
+       }
+   }
+   ```
+
+   </div>
+
+3. Re-import the project.
+
+To use these dependencies from the Kotlin code, import the packages `cocoapods.<library-name>`.
+
+<div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+```kotlin
+import cocoapods.YandexMapKit.*
+```
+
+</div>
+
+If you use the `packageName` parameter, you can import the library using the package name: `import <packageName>`:
+
+<div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+```kotlin
+import YandexMK.YMKPoint
+import YandexMK.YMKDistance
+```
+
+</div>
+
+### Add a dependency on a static Pod library
+
+You can add dependencies on a static Pod library with `pod()` and `useLibraries()` to `build.gradle.kts` 
+(`build.gradle`) of your project:
+
+1. Specify the name of the library using the `pod()` function.
+
+2. Call the `useLibraries()` function: it enables a special flag for static libraries.
+
+3. Specify the minimum deployment target version for the Pod library.
+
+   > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
+   {:.note}
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+   ```kotlin
+   kotlin {
+       ios()
+
+       cocoapods {
+           summary = "CocoaPods test library"
+           homepage = "https://github.com/JetBrains/kotlin"
+
+           ios.deploymentTarget = "13.5"
+
+           pod("YandexMapKit") {
+               version = "~> 3.2"
+           }
+           useLibraries()
+
+       }
+   }
+   ```
+
+   </div>
+
+
+4. Re-import the project.
+
+To use these dependencies from the Kotlin code, import the packages `cocoapods.<library-name>`.
+
+<div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+```kotlin
+import cocoapods.YandexMapKit.*
+```
+
+</div>
+
+### Update Podfile for Xcode
+
+If you want to import your Kotlin project in an Xcode project, you’ll need to make some changes to your Podfile for it to work correctly:
+
+* If your project has any Git, HTTP, or custom Podspec repository dependencies, you should also specify the path to the Podspec in the Podfile.
+
+   For example, if you add a dependency on `podspecWithFilesExample`, declare the path to the Podspec in the Podfile:
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+   
+   ```ruby
+   target 'ios-app' do
+       # ... other depedencies ...
+       pod 'podspecWithFilesExample', :path => 'cocoapods/externalSources/url/podspecWithFilesExample'
+   end
+   ```
+
+   </div>
+
+   The `:path` should contain the filepath to the Pod.
+
+* When you add a library from the custom Podspec repository, you should also specify the [location](https://guides.cocoapods.org/syntax/podfile.html#source) of specs at the beginning of your Podfile:
+
+   <div class="sample" markdown="1" theme="idea" data-highlight-only>
+
+   ```ruby
+   source 'https://github.com/Kotlin/kotlin-cocoapods-spec.git'
+
+   target 'kotlin-cocoapods-xcproj' do
+       # ... other depedencies ...
+       pod 'example'
+   end
+   ```
+
+   </div>
+
+> Re-import the project after making changes in Podfile.
+{:.note}
+
+If you don't make these changes to the Podfile, the `podInstall` task will fail and the CocoaPods plugin will show an error message in the log.
+
+Check out the `withXcproject` branch of the [sample project](https://github.com/Kotlin/kotlin-with-cocoapods-sample), which contains an example of Xcode integration with an existing Xcode project named `kotlin-cocoapods-xcproj`.
+
 ## Use a Kotlin Gradle project as a CocoaPods dependency
 
 You can use a Kotlin Multiplatform project with native targets as a CocoaPods dependency (Kotlin Pod). You can include such a dependency
@@ -195,7 +623,6 @@ in the Podfile of the Xcode project by its name and path to the project director
 This dependency will be automatically built (and rebuilt) along with this project.
 Such an approach simplifies importing to Xcode by removing a need to write the corresponding Gradle tasks and Xcode build steps manually.
 
- 
 You can add dependencies between:
 * [A Kotlin Pod and an Xcode project with one target](#add-a-dependency-between-a-kotlin-pod-and-xcode-project-with-one-target)
 * [A Kotlin Pod and an Xcode project with several targets](#add-a-dependency-between-a-kotlin-pod-with-an-xcode-project-with-several-targets)
@@ -212,8 +639,8 @@ directive.
 2. Add the path to your Xcode project `Podfile` with `podfile = project.file(..)` to `build.gradle.kts` (`build.gradle`) 
 of your Kotlin project.  
     This step helps synchronize your Xcode project with Kotlin Pod dependencies by calling `pod install` for your `Podfile`.
-3. Specify the minimum target version for the Pod library.
-    > If you don't specify the minimum target version and a dependency Pod requires a higher deployment target, you may get an error.
+3. Specify the minimum deployment target version for the Pod library.
+    > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
     {:.note}
 
     <div class="sample" markdown="1" theme="idea" data-highlight-only>
@@ -226,7 +653,9 @@ of your Kotlin project.
             summary = "CocoaPods test library"
             homepage = "https://github.com/JetBrains/kotlin"
             ios.deploymentTarget = "13.5"
-            pod("AFNetworking", "~> 4.0.0")
+            pod("AFNetworking") {
+                version = "~> 4.0.0"
+            }
             podfile = project.file("../ios-app/Podfile")
         }
     }
@@ -241,7 +670,7 @@ of your Kotlin project.
     ```ruby
     use_frameworks!
     
-    platform :ios, '9.0'
+    platform :ios, '13.5'
     
     target 'ios-app' do
             pod 'kotlin_library', :path => '../kotlin-library'
@@ -259,7 +688,9 @@ of your Kotlin project.
  your Kotlin project.  
     This step helps synchronize your Xcode project with Kotlin Pod dependencies by calling `pod install` for your `Podfile`.
 3. Add dependencies to the Pod libraries that you want to use in your project with `pod()`.
-4. For each target, specify the minimum target version for the Pod library.
+4. For each target, specify the minimum deployment target version for the Pod library.
+    > If you don't specify the minimum deployment target version and a dependency Pod requires a higher deployment target, you will get an error.
+    {:.note}
 
     <div class="sample" markdown="1" theme="idea" data-highlight-only>
     
@@ -274,7 +705,9 @@ of your Kotlin project.
             ios.deploymentTarget = "13.5"
             tvos.deploymentTarget = "13.4"
        
-            pod("AFNetworking", "~> 4.0.0")
+            pod("AFNetworking") {
+                version = "~> 4.0.0"
+            }
             podfile = project.file("../severalTargetsXcodeProject/Podfile") // specify the path to Podfile
         }
     }
@@ -307,4 +740,4 @@ of your Kotlin project.
     
 6. Re-import the project.
 
-You can find a sample project [here](https://github.com/Kotlin/multitarget-xcode-with-kotlin-cocoapods-sample).
\ No newline at end of file
+You can find a sample project [here](https://github.com/Kotlin/multitarget-xcode-with-kotlin-cocoapods-sample).
diff --git a/kotlin-native/DEBUGGING.md b/kotlin-native/DEBUGGING.md
index a5c2d59c803..6f66bc8db96 100644
--- a/kotlin-native/DEBUGGING.md
+++ b/kotlin-native/DEBUGGING.md
@@ -197,10 +197,12 @@ Process 4985 launched: './program.kexe' (x86_64)
 (lldb) fr var
 (int) x = 1
 (int) y = 2
-(ObjHeader *) p = Point(x=1, y=2)
+(ObjHeader *) p = [x: ..., y: ...]
 (lldb) p p
-(ObjHeader *) $2 = Point(x=1, y=2)
-(lldb) 
+(ObjHeader *) $2 = [x: ..., y: ...]
+(lldb) script lldb.frame.FindVariable("p").GetChildMemberWithName("x").Dereference().GetValue()
+'1'
+(lldb)
 ```
 
 </div>
@@ -245,8 +247,8 @@ Process 80496 stopped
    12   }
 
 Process 80496 launched: './program.kexe' (x86_64)
-(lldb) expression -- Konan_DebugPrint(a_variable)
-(a_variable) one is 1(KInt) $0 = 0
+(lldb) expression -- (int32_t)Konan_DebugPrint(a_variable)
+(a_variable) one is 1(int32_t) $0 = 0
 (lldb)
 
 ```
diff --git a/kotlin-native/HACKING.md b/kotlin-native/HACKING.md
index 68a466eb72c..491efd418e5 100644
--- a/kotlin-native/HACKING.md
+++ b/kotlin-native/HACKING.md
@@ -100,6 +100,8 @@ To update the blackbox compiler tests set TeamCity build number in `gradle.prope
 and then a final native binary is produced from this klibrary using the -Xinclude compiler flag.
 
         ./gradlew -Ptest_two_stage backend.native:tests:array0
+        
+* **-Ptest_with_cache_kind=static|dynamic** enables using caches during testing. 
        
  ### Runtime unit tests
  
@@ -134,7 +136,8 @@ To use a local GTest copy instead of the downloaded one, add the following line
     
  To measure performance of Kotlin/Native compiler on existing benchmarks:
  
-    ./gradlew :performance:konanRun
+    cd performance
+    ../gradlew :konanRun
 
  **NOTE**: **konanRun** task needs built compiler and libs. To test against working tree make sure to run
 
@@ -144,19 +147,23 @@ To use a local GTest copy instead of the downloaded one, add the following line
     
  **konanRun** task can be run separately for one/several benchmark applications:
  
-    ./gradlew :performance:cinterop:konanRun
+    cd performance
+    ../gradlew :cinterop:konanRun
     
  **konanRun** task has parameter `filter` which allows to run only some subset of benchmarks:
  
-    ./gradlew :performance:cinterop:konanRun --filter=struct,macros
+    cd performance
+    ../gradlew :cinterop:konanRun --filter=struct,macros
     
  Or you can use `filterRegex` if you want to specify the filter as regexes:
  
-    ./gradlew :performance:ring:konanRun --filterRegex=String.*,Loop.*
+    cd performance
+    ../gradlew :ring:konanRun --filterRegex=String.*,Loop.*
     
  There us also verbose mode to follow progress of running benchmarks
  
-    ./gradlew :performance:cinterop:konanRun --verbose
+    cd performance
+    ../gradlew :cinterop:konanRun --verbose
     
     > Task :performance:cinterop:konanRun
     [DEBUG] Warm up iterations for benchmark macros
@@ -165,16 +172,19 @@ To use a local GTest copy instead of the downloaded one, add the following line
     
  There are also tasks for running benchmarks on JVM (pay attention, some benchmarks e.g. cinterop benchmarks can't be run on JVM)
  
-    ./gradlew :performance:jvmRun
+    cd performance
+    ../gradlew :jvmRun
     
  Files with results of benchmarks run are saved in `performance/build/nativeReport.json` for konanRun and `jvmReport.json` for jvmRun.
  You can change the output filename by setting the `nativeJson` property for konanRun and `jvmJson` for jvmRun:
 
-    ./gradlew :performance:ring:konanRun --filter=String.*,Loop.* -PnativeJson=stringsAndLoops.json
+    cd performance
+    ../gradlew :ring:konanRun --filter=String.*,Loop.* -PnativeJson=stringsAndLoops.json
 
  You can use the `compilerArgs` property to pass flags to the compiler used to compile the benchmarks:
 
-    ./gradlew :performance:konanRun -PcompilerArgs="--time -g"
+    cd performance
+    ../gradlew :konanRun -PcompilerArgs="--time -g"
 
  To compare different results run benchmarksAnalyzer tool:
  
@@ -263,9 +273,16 @@ instead of provided one.
 `llvmHome.<HOST_NAME>` variable in `<distribution_location>/konan/konan.properties` controls 
 which LLVM distribution Kotlin/Native will use in its compilation pipeline. 
 You can replace its value with either `$llvm.<HOST_NAME>.{dev, user}` to use one of predefined distributions
-or pass an absolute to your own distribution. 
+or pass an absolute to your own distribution.
 Don't forget to set `llvmVersion.<HOST_NAME>` to the version of your LLVM distribution.
 
+#### Example. Using LLVM from an absolute path.
+Assuming LLVM distribution is installed at `/usr` path, one can specify a path to it 
+with the `-Xoverride-konan-properties` option:
+```
+konanc main.kt -Xoverride-konan-properties=llvmHome.linux_x64=/usr
+```
+
 ### Playing with compilation pipeline.
 
 Following compiler phases control different parts of LLVM pipeline:
@@ -276,18 +293,18 @@ Following compiler phases control different parts of LLVM pipeline:
 For example, pass `-Xdisable-phases=BitcodeOptimization` to skip optimization pipeline.
 Note that disabling `LinkBitcodeDependencies` or `ObjectFiles` will break compilation pipeline.
 
-By default, compiler takes options for Clang from [konan.properties](konan/konan.properties) file
-by combining `clangFlags.<TARGET>` and `clang<Noopt/Opt/Debug>Flags.<TARGET>` properties.
-To override this behaviour, one can specify flag `-Xoverride-clang-options=<arg1, ..., argN>`.
+Compiler takes options for Clang from [konan.properties](konan/konan.properties) file
+by combining `clangFlags.<TARGET>` and `clang<Noopt/Opt/Debug>Flags.<TARGET>` properties. 
+Use `-Xoverride-konan-properties=<key_1=value_1; ...;key_n=value_n>` flag to override default values.
 
 Please note:
 1. Kotlin Native passes bitcode files to Clang instead of C or C++, so many flags won't work.
-2. `-c` should be passed because Kotlin/Native calls linker by itself.
-
+2. `-cc1 -emit-obj` should be passed because Kotlin/Native calls linker by itself.
+3. Use `clang -cc1 -help` to see a list of available options.
+ 
 Another useful compiler option is `-Xtemporary-files-dir=<PATH>` which allows
 to specify a directory for intermediate compiler artifacts like bitcode and object files.
 
-
 #### Example 1. Bitcode right after IR to Bitcode translation.
 ```shell script
 konanc main.kt -produce bitcode -o bitcode.bc
@@ -301,7 +318,8 @@ konanc main.kt -Xtemporary-files-dir=<PATH> -o <OUTPUT_NAME>
 
 #### Example 3. Replace predefined LLVM pipeline with Clang options.
 ```shell script
-konanc main.kt -Xdisable-phases=BitcodeOptimization -Xoverride-clang-options=-c,-O2
+CLANG_FLAGS="clangFlags.macos_x64=-cc1 -emit-obj;clangNooptFlags.macos_x64=-O2"
+konanc main.kt -Xdisable-phases=BitcodeOptimization -Xoverride-konan-properties="$CLANG_FLAGS"
 ```
 
 ## Running Clang the same way Kotlin/Native compiler does
diff --git a/kotlin-native/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/ModuleSupport.kt b/kotlin-native/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/ModuleSupport.kt
index b603ae69c2e..a9b7a03501f 100644
--- a/kotlin-native/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/ModuleSupport.kt
+++ b/kotlin-native/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/ModuleSupport.kt
@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.native.interop.indexer
 
 import clang.*
 import kotlinx.cinterop.*
+import java.nio.file.Files
 
 data class ModulesInfo(val topLevelHeaders: List<String>, val ownHeaders: Set<String>)
 
@@ -39,13 +40,13 @@ internal open class ModularCompilation(compilation: Compilation): Compilation by
     }
 
     private val moduleCacheDirectory = if (compilation.compilerArgs.none { it.startsWith(moduleCacheFlag) }) {
-        createTempDir("ModuleCache")
+        Files.createTempDirectory("ModuleCache").toAbsolutePath().toFile()
     } else {
         null
     }
 
     override val compilerArgs: List<String> = compilation.compilerArgs +
-            listOfNotNull("-fmodules", moduleCacheDirectory?.let { "$moduleCacheFlag${it.absolutePath}" })
+            listOfNotNull("-fmodules", moduleCacheDirectory?.let { "$moduleCacheFlag${it}" })
 
     override fun dispose() {
         moduleCacheDirectory?.deleteRecursively()
diff --git a/kotlin-native/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Utils.kt b/kotlin-native/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Utils.kt
index 371bc3c6b63..5ea12ca88d4 100644
--- a/kotlin-native/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Utils.kt
+++ b/kotlin-native/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Utils.kt
@@ -100,7 +100,7 @@ internal fun parseTranslationUnit(
         )
 
         if (errorCode != CXErrorCode.CXError_Success) {
-            val copiedSourceFile = sourceFile.copyTo(createTempFile(suffix = sourceFile.name), overwrite = true)
+            val copiedSourceFile = sourceFile.copyTo(Files.createTempFile(null, sourceFile.name).toFile(), overwrite = true)
 
             error("""
                 clang_parseTranslationUnit2 failed with $errorCode;
@@ -241,7 +241,7 @@ internal fun Appendable.appendPreamble(compilation: Compilation) = this.apply {
  * Creates temporary source file which includes the library.
  */
 internal fun Compilation.createTempSource(): File {
-    val result = createTempFile(suffix = ".${language.sourceFileExtension}")
+    val result = Files.createTempFile(null, ".${language.sourceFileExtension}").toFile()
     result.deleteOnExit()
 
     result.bufferedWriter().use { writer ->
@@ -292,7 +292,7 @@ fun Compilation.precompileHeaders(): CompilationWithPCH = withIndex { index ->
 }
 
 internal fun Compilation.withPrecompiledHeader(translationUnit: CXTranslationUnit): CompilationWithPCH {
-    val precompiledHeader = createTempFile(suffix = ".pch").apply { this.deleteOnExit() }
+    val precompiledHeader = Files.createTempFile(null, ".pch").toFile().apply { this.deleteOnExit() }
     clang_saveTranslationUnit(translationUnit, precompiledHeader.absolutePath, 0)
 
     return CompilationWithPCH(this.compilerArgs, precompiledHeader.absolutePath, this.language)
@@ -740,12 +740,10 @@ private fun createVfsOverlayFileContents(virtualPathToReal: Map<Path, Path>): By
 fun createVfsOverlayFile(virtualPathToReal: Map<Path, Path>): Path {
     val bytes = createVfsOverlayFileContents(virtualPathToReal)
 
-    return createTempFile(prefix = "konan", suffix = ".vfsoverlay").apply {
-        bufferedWriter().use {
-            writeBytes(bytes)
-        }
-        deleteOnExit()
-    }.toPath()
+    return Files.createTempFile("konan", ".vfsoverlay").also {
+        Files.write(it, bytes)
+        it.toFile().deleteOnExit()
+    }
 }
 
 tailrec fun Type.unwrapTypedefs(): Type = if (this is Typedef) {
diff --git a/kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt b/kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt
index ceae51a34c4..a93b51f10a9 100644
--- a/kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt
+++ b/kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt
@@ -16,6 +16,7 @@
 
 package kotlinx.cinterop
 
+import org.jetbrains.kotlin.konan.util.nativeMemoryAllocator
 import sun.misc.Unsafe
 
 private val NativePointed.address: Long
@@ -95,19 +96,20 @@ internal object nativeMemUtils {
         return unsafe.allocateInstance(T::class.java) as T
     }
 
-    fun alloc(size: Long, align: Int): NativePointed {
-        val address = unsafe.allocateMemory(
-                if (size == 0L) 1L else size // It is a hack: `sun.misc.Unsafe` can't allocate zero bytes
-        )
-
+    internal fun allocRaw(size: Long, align: Int): NativePtr {
+        val address = unsafe.allocateMemory(size)
         if (address % align != 0L) TODO(align.toString())
-        return interpretOpaquePointed(address)
+        return address
     }
 
-    fun free(mem: NativePtr) {
+    internal fun freeRaw(mem: NativePtr) {
         unsafe.freeMemory(mem)
     }
 
+    fun alloc(size: Long, align: Int) = interpretOpaquePointed(nativeMemoryAllocator.alloc(size, align))
+
+    fun free(mem: NativePtr) = nativeMemoryAllocator.free(mem)
+
     private val unsafe = with(Unsafe::class.java.getDeclaredField("theUnsafe")) {
         isAccessible = true
         return@with this.get(null) as Unsafe
diff --git a/kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt b/kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt
index d1943be26b7..f99ac1fb915 100644
--- a/kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt
+++ b/kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt
@@ -98,7 +98,7 @@ fun loadKonanLibrary(name: String) {
         try {
             System.load("$dir/$fullLibraryName")
         } catch (e: UnsatisfiedLinkError) {
-            val tempDir = createTempDir(directory = File(dir)).absolutePath
+            val tempDir = Files.createTempDirectory(Paths.get(dir), null).toAbsolutePath().toString()
             Files.createLink(Paths.get(tempDir, fullLibraryName), Paths.get(dir, fullLibraryName))
             // TODO: Does not work on Windows. May be use FILE_FLAG_DELETE_ON_CLOSE?
             File(tempDir).deleteOnExit()
diff --git a/kotlin-native/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt b/kotlin-native/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt
index 1c6c9c2443f..a4e83f74b40 100644
--- a/kotlin-native/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt
+++ b/kotlin-native/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt
@@ -390,11 +390,29 @@ private class CString(val bytes: ByteArray): CValues<ByteVar>() {
     }
 }
 
+private object EmptyCString: CValues<ByteVar>() {
+    override val size get() = 1
+    override val align get() = 1
+
+    private val placement =
+            interpretCPointer<ByteVar>(nativeMemUtils.allocRaw(1, 1))!!.also {
+                it[0] = 0.toByte()
+            }
+
+    override fun getPointer(scope: AutofreeScope): CPointer<ByteVar> {
+        return placement
+    }
+    override fun place(placement: CPointer<ByteVar>): CPointer<ByteVar> {
+        placement[0] = 0.toByte()
+        return placement
+    }
+}
+
 /**
  * @return the value of zero-terminated UTF-8-encoded C string constructed from given [kotlin.String].
  */
 public val String.cstr: CValues<ByteVar>
-    get() = CString(encodeToUtf8(this))
+    get() = if (isEmpty()) EmptyCString else CString(encodeToUtf8(this))
 
 /**
  * @return the value of zero-terminated UTF-8-encoded C string constructed from given [kotlin.String].
@@ -523,7 +541,7 @@ public fun CPointer<ShortVar>.toKStringFromUtf16(): String {
         chars[index] = nativeBytes[index].toChar()
         ++index
     }
-    return String(chars)
+    return chars.concatToString()
 }
 
 /**
@@ -555,7 +573,7 @@ public fun CPointer<IntVar>.toKStringFromUtf32(): String {
             chars[toIndex++] = value.toChar()
         }
     }
-    return String(chars)
+    return chars.concatToString()
 }
 
 /**
diff --git a/kotlin-native/Interop/Runtime/src/native/kotlin/kotlinx/cinterop/NativeMem.kt b/kotlin-native/Interop/Runtime/src/native/kotlin/kotlinx/cinterop/NativeMem.kt
index 88e69256436..c39f1364981 100644
--- a/kotlin-native/Interop/Runtime/src/native/kotlin/kotlinx/cinterop/NativeMem.kt
+++ b/kotlin-native/Interop/Runtime/src/native/kotlin/kotlinx/cinterop/NativeMem.kt
@@ -118,14 +118,22 @@ internal object nativeMemUtils {
     }
 
     fun alloc(size: Long, align: Int): NativePointed {
+        return interpretOpaquePointed(allocRaw(size, align))
+    }
+
+    fun free(mem: NativePtr) {
+        freeRaw(mem)
+    }
+
+    internal fun allocRaw(size: Long, align: Int): NativePtr {
         val ptr = malloc(size, align)
         if (ptr == nativeNullPtr) {
             throw OutOfMemoryError("unable to allocate native memory")
         }
-        return interpretOpaquePointed(ptr)
+        return ptr
     }
 
-    fun free(mem: NativePtr) {
+    internal fun freeRaw(mem: NativePtr) {
         cfree(mem)
     }
 }
@@ -143,7 +151,7 @@ public fun CPointer<UShortVar>.toKStringFromUtf16(): String {
         chars[index] = nativeBytes[index].toShort().toChar()
         ++index
     }
-    return String(chars)
+    return chars.concatToString()
 }
 
 public fun CPointer<ShortVar>.toKString(): String = this.toKStringFromUtf16()
diff --git a/kotlin-native/Interop/Runtime/src/native/kotlin/kotlinx/cinterop/ObjectiveCImpl.kt b/kotlin-native/Interop/Runtime/src/native/kotlin/kotlinx/cinterop/ObjectiveCImpl.kt
index 8b1d65f5ffd..1f52e7d1ac5 100644
--- a/kotlin-native/Interop/Runtime/src/native/kotlin/kotlinx/cinterop/ObjectiveCImpl.kt
+++ b/kotlin-native/Interop/Runtime/src/native/kotlin/kotlinx/cinterop/ObjectiveCImpl.kt
@@ -98,7 +98,7 @@ class ObjCNotImplementedVar<T : Any?>(rawPtr: NativePtr) : CVariable(rawPtr) {
 
 var <T : Any?> ObjCNotImplementedVar<T>.value: T
     get() = TODO()
-    set(value) = TODO()
+    set(_) = TODO()
 
 typealias ObjCStringVarOf<T> = ObjCNotImplementedVar<T>
 typealias ObjCBlockVar<T> = ObjCNotImplementedVar<T>
diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt b/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt
index 8f5aa9e76cb..7ec9f8e9c8f 100644
--- a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt
+++ b/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt
@@ -326,6 +326,11 @@ private class MappingExtensions(
                 Flag.Type.IS_NULLABLE.takeIf { nullable }
         )
 
+    val AbbreviatedType.expandedTypeFlags: Flags
+        get() = flagsOfNotNull(
+                Flag.Type.IS_NULLABLE.takeIf { isEffectivelyNullable() }
+        )
+
     val TypealiasStub.flags: Flags
         get() = flagsOfNotNull(
                 Flag.IS_PUBLIC
@@ -357,6 +362,13 @@ private class MappingExtensions(
                 Flag.HAS_ANNOTATIONS.takeIf { annotations.isNotEmpty() }
         ) or visibility.flags
 
+    private tailrec fun StubType.isEffectivelyNullable(): Boolean =
+            when {
+                nullable -> true
+                this !is AbbreviatedType -> false
+                else -> underlyingType.isEffectivelyNullable()
+            }
+
     fun AnnotationStub.map(): KmAnnotation {
         fun Pair<String, String>.asAnnotationArgument() =
                 (first to KmAnnotationArgument.StringValue(second)).takeIf { second.isNotEmpty() }
@@ -467,8 +479,7 @@ private class MappingExtensions(
                 km.arguments += typeArguments
             }
             if (shouldExpandTypeAliases) {
-                // Abbreviated and expanded types have the same nullability.
-                KmType(flags).also { km ->
+                KmType(expandedTypeFlags).also { km ->
                     km.abbreviatedType = abbreviatedType
                     val kmUnderlyingType = underlyingType.map(true)
                     km.arguments += kmUnderlyingType.arguments
diff --git a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
index d5f0d29c9b6..cb56451555b 100644
--- a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
+++ b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
@@ -183,6 +183,7 @@ class K2Native : CLICompiler<K2NativeCompilerArguments>() {
 
                 if (arguments.verifyCompiler != null)
                     put(VERIFY_COMPILER, arguments.verifyCompiler == "true")
+                put(VERIFY_IR, arguments.verifyIr)
                 put(VERIFY_BITCODE, arguments.verifyBitCode)
 
                 put(ENABLED_PHASES,
@@ -191,9 +192,6 @@ class K2Native : CLICompiler<K2NativeCompilerArguments>() {
                         arguments.disablePhases.toNonNullList())
                 put(LIST_PHASES, arguments.listPhases)
 
-                put(COMPATIBLE_COMPILER_VERSIONS,
-                    arguments.compatibleCompilerVersions.toNonNullList())
-
                 put(ENABLE_ASSERTIONS, arguments.enableAssertions)
 
                 put(MEMORY_MODEL, when (arguments.memoryModel) {
@@ -250,8 +248,17 @@ class K2Native : CLICompiler<K2NativeCompilerArguments>() {
                 parseShortModuleName(arguments, configuration, outputKind)?.let {
                     put(SHORT_MODULE_NAME, it)
                 }
-                put(DISABLE_FAKE_OVERRIDE_VALIDATOR, arguments.disableFakeOverrideValidator)
+                put(FAKE_OVERRIDE_VALIDATOR, arguments.fakeOverrideValidator)
                 putIfNotNull(PRE_LINK_CACHES, parsePreLinkCachesValue(configuration, arguments.preLinkCaches))
+                putIfNotNull(OVERRIDE_KONAN_PROPERTIES, parseOverrideKonanProperties(arguments, configuration))
+                put(DESTROY_RUNTIME_MODE, when (arguments.destroyRuntimeMode) {
+                    "legacy" -> DestroyRuntimeMode.LEGACY
+                    "on-shutdown" -> DestroyRuntimeMode.ON_SHUTDOWN
+                    else -> {
+                        configuration.report(ERROR, "Unsupported destroy runtime mode ${arguments.destroyRuntimeMode}")
+                        DestroyRuntimeMode.ON_SHUTDOWN
+                    }
+                })
             }
         }
     }
@@ -455,6 +462,24 @@ private fun parseDebugPrefixMap(
     }
 }.toMap()
 
+private fun parseOverrideKonanProperties(
+        arguments: K2NativeCompilerArguments,
+        configuration: CompilerConfiguration
+): Map<String, String>? =
+        arguments.overrideKonanProperties?.mapNotNull {
+            val keyValueSeparatorIndex = it.indexOf('=')
+            if (keyValueSeparatorIndex > 0) {
+                it.substringBefore('=') to it.substringAfter('=')
+            } else {
+                configuration.report(
+                        ERROR,
+                        "incorrect property format: expected '<key>=<value>', got '$it'"
+                )
+                null
+            }
+        }?.toMap()
+
+
 
 fun main(args: Array<String>) = K2Native.main(args)
 fun mainNoExitWithGradleRenderer(args: Array<String>) = K2Native.mainNoExitWithGradleRenderer(args)
diff --git a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt
index 942d8ebe913..a371604f89f 100644
--- a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt
+++ b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt
@@ -121,9 +121,6 @@ class K2NativeCompilerArguments : CommonCompilerArguments() {
     @Argument(value="-Xcheck-dependencies", deprecatedName = "--check_dependencies", description = "Check dependencies and download the missing ones")
     var checkDependencies: Boolean = false
 
-    @Argument(value="-Xcompatible-compiler-version", valueDescription = "<version>", description = "Assume the given compiler version to be binary compatible")
-    var compatibleCompilerVersions: Array<String>? = null
-
     @Argument(value = EMBED_BITCODE_FLAG, description = "Embed LLVM IR bitcode as data")
     var embedBitcode: Boolean = false
 
@@ -145,8 +142,8 @@ class K2NativeCompilerArguments : CommonCompilerArguments() {
     )
     var exportedLibraries: Array<String>? = null
 
-    @Argument(value="-Xdisable-fake-override-validator", description = "Disable IR fake override validator")
-    var disableFakeOverrideValidator: Boolean = false
+    @Argument(value="-Xfake-override-validator", description = "Enable IR fake override validator")
+    var fakeOverrideValidator: Boolean = false
 
     @Argument(
             value = "-Xframework-import-header",
@@ -228,6 +225,9 @@ class K2NativeCompilerArguments : CommonCompilerArguments() {
     @Argument(value = "-Xverify-bitcode", deprecatedName = "--verify_bitcode", description = "Verify llvm bitcode after each method")
     var verifyBitCode: Boolean = false
 
+    @Argument(value = "-Xverify-ir", description = "Verify IR")
+    var verifyIr: Boolean = false
+
     @Argument(value = "-Xverify-compiler", description = "Verify compiler")
     var verifyCompiler: String? = null
 
@@ -278,6 +278,19 @@ class K2NativeCompilerArguments : CommonCompilerArguments() {
     )
     var preLinkCaches: String? = null
 
+    // We use `;` as delimiter because properties may contain comma-separated values.
+    // For example, target cpu features.
+    @Argument(
+            value = "-Xoverride-konan-properties",
+            valueDescription = "key1=value1;key2=value2;...",
+            description = "Override konan.properties.values",
+            delimiter = ";"
+    )
+    var overrideKonanProperties: Array<String>? = null
+
+    @Argument(value="-Xdestroy-runtime-mode", valueDescription = "<mode>", description = "When to destroy runtime. 'legacy' and 'on-shutdown' are currently supported. NOTE: 'legacy' mode is deprecated and will be removed.")
+    var destroyRuntimeMode: String? = "on-shutdown"
+
     override fun configureAnalysisFlags(collector: MessageCollector): MutableMap<AnalysisFlag<*>, Any> =
             super.configureAnalysisFlags(collector).also {
                 val useExperimental = it[AnalysisFlags.useExperimental] as List<*>
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt
index ebfe168967a..52a28d85f39 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt
@@ -28,19 +28,24 @@ class CachedLibraries(
         }
     }
 
+    private val cacheDirsContents = mutableMapOf<String, Set<String>>()
+
     private fun selectCache(library: KotlinLibrary, cacheDir: File): Cache? {
         // See Linker.renameOutput why is it ok to have an empty cache directory.
-        if (cacheDir.listFilesOrEmpty.isEmpty()) return null
+        val cacheDirContents = cacheDirsContents.getOrPut(cacheDir.absolutePath) {
+            cacheDir.listFilesOrEmpty.map { it.absolutePath }.toSet()
+        }
+        if (cacheDirContents.isEmpty()) return null
         val baseName = getCachedLibraryName(library)
         val dynamicFile = cacheDir.child(getArtifactName(baseName, CompilerOutputKind.DYNAMIC_CACHE))
         val staticFile = cacheDir.child(getArtifactName(baseName, CompilerOutputKind.STATIC_CACHE))
 
-        if (dynamicFile.exists && staticFile.exists)
+        if (dynamicFile.absolutePath in cacheDirContents && staticFile.absolutePath in cacheDirContents)
             error("Both dynamic and static caches files cannot be in the same directory." +
                     " Library: ${library.libraryName}, path to cache: ${cacheDir.absolutePath}")
         return when {
-            dynamicFile.exists -> Cache(Cache.Kind.DYNAMIC, dynamicFile.absolutePath)
-            staticFile.exists -> Cache(Cache.Kind.STATIC, staticFile.absolutePath)
+            dynamicFile.absolutePath in cacheDirContents -> Cache(Cache.Kind.DYNAMIC, dynamicFile.absolutePath)
+            staticFile.absolutePath in cacheDirContents -> Cache(Cache.Kind.STATIC, staticFile.absolutePath)
             else -> error("No cache found for library ${library.libraryName} at ${cacheDir.absolutePath}")
         }
     }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
index 9d8cae222b5..7c32df1e0f3 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
@@ -40,11 +40,13 @@ import org.jetbrains.kotlin.backend.common.ir.copyTo
 import org.jetbrains.kotlin.backend.common.ir.copyToWithoutSuperTypes
 import org.jetbrains.kotlin.backend.konan.objcexport.ObjCExport
 import org.jetbrains.kotlin.backend.konan.llvm.coverage.CoverageManager
+import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyClass
 import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrFieldSymbolImpl
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.konan.library.KonanLibraryLayout
+import org.jetbrains.kotlin.konan.util.disposeNativeMemoryAllocator
 import org.jetbrains.kotlin.library.SerializedIrModule
 import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal
 
@@ -185,7 +187,6 @@ internal class SpecialDeclarationsFactory(val context: Context) {
 }
 
 internal class Context(config: KonanConfig) : KonanBackendContext(config) {
-    override val lateinitNullableFields = mutableMapOf<IrField, IrField>()
     lateinit var frontendServices: FrontendServices
     lateinit var environment: KotlinCoreEnvironment
     lateinit var bindingContext: BindingContext
@@ -254,10 +255,20 @@ internal class Context(config: KonanConfig) : KonanBackendContext(config) {
         KonanReflectionTypes(moduleDescriptor, KonanFqNames.internalPackageName)
     }
 
-    val layoutBuilders = mutableMapOf<IrClass, ClassLayoutBuilder>()
+    // TODO: Remove after adding special <userData> property to IrDeclaration.
+    private val layoutBuilders = mutableMapOf<IrClass, ClassLayoutBuilder>()
 
-    fun getLayoutBuilder(irClass: IrClass) = layoutBuilders.getOrPut(irClass) {
-        ClassLayoutBuilder(irClass, this, isLowered = shouldLower(this, irClass))
+    fun getLayoutBuilder(irClass: IrClass): ClassLayoutBuilder {
+        if (irClass is IrLazyClass)
+            return layoutBuilders.getOrPut(irClass) {
+                ClassLayoutBuilder(irClass, this, isLowered = shouldLower(this, irClass))
+            }
+        val metadata = irClass.metadata as? CodegenClassMetadata
+                ?: CodegenClassMetadata(irClass).also { irClass.metadata = it }
+        metadata.layoutBuilder?.let { return it }
+        val layoutBuilder = ClassLayoutBuilder(irClass, this, isLowered = shouldLower(this, irClass))
+        metadata.layoutBuilder = layoutBuilder
+        return layoutBuilder
     }
 
     lateinit var globalHierarchyAnalysisResult: GlobalHierarchyAnalysisResult
@@ -335,6 +346,14 @@ internal class Context(config: KonanConfig) : KonanBackendContext(config) {
         llvmDisposed = true
     }
 
+    private var nativeMemFreed = false
+
+    fun freeNativeMem() {
+        if (nativeMemFreed) return
+        disposeNativeMemoryAllocator()
+        nativeMemFreed = true
+    }
+
     val cStubsManager = CStubsManager(config.target)
 
     val coverage = CoverageManager(this)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DestroyRuntimeMode.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DestroyRuntimeMode.kt
new file mode 100644
index 00000000000..e55b9955df1
--- /dev/null
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DestroyRuntimeMode.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+package org.jetbrains.kotlin.backend.konan
+
+// Must match `DestroyRuntimeMode` in Runtime.h
+enum class DestroyRuntimeMode(val value: Int) {
+    LEGACY(0),
+    ON_SHUTDOWN(1),
+}
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt
index 56c000f2e2f..d0fcbde4df6 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt
@@ -36,8 +36,6 @@ internal abstract class KonanBackendContext(val config: KonanConfig) : CommonBac
 
     abstract override val ir: KonanIr
 
-    override val transformedFunction: MutableMap<IrFunctionSymbol, IrSimpleFunctionSymbol>
-        get() = TODO("not implemented")
     override val scriptMode: Boolean = false
 
     override val sharedVariablesManager by lazy {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
index 54e22cefe0e..9a6a2755326 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
@@ -30,7 +30,8 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
     internal val distribution = Distribution(
             configuration.get(KonanConfigKeys.KONAN_HOME) ?: KonanHomeProvider.determineKonanHome(),
             false,
-            configuration.get(KonanConfigKeys.RUNTIME_FILE)
+            configuration.get(KonanConfigKeys.RUNTIME_FILE),
+            configuration.get(KonanConfigKeys.OVERRIDE_KONAN_PROPERTIES)
     )
 
     private val platformManager = PlatformManager(distribution)
@@ -44,6 +45,10 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
             ?: target.family.isAppleFamily // Default is true for Apple targets.
 
     val memoryModel: MemoryModel get() = configuration.get(KonanConfigKeys.MEMORY_MODEL)!!
+    val destroyRuntimeMode: DestroyRuntimeMode get() = configuration.get(KonanConfigKeys.DESTROY_RUNTIME_MODE)!!
+
+    val needVerifyIr: Boolean
+        get() = configuration.get(KonanConfigKeys.VERIFY_IR) == true
 
     val needCompilerVerification: Boolean
         get() = configuration.get(KonanConfigKeys.VERIFY_COMPILER) ?:
@@ -127,6 +132,10 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
                     configuration.report(CompilerMessageSeverity.STRONG_WARNING,
                             "Experimental memory model requires threads, which are not supported on target ${target.name}. Used strict memory model.")
                     MemoryModel.STRICT
+                } else if (destroyRuntimeMode == DestroyRuntimeMode.LEGACY) {
+                    configuration.report(CompilerMessageSeverity.STRONG_WARNING,
+                            "Experimental memory model is incompatible with 'legacy' destroy runtime mode. Used strict memory model.")
+                    MemoryModel.STRICT
                 } else {
                     MemoryModel.EXPERIMENTAL
                 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt
index c4e68b64aaf..821b079779c 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt
@@ -14,12 +14,10 @@ class KonanConfigKeys {
         // Keep the list lexically sorted.
         val CHECK_DEPENDENCIES: CompilerConfigurationKey<Boolean>
                 = CompilerConfigurationKey.create("check dependencies and download the missing ones")
-        val COMPATIBLE_COMPILER_VERSIONS: CompilerConfigurationKey<List<String>>
-                = CompilerConfigurationKey.create("compatible compiler versions")
         val DEBUG: CompilerConfigurationKey<Boolean>
                 = CompilerConfigurationKey.create("add debug information")
-        val DISABLE_FAKE_OVERRIDE_VALIDATOR: CompilerConfigurationKey<Boolean>
-                = CompilerConfigurationKey.create("disable fake override validator")
+        val FAKE_OVERRIDE_VALIDATOR: CompilerConfigurationKey<Boolean>
+                = CompilerConfigurationKey.create("fake override validator")
         val DISABLED_PHASES: CompilerConfigurationKey<List<String>> 
                 = CompilerConfigurationKey.create("disable backend phases")
         val BITCODE_EMBEDDING_MODE: CompilerConfigurationKey<BitcodeEmbedding.Mode>
@@ -128,6 +126,8 @@ class KonanConfigKeys {
                 = CompilerConfigurationKey.create("directory for temporary files")
         val VERIFY_BITCODE: CompilerConfigurationKey<Boolean>
                 = CompilerConfigurationKey.create("verify bitcode")
+        val VERIFY_IR: CompilerConfigurationKey<Boolean>
+                = CompilerConfigurationKey.create("verify IR")
         val VERIFY_COMPILER: CompilerConfigurationKey<Boolean>
                 = CompilerConfigurationKey.create("verify compiler")
         val DEBUG_INFO_VERSION: CompilerConfigurationKey<Int>
@@ -144,6 +144,10 @@ class KonanConfigKeys {
                 = CompilerConfigurationKey.create("remap file source paths in debug info")
         val PRE_LINK_CACHES: CompilerConfigurationKey<Boolean>
                 = CompilerConfigurationKey.create("perform compiler caches pre-link")
+        val OVERRIDE_KONAN_PROPERTIES: CompilerConfigurationKey<Map<String, String>>
+                = CompilerConfigurationKey.create("override konan.properties values")
+        val DESTROY_RUNTIME_MODE: CompilerConfigurationKey<DestroyRuntimeMode>
+                = CompilerConfigurationKey.create("when to destroy runtime")
     }
 }
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt
index aab93ee9f87..b37374d5b8d 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt
@@ -28,7 +28,11 @@ fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEnvironme
     try {
         toplevelPhase.cast<CompilerPhase<Context, Unit, Unit>>().invokeToplevel(context.phaseConfig, context, Unit)
     } finally {
-        context.disposeLlvm()
+        try {
+            context.disposeLlvm()
+        } finally {
+            context.freeNativeMem()
+        }
     }
 }
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLibrariesResolveSupport.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLibrariesResolveSupport.kt
index d2f62892442..7ae2d5ee1c9 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLibrariesResolveSupport.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLibrariesResolveSupport.kt
@@ -53,15 +53,11 @@ class KonanLibrariesResolveSupport(
                 }
             }
 
-    private val compatibleCompilerVersions: List<CompilerVersion> =
-            configuration.getList(KonanConfigKeys.COMPATIBLE_COMPILER_VERSIONS).map { it.parseCompilerVersion() }
-
     private val resolver = defaultResolver(
             repositories,
             libraryNames.filter { it.contains(File.separator) },
             target,
             distribution,
-            compatibleCompilerVersions,
             resolverLogger
     ).libraryResolver()
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Linker.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Linker.kt
index 1f379002591..e4f5ca41f73 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Linker.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Linker.kt
@@ -114,7 +114,7 @@ internal class Linker(val context: Context) {
             additionalLinkerArgs = if (target.family.isAppleFamily) {
                 when (context.config.produce) {
                     CompilerOutputKind.DYNAMIC_CACHE ->
-                        listOf("-install_name", context.config.outputFiles.mainFile)
+                        listOf("-install_name", context.config.outputFiles.dynamicCacheInstallName)
                     else -> listOf("-dead_strip")
                 }
             } else {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LlvmModuleSpecificationImpl.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LlvmModuleSpecificationImpl.kt
index 5e3ce5256ca..c17084ffb3c 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LlvmModuleSpecificationImpl.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LlvmModuleSpecificationImpl.kt
@@ -5,11 +5,10 @@
 
 package org.jetbrains.kotlin.backend.konan
 
-import org.jetbrains.kotlin.backend.konan.descriptors.konanLibrary
+import org.jetbrains.kotlin.backend.konan.ir.konanLibrary
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
-import org.jetbrains.kotlin.ir.util.module
 import org.jetbrains.kotlin.library.KotlinLibrary
 
 internal abstract class LlvmModuleSpecificationBase(protected val cachedLibraries: CachedLibraries) : LlvmModuleSpecification {
@@ -26,7 +25,7 @@ internal abstract class LlvmModuleSpecificationBase(protected val cachedLibrarie
             module.konanLibrary.let { it == null || containsLibrary(it) }
 
     override fun containsDeclaration(declaration: IrDeclaration): Boolean =
-            declaration.module.konanLibrary.let { it == null || containsLibrary(it) }
+            declaration.konanLibrary.let { it == null || containsLibrary(it) }
 }
 
 internal class DefaultLlvmModuleSpecification(cachedLibraries: CachedLibraries)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt
index ca4546c47b7..9e236b03c97 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.backend.konan.llvm.makeVisibilityHiddenLikeLlvmInter
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import org.jetbrains.kotlin.konan.target.Configurables
 import org.jetbrains.kotlin.konan.target.KonanTarget
-import org.jetbrains.kotlin.konan.target.ZephyrConfigurables
 
 private fun initializeLlvmGlobalPassRegistry() {
     val passRegistry = LLVMGetGlobalPassRegistry()
@@ -46,53 +45,26 @@ private class LlvmPipelineConfiguration(context: Context) {
 
     val targetTriple: String = context.llvm.targetTriple
 
-    // Some of these values are copied from corresponding runtime.bc
-    // which is using "generic" target CPU for many case.
-    // This approach is suboptimal because target-cpu="generic" limits
-    // the set of used cpu features.
-    // TODO: refactor KonanTarget so that we can explicitly specify
-    //  target cpu or arch+features combination in a single place.
-    val cpuModel: String = when (target) {
-        KonanTarget.IOS_ARM32 -> "generic"
-        KonanTarget.IOS_ARM64 -> "cyclone"
-        KonanTarget.IOS_X64 -> "core2"
-        KonanTarget.TVOS_ARM64 -> "cyclone"
-        KonanTarget.TVOS_X64 -> "core2"
-        KonanTarget.WATCHOS_X86 -> "i386"
-        KonanTarget.WATCHOS_X64 -> "core2"
-        KonanTarget.WATCHOS_ARM64,
-        KonanTarget.WATCHOS_ARM32 -> "cortex-a7"
-        KonanTarget.LINUX_X64 -> "x86-64"
-        KonanTarget.MINGW_X86 -> "pentium4"
-        KonanTarget.MINGW_X64 -> "x86-64"
-        KonanTarget.MACOS_X64 -> "core2"
-        KonanTarget.LINUX_ARM32_HFP -> "arm1136jf-s"
-        KonanTarget.LINUX_ARM64 -> "generic"
-        KonanTarget.ANDROID_ARM32 -> "arm7tdmi"
-        KonanTarget.ANDROID_ARM64 -> "cortex-a57"
-        KonanTarget.ANDROID_X64 -> "x86-64"
-        KonanTarget.ANDROID_X86 -> "i686"
-        KonanTarget.LINUX_MIPS32 -> "mips32r2"
-        KonanTarget.LINUX_MIPSEL32 -> "mips32r2"
-        KonanTarget.WASM32 -> "generic"
-        is KonanTarget.ZEPHYR -> (configurables as ZephyrConfigurables).targetCpu ?: run {
-            context.reportCompilationWarning("targetCpu for target $target was not set. Targeting `generic` cpu.")
-            "generic"
-        }
+    val cpuModel: String = configurables.targetCpu ?: run {
+        context.reportCompilationWarning("targetCpu for target $target was not set. Targeting `generic` cpu.")
+        "generic"
     }
 
-    val cpuFeatures: String = when (target) {
-        KonanTarget.LINUX_ARM32_HFP -> "+dsp,+strict-align,+vfp2,-crypto,-d16,-fp-armv8,-fp-only-sp,-fp16,-neon,-thumb-mode,-vfp3,-vfp4"
-        KonanTarget.ANDROID_ARM32 -> "+soft-float,+strict-align,-crypto,-neon,-thumb-mode"
-        else -> ""
-    }
+    val cpuFeatures: String = configurables.targetCpuFeatures ?: ""
 
     /**
      * Null value means that LLVM should use default inliner params
      * for the provided optimization and size level.
      */
     val customInlineThreshold: Int? = when {
-        context.shouldOptimize() -> INLINE_THRESHOLD_OPT
+        context.shouldOptimize() -> configurables.llvmInlineThreshold?.let {
+            it.toIntOrNull() ?: run {
+                context.reportCompilationWarning(
+                        "`llvmInlineThreshold` should be an integer. Got `$it` instead. Using default value."
+                )
+                null
+            }
+        }
         context.shouldContainDebugInfo() -> null
         else -> null
     }
@@ -122,15 +94,6 @@ private class LlvmPipelineConfiguration(context: Context) {
 
     val codeModel: LLVMCodeModel = LLVMCodeModel.LLVMCodeModelDefault
 
-    companion object {
-        // By default LLVM uses 250 for -03 builds.
-        // We use a smaller value since default value leads to
-        // unreasonably bloated runtime code without any measurable
-        // performance benefits.
-        // This value still has to be tuned for different targets, though.
-        private const val INLINE_THRESHOLD_OPT = 100
-    }
-
     enum class LlvmOptimizationLevel(val value: Int) {
         NONE(0),
         DEFAULT(1),
@@ -147,7 +110,17 @@ private class LlvmPipelineConfiguration(context: Context) {
 internal fun runLlvmOptimizationPipeline(context: Context) {
     val llvmModule = context.llvmModule!!
     val config = LlvmPipelineConfiguration(context)
-
+    context.log {
+        """
+            Running LLVM optimizations with the following parameters:
+            target_triple: ${config.targetTriple}
+            cpu_model: ${config.cpuModel}
+            cpu_features: ${config.cpuFeatures}
+            optimization_level: ${config.optimizationLevel.value}
+            size_level: ${config.sizeLevel.value}
+            inline_threshold: ${config.customInlineThreshold ?: "default"}
+        """.trimIndent()
+    }
     memScoped {
         LLVMKotlinInitializeTargets()
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OutputFiles.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OutputFiles.kt
index e592ffbf9a5..17ab45185c5 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OutputFiles.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OutputFiles.kt
@@ -39,6 +39,10 @@ class OutputFiles(outputPath: String?, target: KonanTarget, val produce: Compile
             else
                 outputName.fullOutputName()
 
+    private val cacheFile = File(outputName.fullOutputName()).absoluteFile.name
+
+    val dynamicCacheInstallName = File(outputName).child(cacheFile).absolutePath
+
     val tempCacheDirectory =
             if (produce.isCache)
                 File(outputName + Random.nextLong().toString())
@@ -46,7 +50,7 @@ class OutputFiles(outputPath: String?, target: KonanTarget, val produce: Compile
 
     val nativeBinaryFile =
             if (produce.isCache)
-                tempCacheDirectory!!.child(File(outputName.fullOutputName()).absoluteFile.name).absolutePath
+                tempCacheDirectory!!.child(cacheFile).absolutePath
             else mainFile
 
     val symbolicInfoFile = "$nativeBinaryFile.dSYM"
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt
index 49abcccc74b..882b92d5d45 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt
@@ -8,12 +8,11 @@ import org.jetbrains.kotlin.backend.common.serialization.mangle.ManglerChecker
 import org.jetbrains.kotlin.backend.common.serialization.mangle.descriptor.Ir2DescriptorManglerAdapter
 import org.jetbrains.kotlin.backend.konan.descriptors.isForwardDeclarationModule
 import org.jetbrains.kotlin.backend.konan.descriptors.isFromInteropLibrary
-import org.jetbrains.kotlin.backend.konan.descriptors.konanLibrary
+import org.jetbrains.kotlin.backend.konan.ir.konanLibrary
 import org.jetbrains.kotlin.backend.konan.ir.KonanSymbols
 import org.jetbrains.kotlin.backend.konan.ir.interop.IrProviderForCEnumAndCStructStubs
+import org.jetbrains.kotlin.backend.konan.serialization.*
 import org.jetbrains.kotlin.backend.konan.serialization.KonanIrLinker
-import org.jetbrains.kotlin.backend.konan.serialization.KonanManglerDesc
-import org.jetbrains.kotlin.backend.konan.serialization.KonanManglerIr
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -29,6 +28,7 @@ import org.jetbrains.kotlin.ir.visitors.acceptVoid
 import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
 import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.CleanableBindingContext
 import org.jetbrains.kotlin.utils.DFS
 
 internal fun Context.psiToIr(
@@ -72,8 +72,6 @@ internal fun Context.psiToIr(
         val irProviderForCEnumsAndCStructs =
                 IrProviderForCEnumAndCStructStubs(generatorContext, interopBuiltIns, symbols)
 
-        val deserializeFakeOverrides = config.configuration.getBoolean(CommonConfigurationKeys.DESERIALIZE_FAKE_OVERRIDES)
-
         val translationContext = object : TranslationPluginContext {
             override val moduleDescriptor: ModuleDescriptor
                 get() = generatorContext.moduleDescriptor
@@ -98,7 +96,6 @@ internal fun Context.psiToIr(
                 stubGenerator,
                 irProviderForCEnumsAndCStructs,
                 exportedDependencies,
-                deserializeFakeOverrides,
                 config.cachedLibraries
         ).also { linker ->
 
@@ -120,10 +117,12 @@ internal fun Context.psiToIr(
                     val kotlinLibrary = dependency.getCapability(KlibModuleOrigin.CAPABILITY)?.let {
                         (it as? DeserializedKlibModuleOrigin)?.library
                     }
-                    if (isProducingLibrary)
-                        linker.deserializeOnlyHeaderModule(dependency, kotlinLibrary)
-                    else
-                        linker.deserializeIrModuleHeader(dependency, kotlinLibrary)
+                    when {
+                        isProducingLibrary -> linker.deserializeOnlyHeaderModule(dependency, kotlinLibrary)
+                        kotlinLibrary != null && config.cachedLibraries.isLibraryCached(kotlinLibrary) ->
+                            linker.deserializeHeadersWithInlineBodies(dependency, kotlinLibrary)
+                        else -> linker.deserializeIrModuleHeader(dependency, kotlinLibrary)
+                    }
                 }
                 if (dependencies.size == dependenciesCount) break
                 dependenciesCount = dependencies.size
@@ -153,7 +152,7 @@ internal fun Context.psiToIr(
     }
 
     expectDescriptorToSymbol = mutableMapOf()
-    val module = translator.generateModuleFragment(
+    val mainModule = translator.generateModuleFragment(
             generatorContext,
             environment.getSourceFiles(),
             irProviders = listOf(irDeserializer),
@@ -163,7 +162,7 @@ internal fun Context.psiToIr(
             // how ExpectedActualResolver is implemented.
             // Need to fix ExpectActualResolver to either cache expects or somehow reduce the member scope searches.
             expectDescriptorToSymbol = if (expectActualLinker) expectDescriptorToSymbol else null
-    )
+    ).toKonanModule()
 
     irDeserializer.postProcess()
 
@@ -172,16 +171,16 @@ internal fun Context.psiToIr(
 
     symbolTable.noUnboundLeft("Unbound symbols left after linker")
 
-    module.acceptVoid(ManglerChecker(KonanManglerIr, Ir2DescriptorManglerAdapter(KonanManglerDesc)))
+    mainModule.acceptVoid(ManglerChecker(KonanManglerIr, Ir2DescriptorManglerAdapter(KonanManglerDesc)))
 
     val modules = if (isProducingLibrary) emptyMap() else (irDeserializer as KonanIrLinker).modules
 
-    if (!config.configuration.getBoolean(KonanConfigKeys.DISABLE_FAKE_OVERRIDE_VALIDATOR)) {
+    if (config.configuration.getBoolean(KonanConfigKeys.FAKE_OVERRIDE_VALIDATOR)) {
         val fakeOverrideChecker = FakeOverrideChecker(KonanManglerIr, KonanManglerDesc)
         modules.values.forEach { fakeOverrideChecker.check(it) }
     }
 
-    irModule = module
+    irModule = mainModule
 
     // Note: coupled with [shouldLower] below.
     irModules = modules.filterValues { llvmModuleSpecification.containsModule(it) }
@@ -194,4 +193,15 @@ internal fun Context.psiToIr(
         internalAbi.init(irModules.values + irModule!!)
         functionIrClassFactory.module = (modules.values + irModule!!).single { it.descriptor.isNativeStdlib() }
     }
-}
\ No newline at end of file
+
+    mainModule.files.forEach { it.metadata = KonanFileMetadataSource(mainModule) }
+    modules.values.forEach { module ->
+        module.files.forEach { it.metadata = KonanFileMetadataSource(module as KonanIrModuleFragmentImpl) }
+    }
+
+    val originalBindingContext = bindingContext as? CleanableBindingContext
+            ?: error("BindingContext should be cleanable in K/N IR to avoid leaking memory: $bindingContext")
+    originalBindingContext.clear()
+
+    this.bindingContext = BindingContext.EMPTY
+}
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
index b92344bd15d..4c24ed52d02 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 
 internal fun moduleValidationCallback(state: ActionState, module: IrModuleFragment, context: Context) {
-    if (!context.config.needCompilerVerification) return
+    if (!context.config.needVerifyIr) return
 
     val validatorConfig = IrValidatorConfig(
         abortOnError = false,
@@ -438,7 +438,8 @@ val toplevelPhase: CompilerPhase<*, Unit, Unit> = namedUnitPhase(
                                 unitSink()
                 ) then
                 objectFilesPhase then
-                linkerPhase
+                linkerPhase then
+                freeNativeMemPhase
 )
 
 internal fun PhaseConfig.disableIf(phase: AnyNamedPhase, condition: Boolean) {
@@ -475,5 +476,6 @@ internal fun PhaseConfig.konanPhasesConfig(config: KonanConfig) {
         disableIf(psiToIrPhase, isDescriptorsOnlyLibrary)
         disableIf(destroySymbolTablePhase, isDescriptorsOnlyLibrary)
         disableIf(copyDefaultValuesToActualPhase, isDescriptorsOnlyLibrary)
+        disableIf(specialBackendChecksPhase, isDescriptorsOnlyLibrary)
     }
 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt
index a39fefa269f..7c0c6563e02 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.backend.common.lower.at
 import org.jetbrains.kotlin.backend.common.lower.irNot
 import org.jetbrains.kotlin.backend.konan.PrimitiveBinaryType
 import org.jetbrains.kotlin.backend.konan.RuntimeNames
-import org.jetbrains.kotlin.backend.konan.descriptors.konanLibrary
+import org.jetbrains.kotlin.backend.konan.ir.konanLibrary
 import org.jetbrains.kotlin.backend.konan.getObjCMethodInfo
 import org.jetbrains.kotlin.backend.konan.ir.KonanSymbols
 import org.jetbrains.kotlin.backend.konan.ir.buildSimpleAnnotation
@@ -303,7 +303,7 @@ internal fun KotlinStubs.generateObjCCall(
 ) = builder.irBlock {
     val resolved = method.resolveFakeOverride(allowAbstract = true)?: method
     val exceptionMode = ForeignExceptionMode.byValue(
-            resolved.module.konanLibrary?.manifestProperties
+            resolved.konanLibrary?.manifestProperties
                     ?.getProperty(ForeignExceptionMode.manifestKey)
     )
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
index 51b8249f9a9..7a9a2f33a92 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
@@ -10,8 +10,6 @@ import org.jetbrains.kotlin.backend.konan.RuntimeNames
 import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
-import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
-import org.jetbrains.kotlin.descriptors.konan.klibModuleOrigin
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.OverridingUtil
 import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
@@ -156,5 +154,3 @@ internal val DeclarationDescriptor.isExpectMember: Boolean
 
 internal val DeclarationDescriptor.isSerializableExpectClass: Boolean
     get() = this is ClassDescriptor && ExpectedActualDeclarationChecker.shouldGenerateExpectClass(this)
-
-val ModuleDescriptor.konanLibrary get() = (this.klibModuleOrigin as? DeserializedKlibModuleOrigin)?.library
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt
index 606317321b0..1706ff71686 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt
@@ -7,9 +7,17 @@ package org.jetbrains.kotlin.backend.konan.ir
 
 import org.jetbrains.kotlin.backend.common.atMostOne
 import org.jetbrains.kotlin.backend.konan.DECLARATION_ORIGIN_INLINE_CLASS_SPECIAL_FUNCTION
+import org.jetbrains.kotlin.backend.konan.descriptors.isInteropLibrary
+import org.jetbrains.kotlin.backend.konan.llvm.KonanMetadata
+import org.jetbrains.kotlin.backend.konan.serialization.KonanFileMetadataSource
+import org.jetbrains.kotlin.backend.konan.serialization.KonanIrModuleFragmentImpl
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
+import org.jetbrains.kotlin.descriptors.konan.klibModuleOrigin
 import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyDeclarationBase
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.expressions.IrConst
@@ -23,6 +31,7 @@ import org.jetbrains.kotlin.ir.types.IdSignatureValues
 import org.jetbrains.kotlin.ir.types.classifierOrFail
 import org.jetbrains.kotlin.ir.types.isMarkedNullable
 import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.library.KotlinLibrary
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -101,3 +110,23 @@ fun buildSimpleAnnotation(irBuiltIns: IrBuiltIns, startOffset: Int, endOffset: I
 
 internal fun IrExpression.isBoxOrUnboxCall() =
         (this is IrCall && symbol.owner.origin == DECLARATION_ORIGIN_INLINE_CLASS_SPECIAL_FUNCTION)
+
+val ModuleDescriptor.konanLibrary get() = (this.klibModuleOrigin as? DeserializedKlibModuleOrigin)?.library
+val IrModuleFragment.konanLibrary get() =
+    (this as? KonanIrModuleFragmentImpl)?.konanLibrary ?: descriptor.konanLibrary
+val IrFile.konanLibrary get() =
+    (metadata as? KonanFileMetadataSource)?.module?.konanLibrary ?: packageFragmentDescriptor.containingDeclaration.konanLibrary
+val IrDeclaration.konanLibrary: KotlinLibrary? get() {
+    ((this as? IrMetadataSourceOwner)?.metadata as? KonanMetadata)?.let { return it.konanLibrary }
+    val result = when (val parent = parent) {
+        is IrFile -> parent.konanLibrary
+        is IrPackageFragment -> parent.packageFragmentDescriptor.containingDeclaration.konanLibrary
+        is IrDeclaration -> parent.konanLibrary
+        else -> TODO("Unexpected declaration parent: $parent")
+    }
+    if (this is IrMetadataSourceOwner && this !is IrLazyDeclarationBase)
+        metadata = KonanMetadata(metadata?.name, result)
+    return result
+}
+
+fun IrDeclaration.isFromInteropLibrary() = konanLibrary?.isInteropLibrary() == true
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt
index eab5171e6c0..ea65b605557 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumByValueFunctionGenerator.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
+import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.ir.types.getClass
@@ -87,7 +88,8 @@ internal class CEnumByValueFunctionGenerator(
                         )
                     }
                 }
-                +irCall(symbols.throwNullPointerException, irBuiltIns.nothingType)
+                +IrCallImpl.fromSymbolDescriptor(startOffset, endOffset, irBuiltIns.nothingType,
+                        symbols.throwNullPointerException)
             })
         }
         return byValueIrFunction
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt
index eafb782eda2..f90f2ffefd2 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt
@@ -54,9 +54,7 @@ internal class CEnumCompanionGenerator(
             it.body = irBuilder(irBuiltIns, it.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody {
                 +IrDelegatingConstructorCallImpl.fromSymbolDescriptor(
                         startOffset, endOffset, context.irBuiltIns.unitType,
-                        superConstructorSymbol,
-                        superConstructorSymbol.owner.typeParameters.size,
-                        superConstructorSymbol.owner.valueParameters.size
+                        superConstructorSymbol
                 )
                 +irInstanceInitializer(symbolTable.referenceClass(companionObjectDescriptor))
             }
@@ -80,17 +78,17 @@ internal class CEnumCompanionGenerator(
                 .single { it.name.identifier == enumEntryName }.symbol
     }
 
-    private fun generateAliasGetterBody(getter: IrSimpleFunction, entrySymbol: IrEnumEntrySymbol): IrBody =
+    private fun generateAliasGetterBody(getter: IrSimpleFunction, entrySymbol: IrEnumEntrySymbol, enumClass: IrClass): IrBody =
             irBuilder(irBuiltIns, getter.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody {
                 +irReturn(
-                        IrGetEnumValueImpl(startOffset, endOffset, entrySymbol.owner.parentAsClass.defaultType, entrySymbol)
+                        IrGetEnumValueImpl(startOffset, endOffset, enumClass.defaultType, entrySymbol)
                 )
             }
 
     private fun declareEntryAliasProperty(propertyDescriptor: PropertyDescriptor, enumClass: IrClass): IrProperty {
         val entrySymbol = fundCorrespondingEnumEntrySymbol(propertyDescriptor, enumClass)
         return createProperty(propertyDescriptor).also {
-            it.getter!!.body = generateAliasGetterBody(it.getter!!, entrySymbol)
+            it.getter!!.body = generateAliasGetterBody(it.getter!!, entrySymbol, enumClass)
         }
     }
 }
\ No newline at end of file
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt
index aa0a04c6abf..5cea0c767f9 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt
@@ -57,10 +57,8 @@ internal class CEnumVarClassGenerator(
                 interopBuiltIns.cEnumVar.unsubstitutedPrimaryConstructor!!
         )
         irConstructor.body = irBuilder(irBuiltIns, irConstructor.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody {
-            +IrDelegatingConstructorCallImpl(
-                    startOffset, endOffset, context.irBuiltIns.unitType, enumVarConstructorSymbol,
-                    enumVarConstructorSymbol.owner.typeParameters.size,
-                    enumVarConstructorSymbol.owner.valueParameters.size
+            +IrDelegatingConstructorCallImpl.fromSymbolDescriptor(
+                    startOffset, endOffset, context.irBuiltIns.unitType, enumVarConstructorSymbol
             ).also {
                 it.putValueArgument(0, irGet(irConstructor.valueParameters[0]))
             }
@@ -83,9 +81,7 @@ internal class CEnumVarClassGenerator(
             it.body = irBuilder(irBuiltIns, it.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody {
                 +IrDelegatingConstructorCallImpl.fromSymbolDescriptor(
                         startOffset, endOffset, context.irBuiltIns.unitType,
-                        superConstructorSymbol,
-                        superConstructorSymbol.owner.typeParameters.size,
-                        superConstructorSymbol.owner.valueParameters.size
+                        superConstructorSymbol
                 ).also {
                     it.putValueArgument(0, irInt(typeSize))
                 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarClassGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarClassGenerator.kt
index 8ab3200b262..e844c8aa444 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarClassGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarClassGenerator.kt
@@ -64,9 +64,7 @@ internal class CStructVarClassGenerator(
             irConstructor.body = irBuilder(irBuiltIns, irConstructor.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody {
                 +IrDelegatingConstructorCallImpl.fromSymbolDescriptor(
                         startOffset, endOffset,
-                        context.irBuiltIns.unitType, enumVarConstructorSymbol,
-                        irConstructor.typeParameters.size,
-                        1
+                        context.irBuiltIns.unitType, enumVarConstructorSymbol
                 ).also {
                     it.putValueArgument(0, irGet(irConstructor.valueParameters[0]))
                 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt
index 2277c7b704d..133df36ea76 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt
@@ -48,9 +48,7 @@ internal class CStructVarCompanionGenerator(
             irConstructor.body = irBuilder(irBuiltIns, irConstructor.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody {
                 +IrDelegatingConstructorCallImpl.fromSymbolDescriptor(
                         startOffset, endOffset, context.irBuiltIns.unitType,
-                        superConstructorSymbol,
-                        irConstructor.typeParameters.size,
-                        2
+                        superConstructorSymbol
                 ).also {
                     it.putValueArgument(0, irLong(size))
                     it.putValueArgument(1, irInt(align))
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt
index b040bbc5c94..a34ec0c69bf 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt
@@ -74,6 +74,16 @@ internal val disposeLLVMPhase = namedUnitPhase(
         }
 )
 
+internal val freeNativeMemPhase = namedUnitPhase(
+        name = "FreeNativeMem",
+        description = "Free native memory used by interop",
+        lower = object : CompilerPhase<Context, Unit, Unit> {
+            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState<Unit>, context: Context, input: Unit) {
+                context.freeNativeMem()
+            }
+        }
+)
+
 internal val RTTIPhase = makeKonanModuleOpPhase(
         name = "RTTI",
         description = "RTTI generation",
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
index c326d70c176..73b7ece16fa 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
@@ -452,9 +452,9 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
             call(context.llvm.freezeSubgraph, listOf(value), Lifetime.IRRELEVANT, exceptionHandler)
     }
 
-    fun checkMainThread(exceptionHandler: ExceptionHandler) {
+    fun checkGlobalsAccessible(exceptionHandler: ExceptionHandler) {
         if (context.memoryModel == MemoryModel.STRICT)
-            call(context.llvm.checkMainThread, emptyList(), Lifetime.IRRELEVANT, exceptionHandler)
+            call(context.llvm.checkGlobalsAccessible, emptyList(), Lifetime.IRRELEVANT, exceptionHandler)
     }
 
     private fun updateReturnRef(value: LLVMValueRef, address: LLVMValueRef) {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt
index 894c2b97c2d..394e29ff712 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt
@@ -521,7 +521,7 @@ internal class Llvm(val context: Context, val llvmModule: LLVMModuleRef) {
     val mutationCheck = importRtFunction("MutationCheck")
     val checkLifetimesConstraint = importRtFunction("CheckLifetimesConstraint")
     val freezeSubgraph = importRtFunction("FreezeSubgraph")
-    val checkMainThread = importRtFunction("CheckIsMainThread")
+    val checkGlobalsAccessible = importRtFunction("CheckGlobalsAccessible")
 
     val kRefSharedHolderInitLocal = importRtFunction("KRefSharedHolder_initLocal")
     val kRefSharedHolderInit = importRtFunction("KRefSharedHolder_init")
@@ -636,4 +636,4 @@ internal class Llvm(val context: Context, val llvmModule: LLVMModuleRef) {
     val llvmVector128 = vector128Type
 }
 
-class IrStaticInitializer(val module: ModuleDescriptor, val initializer: LLVMValueRef)
+class IrStaticInitializer(val konanLibrary: KotlinLibrary?, val initializer: LLVMValueRef)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
index 8925ef0adef..f2044d3c6fc 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.backend.konan.*
 import org.jetbrains.kotlin.backend.konan.descriptors.*
 import org.jetbrains.kotlin.backend.konan.ir.*
 import org.jetbrains.kotlin.backend.konan.llvm.coverage.LLVMCoverageInstrumentation
+import org.jetbrains.kotlin.backend.konan.serialization.KonanIrModuleFragmentImpl
 import org.jetbrains.kotlin.builtins.UnsignedType
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -32,14 +33,15 @@ import org.jetbrains.kotlin.ir.visitors.acceptVoid
 import org.jetbrains.kotlin.konan.ForeignExceptionMode
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import org.jetbrains.kotlin.konan.target.Family
+import org.jetbrains.kotlin.library.KotlinLibrary
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.classId
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
 
 internal enum class FieldStorageKind {
-    MAIN_THREAD,
-    SHARED,
+    GLOBAL, // In the old memory model these are only accessible from the "main" thread.
+    SHARED_FROZEN,
     THREAD_LOCAL
 }
 
@@ -55,12 +57,12 @@ internal val IrField.storageKind: FieldStorageKind get() {
     val annotations = correspondingPropertySymbol?.owner?.annotations ?: annotations
     return when {
         annotations.hasAnnotation(KonanFqNames.threadLocal) -> FieldStorageKind.THREAD_LOCAL
-        !isFinal -> FieldStorageKind.MAIN_THREAD
-        annotations.hasAnnotation(KonanFqNames.sharedImmutable) -> FieldStorageKind.SHARED
+        !isFinal -> FieldStorageKind.GLOBAL
+        annotations.hasAnnotation(KonanFqNames.sharedImmutable) -> FieldStorageKind.SHARED_FROZEN
         // TODO: simplify, once IR types are fully there.
         (type.classifierOrNull?.owner as? IrAnnotationContainer)
-                ?.annotations?.hasAnnotation(KonanFqNames.frozen) == true -> FieldStorageKind.SHARED
-        else -> FieldStorageKind.MAIN_THREAD
+                ?.annotations?.hasAnnotation(KonanFqNames.frozen) == true -> FieldStorageKind.SHARED_FROZEN
+        else -> FieldStorageKind.GLOBAL
     }
 }
 
@@ -71,9 +73,9 @@ internal fun IrClass.storageKind(context: Context): ObjectStorageKind = when {
     else -> ObjectStorageKind.SHARED
 }
 
-val IrField.isMainOnlyNonPrimitive get() = when  {
+val IrField.isGlobalNonPrimitive get() = when  {
         type.computePrimitiveBinaryTypeOrNull() != null -> false
-        else -> storageKind == FieldStorageKind.MAIN_THREAD
+        else -> storageKind == FieldStorageKind.GLOBAL
     }
 
 internal class RTTIGeneratorVisitor(context: Context) : IrElementVisitorVoid {
@@ -323,7 +325,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         context.cAdapterGenerator.generateBindings(codegen)
     }
 
-    private fun runAndProcessInitializers(module: ModuleDescriptor, f: () -> Unit) {
+    private fun runAndProcessInitializers(konanLibrary: KotlinLibrary?, f: () -> Unit) {
         // TODO: collect those two in one place.
         context.llvm.fileInitializers.clear()
         context.llvm.fileUsesThreadLocalObjects = false
@@ -337,7 +339,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
 
         // Create global initialization records.
         val initNode = createInitNode(createInitBody())
-        context.llvm.irStaticInitializers.add(IrStaticInitializer(module, createInitCtor(initNode)))
+        context.llvm.irStaticInitializers.add(IrStaticInitializer(konanLibrary, createInitCtor(initNode)))
     }
 
     //-------------------------------------------------------------------------//
@@ -355,7 +357,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         initializeCachedBoxes(context)
         declaration.acceptChildrenVoid(this)
 
-        runAndProcessInitializers(declaration.descriptor) {
+        runAndProcessInitializers(null) {
             // Note: it is here because it also generates some bitcode.
             context.objCExport.generate(codegen)
 
@@ -363,6 +365,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
 
             context.coverage.writeRegionInfo()
             appendDebugSelector()
+            overrideRuntimeGlobals()
             appendLlvmUsed("llvm.used", context.llvm.usedFunctions + context.llvm.usedGlobals)
             appendLlvmUsed("llvm.compiler.used", context.llvm.compilerUsedGlobals)
             if (context.isNativeLibrary) {
@@ -423,7 +426,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
                                         val address = context.llvmDeclarations.forStaticField(irField).storageAddressAccess.getAddress(
                                                 functionGenerationContext
                                         )
-                                        if (irField.storageKind == FieldStorageKind.SHARED)
+                                        if (irField.storageKind == FieldStorageKind.SHARED_FROZEN)
                                             freeze(initialization, currentCodeContext.exceptionHandler)
                                         storeAny(initialization, address, false)
                                     }
@@ -510,7 +513,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
     override fun visitFile(declaration: IrFile) {
         @Suppress("UNCHECKED_CAST")
         using(FileScope(declaration)) {
-            runAndProcessInitializers(declaration.packageFragmentDescriptor.module) {
+            runAndProcessInitializers(declaration.konanLibrary) {
                 declaration.acceptChildrenVoid(this)
             }
         }
@@ -1459,7 +1462,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         } else {
             // E.g. when generating type operation with reified type parameter in the original body of inline function.
             kTrue
-            // TODO: this code should be unreachable, however [BridgesBuilding] generates IR with such type checks.
+            // TODO: this code should be unreachable, recheck.
         }
         functionGenerationContext.br(bbExit)
         val bbInstanceOfResult = functionGenerationContext.currentBlock
@@ -1573,8 +1576,8 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
             if (value.symbol.owner.correspondingPropertySymbol?.owner?.isConst == true) {
                 evaluateConst(value.symbol.owner.initializer?.expression as IrConst<*>)
             } else {
-                if (context.config.threadsAreAllowed && value.symbol.owner.isMainOnlyNonPrimitive) {
-                    functionGenerationContext.checkMainThread(currentCodeContext.exceptionHandler)
+                if (context.config.threadsAreAllowed && value.symbol.owner.isGlobalNonPrimitive) {
+                    functionGenerationContext.checkGlobalsAccessible(currentCodeContext.exceptionHandler)
                 }
                 val ptr = context.llvmDeclarations.forStaticField(value.symbol.owner).storageAddressAccess.getAddress(
                         functionGenerationContext
@@ -1642,9 +1645,9 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
             val globalAddress = context.llvmDeclarations.forStaticField(value.symbol.owner).storageAddressAccess.getAddress(
                     functionGenerationContext
             )
-            if (context.config.threadsAreAllowed && value.symbol.owner.storageKind == FieldStorageKind.MAIN_THREAD)
-                functionGenerationContext.checkMainThread(currentCodeContext.exceptionHandler)
-            if (value.symbol.owner.storageKind == FieldStorageKind.SHARED)
+            if (context.config.threadsAreAllowed && value.symbol.owner.storageKind == FieldStorageKind.GLOBAL)
+                functionGenerationContext.checkGlobalsAccessible(currentCodeContext.exceptionHandler)
+            if (value.symbol.owner.storageKind == FieldStorageKind.SHARED_FROZEN)
                 functionGenerationContext.freeze(valueToAssign, currentCodeContext.exceptionHandler)
             functionGenerationContext.storeAny(valueToAssign, globalAddress, false)
         }
@@ -2378,6 +2381,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         LLVMSetSection(llvmUsedGlobal.llvmGlobal, "llvm.metadata")
     }
 
+    // TODO: Consider migrating `KonanNeedDebugInfo` to the `overrideRuntimeGlobal` mechanism from below.
     private fun appendDebugSelector() {
         if (!context.producedLlvmModuleContainsStdlib) return
         val llvmDebugSelector =
@@ -2387,6 +2391,39 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         llvmDebugSelector.setLinkage(LLVMLinkage.LLVMExternalLinkage)
     }
 
+    private fun overrideRuntimeGlobal(name: String, value: ConstValue) {
+        // TODO: A similar mechanism is used in `ObjCExportCodeGenerator`. Consider merging them.
+        if (context.llvmModuleSpecification.importsKotlinDeclarationsFromOtherSharedLibraries()) {
+            // When some dynamic caches are used, we consider that stdlib is in the dynamic cache as well.
+            // Runtime is linked into stdlib module only, so import runtime global from it.
+            val global = codegen.importGlobal(name, value.llvmType, context.standardLlvmSymbolsOrigin)
+            val initializer = generateFunction(codegen, functionType(voidType, false), "") {
+                store(value.llvm, global)
+                ret(null)
+            }
+
+            LLVMSetLinkage(initializer, LLVMLinkage.LLVMPrivateLinkage)
+
+            context.llvm.otherStaticInitializers += initializer
+        } else {
+            context.llvmImports.add(context.standardLlvmSymbolsOrigin)
+            // Define a strong runtime global. It'll overrule a weak global defined in a statically linked runtime.
+            val global = context.llvm.staticData.placeGlobal(name, value, true)
+
+            if (context.llvmModuleSpecification.importsKotlinDeclarationsFromOtherObjectFiles()) {
+                context.llvm.usedGlobals += global.llvmGlobal
+                LLVMSetVisibility(global.llvmGlobal, LLVMVisibility.LLVMHiddenVisibility)
+            }
+        }
+    }
+
+    private fun overrideRuntimeGlobals() {
+        if (!context.config.produce.isFinalBinary)
+            return
+
+        overrideRuntimeGlobal("Kotlin_destroyRuntimeMode", Int32(context.config.destroyRuntimeMode.value))
+    }
+
     //-------------------------------------------------------------------------//
     // Create type { i32, void ()*, i8* }
 
@@ -2424,7 +2461,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         }
 
         context.llvm.irStaticInitializers.forEach {
-            val library = it.module.konanLibrary
+            val library = it.konanLibrary
             val initializers = libraryToInitializers[library]
                     ?: error("initializer for not included library ${library?.libraryFile}")
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt
index 03f9722ec87..986c2ea1e57 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt
@@ -15,17 +15,14 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
+import org.jetbrains.kotlin.library.KotlinLibrary
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
 internal fun createLlvmDeclarations(context: Context): LlvmDeclarations {
     val generator = DeclarationsGeneratorVisitor(context)
     context.ir.irModule.acceptChildrenVoid(generator)
-    return with(generator) {
-        LlvmDeclarations(
-                functions, classes, fields, staticFields, uniques
-        )
-    }
+    return LlvmDeclarations(generator.uniques)
 }
 
 // Please note, that llvmName is part of the ABI, and cannot be liberally changed.
@@ -34,22 +31,17 @@ enum class UniqueKind(val llvmName: String) {
     EMPTY_ARRAY("theEmptyArray")
 }
 
-internal class LlvmDeclarations(
-    private val functions: Map<IrFunction, FunctionLlvmDeclarations>,
-    private val classes: Map<IrClass, ClassLlvmDeclarations>,
-    private val fields: Map<IrField, FieldLlvmDeclarations>,
-    private val staticFields: Map<IrField, StaticFieldLlvmDeclarations>,
-    private val unique: Map<UniqueKind, UniqueLlvmDeclarations>) {
+internal class LlvmDeclarations(private val unique: Map<UniqueKind, UniqueLlvmDeclarations>) {
     fun forFunction(function: IrFunction) = forFunctionOrNull(function) ?: with(function){error("$name in $file/${parent.fqNameForIrSerialization}")}
-    fun forFunctionOrNull(function: IrFunction) = functions[function]
+    fun forFunctionOrNull(function: IrFunction) = (function.metadata as? CodegenFunctionMetadata)?.llvm
 
-    fun forClass(irClass: IrClass) = classes[irClass] ?:
+    fun forClass(irClass: IrClass) = (irClass.metadata as? CodegenClassMetadata)?.llvm ?:
             error(irClass.descriptor.toString())
 
-    fun forField(field: IrField) = fields[field] ?:
+    fun forField(field: IrField) = (field.metadata as? CodegenInstanceFieldMetadata)?.llvm ?:
             error(field.descriptor.toString())
 
-    fun forStaticField(field: IrField) = staticFields[field] ?:
+    fun forStaticField(field: IrField) = (field.metadata as? CodegenStaticFieldMetadata)?.llvm ?:
             error(field.descriptor.toString())
 
     fun forSingleton(irClass: IrClass) = forClass(irClass).singletonDeclarations ?:
@@ -100,10 +92,6 @@ private fun ContextUtils.createClassBodyType(name: String, fields: List<IrField>
 private class DeclarationsGeneratorVisitor(override val context: Context) :
         IrElementVisitorVoid, ContextUtils {
 
-    val functions = mutableMapOf<IrFunction, FunctionLlvmDeclarations>()
-    val classes = mutableMapOf<IrClass, ClassLlvmDeclarations>()
-    val fields = mutableMapOf<IrField, FieldLlvmDeclarations>()
-    val staticFields = mutableMapOf<IrField, StaticFieldLlvmDeclarations>()
     val uniques = mutableMapOf<UniqueKind, UniqueLlvmDeclarations>()
 
     private class Namer(val prefix: String) {
@@ -157,7 +145,10 @@ private class DeclarationsGeneratorVisitor(override val context: Context) :
 
     override fun visitClass(declaration: IrClass) {
         if (declaration.requiresRtti()) {
-            this.classes[declaration] = createClassDeclarations(declaration)
+            val classLlvmDeclarations = createClassDeclarations(declaration)
+            val metadata = declaration.metadata as? CodegenClassMetadata
+                    ?: CodegenClassMetadata(declaration).also { declaration.metadata = it }
+            metadata.llvm = classLlvmDeclarations
         }
         super.visitClass(declaration)
     }
@@ -311,12 +302,16 @@ private class DeclarationsGeneratorVisitor(override val context: Context) :
         val containingClass = declaration.parent as? IrClass
         if (containingClass != null) {
             if (!containingClass.requiresRtti()) return
-            val classDeclarations = this.classes[containingClass] ?:
-                error(containingClass.descriptor.toString())
+            val classDeclarations = (containingClass.metadata as? CodegenClassMetadata)?.llvm
+                    ?: error(containingClass.descriptor.toString())
             val allFields = context.getLayoutBuilder(containingClass).fields
-            this.fields[declaration] = FieldLlvmDeclarations(
-                    allFields.indexOf(declaration) + 1, // First field is ObjHeader.
-                    classDeclarations.bodyType
+            declaration.metadata = CodegenInstanceFieldMetadata(
+                    declaration.metadata?.name,
+                    containingClass.konanLibrary,
+                    FieldLlvmDeclarations(
+                            allFields.indexOf(declaration) + 1, // First field is ObjHeader.
+                            classDeclarations.bodyType
+                    )
             )
         } else {
             // Fields are module-private, so we use internal name:
@@ -327,7 +322,11 @@ private class DeclarationsGeneratorVisitor(override val context: Context) :
                 addKotlinGlobal(name, getLLVMType(declaration.type), isExported = false)
             }
 
-            this.staticFields[declaration] = StaticFieldLlvmDeclarations(storage)
+            declaration.metadata = CodegenStaticFieldMetadata(
+                    declaration.metadata?.name,
+                    declaration.konanLibrary,
+                    StaticFieldLlvmDeclarations(storage)
+            )
         }
     }
 
@@ -346,7 +345,7 @@ private class DeclarationsGeneratorVisitor(override val context: Context) :
             if (declaration.isTypedIntrinsic || declaration.isObjCBridgeBased()
                     // All call-sites to external accessors to interop properties
                     // are lowered by InteropLowering.
-                    || (declaration.isAccessor && declaration.isFromMetadataInteropLibrary())
+                    || (declaration.isAccessor && declaration.isFromInteropLibrary())
                     || declaration.annotations.hasAnnotation(RuntimeNames.cCall)) return
 
             context.llvm.externalFunction(declaration.symbolName, llvmFunctionType,
@@ -374,6 +373,40 @@ private class DeclarationsGeneratorVisitor(override val context: Context) :
             function
         }
 
-        this.functions[declaration] = FunctionLlvmDeclarations(llvmFunction)
+        declaration.metadata = CodegenFunctionMetadata(
+                declaration.metadata?.name,
+                declaration.konanLibrary,
+                FunctionLlvmDeclarations(llvmFunction)
+        )
     }
 }
+
+internal open class KonanMetadata(override val name: Name?, val konanLibrary: KotlinLibrary?) : MetadataSource
+
+internal class CodegenClassMetadata(irClass: IrClass)
+    : KonanMetadata(irClass.metadata?.name, irClass.konanLibrary), MetadataSource.Class {
+    var layoutBuilder: ClassLayoutBuilder? = null
+    var llvm: ClassLlvmDeclarations? = null
+}
+
+private class CodegenFunctionMetadata(
+        name: Name?,
+        konanLibrary: KotlinLibrary?,
+        val llvm: FunctionLlvmDeclarations
+) : KonanMetadata(name, konanLibrary), MetadataSource.Function
+
+private class CodegenInstanceFieldMetadata(
+        name: Name?,
+        konanLibrary: KotlinLibrary?,
+        val llvm: FieldLlvmDeclarations
+) : KonanMetadata(name, konanLibrary), MetadataSource.Property {
+    override val isConst = false
+}
+
+private class CodegenStaticFieldMetadata(
+        name: Name?,
+        konanLibrary: KotlinLibrary?,
+        val llvm: StaticFieldLlvmDeclarations
+) : KonanMetadata(name, konanLibrary), MetadataSource.Property {
+    override val isConst = false
+}
\ No newline at end of file
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/VerifyModule.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/VerifyModule.kt
index b67b3bfd674..9ecc32c4f61 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/VerifyModule.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/VerifyModule.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.backend.konan.llvm
 import kotlinx.cinterop.*
 import llvm.*
 import java.io.File
+import java.nio.file.Files
 
 internal fun verifyModule(llvmModule: LLVMModuleRef, current: String = "") = memScoped {
     val errorRef = allocPointerTo<ByteVar>()
@@ -49,7 +50,7 @@ private fun StringBuilder.appendModuleVerificationFailureDetails(
 
     appendVerificationError(verificationError)
 
-    val moduleDumpFile = createTempFile("kotlin_native_llvm_module_dump", ".ll")
+    val moduleDumpFile = Files.createTempFile("kotlin_native_llvm_module_dump", ".ll").toFile()
 
     dumpModuleAndAppendDetails(llvmModule, moduleDumpFile)
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt
index e6dc602de5f..48fc3c761bb 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt
@@ -474,6 +474,7 @@ private fun ObjCExportCodeGenerator.replaceExternalWeakOrCommonGlobal(
         value: ConstValue,
         origin: CompiledKlibModuleOrigin
 ) {
+    // TODO: A similar mechanism is used in `IrToBitcode.overrideRuntimeGlobal`. Consider merging them.
     if (context.llvmModuleSpecification.importsKotlinDeclarationsFromOtherSharedLibraries()) {
         val global = codegen.importGlobal(name, value.llvmType, origin)
         externalGlobalInitializers[global] = value
@@ -1123,11 +1124,9 @@ private fun ObjCExportCodeGenerator.createMethodVirtualAdapter(
     val selector = namer.getSelector(baseMethod.descriptor)
 
     val methodBridge = mapper.bridgeMethod(baseMethod.descriptor)
-    val objCToKotlin = constPointer(generateObjCImp(baseMethod, baseMethod, methodBridge, isVirtual = true))
+    val imp = generateObjCImp(baseMethod, baseMethod, methodBridge, isVirtual = true)
 
-    selectorsToDefine[selector] = methodBridge
-
-    return ObjCToKotlinMethodAdapter(selector, getEncoding(methodBridge), objCToKotlin)
+    return objCToKotlinMethodAdapter(selector, methodBridge, imp)
 }
 
 private fun ObjCExportCodeGenerator.createMethodAdapter(
@@ -1148,12 +1147,10 @@ private fun ObjCExportCodeGenerator.createMethodAdapter(
 
     val selectorName = namer.getSelector(request.base.descriptor)
     val methodBridge = mapper.bridgeMethod(request.base.descriptor)
-    val objCEncoding = getEncoding(methodBridge)
-    val objCToKotlin = constPointer(generateObjCImp(request.implementation, request.base, methodBridge))
 
-    selectorsToDefine[selectorName] = methodBridge
+    val imp = generateObjCImp(request.implementation, request.base, methodBridge)
 
-    ObjCToKotlinMethodAdapter(selectorName, objCEncoding, objCToKotlin)
+    objCToKotlinMethodAdapter(selectorName, methodBridge, imp)
 }
 
 private fun ObjCExportCodeGenerator.createConstructorAdapter(
@@ -1165,12 +1162,9 @@ private fun ObjCExportCodeGenerator.createArrayConstructorAdapter(
 ): ObjCExportCodeGenerator.ObjCToKotlinMethodAdapter {
     val selectorName = namer.getSelector(irConstructor.descriptor)
     val methodBridge = mapper.bridgeMethod(irConstructor.descriptor)
-    val objCEncoding = getEncoding(methodBridge)
-    val objCToKotlin = constPointer(generateObjCImpForArrayConstructor(irConstructor, methodBridge))
+    val imp = generateObjCImpForArrayConstructor(irConstructor, methodBridge)
 
-    selectorsToDefine[selectorName] = methodBridge
-
-    return ObjCToKotlinMethodAdapter(selectorName, objCEncoding, objCToKotlin)
+    return objCToKotlinMethodAdapter(selectorName, methodBridge, imp)
 }
 
 private fun ObjCExportCodeGenerator.vtableIndex(irFunction: IrSimpleFunction): Int? {
@@ -1236,6 +1230,9 @@ private fun ObjCExportCodeGenerator.createTypeAdapter(
             is ObjCGetterForKotlinEnumEntry -> {
                 classAdapters += createEnumEntryAdapter(it.irEnumEntrySymbol.owner)
             }
+            is ObjCClassMethodForKotlinEnumValues -> {
+                classAdapters += createEnumValuesAdapter(it.valuesFunctionSymbol.owner, it.selector)
+            }
             is ObjCMethodForKotlinMethod -> {} // Handled below.
         }.let {} // Force exhaustive.
     }
@@ -1424,16 +1421,23 @@ private inline fun ObjCExportCodeGenerator.generateObjCToKotlinSyntheticGetter(
             MethodBridgeReceiver.Static, valueParameters = emptyList()
     )
 
-    val encoding = getEncoding(methodBridge)
     val imp = generateFunction(codegen, objCFunctionType(context, methodBridge), "objc2kotlin") {
         block()
     }
 
     LLVMSetLinkage(imp, LLVMLinkage.LLVMPrivateLinkage)
 
+    return objCToKotlinMethodAdapter(selector, methodBridge, imp)
+}
+
+private fun ObjCExportCodeGenerator.objCToKotlinMethodAdapter(
+        selector: String,
+        methodBridge: MethodBridge,
+        imp: LLVMValueRef
+): ObjCExportCodeGenerator.ObjCToKotlinMethodAdapter {
     selectorsToDefine[selector] = methodBridge
 
-    return ObjCToKotlinMethodAdapter(selector, encoding, constPointer(imp))
+    return ObjCToKotlinMethodAdapter(selector, getEncoding(methodBridge), constPointer(imp))
 }
 
 private fun ObjCExportCodeGenerator.createUnitInstanceAdapter() =
@@ -1473,6 +1477,21 @@ private fun ObjCExportCodeGenerator.createEnumEntryAdapter(
     }
 }
 
+private fun ObjCExportCodeGenerator.createEnumValuesAdapter(
+        valuesFunction: IrFunction,
+        selector: String
+): ObjCExportCodeGenerator.ObjCToKotlinMethodAdapter {
+    val methodBridge = MethodBridge(
+            returnBridge = MethodBridge.ReturnValue.Mapped(ReferenceBridge),
+            receiver = MethodBridgeReceiver.Static,
+            valueParameters = emptyList()
+    )
+
+    val imp = generateObjCImp(valuesFunction, valuesFunction, methodBridge, isVirtual = false)
+
+    return objCToKotlinMethodAdapter(selector, methodBridge, imp)
+}
+
 private fun List<CallableMemberDescriptor>.toMethods(): List<FunctionDescriptor> = this.flatMap {
     when (it) {
         is PropertyDescriptor -> listOfNotNull(it.getter, it.setter)
@@ -1591,7 +1610,8 @@ private fun Context.is64BitNSInteger(): Boolean = when (val target = this.config
     KonanTarget.IOS_ARM64,
     KonanTarget.TVOS_ARM64,
     KonanTarget.TVOS_X64,
-    KonanTarget.MACOS_X64 -> true
+    KonanTarget.MACOS_X64,
+    KonanTarget.WATCHOS_X64 -> true
     KonanTarget.WATCHOS_ARM64,
     KonanTarget.WATCHOS_ARM32,
     KonanTarget.WATCHOS_X86,
@@ -1609,10 +1629,9 @@ private fun Context.is64BitNSInteger(): Boolean = when (val target = this.config
     KonanTarget.LINUX_MIPSEL32,
     KonanTarget.WASM32,
     is KonanTarget.ZEPHYR -> error("Target $target has no support for NSInteger type.")
-    KonanTarget.WATCHOS_X64 -> error("Target $target is not supported.")
 }
 
-internal fun Context.is64BitLong(): Boolean = when (val target = this.config.target) {
+internal fun Context.is64BitLong(): Boolean = when (this.config.target) {
     KonanTarget.IOS_X64,
     KonanTarget.IOS_ARM64,
     KonanTarget.TVOS_ARM64,
@@ -1622,7 +1641,8 @@ internal fun Context.is64BitLong(): Boolean = when (val target = this.config.tar
     KonanTarget.LINUX_ARM64,
     KonanTarget.MINGW_X64,
     KonanTarget.LINUX_X64,
-    KonanTarget.MACOS_X64 -> true
+    KonanTarget.MACOS_X64,
+    KonanTarget.WATCHOS_X64 -> true
     KonanTarget.WATCHOS_ARM64,
     KonanTarget.WATCHOS_ARM32,
     KonanTarget.ANDROID_X86,
@@ -1635,5 +1655,4 @@ internal fun Context.is64BitLong(): Boolean = when (val target = this.config.tar
     KonanTarget.WASM32,
     is KonanTarget.ZEPHYR,
     KonanTarget.IOS_ARM32 -> false
-    KonanTarget.WATCHOS_X64 -> error("Target $target is not supported.")
 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt
index 02bcf832aaa..91e9913eb05 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt
@@ -23,9 +23,7 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrPropertyImpl
 import org.jetbrains.kotlin.ir.descriptors.WrappedPropertyDescriptor
 import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
-import org.jetbrains.kotlin.ir.expressions.impl.IrBlockImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrGetObjectValueImpl
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.symbols.impl.IrFieldSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrPropertySymbolImpl
@@ -35,7 +33,6 @@ import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.visitors.*
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.utils.addIfNotNull
 
 /**
  * Boxes and unboxes values of value types when necessary.
@@ -237,8 +234,13 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
                 buildUnboxFunction(declaration, context.getUnboxFunction(declaration))
             }
 
-            declaration.constructors.filter { !it.isPrimary }.toList().mapTo(declaration.declarations) {
-                context.getLoweredInlineClassConstructor(it)
+            if (declaration.isNativePrimitiveType()) {
+                // Constructors for these types aren't used and actually are malformed (e.g. lack the parameter).
+                // Skipping here for simplicity.
+            } else {
+                declaration.constructors.toList().mapTo(declaration.declarations) {
+                    context.getLoweredInlineClassConstructor(it)
+                }
             }
         }
 
@@ -266,21 +268,14 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
         super.visitSetField(expression)
 
         return if (expression.symbol.owner.parentClassOrNull?.isInlined() == true) {
-            // TODO: it is better to get rid of functions setting such fields.
-            // Here we're trying to maintain all IR nodes as is, albeit the transformed IR isn't equivalent to the original.
-            // By far SET_FIELD can only be in the constructor which won't be codegened.
-            // Box functions use createUninitializedInstance instead of constructor calls
-            // and are placed separately so they won't be processed here.
-            val startOffset = expression.startOffset
-            val endOffset = expression.endOffset
-            IrBlockImpl(startOffset, endOffset, irBuiltIns.unitType).apply {
-                statements.addIfNotNull(expression.receiver)
-                statements += expression.value
-                statements += IrCallImpl(startOffset, endOffset, irBuiltIns.nothingType, symbols.throwNullPointerException,
-                        symbols.throwNullPointerException.owner.typeParameters.size,
-                        symbols.throwNullPointerException.owner.valueParameters.size)
-                statements += IrGetObjectValueImpl(startOffset, endOffset, irBuiltIns.unitType, irBuiltIns.unitClass)
-            }
+            // Happens in one of the cases:
+            // 1. In primary constructor of the inlined class. Makes no sense, "has no effect", can be removed.
+            //    The constructor will be lowered and used.
+            // 2. In setter of NativePointed.rawPtr. It is generally a hack and isn't actually used.
+            //    TODO: it is better to get rid of it.
+            //
+            // So drop the entire IrSetField:
+            return builder.irComposite(expression) {}
         } else {
             expression
         }
@@ -301,8 +296,11 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
         super.visitConstructor(declaration)
 
         if (declaration.constructedClass.isInlined()) {
-            if (!declaration.isPrimary) {
-                buildLoweredSecondaryConstructor(declaration)
+            if (declaration.constructedClass.isNativePrimitiveType()) {
+                // Constructors for these types aren't used and actually are malformed (e.g. lack the parameter).
+                // Skipping here for simplicity.
+            } else {
+                buildLoweredConstructor(declaration)
             }
             // TODO: fix DFG building and nullify the body instead.
             (declaration.body as IrBlockBody).statements.clear()
@@ -431,22 +429,35 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
     private fun IrBuilderWithScope.lowerConstructorCallToValue(
             expression: IrMemberAccessExpression<*>,
             callee: IrConstructor
-    ): IrExpression = if (callee.isPrimary) {
-        expression.getValueArgument(0)!!
-    } else {
-        this.at(expression).irCall(this@InlineClassTransformer.context.getLoweredInlineClassConstructor(callee)).apply {
+    ): IrExpression {
+        this.at(expression)
+        val loweredConstructor = this@InlineClassTransformer.context.getLoweredInlineClassConstructor(callee)
+        return if (callee.isPrimary) this.irBlock {
+            val argument = irTemporary(expression.getValueArgument(0)!!)
+            +irCall(loweredConstructor).apply {
+                putValueArgument(0, irGet(argument))
+            }
+            +irGet(argument)
+        } else this.irCall(loweredConstructor).apply {
             (0 until expression.valueArgumentsCount).forEach {
                 putValueArgument(it, expression.getValueArgument(it)!!)
             }
         }
     }
 
-    private fun buildLoweredSecondaryConstructor(irConstructor: IrConstructor) {
+    private fun buildLoweredConstructor(irConstructor: IrConstructor) {
         val result = context.getLoweredInlineClassConstructor(irConstructor)
         val irClass = irConstructor.parentAsClass
 
         result.body = context.createIrBuilder(result.symbol).irBlockBody(result) {
-            lateinit var thisVar: IrVariable
+            lateinit var thisVar: IrValueDeclaration
+
+            fun IrBuilderWithScope.genReturnValue(): IrExpression = if (irConstructor.isPrimary) {
+                irGetObject(irBuiltIns.unitClass)
+            } else {
+                irGet(thisVar)
+            }
+
             val parameterMapping = result.valueParameters.associateBy {
                 irConstructor.valueParameters[it.index].symbol
             }
@@ -457,9 +468,14 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
                     override fun visitDelegatingConstructorCall(expression: IrDelegatingConstructorCall): IrExpression {
                         expression.transformChildrenVoid()
 
-                        val value = lowerConstructorCallToValue(expression, expression.symbol.owner)
                         return irBlock(expression) {
-                            thisVar = irTemporary(value)
+                            thisVar = if (irConstructor.isPrimary) {
+                                // Note: block is empty in this case.
+                                result.valueParameters.single()
+                            } else {
+                                val value = lowerConstructorCallToValue(expression, expression.symbol.owner)
+                                irTemporary(value)
+                            }
                         }
                     }
 
@@ -484,7 +500,7 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
                         if (expression.returnTargetSymbol == irConstructor.symbol) {
                             return irReturn(irBlock(expression.startOffset, expression.endOffset) {
                                 +expression.value
-                                +irGet(thisVar)
+                                +genReturnValue()
                             })
                         }
 
@@ -492,7 +508,7 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
                     }
                 })
             }
-            +irReturn(irGet(thisVar))
+            +irReturn(genReturnValue())
         }
     }
 
@@ -502,7 +518,16 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
 
 private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpleFunction by Context.lazyMapMember { irConstructor ->
     require(irConstructor.constructedClass.isInlined())
-    require(!irConstructor.isPrimary)
+
+    val returnType = if (irConstructor.isPrimary) {
+        // Optimization. When constructor is primary, the return value will be the same as the argument.
+        // So we can just use the argument on the call site.
+        // This might be especially important for reference types,
+        // to avoid redundant suboptimal "slot" machinery messing with this code.
+        irBuiltIns.unitType
+    } else {
+        irConstructor.returnType
+    }
 
     val descriptor = WrappedSimpleFunctionDescriptor()
     IrFunctionImpl(
@@ -516,7 +541,7 @@ private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpl
             isExternal = false,
             isTailrec = false,
             isSuspend = false,
-            returnType = irConstructor.returnType,
+            returnType = returnType,
             isExpect = false,
             isFakeOverride = false,
             isOperator = false,
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt
index e5caa09c3e7..a5bee8d2929 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt
@@ -53,6 +53,10 @@ internal class WorkersBridgesBuilding(val context: Context) : DeclarationContain
     private fun buildWorkerBridges(declaration: IrDeclaration): List<IrFunction> {
         val bridges = mutableListOf<IrFunction>()
         declaration.transformChildrenVoid(object: IrElementTransformerVoid() {
+            override fun visitClass(declaration: IrClass): IrStatement {
+                // Skip nested.
+                return declaration
+            }
 
             override fun visitCall(expression: IrCall): IrExpression {
                 expression.transformChildrenVoid(this)
@@ -133,20 +137,24 @@ internal class BridgesBuilding(val context: Context) : ClassLoweringPass {
     override fun lower(irClass: IrClass) {
         val builtBridges = mutableSetOf<IrSimpleFunction>()
 
-        irClass.simpleFunctions()
-                .forEach { function ->
-                    function.allOverriddenFunctions
-                            .map { OverriddenFunctionInfo(function, it) }
-                            .filter { !it.bridgeDirections.allNotNeeded() }
-                            .filter { it.canBeCalledVirtually }
-                            .filter { !it.inheritsBridge }
-                            .distinctBy { it.bridgeDirections }
-                            .forEach {
-                                buildBridge(it, irClass)
-                                builtBridges += it.function
-                            }
+        for (function in irClass.simpleFunctions()) {
+            val set = mutableSetOf<BridgeDirections>()
+            for (overriddenFunction in function.allOverriddenFunctions) {
+                val overriddenFunctionInfo = OverriddenFunctionInfo(function, overriddenFunction)
+                val bridgeDirections = overriddenFunctionInfo.bridgeDirections
+                if (!bridgeDirections.allNotNeeded() && overriddenFunctionInfo.canBeCalledVirtually
+                        && !overriddenFunctionInfo.inheritsBridge && set.add(bridgeDirections)) {
+                    buildBridge(overriddenFunctionInfo, irClass)
+                    builtBridges += function
                 }
+            }
+        }
         irClass.transformChildrenVoid(object: IrElementTransformerVoid() {
+            override fun visitClass(declaration: IrClass): IrStatement {
+                // Skip nested.
+                return declaration
+            }
+
             override fun visitFunction(declaration: IrFunction): IrStatement {
                 declaration.transformChildrenVoid(this)
 
@@ -207,7 +215,12 @@ private fun IrBlockBodyBuilder.buildTypeSafeBarrier(function: IrFunction,
     for (i in valueParameters.indices) {
         if (!typeSafeBarrierDescription.checkParameter(i))
             continue
-        val type = originalValueParameters[i].type
+
+        val type = originalValueParameters[i].type.erasureForTypeOperation()
+        // Note: erasing to single type is not entirely correct if type parameter has multiple upper bounds.
+        // In this case the compiler could generate multiple type checks, one for each upper bound.
+        // But let's keep it simple here for now; JVM backend doesn't do this anyway.
+
         if (!type.isNullableAny()) {
             +returnIfBadType(irGet(valueParameters[i]), type,
                     if (typeSafeBarrierDescription == SpecialGenericSignatures.TypeSafeBarrierDescription.MAP_GET_OR_DEFAULT)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt
index ad89024f187..21f6779a58c 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.backend.konan.DECLARATION_ORIGIN_ENUM
 import org.jetbrains.kotlin.backend.konan.llvm.IntrinsicType
 import org.jetbrains.kotlin.backend.konan.llvm.tryGetIntrinsicType
 import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrPropertyImpl
@@ -124,19 +125,25 @@ internal class EnumUsageLowering(val context: Context)
     }
 }
 
-internal class EnumClassLowering(val context: Context) : ClassLoweringPass {
+internal class EnumClassLowering(val context: Context) : FileLoweringPass {
 
     fun run(irFile: IrFile) {
         // EnumWhenLowering should be performed before EnumUsageLowering because
         // the latter performs lowering of IrGetEnumValue
         EnumWhenLowering(context).lower(irFile)
-        runOnFilePostfix(irFile)
+        lower(irFile)
         EnumUsageLowering(context).lower(irFile)
     }
 
-    override fun lower(irClass: IrClass) {
-        if (irClass.kind != ClassKind.ENUM_CLASS) return
-        EnumClassTransformer(irClass).run()
+    override fun lower(irFile: IrFile) {
+        irFile.transformChildrenVoid(object : IrElementTransformerVoid() {
+            override fun visitClass(declaration: IrClass): IrStatement {
+                declaration.transformChildrenVoid()
+                if (declaration.kind == ClassKind.ENUM_CLASS)
+                    EnumClassTransformer(declaration).run()
+                return declaration
+            }
+        })
     }
 
     private inner class EnumClassTransformer(val irClass: IrClass) {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt
index cf85928b404..6208ec8a143 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt
@@ -179,10 +179,8 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas
                 val result = IrDelegatingConstructorCallImpl.fromSymbolDescriptor(
                         startOffset, endOffset,
                         context.irBuiltIns.unitType,
-                        enumConstructorCall.symbol,
-                        enumConstructorCall.symbol.owner.typeParameters.size,
-                        enumConstructorCall.symbol.owner.valueParameters.size)
-
+                        enumConstructorCall.symbol
+                )
                 assert(result.symbol.owner.valueParameters.size == 2) {
                     "Enum(String, Int) constructor call expected:\n${result.dump()}"
                 }
@@ -216,10 +214,8 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas
                 val result = IrDelegatingConstructorCallImpl.fromSymbolDescriptor(
                         startOffset, endOffset,
                         context.irBuiltIns.unitType,
-                        loweredDelegatingConstructor.symbol,
-                        loweredDelegatingConstructor.symbol.owner.typeParameters.size,
-                        loweredDelegatingConstructor.symbol.owner.valueParameters.size)
-
+                        loweredDelegatingConstructor.symbol
+                )
                 val firstParameter = enumClassConstructor.valueParameters[0]
                 result.putValueArgument(0,
                         IrGetValueImpl(startOffset, endOffset, firstParameter.type, firstParameter.symbol))
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InnerClassLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InnerClassLowering.kt
index ff1022f50d5..9af0994cdee 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InnerClassLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InnerClassLowering.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.backend.common.ClassLoweringPass
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
 import org.jetbrains.kotlin.backend.common.lower.callsSuper
 import org.jetbrains.kotlin.backend.konan.Context
+import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrBlockBody
 import org.jetbrains.kotlin.ir.expressions.IrExpression
@@ -87,6 +88,11 @@ internal class InnerClassLowering(val context: Context) : ClassLoweringPass {
 
         private fun lowerOuterThisReferences() {
             irClass.transformChildrenVoid(object : IrElementTransformerVoidWithContext() {
+                override fun visitClassNew(declaration: IrClass): IrStatement {
+                    // Skip nested.
+                    return declaration
+                }
+
                 override fun visitGetValue(expression: IrGetValue): IrExpression {
                     expression.transformChildrenVoid(this)
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
index 3d640b3af4b..791d47dee94 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
@@ -14,8 +14,6 @@ import org.jetbrains.kotlin.backend.common.lower.*
 import org.jetbrains.kotlin.backend.konan.*
 import org.jetbrains.kotlin.backend.konan.cgen.*
 import org.jetbrains.kotlin.backend.konan.descriptors.allOverriddenFunctions
-import org.jetbrains.kotlin.backend.konan.descriptors.isFromInteropLibrary
-import org.jetbrains.kotlin.backend.konan.descriptors.konanLibrary
 import org.jetbrains.kotlin.backend.konan.descriptors.synthesizedName
 import org.jetbrains.kotlin.backend.konan.ir.*
 import org.jetbrains.kotlin.backend.konan.ir.companionObject
@@ -500,11 +498,8 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
                         startOffset,
                         endOffset,
                         context.irBuiltIns.unitType,
-                        superConstructor,
-                        0,
-                        superConstructor.owner.valueParameters.size
+                        superConstructor
                 )
-
                 +irCall(symbols.interopObjCObjectSuperInitCheck).apply {
                     extensionReceiver = irGet(constructedClass.thisReceiver!!)
                     putValueArgument(0, initCall)
@@ -814,7 +809,7 @@ private class InteropTransformer(val context: Context, override val irFile: IrFi
     private fun tryGenerateInteropConstantRead(expression: IrCall): IrExpression? {
         val function = expression.symbol.owner
 
-        if (!function.descriptor.module.isFromInteropLibrary()) return null
+        if (!function.isFromInteropLibrary()) return null
         if (!function.isGetter) return null
 
         val constantProperty = (function as? IrSimpleFunction)
@@ -873,7 +868,7 @@ private class InteropTransformer(val context: Context, override val irFile: IrFi
         if (function.annotations.hasAnnotation(RuntimeNames.cCall)) {
             context.llvmImports.add(function.llvmSymbolOrigin)
             val exceptionMode = ForeignExceptionMode.byValue(
-                    function.module.konanLibrary?.manifestProperties?.getProperty(ForeignExceptionMode.manifestKey)
+                    function.konanLibrary?.manifestProperties?.getProperty(ForeignExceptionMode.manifestKey)
             )
             return generateWithStubs { generateCCall(expression, builder, isInvoke = false, exceptionMode) }
         }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SpecialBackendChecksTraversal.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SpecialBackendChecksTraversal.kt
index ec64e94faf8..e17c5790fd4 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SpecialBackendChecksTraversal.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SpecialBackendChecksTraversal.kt
@@ -317,10 +317,21 @@ private class BackendChecker(val context: Context, val irFile: IrFile) : IrEleme
             )
         }
 
-        if (callee.returnType.getInlinedClassNative()?.descriptor == interop.nativePointed)
+        if (callee.returnType.isNativePointed(symbols))
             reportError(expression, "Native interop types constructors must not be called directly")
     }
 
+    override fun visitField(declaration: IrField) {
+        if (declaration.isFakeOverride) return // Can't happen now, just trying to be future-proof here.
+
+        val parent = declaration.parent
+
+        if (parent is IrClass && parent.defaultType.isNativePointed(symbols) && parent.symbol != symbols.nativePointed) {
+            val nativePointed = symbols.nativePointed.owner.name
+            reportError(declaration, "Subclasses of $nativePointed cannot have properties with backing fields")
+        }
+    }
+
     override fun visitCall(expression: IrCall) {
         expression.acceptChildrenVoid(this)
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TypeOperatorLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TypeOperatorLowering.kt
index f33aad224d5..3aea32306ae 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TypeOperatorLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TypeOperatorLowering.kt
@@ -25,30 +25,33 @@ import org.jetbrains.kotlin.ir.util.irCall
 import org.jetbrains.kotlin.ir.util.isSimpleTypeWithQuestionMark
 import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 
+internal fun IrType.erasureForTypeOperation(): IrType {
+    if (this !is IrSimpleType) return this
+
+    return when (val classifier = classifier) {
+        is IrClassSymbol -> this
+        is IrTypeParameterSymbol -> {
+            val upperBound = classifier.owner.superTypes.firstOrNull()
+                    ?: TODO("${classifier.descriptor} : ${classifier.descriptor.upperBounds}")
+
+            if (this.hasQuestionMark) {
+                // `T?`
+                upperBound.erasureForTypeOperation().makeNullable()
+            } else {
+                upperBound.erasureForTypeOperation()
+            }
+        }
+        else -> TODO(classifier.toString())
+    }
+}
+
 internal class TypeOperatorLowering(val context: CommonBackendContext) : FileLoweringPass, IrBuildingTransformer(context) {
+
     override fun lower(irFile: IrFile) {
         irFile.transformChildren(this, null)
     }
 
-    private fun IrType.erasure(): IrType {
-        if (this !is IrSimpleType) return this
-
-        return when (val classifier = classifier) {
-            is IrClassSymbol -> this
-            is IrTypeParameterSymbol -> {
-                val upperBound = classifier.owner.superTypes.firstOrNull() ?:
-                        TODO("${classifier.descriptor} : ${classifier.descriptor.upperBounds}")
-
-                if (this.hasQuestionMark) {
-                    // `T?`
-                    upperBound.erasure().makeNullable()
-                } else {
-                    upperBound.erasure()
-                }
-            }
-            else -> TODO(classifier.toString())
-        }
-    }
+    private fun IrType.erasure(): IrType = this.erasureForTypeOperation()
 
     private fun lowerCast(expression: IrTypeOperatorCall): IrExpression {
         builder.at(expression)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt
index 0652aea9149..98d96ad83a3 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.backend.konan.KonanBackendContext
 import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.builtins.UnsignedType
 import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
@@ -61,6 +62,11 @@ internal class VarargInjectionLowering constructor(val context: KonanBackendCont
 
     private fun lower(owner: IrSymbol, element: IrElement?) {
         element?.transformChildrenVoid(object: IrElementTransformerVoid() {
+            override fun visitClass(declaration: IrClass): IrStatement {
+                // Skip nested.
+                return declaration
+            }
+
             val transformer = this
 
             private fun replaceEmptyParameterWithEmptyArray(expression: IrFunctionAccessExpression) {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt
index 376bc9e7c3e..842db0ed5b2 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt
@@ -10,10 +10,7 @@ import org.jetbrains.kotlin.backend.konan.descriptors.enumEntries
 import org.jetbrains.kotlin.backend.konan.descriptors.isArray
 import org.jetbrains.kotlin.backend.konan.descriptors.isInterface
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
-import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
-import org.jetbrains.kotlin.ir.symbols.IrEnumEntrySymbol
-import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.util.SymbolTable
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
 
@@ -67,6 +64,13 @@ internal fun ObjCExportedInterface.createCodeSpec(symbolTable: SymbolTable): Obj
                 descriptor.enumEntries.mapTo(methods) {
                     ObjCGetterForKotlinEnumEntry(symbolTable.referenceEnumEntry(it))
                 }
+
+                descriptor.getEnumValuesFunctionDescriptor()?.let {
+                    methods += ObjCClassMethodForKotlinEnumValues(
+                            symbolTable.referenceSimpleFunction(it),
+                            namer.getEnumValuesSelector(it)
+                    )
+                }
             }
 
             val categoryMethods = categoryMembers[descriptor].orEmpty().toObjCMethods()
@@ -100,6 +104,11 @@ internal class ObjCFactoryMethodForKotlinArrayConstructor(
 
 internal class ObjCGetterForKotlinEnumEntry(val irEnumEntrySymbol: IrEnumEntrySymbol) : ObjCMethodSpec()
 
+internal class ObjCClassMethodForKotlinEnumValues(
+        val valuesFunctionSymbol: IrFunctionSymbol,
+        val selector: String
+) : ObjCMethodSpec()
+
 internal sealed class ObjCTypeSpec(val binaryName: String)
 
 internal sealed class ObjCTypeForKotlinType(
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
index bf1bdb44f2b..5b309e2bd00 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
@@ -240,7 +240,7 @@ internal class ObjCExportTranslatorImpl(
                     .asSequence()
                     .filter { mapper.shouldBeExposed(it) }
                     .map {
-                        generator?.generateInterface(it)
+                        generator?.generateExtraInterfaceEarly(it)
                         referenceProtocol(it).objCName
                     }
                     .toList()
@@ -249,7 +249,7 @@ internal class ObjCExportTranslatorImpl(
             classDescriptor: ClassDescriptor,
             declarations: List<CallableMemberDescriptor>
     ): ObjCInterface {
-        generator?.generateClass(classDescriptor)
+        generator?.generateExtraClassEarly(classDescriptor)
 
         val name = referenceClass(classDescriptor).objCName
         val members = buildMembers {
@@ -301,7 +301,7 @@ internal class ObjCExportTranslatorImpl(
         val superName = if (superClass == null) {
             kotlinAnyName
         } else {
-            generator?.generateClass(superClass)
+            generator?.generateExtraClassEarly(superClass)
             referenceClass(superClass)
         }
 
@@ -365,6 +365,14 @@ internal class ObjCExportTranslatorImpl(
                         +ObjCProperty(entryName, it, type, listOf("class", "readonly"),
                                 declarationAttributes = listOf(swiftNameAttribute(entryName)))
                     }
+
+                    // Note: it is possible to support this function through a common machinery,
+                    // but it is very special (static and synthetic), so apparently it is much easier
+                    // to keep this ad hoc here than to add special cases to the most complicated parts
+                    // of the machinery.
+                    descriptor.getEnumValuesFunctionDescriptor()?.let { enumValues ->
+                        +buildEnumValuesMethod(enumValues, genericExportScope)
+                    }
                 }
                 else -> {
                     // Nothing special.
@@ -404,6 +412,21 @@ internal class ObjCExportTranslatorImpl(
         )
     }
 
+    private fun buildEnumValuesMethod(
+            enumValues: SimpleFunctionDescriptor,
+            genericExportScope: ObjCExportScope
+    ): ObjCMethod {
+        val selector = namer.getEnumValuesSelector(enumValues)
+        return ObjCMethod(
+                enumValues,
+                isInstanceMethod = false,
+                returnType = mapReferenceType(enumValues.returnType!!, genericExportScope),
+                selectors = splitSelector(selector),
+                parameters = emptyList(),
+                attributes = listOf(swiftNameAttribute("$selector()"))
+        )
+    }
+
     private fun ClassDescriptor.getExposedMembers(): List<CallableMemberDescriptor> =
             this.unsubstitutedMemberScope.getContributedDescriptors()
                     .asSequence()
@@ -979,16 +1002,8 @@ abstract class ObjCExportHeaderGenerator internal constructor(
     private val topLevel = mutableMapOf<SourceFile, MutableList<CallableMemberDescriptor>>()
 
     fun build(): List<String> = mutableListOf<String>().apply {
-        add("#import <Foundation/NSArray.h>")
-        add("#import <Foundation/NSDictionary.h>")
-        add("#import <Foundation/NSError.h>")
-        add("#import <Foundation/NSObject.h>")
-        add("#import <Foundation/NSSet.h>")
-        add("#import <Foundation/NSString.h>")
-        add("#import <Foundation/NSValue.h>")
-        getAdditionalImports().forEach {
-            add("#import <$it>")
-        }
+        addImports(foundationImports)
+        addImports(getAdditionalImports())
         add("")
 
         if (classForwardDeclarations.isNotEmpty()) {
@@ -1031,19 +1046,32 @@ abstract class ObjCExportHeaderGenerator internal constructor(
         return ObjCExportedInterface(generatedClasses, extensions, topLevel, headerLines, namer, mapper)
     }
 
+    fun getExportStubs(): ObjCExportedStubs =
+        ObjCExportedStubs(classForwardDeclarations, protocolForwardDeclarations, stubs)
+
     protected abstract fun reportWarning(text: String)
 
     protected abstract fun reportWarning(method: FunctionDescriptor, text: String)
 
     protected open fun getAdditionalImports(): List<String> = emptyList()
 
-
-    fun translateModule(): List<Stub<*>> {
+    fun translateModule() {
         // TODO: make the translation order stable
         // to stabilize name mangling.
+        translateBaseDeclarations()
+        translateModuleDeclarations()
+    }
 
+    fun translateBaseDeclarations() {
         stubs += translator.generateBaseDeclarations()
+    }
 
+    fun translateModuleDeclarations() {
+        translatePackageFragments()
+        translateExtraClasses()
+    }
+
+    private fun translatePackageFragments() {
         val packageFragments = moduleDescriptors.flatMap { it.getPackageFragments() }
 
         packageFragments.forEach { packageFragment ->
@@ -1096,18 +1124,31 @@ abstract class ObjCExportHeaderGenerator internal constructor(
         topLevel.forEach { sourceFile, declarations ->
             generateFile(sourceFile, declarations)
         }
+    }
 
+    /**
+     * Translates additional classes referenced from the module's declarations, such as parameter types, return types,
+     * thrown exception types, and underlying enum types.
+     *
+     * This is required for classes from dependencies to be exported correctly. However, we also currently rely on this
+     * for a few edge cases, such as some inner classes. Sub classes may reject certain descriptors to be translated.
+     * Some referenced descriptors may be translated early for ordering reasons.
+     * @see shouldTranslateExtraClass
+     * @see generateExtraClassEarly
+     * @see generateExtraInterfaceEarly
+     */
+    private fun translateExtraClasses() {
         while (extraClassesToTranslate.isNotEmpty()) {
             val descriptor = extraClassesToTranslate.first()
             extraClassesToTranslate -= descriptor
+
+            assert(shouldTranslateExtraClass(descriptor)) { "Shouldn't be queued for translation: $descriptor" }
             if (descriptor.isInterface) {
                 generateInterface(descriptor)
             } else {
                 generateClass(descriptor)
             }
         }
-
-        return stubs
     }
 
     private fun generateFile(sourceFile: SourceFile, declarations: List<CallableMemberDescriptor>) {
@@ -1118,18 +1159,28 @@ abstract class ObjCExportHeaderGenerator internal constructor(
         stubs.add(translator.translateExtensions(classDescriptor, declarations))
     }
 
-    internal fun generateClass(descriptor: ClassDescriptor) {
+    protected open fun shouldTranslateExtraClass(descriptor: ClassDescriptor): Boolean = true
+
+    internal fun generateExtraClassEarly(descriptor: ClassDescriptor) {
+        if (shouldTranslateExtraClass(descriptor)) generateClass(descriptor)
+    }
+
+    internal fun generateExtraInterfaceEarly(descriptor: ClassDescriptor) {
+        if (shouldTranslateExtraClass(descriptor)) generateInterface(descriptor)
+    }
+
+    private fun generateClass(descriptor: ClassDescriptor) {
         if (!generatedClasses.add(descriptor)) return
         stubs.add(translator.translateClass(descriptor))
     }
 
-    internal fun generateInterface(descriptor: ClassDescriptor) {
+    private fun generateInterface(descriptor: ClassDescriptor) {
         if (!generatedClasses.add(descriptor)) return
         stubs.add(translator.translateInterface(descriptor))
     }
 
     internal fun requireClassOrInterface(descriptor: ClassDescriptor) {
-        if (descriptor !in generatedClasses) {
+        if (shouldTranslateExtraClass(descriptor) && descriptor !in generatedClasses) {
             extraClassesToTranslate += descriptor
         }
     }
@@ -1141,6 +1192,24 @@ abstract class ObjCExportHeaderGenerator internal constructor(
     internal fun referenceProtocol(objCName: String) {
         protocolForwardDeclarations += objCName
     }
+
+    companion object {
+        val foundationImports = listOf(
+            "Foundation/NSArray.h",
+            "Foundation/NSDictionary.h",
+            "Foundation/NSError.h",
+            "Foundation/NSObject.h",
+            "Foundation/NSSet.h",
+            "Foundation/NSString.h",
+            "Foundation/NSValue.h"
+        )
+
+        private fun MutableList<String>.addImports(imports: Iterable<String>) {
+            imports.forEach {
+                add("#import <$it>")
+            }
+        }
+    }
 }
 
 private fun objCInterface(
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt
index 0b5991c0dce..fa96217dcda 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.backend.konan.descriptors.isArray
 import org.jetbrains.kotlin.backend.konan.descriptors.isInterface
 import org.jetbrains.kotlin.builtins.*
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.resolve.deprecation.Deprecation
 import org.jetbrains.kotlin.resolve.deprecation.DeprecationLevelValue
@@ -181,6 +182,15 @@ internal fun ObjCExportMapper.isTopLevel(descriptor: CallableMemberDescriptor):
 internal fun ObjCExportMapper.isObjCProperty(property: PropertyDescriptor): Boolean =
         property.extensionReceiverParameter == null || getClassIfCategory(property) != null
 
+internal fun ClassDescriptor.getEnumValuesFunctionDescriptor(): SimpleFunctionDescriptor? {
+    require(this.kind == ClassKind.ENUM_CLASS)
+
+    return this.staticScope.getContributedFunctions(
+            StandardNames.ENUM_VALUES,
+            NoLookupLocation.FROM_BACKEND
+    ).singleOrNull { it.extensionReceiverParameter == null && it.valueParameters.size == 0 }
+}
+
 internal fun ObjCExportMapper.doesThrow(method: FunctionDescriptor): Boolean = method.allOverriddenDescriptors.any {
     it.overriddenDescriptors.isEmpty() && it.annotations.hasAnnotation(KonanFqNames.throws)
 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
index 3e06c627ed5..c7827f5d090 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.backend.konan.descriptors.isArray
 import org.jetbrains.kotlin.backend.konan.descriptors.isInterface
 import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.konan.*
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
@@ -56,6 +57,7 @@ interface ObjCExportNamer {
     fun getPropertyName(property: PropertyDescriptor): String
     fun getObjectInstanceSelector(descriptor: ClassDescriptor): String
     fun getEnumEntrySelector(descriptor: ClassDescriptor): String
+    fun getEnumValuesSelector(descriptor: FunctionDescriptor): String
     fun getTypeParameterName(typeParameterDescriptor: TypeParameterDescriptor): String
 
     fun numberBoxName(classId: ClassId): ClassOrProtocolName
@@ -328,7 +330,7 @@ internal class ObjCExportNamerImpl(
 
     private val genericTypeParameterNameMapping = GenericTypeParameterNameMapping()
 
-    private abstract inner class ClassPropertyNameMapping<T : Any> : Mapping<T, String>() {
+    private abstract inner class ClassSelectorNameMapping<T : Any> : Mapping<T, String>() {
 
         // Try to avoid clashing with NSObject class methods:
 
@@ -343,12 +345,12 @@ internal class ObjCExportNamerImpl(
         override fun reserved(name: String) = (name in reserved) || (name in cKeywords)
     }
 
-    private val objectInstanceSelectors = object : ClassPropertyNameMapping<ClassDescriptor>() {
+    private val objectInstanceSelectors = object : ClassSelectorNameMapping<ClassDescriptor>() {
         override fun conflict(first: ClassDescriptor, second: ClassDescriptor) = false
     }
 
-    private val enumEntrySelectors = object : ClassPropertyNameMapping<ClassDescriptor>() {
-        override fun conflict(first: ClassDescriptor, second: ClassDescriptor) =
+    private val enumClassSelectors = object : ClassSelectorNameMapping<DeclarationDescriptor>() {
+        override fun conflict(first: DeclarationDescriptor, second: DeclarationDescriptor) =
                 first.containingDeclaration == second.containingDeclaration
     }
 
@@ -558,7 +560,7 @@ internal class ObjCExportNamerImpl(
     override fun getEnumEntrySelector(descriptor: ClassDescriptor): String {
         assert(descriptor.kind == ClassKind.ENUM_ENTRY)
 
-        return enumEntrySelectors.getOrPut(descriptor) {
+        return enumClassSelectors.getOrPut(descriptor) {
             // FOO_BAR_BAZ -> fooBarBaz:
             val name = descriptor.name.asString().split('_').mapIndexed { index, s ->
                 val lower = s.toLowerCase()
@@ -569,6 +571,19 @@ internal class ObjCExportNamerImpl(
         }
     }
 
+    override fun getEnumValuesSelector(descriptor: FunctionDescriptor): String {
+        val containingDeclaration = descriptor.containingDeclaration
+        require(containingDeclaration is ClassDescriptor && containingDeclaration.kind == ClassKind.ENUM_CLASS)
+        require(descriptor.name == StandardNames.ENUM_VALUES)
+        require(descriptor.dispatchReceiverParameter == null) { "must be static" }
+        require(descriptor.extensionReceiverParameter == null) { "must be static" }
+        require(descriptor.valueParameters.isEmpty())
+
+        return enumClassSelectors.getOrPut(descriptor) {
+            StringBuilder(descriptor.name.asString()).mangledBySuffixUnderscores()
+        }
+    }
+
     override fun getTypeParameterName(typeParameterDescriptor: TypeParameterDescriptor): String {
         return genericTypeParameterNameMapping.getOrPut(typeParameterDescriptor) {
             StringBuilder().apply {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedStubs.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedStubs.kt
new file mode 100644
index 00000000000..fa9501b4ca2
--- /dev/null
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedStubs.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+package org.jetbrains.kotlin.backend.konan.objcexport
+
+data class ObjCExportedStubs(
+    val classForwardDeclarations: Set<String>,
+    val protocolForwardDeclarations: Set<String>,
+    val stubs: List<Stub<*>>
+)
\ No newline at end of file
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjcExportHeaderGeneratorMobile.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjcExportHeaderGeneratorMobile.kt
index a7f9ac33c18..e6334bc2298 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjcExportHeaderGeneratorMobile.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjcExportHeaderGeneratorMobile.kt
@@ -1,16 +1,19 @@
 package org.jetbrains.kotlin.backend.konan.objcexport
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.resolve.deprecation.DeprecationResolver
+import org.jetbrains.kotlin.resolve.descriptorUtil.module
 
 class ObjcExportHeaderGeneratorMobile internal constructor(
         moduleDescriptors: List<ModuleDescriptor>,
         mapper: ObjCExportMapper,
         namer: ObjCExportNamer,
         private val warningCollector: ObjCExportWarningCollector,
-        objcGenerics: Boolean
+        objcGenerics: Boolean,
+        private val restrictToLocalModules: Boolean
 ) : ObjCExportHeaderGenerator(moduleDescriptors, mapper, namer, objcGenerics) {
 
     companion object {
@@ -20,21 +23,26 @@ class ObjcExportHeaderGeneratorMobile internal constructor(
                 builtIns: KotlinBuiltIns,
                 moduleDescriptors: List<ModuleDescriptor>,
                 deprecationResolver: DeprecationResolver? = null,
-                local: Boolean = false): ObjCExportHeaderGenerator {
-
+                local: Boolean = false,
+                restrictToLocalModules: Boolean = false): ObjCExportHeaderGenerator {
             val mapper = ObjCExportMapper(deprecationResolver, local)
             val namerConfiguration = createNamerConfiguration(configuration)
             val namer = ObjCExportNamerImpl(namerConfiguration, builtIns, mapper, local)
 
             return ObjcExportHeaderGeneratorMobile(
-                    moduleDescriptors,
-                    mapper,
-                    namer,
-                    warningCollector,
-                    configuration.objcGenerics)
+                moduleDescriptors,
+                mapper,
+                namer,
+                warningCollector,
+                configuration.objcGenerics,
+                restrictToLocalModules
+            )
         }
     }
 
+    override fun shouldTranslateExtraClass(descriptor: ClassDescriptor): Boolean =
+        !restrictToLocalModules || descriptor.module in moduleDescriptors
+
     override fun reportWarning(text: String) {
         warningCollector.reportWarning(text)
     }
@@ -42,5 +50,4 @@ class ObjcExportHeaderGeneratorMobile internal constructor(
     override fun reportWarning(method: FunctionDescriptor, text: String) {
         warningCollector.reportWarning(method, text)
     }
-
 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt
index 3f67829cdf2..36f42b5e1eb 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt
@@ -820,7 +820,7 @@ internal object Devirtualization {
                 val value = fromId.toLong() or (toId.toLong() shl 32)
                 // This is 64-bit extension of a hashing method from Knuth's "The Art of Computer Programming".
                 // The magic constant is the closest prime to 2^64 * phi, where phi is the golden ratio.
-                val bucketIdx = ((value.toULong() * 11400714819323198393UL) % bagOfEdges.size.toUInt()).toInt()
+                val bucketIdx = ((value.toULong() * 11400714819323198393UL) % bagOfEdges.size.toULong()).toInt()
                 val bucket = bagOfEdges[bucketIdx] ?: LongArrayList().also { bagOfEdges[bucketIdx] = it }
                 for (x in bucket)
                     if (x == value) return
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
index 803dce00605..69a282cf6a1 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
@@ -24,22 +24,24 @@ import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolD
 import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer
 import org.jetbrains.kotlin.backend.konan.CachedLibraries
 import org.jetbrains.kotlin.backend.konan.descriptors.isInteropLibrary
-import org.jetbrains.kotlin.backend.konan.descriptors.konanLibrary
 import org.jetbrains.kotlin.backend.konan.ir.interop.IrProviderForCEnumAndCStructStubs
+import org.jetbrains.kotlin.backend.konan.ir.konanLibrary
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
 import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib
+import org.jetbrains.kotlin.descriptors.konan.klibModuleOrigin
 import org.jetbrains.kotlin.descriptors.konan.kotlinLibrary
 import org.jetbrains.kotlin.ir.builders.TranslationPluginContext
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
-import org.jetbrains.kotlin.ir.declarations.impl.IrModuleFragmentImpl
 import org.jetbrains.kotlin.ir.descriptors.IrAbstractFunctionFactory
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
-import org.jetbrains.kotlin.ir.symbols.impl.IrFileSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrPublicSymbolBase
 import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.library.IrLibrary
 import org.jetbrains.kotlin.library.KotlinLibrary
 import org.jetbrains.kotlin.name.ClassId
@@ -76,9 +78,8 @@ internal class KonanIrLinker(
         private val stubGenerator: DeclarationStubGenerator,
         private val cenumsProvider: IrProviderForCEnumAndCStructStubs,
         exportedDependencies: List<ModuleDescriptor>,
-        deserializeFakeOverrides: Boolean,
         private val cachedLibraries: CachedLibraries
-) : KotlinIrLinker(currentModule, logger, builtIns, symbolTable, exportedDependencies, deserializeFakeOverrides) {
+) : KotlinIrLinker(currentModule, logger, builtIns, symbolTable, exportedDependencies) {
 
     companion object {
         private val C_NAMES_NAME = Name.identifier("cnames")
@@ -107,8 +108,13 @@ internal class KonanIrLinker(
         return KonanModuleDeserializer(moduleDescriptor, klib ?: error("Expecting kotlin library"), strategy)
     }
 
-    private inner class KonanModuleDeserializer(moduleDescriptor: ModuleDescriptor, klib: IrLibrary, strategy: DeserializationStrategy):
-        KotlinIrLinker.BasicIrModuleDeserializer(moduleDescriptor, klib, strategy)
+    private inner class KonanModuleDeserializer(
+            moduleDescriptor: ModuleDescriptor,
+            klib: IrLibrary,
+            strategy: DeserializationStrategy
+    ): KotlinIrLinker.BasicIrModuleDeserializer(moduleDescriptor, klib, strategy) {
+        override val moduleFragment: IrModuleFragment = KonanIrModuleFragmentImpl(moduleDescriptor, builtIns, emptyList())
+    }
 
     private inner class KonanInteropModuleDeserializer(
             moduleDescriptor: ModuleDescriptor,
@@ -160,7 +166,7 @@ internal class KonanIrLinker(
             return symbolOwner.symbol
         }
 
-        override val moduleFragment: IrModuleFragment = IrModuleFragmentImpl(moduleDescriptor, builtIns)
+        override val moduleFragment: IrModuleFragment = KonanIrModuleFragmentImpl(moduleDescriptor, builtIns)
         override val moduleDependencies: Collection<IrModuleDeserializer> = listOfNotNull(forwardDeclarationDeserializer)
     }
 
@@ -208,7 +214,7 @@ internal class KonanIrLinker(
             return declaredDeclaration.getOrPut(idSig) { buildForwardDeclarationStub(descriptor) }.symbol
         }
 
-        override val moduleFragment: IrModuleFragment = IrModuleFragmentImpl(moduleDescriptor, builtIns)
+        override val moduleFragment: IrModuleFragment = KonanIrModuleFragmentImpl(moduleDescriptor, builtIns)
         override val moduleDependencies: Collection<IrModuleDeserializer> = emptyList()
     }
 
@@ -226,3 +232,34 @@ internal class KonanIrLinker(
             override val irBuiltIns: IrBuiltIns
     ):TranslationPluginContext
 }
+
+class KonanIrModuleFragmentImpl(
+        override val descriptor: ModuleDescriptor,
+        override val irBuiltins: IrBuiltIns,
+        files: List<IrFile> = emptyList(),
+) : IrModuleFragment() {
+    override val name: Name get() = descriptor.name // TODO
+
+    override val files: MutableList<IrFile> = files.toMutableList()
+
+    val konanLibrary = (descriptor.klibModuleOrigin as? DeserializedKlibModuleOrigin)?.library
+
+    override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
+            visitor.visitModuleFragment(this, data)
+
+    override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {
+        files.forEach { it.accept(visitor, data) }
+    }
+
+    override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
+        files.forEachIndexed { i, irFile ->
+            files[i] = irFile.transform(transformer, data)
+        }
+    }
+}
+
+fun IrModuleFragment.toKonanModule() = KonanIrModuleFragmentImpl(descriptor, irBuiltins, files)
+
+class KonanFileMetadataSource(val module: KonanIrModuleFragmentImpl) : MetadataSource.File {
+    override val name: Name? = null
+}
\ No newline at end of file
diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index f887c460182..8008e5a022e 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -29,8 +29,16 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$gradlePluginVersion"
     }
-    ext.useCustomDist = project.hasProperty("konan.home")
+    ext.useCustomDist = project.hasProperty("kotlin.native.home") ||
+            project.hasProperty("org.jetbrains.kotlin.native.home") ||
+            project.hasProperty("konan.home")
+    ext.kotlinNativeDist = project.findProperty("kotlin.native.home")
+            ?: project.findProperty("org.jetbrains.kotlin.native.home")
+            ?: project.findProperty("konan.home")
+            ?: distDir.absolutePath
     if (!useCustomDist) {
+        ext.setProperty("kotlin.native.home", distDir.absolutePath)
+        ext.setProperty("org.jetbrains.kotlin.native.home", distDir.absolutePath)
         ext.setProperty("konan.home", distDir.absolutePath)
     }
 }
@@ -96,7 +104,7 @@ externalStdlibTestsDir.mkdirs()
 ext.platformManager = project.rootProject.platformManager
 ext.target = platformManager.targetManager(project.testTarget).target
 
-ext.testLibraryDir = "${project.property("konan.home")}/klib/platform/${project.target.name}"
+ext.testLibraryDir = "${ext.kotlinNativeDist}/klib/platform/${project.target.name}"
 
 // Add executor to run tests depending on a target
 project.convention.plugins.executor = ExecutorServiceKt.create(project)
@@ -113,8 +121,16 @@ ext.konanNoRun = true
 
 final CacheTesting cacheTesting = CacheTestingKt.configureCacheTesting(project)
 if (cacheTesting != null) {
-    // Note: can't do this in [CacheTesting.configure] since task classes aren't accessible there.
+    // Check for debug build and set the -g option.
+    if (project.globalTestArgs.contains("-opt")) {
+        throw new IllegalArgumentException("Cache testing should be run with debug build. " +
+                "Remove -opt options from the test args")
+    }
+    if (!project.globalTestArgs.contains("-g")) {
+        project.globalTestArgs.add("-g")
+    }
 
+    // Note: can't do this in [CacheTesting.configure] since task classes aren't accessible there.
     tasks.withType(KonanCompileNativeBinary.class).configureEach {
         dependsOn cacheTesting.buildCacheTask
         extraOpts cacheTesting.compilerArgs
@@ -1044,6 +1060,12 @@ task worker11(type: KonanLocalTest) {
     source = "runtime/workers/worker11.kt"
 }
 
+standaloneTest("worker_threadlocal_no_leak") {
+    disabled = project.globalTestArgs.contains('-opt') || (project.testTarget == 'wasm32') // Needs debug build and pthreads.
+    source = "runtime/workers/worker_threadlocal_no_leak.kt"
+    flags = ['-g']
+}
+
 task freeze0(type: KonanLocalTest) {
     enabled = (project.testTarget != 'wasm32') // No workers on WASM.
     goldValue = "frozen bit is true\n" +
@@ -1534,6 +1556,10 @@ task bridges_special(type: KonanLocalTest) {
     source = "codegen/bridges/special.kt"
 }
 
+task bridges_specialGeneric(type: KonanLocalTest) {
+    source = "codegen/bridges/specialGeneric.kt"
+}
+
 task bridges_nativePointed(type: KonanLocalTest) {
     source = "codegen/bridges/nativePointed.kt"
 }
@@ -2151,7 +2177,7 @@ standaloneTest("link_default_libs") {
 
 standaloneTest("link_testLib_explicitly") {
     // there are no testLibrary for cross targets yet.
-    enabled = project.testTarget == null || project.testTarget == project.hostName
+    enabled = project.target.name == project.hostName
 
     dependsOn 'installTestLibrary'
     goldValue = "This is a side effect of a test library linked into the binary.\nYou should not be seeing this.\n\nHello\n"
@@ -3257,6 +3283,10 @@ task deserialized_listof0(type: KonanLocalTest) {
     source = "serialization/deserialized_listof0.kt"
 }
 
+task deserialized_fields(type: KonanLocalTest) {
+    source = "serialization/deserialized_fields.kt"
+}
+
 task genKt39548 {
     doFirst {
         GenTestKT39548Kt.genTestKT39548(file("$buildDir/kt39548/kt39548.kt"))
@@ -3714,6 +3744,10 @@ createInterop("embedStaticLibraries") {
     it.extraOpts '-staticLibrary', "2.a"
 }
 
+createInterop("kt43265") {
+    it.defFile 'interop/kt43265/kt43265.def'
+}
+
 if (PlatformInfo.isAppleTarget(project)) {
     createInterop("objcSmoke") {
         it.defFile 'interop/objc/objcSmoke.def'
@@ -4014,6 +4048,12 @@ interopTest("interop_array_pointers") {
     source = "interop/basics/arrayPointers.kt"
 }
 
+interopTest("interop_kt43265") {
+    disabled = (project.testTarget == 'wasm32') // No interop for wasm yet.
+    interop = 'kt43265'
+    source = "interop/kt43265/usage.kt"
+}
+
 standaloneTest("interop_pinning") {
     disabled = (project.testTarget == 'wasm32') // Uses exceptions.
     source = "interop/basics/pinning.kt"
@@ -4024,6 +4064,10 @@ task interop_convert(type: KonanLocalTest) {
     source = "codegen/intrinsics/interop_convert.kt"
 }
 
+task interop_sourceCodeStruct(type: KonanLocalTest) {
+    source = "codegen/intrinsics/interop_sourceCodeStruct.kt"
+}
+
 /*
 TODO: This test isn't run automatically
 task interop_echo_server(type: RunInteropKonanTest) {
@@ -4250,7 +4294,7 @@ standaloneTest("interop_objc_illegal_sharing") {
 }
 
 dynamicTest("produce_dynamic") {
-    disabled = (project.testTarget != null && project.testTarget != project.hostName)
+    disabled = (project.target.name != project.hostName)
     source = "produce_dynamic/simple/hello.kt"
     cSource = "$projectDir/produce_dynamic/simple/main.c"
     goldValue = "Hello, dynamic!\n" +
@@ -4276,7 +4320,8 @@ dynamicTest("produce_dynamic") {
 }
 
 dynamicTest("interop_concurrentRuntime") {
-    disabled = (project.testTarget != null && project.testTarget != project.hostName)
+    disabled = (project.target.name != project.hostName)
+    disabled = true  // KT-43180
     source = "interop/concurrentTerminate/reverseInterop.kt"
     cSource = "$projectDir/interop/concurrentTerminate/main.cpp"
     clangTool = "clang++"
@@ -4286,8 +4331,7 @@ dynamicTest("interop_concurrentRuntime") {
 }
 
 dynamicTest("interop_kt42397") {
-    disabled = (project.testTarget != null && project.testTarget != project.hostName) ||
-            project.globalTestArgs.contains('-opt')
+    disabled = project.target.name != project.hostName || project.globalTestArgs.contains('-opt')
     source = "interop/kt42397/knlibrary.kt"
     cSource = "$projectDir/interop/kt42397/test.cpp"
     clangTool = "clang++"
@@ -4295,7 +4339,7 @@ dynamicTest("interop_kt42397") {
 }
 
 dynamicTest("interop_cleaners_main_thread") {
-    disabled = (project.testTarget != null && project.testTarget != project.hostName)
+    disabled = (project.target.name != project.hostName)
     source = "interop/cleaners/cleaners.kt"
     cSource = "$projectDir/interop/cleaners/main_thread.cpp"
     clangTool = "clang++"
@@ -4304,7 +4348,7 @@ dynamicTest("interop_cleaners_main_thread") {
 }
 
 dynamicTest("interop_cleaners_second_thread") {
-    disabled = (project.testTarget != null && project.testTarget != project.hostName)
+    disabled = (project.target.name != project.hostName)
     source = "interop/cleaners/cleaners.kt"
     cSource = "$projectDir/interop/cleaners/second_thread.cpp"
     clangTool = "clang++"
@@ -4313,7 +4357,7 @@ dynamicTest("interop_cleaners_second_thread") {
 }
 
 dynamicTest("interop_cleaners_leak") {
-    disabled = (project.testTarget != null && project.testTarget != project.hostName)
+    disabled = (project.target.name != project.hostName)
     source = "interop/cleaners/cleaners.kt"
     cSource = "$projectDir/interop/cleaners/leak.cpp"
     clangTool = "clang++"
@@ -4321,6 +4365,34 @@ dynamicTest("interop_cleaners_leak") {
     flags = ['-Xopt-in=kotlin.native.internal.InternalForKotlinNative']
 }
 
+dynamicTest("interop_migrating_main_thread_legacy") {
+    disabled = (project.target.name != project.hostName)
+    source = "interop/migrating_main_thread/lib.kt"
+    flags = ['-Xdestroy-runtime-mode=legacy']
+    clangFlags = ['-DIS_LEGACY']
+    cSource = "$projectDir/interop/migrating_main_thread/main.cpp"
+    clangTool = "clang++"
+}
+
+dynamicTest("interop_migrating_main_thread") {
+    disabled = (project.target.name != project.hostName)
+    source = "interop/migrating_main_thread/lib.kt"
+    flags = ['-Xdestroy-runtime-mode=on-shutdown']
+    cSource = "$projectDir/interop/migrating_main_thread/main.cpp"
+    clangTool = "clang++"
+}
+
+dynamicTest("interop_memory_leaks") {
+    disabled = (project.target.name != project.hostName) ||
+            project.globalTestArgs.contains('-opt') || (project.testTarget == 'wasm32') // Needs debug build.
+    source = "interop/memory_leaks/lib.kt"
+    cSource = "$projectDir/interop/memory_leaks/main.cpp"
+    clangTool = "clang++"
+    flags = ['-g', '-Xdestroy-runtime-mode=legacy'] // Runtime cannot be destroyed with interop with on-shutdown.
+    expectedExitStatusChecker = { it != 0 }
+    outputChecker = { s -> s.contains("Memory leaks detected, 1 objects leaked!") }
+}
+
 task library_mismatch(type: KonanDriverTest) {
     // Does not work for cross targets yet.
     enabled = !(project.testTarget != null && project.target.name != project.hostName)
@@ -4495,7 +4567,7 @@ if (isAppleTarget(project)) {
         framework(frameworkName) {
             sources = ['objcexport']
             library = libraryName
-            opts = ["-Xemit-lazy-objc-header=$lazyHeader", "-Xopt-in=kotlin.ExperimentalStdlibApi"]
+            opts = ["-Xemit-lazy-objc-header=$lazyHeader"]
         }
         swiftSources = ['objcexport']
     }
@@ -4526,7 +4598,6 @@ if (isAppleTarget(project)) {
             artifact = frameworkArtifactName
             library = libraryName
             isStatic = true
-            opts = ['-Xstatic-framework', "-Xopt-in=kotlin.ExperimentalStdlibApi"]
         }
         swiftSources = ['objcexport']
     }
@@ -4761,12 +4832,36 @@ standaloneTest("local_ea_arraysfieldwrite") {
     source = "codegen/localEscapeAnalysis/arraysFieldWrite.kt"
 }
 
+task override_konan_properties0(type: KonanDriverTest) {
+
+    def overrides = PlatformInfo.isWindows()
+            ? '-Xoverride-konan-properties="llvmInlineThreshold=76"'
+            : '-Xoverride-konan-properties=llvmInlineThreshold=76'
+    flags = [
+            "-opt",
+            "-Xverbose-phases=BitcodeOptimization",
+            overrides
+    ]
+    compilerMessages = true
+    source = "link/ir_providers/hello.kt"
+    def messages =
+            "inline_threshold: 76\n" +
+            "hello\n"
+    goldValue = PlatformInfo.isWindows() ? messages.replaceAll('\\/', '\\\\') : messages
+    outputChecker = { out ->
+        goldValue.split("\n")
+                .collect { line -> out.contains(line) }
+                .every { it == true }
+    }
+}
+
 /**
  * Creates tasks to build and execute stdlib tests.
  */
 KotlinNativeTestKt.createTest(project, 'stdlibTest', KonanGTest) { task ->
     def sources = UtilsKt.getFilesToCompile(project,
             [ 'build/stdlib_external/stdlib', 'stdlib_external/utils.kt',
+                                 'stdlib_external/collections',
                                  'stdlib_external/jsCollectionFactoriesActuals.kt',
                                  'stdlib_external/text/StringEncodingTestNative.kt'],
             [ 'build/stdlib_external/stdlib/test/internalAnnotations.kt' ])
@@ -4777,6 +4872,7 @@ KotlinNativeTestKt.createTest(project, 'stdlibTest', KonanGTest) { task ->
             baseDir "$testOutputStdlib/stdlibTest"
             enableMultiplatform true
             extraOpts '-tr',
+                    '-Xverify-ir',
                     '-Xopt-in=kotlin.RequiresOptIn,kotlin.ExperimentalStdlibApi',
                     "-friend-modules", project.rootProject.file("${project.properties['konan.home']}/klib/common/stdlib").absolutePath
             extraOpts project.globalTestArgs
@@ -4816,6 +4912,7 @@ task buildKonanTests { t ->
             srcFiles sources
             baseDir testOutputLocal
             extraOpts '-tr'
+            extraOpts '-Xverify-ir'
             extraOpts project.globalTestArgs
         }
     }
diff --git a/kotlin-native/backend.native/tests/codegen/bridges/specialGeneric.kt b/kotlin-native/backend.native/tests/codegen/bridges/specialGeneric.kt
new file mode 100644
index 00000000000..5749dc36dba
--- /dev/null
+++ b/kotlin-native/backend.native/tests/codegen/bridges/specialGeneric.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+package codegen.bridges.specialGeneric
+
+import kotlin.test.*
+
+interface Element {
+    val isContained: Boolean
+}
+
+object ContainedElement : Element {
+    override val isContained: Boolean = true
+}
+
+object NotContainedElement : Element {
+    override val isContained: Boolean = false
+}
+
+internal class MySet<E : Element> : Set<E> {
+    override fun contains(element: E): Boolean = element.isContained
+
+    override fun equals(other: Any?): Boolean = TODO()
+    override fun hashCode(): Int = TODO()
+    override fun toString(): String = TODO()
+
+    override val size: Int get() = TODO()
+    override fun isEmpty(): Boolean = TODO()
+    override fun containsAll(elements: Collection<E>): Boolean = TODO()
+
+    override fun iterator(): Iterator<E> = TODO()
+}
+
+fun set(): Set<Any> = MySet<Element>()
+
+@Test
+fun testMySet() {
+    val set = set()
+    assertFalse(set.contains(Any()))
+    assertFalse(set.contains(NotContainedElement))
+    assertTrue(set.contains(ContainedElement))
+}
diff --git a/kotlin-native/backend.native/tests/codegen/intrinsics/interop_sourceCodeStruct.kt b/kotlin-native/backend.native/tests/codegen/intrinsics/interop_sourceCodeStruct.kt
new file mode 100644
index 00000000000..be891194f47
--- /dev/null
+++ b/kotlin-native/backend.native/tests/codegen/intrinsics/interop_sourceCodeStruct.kt
@@ -0,0 +1,40 @@
+package codegen.intrinsics.interop_sourceCodeStruct
+
+import kotlinx.cinterop.*
+import kotlinx.cinterop.internal.*
+import kotlin.test.*
+
+// Just making sure this doesn't get accidentally forbidden or otherwise broken.
+// (however defining structs this way is still strongly discouraged, please define
+// structs in C headers or .def files instead).
+
+@CStruct("struct { int p0; int p1; }")
+class S(rawPtr: NativePtr) : CStructVar(rawPtr) {
+
+    companion object : CStructVar.Type(8, 4)
+
+    var x: Int
+        get() = memberAt<IntVar>(0).value
+        set(value) {
+            memberAt<IntVar>(0).value = value
+        }
+
+    var y: Int
+        get() = memberAt<IntVar>(4).value
+        set(value) {
+            memberAt<IntVar>(4).value = value
+        }
+}
+
+@Test
+fun test() = memScoped {
+    val s = alloc<S>()
+
+    s.x = 123
+    assertEquals(123, s.x)
+    assertEquals(123, s.ptr.reinterpret<IntVar>()[0])
+
+    s.y = 321
+    assertEquals(321, s.y)
+    assertEquals(321, s.ptr.reinterpret<IntVar>()[1])
+}
diff --git a/kotlin-native/backend.native/tests/compilerChecks/t60.kt b/kotlin-native/backend.native/tests/compilerChecks/t60.kt
new file mode 100644
index 00000000000..0b234eac4d6
--- /dev/null
+++ b/kotlin-native/backend.native/tests/compilerChecks/t60.kt
@@ -0,0 +1,10 @@
+import kotlinx.cinterop.*
+
+class Vertex constructor(rawPtr: NativePtr) : CStructVar(rawPtr) {
+    var x: Float = 0f
+    var y: Float = 0f
+    var r: Float = 0f
+    var g: Float = 0f
+    var b: Float = 0f
+    companion object : CStructVar.Type(40, 8)
+}
diff --git a/kotlin-native/backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/LldbTests.kt b/kotlin-native/backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/LldbTests.kt
index b06536b32c6..bf96803c06a 100644
--- a/kotlin-native/backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/LldbTests.kt
+++ b/kotlin-native/backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/LldbTests.kt
@@ -79,8 +79,8 @@ class LldbTests {
         > r
         > fr var
         (ObjHeader *) args = []
-        (ObjHeader *) point = {'x': 1, 'y': 2}
-        (ObjHeader *) person = {}
+        (ObjHeader *) point = [x: ..., y: ...]
+        (ObjHeader *) person = []
     """)
 
     @Test
@@ -101,8 +101,8 @@ class LldbTests {
         > r
         > fr var
         (ObjHeader *) args = []
-        (ObjHeader *) xs = [1, 2, 3]
-        (ObjHeader *) ys = [{'x': 1, 'y': 2}, 'null']
+        (ObjHeader *) xs = [..., ..., ...]
+        (ObjHeader *) ys = [..., ...]
     """)
 
     @Test
@@ -117,7 +117,7 @@ class LldbTests {
         > b main.kt:3
         > r
         > fr var xs
-        (ObjHeader *) xs = [3, 5, 8]
+        (ObjHeader *) xs = [..., ..., ...]
     """)
 
     @Test
diff --git a/kotlin-native/backend.native/tests/interop/cleaners/cleaners.kt b/kotlin-native/backend.native/tests/interop/cleaners/cleaners.kt
index a00050c863a..f430ccce5dc 100644
--- a/kotlin-native/backend.native/tests/interop/cleaners/cleaners.kt
+++ b/kotlin-native/backend.native/tests/interop/cleaners/cleaners.kt
@@ -6,6 +6,8 @@
 
 import kotlin.native.internal.*
 
+fun ensureInitialized() {}
+
 fun createCleaner() {
     createCleaner(42) {
         println(it)
diff --git a/kotlin-native/backend.native/tests/interop/cleaners/second_thread.cpp b/kotlin-native/backend.native/tests/interop/cleaners/second_thread.cpp
index 9ab0dda0941..5ef9463a5aa 100644
--- a/kotlin-native/backend.native/tests/interop/cleaners/second_thread.cpp
+++ b/kotlin-native/backend.native/tests/interop/cleaners/second_thread.cpp
@@ -8,6 +8,9 @@
 #include <thread>
 
 int main() {
+    // Make sure runtime is initialized on the main thread, so that secondary thread death
+    // doesn't destroy the entire runtime.
+    testlib_symbols()->kotlin.root.ensureInitialized();
     std::thread t([]() { testlib_symbols()->kotlin.root.createCleaner(); });
     t.join();
     testlib_symbols()->kotlin.root.performGC();
diff --git a/kotlin-native/backend.native/tests/interop/kt43265/kt43265.def b/kotlin-native/backend.native/tests/interop/kt43265/kt43265.def
new file mode 100644
index 00000000000..d77837c3eef
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/kt43265/kt43265.def
@@ -0,0 +1,7 @@
+strictEnums = bcm2835FunctionSelect
+---
+enum bcm2835FunctionSelect {
+  BCM2835_GPIO_FSEL_INPT = 0x00, BCM2835_GPIO_FSEL_OUTP = 0x01, BCM2835_GPIO_FSEL_ALT0 = 0x04, BCM2835_GPIO_FSEL_ALT1 = 0x05,
+  BCM2835_GPIO_FSEL_ALT2 = 0x06, BCM2835_GPIO_FSEL_ALT3 = 0x07, BCM2835_GPIO_FSEL_ALT4 = 0x03, BCM2835_GPIO_FSEL_ALT5 = 0x02,
+  BCM2835_GPIO_FSEL_MASK = 0x07
+};
\ No newline at end of file
diff --git a/kotlin-native/backend.native/tests/interop/kt43265/usage.kt b/kotlin-native/backend.native/tests/interop/kt43265/usage.kt
new file mode 100644
index 00000000000..7ccdca15207
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/kt43265/usage.kt
@@ -0,0 +1,6 @@
+import kt43265.*
+import kotlin.test.*
+
+fun main() {
+    assertEquals(bcm2835FunctionSelect.BCM2835_GPIO_FSEL_ALT3, bcm2835FunctionSelect.BCM2835_GPIO_FSEL_MASK)
+}
\ No newline at end of file
diff --git a/kotlin-native/backend.native/tests/interop/memory_leaks/lib.kt b/kotlin-native/backend.native/tests/interop/memory_leaks/lib.kt
new file mode 100644
index 00000000000..cfab7ec7202
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/memory_leaks/lib.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+import kotlinx.cinterop.*
+
+fun leakMemory() {
+    StableRef.create(Any())
+}
diff --git a/kotlin-native/backend.native/tests/interop/memory_leaks/main.cpp b/kotlin-native/backend.native/tests/interop/memory_leaks/main.cpp
new file mode 100644
index 00000000000..ee9bbfc3613
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/memory_leaks/main.cpp
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "testlib_api.h"
+
+#include <thread>
+
+int main() {
+    std::thread t([]() {
+        testlib_symbols()->kotlin.root.leakMemory();
+    });
+    t.join();
+    return 0;
+}
diff --git a/kotlin-native/backend.native/tests/interop/migrating_main_thread/lib.kt b/kotlin-native/backend.native/tests/interop/migrating_main_thread/lib.kt
new file mode 100644
index 00000000000..f2bc4c99127
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/migrating_main_thread/lib.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+class A {
+    var i = 0
+}
+
+private var globalA = A()
+
+fun writeToA(i: Int) {
+    globalA.i = i
+}
+
+fun tryReadFromA(default: Int): Int {
+    return try {
+        globalA.i
+    } catch (e: IncorrectDereferenceException) {
+        default
+    }
+}
diff --git a/kotlin-native/backend.native/tests/interop/migrating_main_thread/main.cpp b/kotlin-native/backend.native/tests/interop/migrating_main_thread/main.cpp
new file mode 100644
index 00000000000..35664ea9580
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/migrating_main_thread/main.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "testlib_api.h"
+
+#include <cassert>
+#include <thread>
+
+constexpr int kInitialValue = 0;
+constexpr int kNewValue = 1;
+constexpr int kErrorValue = 2;
+
+int main() {
+    std::thread main1([]() {
+        assert(testlib_symbols()->kotlin.root.tryReadFromA(kErrorValue) == kInitialValue);
+        testlib_symbols()->kotlin.root.writeToA(kNewValue);
+        assert(testlib_symbols()->kotlin.root.tryReadFromA(kErrorValue) == kNewValue);
+    });
+    main1.join();
+
+    std::thread main2([]() {
+#if defined(IS_LEGACY)
+        // Globals were reinitialized.
+        assert(testlib_symbols()->kotlin.root.tryReadFromA(kErrorValue) == kInitialValue);
+#else
+        // Globals are not accessible.
+        assert(testlib_symbols()->kotlin.root.tryReadFromA(kErrorValue) == kErrorValue);
+#endif
+    });
+    main2.join();
+
+    return 0;
+}
diff --git a/kotlin-native/backend.native/tests/interop/objc/smoke.kt b/kotlin-native/backend.native/tests/interop/objc/smoke.kt
index c65be68f0bd..b01f0680854 100644
--- a/kotlin-native/backend.native/tests/interop/objc/smoke.kt
+++ b/kotlin-native/backend.native/tests/interop/objc/smoke.kt
@@ -10,6 +10,8 @@ import kotlin.native.ref.*
 import kotlin.test.*
 
 fun main(args: Array<String>) {
+    // Test relies on full deinitialization at shutdown.
+    kotlin.native.internal.Debugging.forceCheckedShutdown = true
     autoreleasepool {
         run()
     }
diff --git a/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.h b/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.h
new file mode 100644
index 00000000000..0bbf79860ef
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.h
@@ -0,0 +1,9 @@
+#import <Foundation/NSObject.h>
+
+@interface CreateAutoreleaseDeallocated : NSObject
+@property BOOL value;
+@end;
+
+@interface CreateAutorelease : NSObject
++(void)createAutorelease:(CreateAutoreleaseDeallocated*)deallocated;
+@end;
diff --git a/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.kt b/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.kt
new file mode 100644
index 00000000000..ad942a373f0
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.kt
@@ -0,0 +1,198 @@
+import kotlin.native.concurrent.*
+import kotlinx.cinterop.*
+import kotlin.test.*
+import objcTests.*
+
+@Test
+fun testExecuteInMainPark() =
+        test(Execute, InMain, Park)
+
+@Test
+fun testExecuteInMainProcessQueue() =
+        test(Execute, InMain, ProcessQueue)
+
+@Test
+fun testExecuteInWorkerPark() =
+        test(Execute, InWorker, Park)
+
+@Test
+fun testExecuteInWorkerProcessQueue() =
+        test(Execute, InWorker, ProcessQueue)
+
+@Test
+fun testExecuteInMainToWorkerNoYield() =
+        test(Execute, InMainToWorker, NoYield)
+
+@Test
+fun testExecuteAfter0InMainPark() =
+        test(ExecuteAfter0, InMain, Park)
+
+@Test
+fun testExecuteAfter0InMainProcessQueue() =
+        test(ExecuteAfter0, InMain, ProcessQueue)
+
+@Test
+fun testExecuteAfter0InWorkerPark() =
+        test(ExecuteAfter0, InWorker, Park)
+
+@Test
+fun testExecuteAfter0InWorkerProcessQueue() =
+        test(ExecuteAfter0, InWorker, ProcessQueue)
+
+@Test
+fun testExecuteAfter0InMainToWorkerNoYield() =
+        test(ExecuteAfter0, InMainToWorker, NoYield)
+
+@Test
+fun testExecuteAfter10InMainPark() =
+        testExecuteAfter10(InMain, Park)
+
+@Test
+fun testExecuteAfter10InMainProcessQueue() =
+        testExecuteAfter10(InMain, ProcessQueue)
+
+@Test
+fun testExecuteAfter10InWorkerPark() =
+        testExecuteAfter10(InWorker, Park)
+
+@Test
+fun testExecuteAfter10InWorkerProcessQueue() =
+        testExecuteAfter10(InWorker, ProcessQueue)
+
+@Test
+fun testExecuteAfter10InMainToWorkerNoYield() =
+        testExecuteAfter10(InMainToWorker, NoYield)
+
+private fun testExecuteAfter10(context: Context, yieldMethod: Yield) =
+        test(ExecuteAfter10(yieldMethod), context, yieldMethod)
+
+private fun <F> test(method: ExecuteMethod<F>, context: Context, yieldMethod: Yield) {
+    context.withWorker { worker ->
+        fun execute(block: () -> Unit) {
+            val future = method.submit(worker, block)
+            yieldMethod.yield()
+            method.wait(future)
+        }
+
+        val deallocated = CreateAutoreleaseDeallocated()
+
+        execute {
+            CreateAutorelease.createAutorelease(deallocated)
+            // Object is still in autorelease pool:
+            assertFalse(deallocated.value)
+        }
+
+        // autorelease pool is processed after the job is finished, so the object should be deallocated;
+        // Checking in a job to make sure previous job is completely processed:
+        execute {
+            assertTrue(deallocated.value)
+        }
+    }
+}
+
+interface ExecuteMethod<F> {
+    fun submit(worker: Worker, block: () -> Unit): F
+    fun wait(future: F)
+}
+
+object Execute : ExecuteMethod<Future<Unit>> {
+    override fun submit(worker: Worker, block: () -> Unit) = worker.execute(TransferMode.SAFE, { block.freeze() }) {
+        it()
+    }
+
+    override fun wait(future: Future<Unit>) {
+        future.result // Throws on failure.
+    }
+}
+
+abstract class ExecuteAfter : ExecuteMethod<AtomicReference<Any?>> {
+    abstract val timeout: Long
+
+    abstract fun sleepAndYield()
+
+    override fun submit(worker: Worker, block: () -> Unit): AtomicReference<Any?> {
+        val result = AtomicReference<Any?>(null)
+
+        worker.executeAfter(timeout, {
+            try {
+                block()
+                result.value = true
+            } catch (e: Throwable) {
+                result.value = e.freeze()
+            }
+        }.freeze())
+
+        return result
+    }
+
+    override fun wait(future: AtomicReference<Any?>) {
+        while (true) {
+            sleepAndYield()
+            when (val it = future.value) {
+                null -> continue
+                true -> return
+                else -> throw it as Throwable
+            }
+        }
+    }
+}
+
+object ExecuteAfter0 : ExecuteAfter() {
+    override val timeout = 0L
+
+    override fun sleepAndYield() {
+        // No sleep or additional yield required.
+    }
+}
+
+class ExecuteAfter10(val yieldMethod: Yield) : ExecuteAfter() {
+    override val timeout = 10L
+
+    override fun sleepAndYield() {
+        Worker.current.park(timeout + 1L, process = false)
+        yieldMethod.yield()
+    }
+}
+
+interface Context {
+    fun withWorker(block: (worker: Worker) -> Unit)
+}
+
+object InMain : Context {
+    override fun withWorker(block: (worker: Worker) -> Unit) = block(Worker.current)
+}
+
+object InMainToWorker : Context {
+    override fun withWorker(block: (Worker) -> Unit) = kotlin.native.concurrent.withWorker {
+        block(this)
+    }
+}
+
+object InWorker : Context {
+    override fun withWorker(block: (Worker) -> Unit) = kotlin.native.concurrent.withWorker {
+        val method = Execute
+        method.wait(method.submit(this) {
+            block(this)
+        })
+    }
+}
+
+interface Yield {
+    fun yield()
+}
+
+object Park : Yield {
+    override fun yield() {
+        Worker.current.park(0L, process = true)
+    }
+}
+
+object ProcessQueue : Yield {
+    override fun yield() {
+        Worker.current.processQueue()
+    }
+}
+
+object NoYield : Yield {
+    override fun yield() {}
+}
diff --git a/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.m b/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.m
new file mode 100644
index 00000000000..5fa2797d994
--- /dev/null
+++ b/kotlin-native/backend.native/tests/interop/objc/tests/workerAutoreleasePool.m
@@ -0,0 +1,22 @@
+#import "workerAutoreleasePool.h"
+
+@implementation CreateAutoreleaseDeallocated
+@end;
+
+@implementation CreateAutorelease {
+    CreateAutoreleaseDeallocated* deallocated;
+}
++(instancetype)create:(CreateAutoreleaseDeallocated*)deallocated {
+    CreateAutorelease* result = [self new];
+    result->deallocated = deallocated;
+    return result;
+}
+
++(void)createAutorelease:(CreateAutoreleaseDeallocated*)deallocated {
+    [self create:deallocated];
+}
+
+-(void)dealloc {
+    deallocated.value = YES;
+}
+@end;
diff --git a/kotlin-native/backend.native/tests/objcexport/enumValues.kt b/kotlin-native/backend.native/tests/objcexport/enumValues.kt
new file mode 100644
index 00000000000..87eea28cd89
--- /dev/null
+++ b/kotlin-native/backend.native/tests/objcexport/enumValues.kt
@@ -0,0 +1,16 @@
+package enumValues
+
+enum class EnumLeftRightUpDown {
+    LEFT, RIGHT, UP, DOWN
+}
+
+enum class EnumOneTwoThreeValues {
+    ONE, TWO, THREE, VALUES
+}
+
+enum class EnumValuesValues_ {
+    VALUES, VALUES_
+}
+
+enum class EmptyEnum {
+}
diff --git a/kotlin-native/backend.native/tests/objcexport/enumValues.swift b/kotlin-native/backend.native/tests/objcexport/enumValues.swift
new file mode 100644
index 00000000000..a19a3f87078
--- /dev/null
+++ b/kotlin-native/backend.native/tests/objcexport/enumValues.swift
@@ -0,0 +1,47 @@
+import Kt
+
+private func testEnumValues() throws {
+    let values = EnumLeftRightUpDown.values()
+
+    try assertEquals(actual: values.size, expected: 4)
+
+    try assertSame(actual: values.get(index: 0), expected: EnumLeftRightUpDown.left)
+    try assertSame(actual: values.get(index: 1), expected: EnumLeftRightUpDown.right)
+    try assertSame(actual: values.get(index: 2), expected: EnumLeftRightUpDown.up)
+    try assertSame(actual: values.get(index: 3), expected: EnumLeftRightUpDown.down)
+}
+
+private func testEnumValuesMangled() throws {
+    let values = EnumOneTwoThreeValues.values_()
+
+    try assertEquals(actual: values.size, expected: 4)
+
+    try assertSame(actual: values.get(index: 0), expected: EnumOneTwoThreeValues.one)
+    try assertSame(actual: values.get(index: 1), expected: EnumOneTwoThreeValues.two)
+    try assertSame(actual: values.get(index: 2), expected: EnumOneTwoThreeValues.three)
+    try assertSame(actual: values.get(index: 3), expected: EnumOneTwoThreeValues.values)
+}
+
+private func testEnumValuesMangledTwice() throws {
+    let values = EnumValuesValues_.values__()
+
+    try assertEquals(actual: values.size, expected: 2)
+
+    try assertSame(actual: values.get(index: 0), expected: EnumValuesValues_.values)
+    try assertSame(actual: values.get(index: 1), expected: EnumValuesValues_.values_)
+}
+
+private func testEnumValuesEmpty() throws {
+    try assertEquals(actual: EmptyEnum.values().size, expected: 0)
+}
+
+class EnumValuesTests : SimpleTestProvider {
+    override init() {
+        super.init()
+
+        test("TestEnumValues", testEnumValues)
+        test("TestEnumValuesMangled", testEnumValuesMangled)
+        test("TestEnumValuesMangledTwice", testEnumValuesMangledTwice)
+        test("TestEnumValuesEmpty", testEnumValuesEmpty)
+    }
+}
diff --git a/kotlin-native/backend.native/tests/objcexport/expectedLazy.h b/kotlin-native/backend.native/tests/objcexport/expectedLazy.h
index c96ee87923e..85973717d55 100644
--- a/kotlin-native/backend.native/tests/objcexport/expectedLazy.h
+++ b/kotlin-native/backend.native/tests/objcexport/expectedLazy.h
@@ -331,6 +331,52 @@ __attribute__((swift_name("DeallocRetainKt")))
 + (KtKotlinWeakReference<id> *)createWeakReferenceValue:(id)value __attribute__((swift_name("createWeakReference(value:)")));
 @end;
 
+__attribute__((objc_subclassing_restricted))
+__attribute__((swift_name("EnumLeftRightUpDown")))
+@interface KtEnumLeftRightUpDown : KtKotlinEnum<KtEnumLeftRightUpDown *>
++ (instancetype)alloc __attribute__((unavailable));
++ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable));
+- (instancetype)initWithName:(NSString *)name ordinal:(int32_t)ordinal __attribute__((swift_name("init(name:ordinal:)"))) __attribute__((objc_designated_initializer)) __attribute__((unavailable));
+@property (class, readonly) KtEnumLeftRightUpDown *left __attribute__((swift_name("left")));
+@property (class, readonly) KtEnumLeftRightUpDown *right __attribute__((swift_name("right")));
+@property (class, readonly) KtEnumLeftRightUpDown *up __attribute__((swift_name("up")));
+@property (class, readonly) KtEnumLeftRightUpDown *down __attribute__((swift_name("down")));
++ (KtKotlinArray<KtEnumLeftRightUpDown *> *)values __attribute__((swift_name("values()")));
+@end;
+
+__attribute__((objc_subclassing_restricted))
+__attribute__((swift_name("EnumOneTwoThreeValues")))
+@interface KtEnumOneTwoThreeValues : KtKotlinEnum<KtEnumOneTwoThreeValues *>
++ (instancetype)alloc __attribute__((unavailable));
++ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable));
+- (instancetype)initWithName:(NSString *)name ordinal:(int32_t)ordinal __attribute__((swift_name("init(name:ordinal:)"))) __attribute__((objc_designated_initializer)) __attribute__((unavailable));
+@property (class, readonly) KtEnumOneTwoThreeValues *one __attribute__((swift_name("one")));
+@property (class, readonly) KtEnumOneTwoThreeValues *two __attribute__((swift_name("two")));
+@property (class, readonly) KtEnumOneTwoThreeValues *three __attribute__((swift_name("three")));
+@property (class, readonly) KtEnumOneTwoThreeValues *values __attribute__((swift_name("values")));
++ (KtKotlinArray<KtEnumOneTwoThreeValues *> *)values __attribute__((swift_name("values()")));
+@end;
+
+__attribute__((objc_subclassing_restricted))
+__attribute__((swift_name("EnumValuesValues_")))
+@interface KtEnumValuesValues_ : KtKotlinEnum<KtEnumValuesValues_ *>
++ (instancetype)alloc __attribute__((unavailable));
++ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable));
+- (instancetype)initWithName:(NSString *)name ordinal:(int32_t)ordinal __attribute__((swift_name("init(name:ordinal:)"))) __attribute__((objc_designated_initializer)) __attribute__((unavailable));
+@property (class, readonly) KtEnumValuesValues_ *values __attribute__((swift_name("values")));
+@property (class, readonly) KtEnumValuesValues_ *values __attribute__((swift_name("values")));
++ (KtKotlinArray<KtEnumValuesValues_ *> *)values __attribute__((swift_name("values()")));
+@end;
+
+__attribute__((objc_subclassing_restricted))
+__attribute__((swift_name("EmptyEnum")))
+@interface KtEmptyEnum : KtKotlinEnum<KtEmptyEnum *>
++ (instancetype)alloc __attribute__((unavailable));
++ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable));
+- (instancetype)initWithName:(NSString *)name ordinal:(int32_t)ordinal __attribute__((swift_name("init(name:ordinal:)"))) __attribute__((objc_designated_initializer)) __attribute__((unavailable));
++ (KtKotlinArray<KtEmptyEnum *> *)values __attribute__((swift_name("values()")));
+@end;
+
 __attribute__((swift_name("FHolder")))
 @interface KtFHolder : KtBase
 - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
@@ -696,6 +742,7 @@ __attribute__((swift_name("Enumeration")))
 @property (class, readonly) KtEnumeration *answer __attribute__((swift_name("answer")));
 @property (class, readonly) KtEnumeration *year __attribute__((swift_name("year")));
 @property (class, readonly) KtEnumeration *temperature __attribute__((swift_name("temperature")));
++ (KtKotlinArray<KtEnumeration *> *)values __attribute__((swift_name("values()")));
 @property (readonly) int32_t enumValue __attribute__((swift_name("enumValue")));
 @end;
 
@@ -1407,6 +1454,7 @@ __attribute__((swift_name("TestInvalidIdentifiers.E")))
 @property (class, readonly) KtTestInvalidIdentifiersE *_5_ __attribute__((swift_name("_5_")));
 @property (class, readonly) KtTestInvalidIdentifiersE *__ __attribute__((swift_name("__")));
 @property (class, readonly) KtTestInvalidIdentifiersE *__ __attribute__((swift_name("__")));
++ (KtKotlinArray<KtTestInvalidIdentifiersE *> *)values __attribute__((swift_name("values()")));
 @property (readonly) int32_t value __attribute__((swift_name("value")));
 @end;
 
diff --git a/kotlin-native/backend.native/tests/runtime/workers/worker_threadlocal_no_leak.kt b/kotlin-native/backend.native/tests/runtime/workers/worker_threadlocal_no_leak.kt
new file mode 100644
index 00000000000..567e6d1f185
--- /dev/null
+++ b/kotlin-native/backend.native/tests/runtime/workers/worker_threadlocal_no_leak.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+import kotlin.native.concurrent.*
+
+@ThreadLocal
+var x = Any()
+
+fun main() {
+    val worker = Worker.start()
+
+    worker.execute(TransferMode.SAFE, {}) {
+        println(x)  // Make sure x is initialized
+    }.result
+
+    worker.requestTermination().result
+}
diff --git a/kotlin-native/backend.native/tests/serialization/deserialized_fields.kt b/kotlin-native/backend.native/tests/serialization/deserialized_fields.kt
new file mode 100644
index 00000000000..4d9c85f8c77
--- /dev/null
+++ b/kotlin-native/backend.native/tests/serialization/deserialized_fields.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+package serialization.deserialized_fields
+
+import kotlin.test.*
+
+class CustomThrowable(val extraInfo: String): Throwable("Some message", null)
+
+@Test fun runTest() {
+    val custom = CustomThrowable("Extra info")
+    assertEquals(custom.extraInfo, "Extra info")
+    assertEquals(custom.message, "Some message")
+    assertEquals(custom.cause, null)
+}
\ No newline at end of file
diff --git a/kotlin-native/backend.native/tests/stdlib_external/collections/KT42428Test.kt b/kotlin-native/backend.native/tests/stdlib_external/collections/KT42428Test.kt
new file mode 100644
index 00000000000..ef09a06c18b
--- /dev/null
+++ b/kotlin-native/backend.native/tests/stdlib_external/collections/KT42428Test.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package test.collections
+
+import kotlin.test.*
+
+// TODO: consider moving to common stdlib tests.
+class KT42428Test {
+
+    private val listOfLetterIndexPairs = ('a'..'z').withIndex().map { (i, c) -> "$c" to i }
+
+    private val mapOfLetterToIndex = listOfLetterIndexPairs.toMap()
+
+    @Test fun testListOfPairsToMapEntriesContainsMapEntry() {
+        testMapEntriesContainsMapEntry(listOfLetterIndexPairs.toMap(), "h", 7)
+    }
+
+    @Test fun testMapToMutableMapEntriesContainsMapEntry() {
+        testMapEntriesContainsMapEntry(mapOfLetterToIndex.toMutableMap(), "h", 7)
+    }
+
+    @Test fun testHashMapEntriesContainsMapEntry() {
+        testMapEntriesContainsMapEntry(HashMap(mapOfLetterToIndex), "h", 7)
+    }
+
+    @Test fun testLinkedHashMapEntriesContainsMapEntry() {
+        testMapEntriesContainsMapEntry(LinkedHashMap(mapOfLetterToIndex), "h", 7)
+    }
+
+    // Based on https://youtrack.jetbrains.com/issue/KT-42428.
+    private fun testMapEntriesContainsMapEntry(map: Map<String, Int>, key: String, value: Int) {
+        data class SimpleEntry<out K, out V>(override val key: K, override val value: V) : Map.Entry<K, V> {
+
+            override fun equals(other: Any?): Boolean =
+                    other is Map.Entry<*, *> && key == other.key && value == other.value
+
+            override fun hashCode(): Int = key.hashCode() xor value.hashCode()
+
+            override fun toString(): String = "$key=$value"
+        }
+
+
+        assertTrue(map.keys.contains(key))
+
+        // This one requires special efforts to make it work this way.
+        // map.entries can in fact be `MutableSet<MutableMap.MutableEntry>`,
+        // which [contains] method takes [MutableEntry], so the compiler may generate special bridge
+        // returning false for values that aren't [MutableEntry] (including [SimpleEntry]).
+        assertTrue(map.entries.contains(SimpleEntry(key, value)))
+
+        assertTrue(map.entries.toSet().contains(SimpleEntry(key, value)))
+    }
+}
diff --git a/kotlin-native/build-tools/build.gradle.kts b/kotlin-native/build-tools/build.gradle.kts
index 84c4df40623..77a2cf118fd 100644
--- a/kotlin-native/build-tools/build.gradle.kts
+++ b/kotlin-native/build-tools/build.gradle.kts
@@ -39,13 +39,14 @@ group = "org.jetbrains.kotlin"
 version = konanVersion
 
 repositories {
-    jcenter()
     maven(kotlinCompilerRepo)
     maven(buildKotlinCompilerRepo)
     maven("https://cache-redirector.jetbrains.com/maven-central")
     mavenCentral()
     maven("https://kotlin.bintray.com/kotlinx")
     maven("https://dl.bintray.com/kotlin/kotlin-dev")
+    maven("https://cache-redirector.jetbrains.com/jcenter")
+    jcenter()
 }
 
 dependencies {
diff --git a/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
index 7be49e1a6ce..749ee1436b3 100644
--- a/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+++ b/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
@@ -34,6 +34,7 @@ class RunExternalTestGroup extends JavaExec {
     def dist = UtilsKt.getKotlinNativeDist(project)
 
     def enableKonanAssertions = true
+    def verifyIr = true
     String outputDirectory = null
     String goldValue = null
     // Checks test's output against gold value and returns true if the output matches the expectation
@@ -100,6 +101,9 @@ class RunExternalTestGroup extends JavaExec {
             if (enableKonanAssertions) {
                 args "-ea"
             }
+            if (verifyIr) {
+                args "-Xverify-ir"
+            }
             if (project.hasProperty("test_verbose")) {
                 println("Files to compile: $filesToCompile")
                 println(args)
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CompareDistributionSignatures.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CompareDistributionSignatures.kt
new file mode 100644
index 00000000000..1c71ebddd95
--- /dev/null
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CompareDistributionSignatures.kt
@@ -0,0 +1,126 @@
+package org.jetbrains.kotlin
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+import org.jetbrains.kotlin.konan.target.HostManager
+import java.io.File
+
+/**
+ * Compares SignatureIds of the current distribution and the given older one.
+ * Can be used to validate that there are no unexpected breaking ABI changes.
+ */
+open class CompareDistributionSignatures : DefaultTask() {
+
+    @Input
+    lateinit var target: String
+
+    @Input
+    lateinit var oldDistribution: String
+
+    private val newDistribution: String =
+            project.kotlinNativeDist.absolutePath
+
+    enum class OnMismatchMode {
+        FAIL,
+        NOTIFY
+    }
+
+    private val messageBuilder = StringBuilder()
+
+    @Input
+    var onMismatchMode: OnMismatchMode = OnMismatchMode.NOTIFY
+
+    @TaskAction
+    fun run() {
+        val klibs = getKlibs(oldDistribution, newDistribution)
+        if (klibs.missingLibs.isNotEmpty()) {
+            messageBuilder.apply {
+                appendln("Following libraries are missing in the new distro:")
+                klibs.missingLibs.forEach { appendln(it) }
+            }
+        }
+        if (klibs.newLibs.isNotEmpty()) {
+            messageBuilder.apply {
+                appendln("Following libraries were added:")
+                klibs.newLibs.forEach { appendln(it) }
+            }
+        }
+        for ((new, old) in klibs.remainingLibs) {
+            val result = compareSignatures(new, old)
+            if (result.run { newKlibOnly.isNotEmpty() || oldKlibOnly.isNotEmpty() }) {
+                reportMismatch(result, new.name)
+            }
+        }
+        if (messageBuilder.isNotEmpty()) {
+            report(messageBuilder.toString())
+        }
+    }
+
+    private fun reportMismatch(compareDiff: CompareDiff, klibName: String) {
+        messageBuilder.apply {
+            appendln("Mismatch for $klibName:")
+            if (compareDiff.oldKlibOnly.isNotEmpty()) {
+                appendln("Following signatures are missing in the new version:")
+                compareDiff.oldKlibOnly.forEach { appendln(it) }
+            }
+            if (compareDiff.newKlibOnly.isNotEmpty()) {
+                appendln("Following signatures were added:")
+                compareDiff.newKlibOnly.forEach { appendln(it) }
+            }
+        }
+    }
+
+    private fun report(message: String) {
+        when (onMismatchMode) {
+            OnMismatchMode.FAIL -> error(message)
+            OnMismatchMode.NOTIFY -> println(message)
+        }
+    }
+
+    private data class RemainingLibrary(val new: File, val old: File)
+
+    private class KlibDiff(
+        val newLibs: Collection<File>,
+        val missingLibs: Collection<File>,
+        val remainingLibs: Collection<RemainingLibrary>
+    )
+
+    private fun String.stdlib(): File =
+            File("$this/klib/common/stdlib")
+
+    private fun String.platformLibs(target: String): File =
+            File("$this/klib/platform/$target")
+
+    private fun getKlibs(oldDistribution: String, newDistribution: String): KlibDiff {
+        val oldPlatformLibs = oldDistribution.platformLibs(target)
+        val oldPlatformLibsNames = oldPlatformLibs.list().toSet()
+        val newPlatformLibs = newDistribution.platformLibs(target)
+        val newPlatformLibsNames = newPlatformLibs.list().toSet()
+        return KlibDiff(
+                (newPlatformLibsNames - oldPlatformLibsNames).map(newPlatformLibs::resolve),
+                (oldPlatformLibsNames - newPlatformLibsNames).map(oldPlatformLibs::resolve),
+                oldPlatformLibsNames.intersect(newPlatformLibsNames).map {
+                    RemainingLibrary(newPlatformLibs.resolve(it), oldPlatformLibs.resolve(it))
+                } + RemainingLibrary(newDistribution.stdlib(), oldDistribution.stdlib())
+        )
+    }
+
+    private fun getKlibSignatures(klib: File): List<String> {
+        val tool = if (HostManager.hostIsMingw) "klib.bat" else "klib"
+        val klibTool = File("$newDistribution/bin/$tool").absolutePath
+        val args = listOf("signatures", klib.absolutePath)
+        return runProcess(localExecutor(project), klibTool, args).stdOut.lines()
+    }
+
+    private class CompareDiff(val newKlibOnly: Set<String>, val oldKlibOnly: Set<String>)
+
+    private fun compareSignatures(new: File, old: File): CompareDiff {
+        val newKlibSignatures = getKlibSignatures(new).toSet()
+        val oldKlibSignatures = getKlibSignatures(old).toSet()
+        return CompareDiff(
+                newKlibSignatures - oldKlibSignatures,
+                oldKlibSignatures - newKlibSignatures,
+        )
+    }
+}
\ No newline at end of file
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt
index 5b587b77f69..bf5782f5a55 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt
@@ -39,8 +39,8 @@ class ExecClang(private val project: Project) {
         return konanArgs(target)
     }
 
-    fun resolveExecutable(executable: String?): String {
-        val executable = executable ?: "clang"
+    fun resolveExecutable(executableOrNull: String?): String {
+        val executable = executableOrNull ?: "clang"
 
         if (listOf("clang", "clang++").contains(executable)) {
             val llvmDir = project.findProperty("llvmDir")
@@ -88,18 +88,15 @@ class ExecClang(private val project: Project) {
     }
 
     private fun execClang(defaultArgs: List<String>, action: Action<in ExecSpec>): ExecResult {
-        val extendedAction = object : Action<ExecSpec> {
-            override fun execute(execSpec: ExecSpec) {
-                action.execute(execSpec)
+        val extendedAction = Action<ExecSpec> { execSpec ->
+            action.execute(execSpec)
+            execSpec.apply {
+                executable = resolveExecutable(executable)
 
-                execSpec.apply {
-                    executable = resolveExecutable(executable)
-
-                    val hostPlatform = project.findProperty("hostPlatform") as Platform
-                    environment["PATH"] = project.files(hostPlatform.clang.clangPaths).asPath +
-                            java.io.File.pathSeparator + environment["PATH"]
-                    args(defaultArgs)
-                }
+                val hostPlatform = project.findProperty("hostPlatform") as Platform
+                environment["PATH"] = project.files(hostPlatform.clang.clangPaths).asPath +
+                        java.io.File.pathSeparator + environment["PATH"]
+                args = args + defaultArgs
             }
         }
         return project.exec(extendedAction)
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
index b2e7fe01e89..8f6b6d83e51 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
@@ -179,10 +179,10 @@ val Project.executor: ExecutorService
  */
 fun ExecutorService.add(actionParameter: Action<in ExecSpec>) = object : ExecutorService {
     override fun execute(action: Action<in ExecSpec>): ExecResult? =
-            this@add.execute(Action {
+            this@add.execute {
                 action.execute(it)
                 actionParameter.execute(it)
-            })
+            }
 }
 
 /**
@@ -221,6 +221,7 @@ fun localExecutorService(project: Project): ExecutorService = object : ExecutorS
  * @param iosDevice an optional project property used to control simulator's device type
  *        Specify -PiosDevice=iPhone X to set it
  */
+@Suppress("KDocUnresolvedReference")
 private fun simulator(project: Project): ExecutorService = object : ExecutorService {
 
     private val target = project.testTarget
@@ -245,7 +246,7 @@ private fun simulator(project: Project): ExecutorService = object : ExecutorServ
     private val device = project.findProperty("iosDevice")?.toString() ?: when (target) {
         KonanTarget.TVOS_X64 -> "Apple TV 4K"
         KonanTarget.IOS_X64 -> "iPhone 8"
-        KonanTarget.WATCHOS_X64,
+        KonanTarget.WATCHOS_X64 -> "Apple Watch Series 6 - 40mm"
         KonanTarget.WATCHOS_X86 -> "Apple Watch Series 4 - 40mm"
         else -> error("Unexpected simulation target: $target")
     }
@@ -269,6 +270,7 @@ private fun simulator(project: Project): ExecutorService = object : ExecutorServ
  * @param remote makes binaries be executed on a remote host
  *        Specify it as -Premote=user@host
  */
+@Suppress("KDocUnresolvedReference")
 private fun sshExecutor(project: Project): ExecutorService = object : ExecutorService {
 
     private val remote: String = project.property("remote").toString()
@@ -332,14 +334,15 @@ private fun deviceLauncher(project: Project) = object : ExecutorService {
 
     private val deviceName = project.findProperty("device_name") as? String
 
+    private val bundleID = "org.jetbrains.kotlin.KonanTestLauncher"
+
     override fun execute(action: Action<in ExecSpec>): ExecResult? {
-        var result: ExecResult? = null
+        val result: ExecResult?
         try {
             val udid = targetUDID()
             println("Found device UDID: $udid")
             install(udid, xcProject.resolve("build/KonanTestLauncher.ipa").toString())
-            val bundleId = "org.jetbrains.kotlin.KonanTestLauncher"
-            val commands = startDebugServer(udid, bundleId)
+            val commands = startDebugServer(udid)
                     .split("\n")
                     .filter { it.isNotBlank() }
                     .flatMap { listOf("-o", it) }
@@ -377,7 +380,7 @@ private fun deviceLauncher(project: Project) = object : ExecutorService {
                         savedOut?.write(it.toByteArray())
                     }
 
-            uninstall(udid, bundleId)
+            uninstall(udid)
         } catch (exc: Exception) {
             throw RuntimeException("iOS-device execution failed", exc)
         } finally {
@@ -463,12 +466,12 @@ private fun deviceLauncher(project: Project) = object : ExecutorService {
         check(result.exitValue == 0) { "Installation of $bundlePath failed: $out" }
     }
 
-    private fun uninstall(udid: String, bundleId: String) {
+    private fun uninstall(udid: String) {
         val out = ByteArrayOutputStream()
 
         project.exec {
             it.workingDir = xcProject.toFile()
-            it.commandLine = listOf(idb, "uninstall", "--udid", udid, bundleId)
+            it.commandLine = listOf(idb, "uninstall", "--udid", udid, bundleID)
             it.standardOutput = out
             it.errorOutput = out
             it.isIgnoreExitValue = true
@@ -476,12 +479,12 @@ private fun deviceLauncher(project: Project) = object : ExecutorService {
         println(out.toString())
     }
 
-    private fun startDebugServer(udid: String, bundleId: String): String {
+    private fun startDebugServer(udid: String): String {
         val out = ByteArrayOutputStream()
 
         val result = project.exec {
             it.workingDir = xcProject.toFile()
-            it.commandLine = listOf(idb, "debugserver", "start", "--udid", udid, bundleId)
+            it.commandLine = listOf(idb, "debugserver", "start", "--udid", udid, bundleID)
             it.standardOutput = out
             it.errorOutput = out
             it.isIgnoreExitValue = true
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt
index 07bc51be939..faea66b2134 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt
@@ -14,6 +14,8 @@ import java.io.File
 open class KlibInstall: Exec() {
     @InputFile
     lateinit var klib: File
+
+    @Input
     var repo: File = project.rootDir
 
     val installDir: File
@@ -28,8 +30,7 @@ open class KlibInstall: Exec() {
 
     override fun configure(config: Closure<*>): Task {
         val result = super.configure(config)
-        val konanHomePath = project.findProperty("org.jetbrains.kotlin.native.home") ?: "dist"
-        val konanHome = project.rootProject.file(konanHomePath)
+        val konanHome = project.kotlinNativeDist
         val suffix = if (HostManager.host == KonanTarget.MINGW_X64) ".bat" else  ""
         val klibProgram = "$konanHome/bin/klib$suffix"
 
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
index 438c6f00044..85fb358c380 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
@@ -15,12 +15,14 @@ import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.TaskAction
 import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.gradle.process.ExecSpec
+import org.jetbrains.kotlin.konan.exec.Command
 
 import java.io.File
 import java.io.ByteArrayOutputStream
 import java.util.regex.Pattern
 
 import org.jetbrains.kotlin.konan.target.HostManager
+import org.jetbrains.kotlin.konan.target.LinkerOutputKind
 
 abstract class KonanTest : DefaultTask(), KonanTestExecutable {
     enum class Logger {
@@ -331,11 +333,21 @@ open class KonanStandaloneTest : KonanLocalTest() {
     @Input @Optional
     var enableKonanAssertions = true
 
+    @Input @Optional
+    var verifyIr = true
+
     /**
      * Compiler flags used to build a test.
      */
     var flags: List<String> = listOf()
-        get() = if (enableKonanAssertions) field + "-ea" else field
+        get() {
+            val result = field.toMutableList()
+            if (enableKonanAssertions)
+                result += "-ea"
+            if (verifyIr)
+                result += "-Xverify-ir"
+            return result
+        }
 
     fun getSources(): Provider<List<String>> = project.provider {
         val sources = buildCompileList(project.file(source).toPath(), outputDirectory)
@@ -380,7 +392,7 @@ open class KonanDriverTest : KonanStandaloneTest() {
             it.print("Konanc compiler execution:")
             project.file("$executable.compilation.log").run {
                 writeText(it.stdOut)
-                writeText(it.stdErr)
+                appendText(it.stdErr)
             }
             check(it.exitCode == 0) { "Compiler failed with exit code ${it.exitCode}" }
         }
@@ -418,8 +430,12 @@ open class KonanDynamicTest : KonanStandaloneTest() {
     @Input
     lateinit var cSource: String
 
+    @Input
     var clangTool = "clang"
 
+    @Input
+    var clangFlags: List<String> = listOf()
+
     // Replace testlib_api.h and all occurrences of the testlib with the actual name of the test
     private fun processCSource(): String {
         val sourceFile = File(cSource)
@@ -439,25 +455,49 @@ open class KonanDynamicTest : KonanStandaloneTest() {
     private fun clang() {
         val log = ByteArrayOutputStream()
         val plugin = project.convention.getPlugin(ExecClang::class.java)
-        val execResult = plugin.execKonanClang(project.testTarget, Action<ExecSpec> {
+        val artifactsDir = "$outputDirectory/${project.testTarget}"
+
+        fun flagsContain(opt: String) = project.globalTestArgs.contains(opt) || flags.contains(opt)
+        val isOpt = flagsContain("-opt")
+        val isDebug = flagsContain("-g")
+
+        val execResult = plugin.execKonanClang(project.testTarget) {
             it.workingDir = File(outputDirectory)
             it.executable = clangTool
-            val artifactsDir = "$outputDirectory/${project.testTarget}"
             it.args = listOf(processCSource(),
-                    "-o", executable,
-                    "-I", artifactsDir,
-                    "-L", artifactsDir,
-                    "-l", name,
-                    "-Wl,-rpath,$artifactsDir")
-
+                    "-c",
+                    "-o", "$executable.o",
+                    "-I", artifactsDir
+            ) + clangFlags
             it.standardOutput = log
             it.errorOutput = log
             it.isIgnoreExitValue = true
-        })
+        }
         log.toString("UTF-8").also {
             project.file("$executable.compilation.log").writeText(it)
             println(it)
         }
         execResult.assertNormalExitValue()
+
+        val linker = project.platformManager.platform(project.testTarget).linker
+        val commands = linker.finalLinkCommands(
+                objectFiles = listOf("$executable.o"),
+                executable = executable,
+                libraries = listOf("-l$name"),
+                linkerArgs = listOf("-L", artifactsDir, "-rpath", artifactsDir),
+                optimize = isOpt,
+                debug = isDebug,
+                kind = LinkerOutputKind.EXECUTABLE,
+                outputDsymBundle = "",
+                needsProfileLibrary = false,
+                mimallocEnabled = false
+        )
+        commands.map { cmd ->
+            // Filter out linker option that defines __cxa_demangle because Konan_cxa_demangle is not defined in tests.
+            Command(cmd.argsWithExecutable.filterNot { it.contains("--defsym") || it.contains("Konan_cxa_demangle") })
+        }.forEach {
+            it.logWith { message -> project.file("$executable.compilation.log").appendText(message()) }
+            it.execute()
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/MPPTools.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/MPPTools.kt
index 050da54140a..2258508cfd6 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/MPPTools.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/MPPTools.kt
@@ -98,14 +98,14 @@ fun createJsonReport(projectProperties: Map<String, Any>): String {
     val machine = Environment.Machine(getValue("cpu"), getValue("os"))
     val jdk = Environment.JDKInstance(getValue("jdkVersion"), getValue("jdkVendor"))
     val env = Environment(machine, jdk)
-    val flags = (projectProperties["flags"] ?: emptyList<String>()) as List<String>
+    val flags: List<String> = (projectProperties["flags"] as? List<*>)?.filterIsInstance<String>() ?: emptyList()
     val backend = Compiler.Backend(Compiler.backendTypeFromString(getValue("type"))!! ,
                                     getValue("compilerVersion"), flags)
     val kotlin = Compiler(backend, getValue("kotlinVersion"))
     val benchDesc = getValue("benchmarks")
     val benchmarksArray = JsonTreeParser.parse(benchDesc)
     val benchmarks = parseBenchmarksArray(benchmarksArray)
-            .union(projectProperties["compileTime"] as List<BenchmarkResult>).union(
+            .union((projectProperties["compileTime"] as? List<*>)?.filterIsInstance<BenchmarkResult>() ?: emptyList()).union(
                     listOf(projectProperties["codeSize"] as? BenchmarkResult).filterNotNull()).toList()
     val report = BenchmarksReport(env, benchmarks, kotlin)
     return report.toJson()
@@ -184,7 +184,6 @@ fun sendUploadRequest(url: String, fileName: String, username: String? = null, p
 }
 
 // A short-cut to add a Kotlin/Native run task.
-@JvmOverloads
 fun createRunTask(
         subproject: Project,
         name: String,
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/RegressionsReporter.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/RegressionsReporter.kt
index 5159a9b8e47..787bafc3124 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/RegressionsReporter.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/RegressionsReporter.kt
@@ -100,8 +100,7 @@ open class RegressionsReporter : DefaultTask() {
         val teamcityConfig = System.getenv("TEAMCITY_BUILD_PROPERTIES_FILE") ?:
             error("Can't load teamcity config!")
 
-        val buildProperties = Properties()
-        buildProperties.load(FileInputStream(teamcityConfig))
+        val buildProperties = Properties().apply { load(FileInputStream(teamcityConfig)) }
         val buildId = buildProperties.getProperty("teamcity.build.id")
         val buildTypeId = buildProperties.getProperty("teamcity.buildType.id")
         val buildNumber = buildProperties.getProperty("build.number")
@@ -115,7 +114,7 @@ open class RegressionsReporter : DefaultTask() {
         val testReportUrl = testReportUrl(buildId, buildTypeId)
 
         // Get previous build on branch.
-        val builds = getBuild(previousBuildLocator(buildTypeId,branch), user, password)
+        getBuild(previousBuildLocator(buildTypeId,branch), user, password)
 
         // Get changes description.
         val changesList = getCommits("id:$buildId", user, password)
@@ -135,7 +134,7 @@ open class RegressionsReporter : DefaultTask() {
         val target = System.getProperty("os.name").replace("\\s".toRegex(), "")
 
         // Generate comparison report.
-        val output = arrayOf("$analyzer", "-r", "html", "$currentBenchmarksReportFile", "artifactory:$compareToBuildNumber:$target:$artifactoryFileName", "-o", "$htmlReport")
+        val output = arrayOf(analyzer, "-r", "html", currentBenchmarksReportFile, "artifactory:$compareToBuildNumber:$target:$artifactoryFileName", "-o", htmlReport)
                 .runCommand()
 
         if (output.contains("Uncaught exception")) {
@@ -170,4 +169,4 @@ open class RegressionsReporter : DefaultTask() {
         }
         session.disconnect()
     }
-}
\ No newline at end of file
+}
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/XcRunRuntimeUtils.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/XcRunRuntimeUtils.kt
index 84828a6723b..49ce5d00033 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/XcRunRuntimeUtils.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/XcRunRuntimeUtils.kt
@@ -10,14 +10,14 @@ import kotlin.math.min
  * Examples of numeric version strings: "12.4.1.2", "9", "0.5".
  */
 private fun compareStringsAsVersions(version1: String, version2: String): Int {
-    val version1 = version1.split('.').map { it.toInt() }
-    val version2 = version2.split('.').map { it.toInt() }
-    val minimalLength = min(version1.size, version2.size)
+    val splitVersion1 = version1.split('.').map { it.toInt() }
+    val splitVersion2 = version2.split('.').map { it.toInt() }
+    val minimalLength = min(splitVersion1.size, splitVersion2.size)
     for (index in 0 until minimalLength) {
-        if (version1[index] < version2[index]) return -1
-        if (version1[index] > version2[index]) return 1
+        if (splitVersion1[index] < splitVersion2[index]) return -1
+        if (splitVersion1[index] > splitVersion2[index]) return 1
     }
-    return version1.size.compareTo(version2.size)
+    return splitVersion1.size.compareTo(splitVersion2.size)
 }
 
 /**
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt
index 49012e52e60..77d59d93dbe 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt
@@ -71,6 +71,7 @@ open class BenchmarkExtension @Inject constructor(val project: Project) {
     var compilerOpts: List<String> = emptyList()
     var buildType: NativeBuildType = NativeBuildType.RELEASE
     var repeatingType: BenchmarkRepeatingType = BenchmarkRepeatingType.INTERNAL
+    var cleanBeforeRunTask: String? = "konanRun"
 
     val dependencies: BenchmarkDependencies = BenchmarkDependencies()
 
@@ -256,6 +257,11 @@ abstract class BenchmarkingPlugin: Plugin<Project> {
 
         // JVM report task.
         configureJvmJsonTask(jvmRun)
+
+        project.afterEvaluate {
+            // Need to rebuild benchmark to collect compile time.
+            project.benchmark.cleanBeforeRunTask?.let { tasks.getByName(it).dependsOn("clean") }
+        }
     }
 
     override fun apply(target: Project) = with(target) {
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/CompileBenchmarkingPlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/CompileBenchmarkingPlugin.kt
index 79ca911f97c..b96f928921b 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/CompileBenchmarkingPlugin.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/CompileBenchmarkingPlugin.kt
@@ -110,9 +110,7 @@ open class CompileBenchmarkingPlugin : Plugin<Project> {
     private fun getCompilerFlags(benchmarkExtension: CompileBenchmarkExtension) =
             benchmarkExtension.compilerOpts
 
-    private fun Project.configureJvmRun(
-        benchmarkExtension: CompileBenchmarkExtension
-    ) {
+    private fun Project.configureJvmRun() {
         val jvmRun = tasks.create("jvmRun") {
             it.group = BenchmarkingPlugin.BENCHMARKING_GROUP
             it.description = "Runs the compile only benchmark for Kotlin/JVM."
@@ -139,7 +137,7 @@ open class CompileBenchmarkingPlugin : Plugin<Project> {
         // Create tasks.
         configureUtilityTasks()
         configureKonanRun(benchmarkExtension)
-        configureJvmRun(benchmarkExtension)
+        configureJvmRun()
     }
 
     companion object {
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/SwiftBenchmarkingPlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/SwiftBenchmarkingPlugin.kt
index 5f0c8bdadbb..ee5f7d51b06 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/SwiftBenchmarkingPlugin.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/SwiftBenchmarkingPlugin.kt
@@ -79,7 +79,7 @@ open class SwiftBenchmarkingPlugin : BenchmarkingPlugin() {
         val nativeTarget = kotlin.targets.getByName(NATIVE_TARGET_NAME) as KotlinNativeTarget
         // Build executable from swift code.
         framework = nativeTarget.binaries.getFramework(nativeFrameworkName, benchmark.buildType)
-        val buildSwift = tasks.create("buildSwift") { task ->
+        tasks.create("buildSwift") { task ->
             task.dependsOn(framework.linkTaskName)
             task.doLast {
                 val frameworkParentDirPath = framework.outputDirectory.absolutePath
@@ -104,4 +104,4 @@ open class SwiftBenchmarkingPlugin : BenchmarkingPlugin() {
             } else {
                 listOf("-O", "-wmo")
             }
-}
\ No newline at end of file
+}
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt
index 4cd0298ef37..1cc97443109 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt
@@ -43,9 +43,6 @@ open class CompileToBitcode @Inject constructor(
     var srcDirs: FileCollection = project.files(srcRoot.resolve("cpp"))
     var headersDirs: FileCollection = project.files(srcRoot.resolve("headers"))
 
-    @Input
-    var skipLinkagePhase = false
-
     @Input
     var language = Language.CPP
 
@@ -92,10 +89,35 @@ open class CompileToBitcode @Inject constructor(
             }
         }
 
+    private fun outputFileForInputFile(file: File, extension: String) = objDir.resolve("${file.nameWithoutExtension}.${extension}")
+    private fun bitcodeFileForInputFile(file: File) = outputFileForInputFile(file, "bc")
+
     @get:InputFiles
     protected val headers: Iterable<File>
         get() {
-            return headersDirs.files.flatMap { dir ->
+            // Not using clang's -M* flags because there's a problem with our current include system:
+            // We allow includes relative to the current directory and also pass -I for each imported module
+            // Given file tree:
+            // a:
+            //  header.hpp
+            // b:
+            //  impl.cpp
+            // Assume module b adds a to its include path.
+            // If b/impl.cpp has #include "header.hpp", it'll be included from a/header.hpp. If we add another file
+            // header.hpp into b/, the next compilation of b/impl.cpp will include b/header.hpp. -M flags, however,
+            // won't generate a dependency on b/header.hpp, so incremental compilation will be broken.
+            // TODO: Apart from dependency generation this also makes it awkward to have two files with
+            //       the same name (e.g. Utils.h) in directories a/ and b/: For the b/impl.cpp to include a/header.hpp
+            //       it needs to have #include "../a/header.hpp"
+
+            val dirs = mutableSetOf<File>()
+            // First add dirs with sources, as clang by default adds directory with the source to the include path.
+            inputFiles.forEach {
+                dirs.add(it.parentFile)
+            }
+            // Now add manually given header dirs.
+            dirs.addAll(headersDirs.files)
+            return dirs.flatMap { dir ->
                 project.fileTree(dir) {
                     val includePatterns = when (language) {
                         Language.C -> arrayOf("**/.h")
@@ -120,15 +142,13 @@ open class CompileToBitcode @Inject constructor(
             it.args = compilerFlags + inputFiles.map { it.absolutePath }
         }
 
-        if (!skipLinkagePhase) {
-            project.exec {
-                val llvmDir = project.findProperty("llvmDir")
-                it.executable = "$llvmDir/bin/llvm-link"
-                it.args = listOf("-o", outFile.absolutePath) + linkerArgs +
-                        project.fileTree(objDir) {
-                            it.include("**/*.bc")
-                        }.files.map { it.absolutePath }
-            }
+        project.exec {
+            val llvmDir = project.findProperty("llvmDir")
+            it.executable = "$llvmDir/bin/llvm-link"
+            it.args = listOf("-o", outFile.absolutePath) + linkerArgs +
+                    inputFiles.map {
+                        bitcodeFileForInputFile(it).absolutePath
+                    }
         }
     }
 }
\ No newline at end of file
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt
index 85af1c8a588..349ce47ea22 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt
@@ -35,7 +35,7 @@ open class CompileToBitcodePlugin: Plugin<Project> {
 open class CompileToBitcodeExtension @Inject constructor(val project: Project) {
 
     private val targetList = with(project) {
-        provider { rootProject.property("targetList") as List<String> } // TODO: Can we make it better?
+        provider { (rootProject.property("targetList") as? List<*>)?.filterIsInstance<String>() ?: emptyList() } // TODO: Can we make it better?
     }
 
     fun create(
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt
index e6734c3e645..880fb4cb971 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt
@@ -184,6 +184,7 @@ fun createTestTask(
                 excludeFiles = emptyList()
                 includeFiles = listOf("**/*Test.cpp", "**/*Test.mm")
                 dependsOn(it)
+                dependsOn("downloadGoogleTest")
                 compilerArgs.addAll(it.compilerArgs)
                 headersDirs += googleTestExtension.headersDirs
                 this.configureCompileToBitcode()
diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
index 254fab291df..8cf97669123 100644
--- a/kotlin-native/build.gradle
+++ b/kotlin-native/build.gradle
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.KotlinBuildPusher
 import org.jetbrains.kotlin.CollisionDetector
 import org.jetbrains.kotlin.CollisionTransformer
 import org.jetbrains.kotlin.CompilationDatabaseKt
+import org.jetbrains.kotlin.CompareDistributionSignatures
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.jetbrains.kotlin.UtilsKt
@@ -37,6 +38,7 @@ buildscript {
         maven { url "https://cache-redirector.jetbrains.com/maven-central" }
         mavenCentral()
         maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
+        maven { url "https://cache-redirector.jetbrains.com/jcenter" }
         jcenter()
     }
 
@@ -129,6 +131,15 @@ allprojects {
         }
     }
 
+    if (findProperty("kotlin.build.useIR") == "true") {
+        tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+            kotlinOptions {
+                useIR = true
+                freeCompilerArgs += ["-Xir-binary-with-stable-abi"]
+            }
+        }
+    }
+
     setupHostAndTarget()
     loadCommandLineProperties()
     loadLocalProperties()
@@ -137,7 +148,7 @@ allprojects {
 
 void setupHostAndTarget() {
     ext.hostName = platformManager.hostName
-    ext.targetList = platformManager.filteredOutEnabledButNotSupported.collect { it.visibleName } as List
+    ext.targetList = platformManager.enabled.collect { it.visibleName } as List
     ext.konanTargetList = platformManager.enabled as List
 }
 
@@ -333,7 +344,7 @@ task detectJarCollision(type: CollisionDetector) {
                                                     "deserialization", "util.runtime", "compiler.common", "type-system", "cones", "resolve",
                                                     "tree", "psi2fir", "fir2ir", "java", "kotlin-build-common", "lightTree",
                                                     "jvm", "checkers", "raw-fir.common", "light-tree2fir", 
-                                                    "fir-serialization", "fir-deserialization", "entrypoint"])
+                                                    "fir-serialization", "fir-deserialization", "entrypoint", "wasm.ir"])
     }
 }
 
@@ -668,12 +679,6 @@ task samples {
     dependsOn 'samplesZip', 'samplesTar'
 }
 
-task performance {
-    dependsOn 'dist'
-    dependsOn ':performance:clean'
-    dependsOn ':performance:konanRun'
-}
-
 task samplesZip(type: Zip)
 task samplesTar(type: Tar) {
     extension = 'tar.gz'
@@ -784,3 +789,15 @@ task compdb(type: Copy) {
     from "$buildDir/${hostName}/compile_commands.json"
     into "$projectDir"
 }
+
+if (project.hasProperty("anotherDistro")) {
+    targetList.each { targetName ->
+        task "${targetName}CheckAbiCompatibility"(type: CompareDistributionSignatures) {
+            dependsOn "${targetName}PlatformLibs"
+
+            target = targetName
+            oldDistribution = project.findProperty("anotherDistro")
+            onMismatchMode = CompareDistributionSignatures.OnMismatchMode.FAIL
+        }
+    }
+}
diff --git a/kotlin-native/codestyle/cpp/README.md b/kotlin-native/codestyle/cpp/README.md
index 0a078aa2a1b..c855ad8a30a 100644
--- a/kotlin-native/codestyle/cpp/README.md
+++ b/kotlin-native/codestyle/cpp/README.md
@@ -4,8 +4,23 @@
 
 ## Headers
 
-* Headers should live in the same folder with it's implementation counterpart (if there's one)
+* Headers should live in the same folder with it's implementation counterpart (if there's one) **TODO**: This does not work with multiple implementations of a single header.
 * Headers should use header guards
+* Headers that are designed to be included into both `.cpp`/`.mm` and `.c`/`.m` should have extension `.h`
+* Headers that are designed to be included into `.cpp`/`.mm` only should have extension `.hpp`
+
+## Namespace usage
+
+* Do not use namespace blocks inside implementation files (`*.c`, `*.cpp`, `*.m`, `*.mm`). Use fully qualified names for definitions.
+* Do not use `extern "C"` blocks inside implementation files.
+
+### Runtime-specific
+
+* Put main module inside `namespace kotlin`
+* Put other modules under `namespace kotlin` in a nested `namespace [module_name]`
+* Put implementation details inside `.h`/`.hpp` into a nested `namespace internal` (e.g. implementation details of module `mm` go into `namespace kotlin { namespace mm { namespace internal { ... } } }`)
+* Put implementation details inside `.cpp`/`.mm` into a global anonymous `namespace`
+* For `extern "C"` declarations emulate namespaces with `Kotlin_[module_name]_` prefixes.
 
 ## Naming
 
diff --git a/kotlin-native/dependencies/build.gradle b/kotlin-native/dependencies/build.gradle
index 6e467ac4448..2f134c6da08 100644
--- a/kotlin-native/dependencies/build.gradle
+++ b/kotlin-native/dependencies/build.gradle
@@ -78,7 +78,7 @@ enum DependencyKind {
 def platformManager = rootProject.ext.platformManager
 
 
-platformManager.filteredOutEnabledButNotSupported.each { target ->
+platformManager.enabled.each { target ->
     def loader = platformManager.loader(target)
 
     task "${target}Dependencies"(type: NativeDep) {
diff --git a/kotlin-native/gradle.properties b/kotlin-native/gradle.properties
index 4b073137ee6..b1068436e30 100644
--- a/kotlin-native/gradle.properties
+++ b/kotlin-native/gradle.properties
@@ -18,12 +18,12 @@
 buildKotlinVersion=1.4.20-dev-2167
 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.20-dev-2167,branch:default:any,pinned:true/artifacts/content/maven
 remoteRoot=konan_tests
-kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.30-dev-1895,branch:default:any,pinned:true/artifacts/content/maven
-kotlinVersion=1.4.30-dev-1895
-kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.30-dev-1895,branch:default:any,pinned:true/artifacts/content/maven
-kotlinStdlibVersion=1.4.30-dev-1895
-kotlinStdlibTestsVersion=1.4.30-dev-1895
-testKotlinCompilerVersion=1.4.30-dev-1895
+kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.30-dev-3009,branch:default:any,pinned:true/artifacts/content/maven
+kotlinVersion=1.4.30-dev-3009
+kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.30-dev-3009,branch:default:any,pinned:true/artifacts/content/maven
+kotlinStdlibVersion=1.4.30-dev-3009
+kotlinStdlibTestsVersion=1.4.30-dev-3009
+testKotlinCompilerVersion=1.4.30-dev-3009
 konanVersion=1.4.30
 
 # A version of Xcode required to build the Kotlin/Native compiler.
@@ -42,5 +42,8 @@ ktorVersion=1.2.1
 shadowVersion=5.1.0
 metadataVersion=0.0.1-dev-10
 
+# Uncomment to compile Kotlin/Native backend modules with JVM IR backend.
+# kotlin.build.useIR=true
+
 # Uncomment to enable composite build
 kotlinProjectPath=..
diff --git a/kotlin-native/gradle/wrapper/gradle-wrapper.properties b/kotlin-native/gradle/wrapper/gradle-wrapper.properties
index 33682bbbf90..14e30f7416a 100644
--- a/kotlin-native/gradle/wrapper/gradle-wrapper.properties
+++ b/kotlin-native/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties
index 20741278b7a..72c055dee17 100644
--- a/kotlin-native/konan/konan.properties
+++ b/kotlin-native/konan/konan.properties
@@ -49,7 +49,16 @@ llvm.mingw_x64.user = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
 llvm.macos_x64.dev = clang-llvm-apple-8.0.0-darwin-macos
 llvm.macos_x64.user = clang-llvm-apple-8.0.0-darwin-macos
 
+# By default LLVM uses 250 for -03 builds.
+# We use a smaller value since default value leads to
+# unreasonably bloated runtime code without any measurable
+# performance benefits.
+# This value still has to be tuned for different targets, though.
+llvmInlineThreshold = 100
 clangDebugFlags = -O0
+
+linkerGccFlags = -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed -lgcc_s --no-as-needed
+
 llvmVersion.linux_x64 = 8.0.0
 llvmVersion.mingw_x64 = 8.0.1
 llvmVersion.macos_x64 = 8.0.0
@@ -63,7 +72,7 @@ additionalToolsDir.macos_x64 = xcode-addon-xcode_12_0-macos_x64
 
 arch.macos_x64 = x86_64
 targetSysRoot.macos_x64 = target-sysroot-xcode_12_0-macos_x64
-
+targetCpu.macos_x64 = core2
 clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.macos_x64 = -O1
 clangOptFlags.macos_x64 = -O3
@@ -105,7 +114,7 @@ target-sysroot-xcode_12_0-ios_arm32.default = \
 arch.ios_arm32 = armv7
 # Shared with 64-bit version.
 targetSysRoot.ios_arm32 = target-sysroot-xcode_12_0-ios_arm64
-
+targetCpu.ios_arm32 = generic
 clangFlags.ios_arm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir
 clangNooptFlags.ios_arm32 = -O1
 clangOptFlags.ios_arm32 = -O3
@@ -137,7 +146,7 @@ target-sysroot-xcode_12_0-ios_arm64.default = \
 
 arch.ios_arm64 = arm64
 targetSysRoot.ios_arm64 = target-sysroot-xcode_12_0-ios_arm64
-
+targetCpu.ios_arm64 = cyclone
 clangFlags.ios_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.ios_arm64 = -O1
 clangOptFlags.ios_arm64 = -O3
@@ -167,7 +176,7 @@ target-sysroot-xcode_12_0-ios_x64.default = \
 
 arch.ios_x64 = x86_64
 targetSysRoot.ios_x64 = target-sysroot-xcode_12_0-ios_x64
-
+targetCpu.ios_x64 = core2
 clangFlags.ios_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.ios_x64 = -O1
 clangOptFlags.ios_x64 = -O3
@@ -194,7 +203,7 @@ target-sysroot-xcode_12_0-tvos_x64.default = \
 
 arch.tvos_x64 = x86_64
 targetSysRoot.tvos_x64 = target-sysroot-xcode_12_0-tvos_x64
-
+targetCpu.tvos_x64 = core2
 clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.tvos_x64 = -O1
 clangOptFlags.tvos_x64 = -O3
@@ -221,7 +230,7 @@ target-sysroot-xcode_12_0-tvos_arm64.default = \
 
 arch.tvos_arm64 = arm64
 targetSysRoot.tvos_arm64 = target-sysroot-xcode_12_0-tvos_arm64
-
+targetCpu.tvos_arm64 = cyclone
 clangFlags.tvos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.tvos_arm64 = -O1
 clangOptFlags.tvos_arm64 = -O3
@@ -248,7 +257,7 @@ target-sysroot-xcode_12_0-watchos_arm32.default = \
 
 arch.watchos_arm32 = armv7k
 targetSysRoot.watchos_arm32 = target-sysroot-xcode_12_0-watchos_arm32
-
+targetCpu.watchos_arm32 = cortex-a7
 clangFlags.watchos_arm32 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.watchos_arm32 = -O1
 clangOptFlags.watchos_arm32 = -O3
@@ -277,7 +286,7 @@ target-sysroot-xcode_12_0-watchos_arm64.default = \
 
 arch.watchos_arm64 = arm64_32
 targetSysRoot.watchos_arm64 = target-sysroot-xcode_12_0-watchos_arm32
-
+targetCpu.watchos_arm64 = cortex-a7
 clangFlags.watchos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir -mllvm -aarch64-watch-bitcode-compatibility \
   -mllvm -arm-bitcode-compatibility -mllvm -fast-isel=false -mllvm -global-isel=false
 clangNooptFlags.watchos_arm64 = -O1
@@ -307,12 +316,12 @@ target-sysroot-xcode_12_0-watchos_x86.default = \
 
 arch.watchos_x86 = i386
 targetSysRoot.watchos_x86 = target-sysroot-xcode_12_0-watchos_x86
-
-# -target-cpu pentium4 makes sure that cogenerator knows which CPU flavour to emit code for.
+# -target-cpu pentium4 makes sure that code-generator knows which CPU flavour to emit code for.
 # Can be seen on optimized build and FP tests, where value is passed on stack
 # by Kotlin and taken from SSE registers by C code.
 # TODO: once this information is available in function attributes, we can remove this flag.
-clangFlags.watchos_x86 = -cc1 -emit-obj -disable-llvm-passes -x ir -target-cpu pentium4
+targetCpu.watchos_x86 = pentium4
+clangFlags.watchos_x86 = -cc1 -emit-obj -disable-llvm-passes -x ir -target-cpu $targetCpu.watchos_x86
 clangNooptFlags.watchos_x86 = -O1
 clangOptFlags.watchos_x86 = -O3
 clangDebugFlags.watchos_x86 = -O0
@@ -328,6 +337,33 @@ osVersionMin.watchos_x86 = 5.0
 runtimeDefinitions.watchos_x86 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS=1 KONAN_NO_64BIT_ATOMIC=1 \
   KONAN_X86=1 KONAN_CORE_SYMBOLICATION=1 KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS=1
 
+# watchOS x86_64 simulator.
+targetToolchain.macos_x64-watchos_x64 = target-toolchain-xcode_12_0-macos_x64
+dependencies.macos_x64-watchos_x64 = \
+  libffi-3.2.1-3-darwin-macos
+
+target-sysroot-xcode_12_0-watchos_x64.default = \
+  remote:internal
+
+arch.watchos_x64 = x86_64
+targetSysRoot.watchos_x64 = target-sysroot-xcode_12_0-watchos_x86
+targetCpu.watchos_x64 = core2
+clangFlags.watchos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir -target-cpu $targetCpu.watchos_x64
+clangNooptFlags.watchos_x64 = -O1
+clangOptFlags.watchos_x64 = -O3
+clangDebugFlags.watchos_x64 = -O0
+clangDynamicFlags.watchos_x64 =
+
+linkerKonanFlags.watchos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 7.0
+linkerOptimizationFlags.watchos_x64 = -dead_strip
+linkerNoDebugFlags.watchos_x64 = -S
+linkerDynamicFlags.watchos_x64 = -dylib
+osVersionMinFlagLd.watchos_x64 = -watchos_simulator_version_min
+osVersionMinFlagClang.watchos_x64 = -mwatchos-simulator-version-min
+osVersionMin.watchos_x64 = 7.0
+runtimeDefinitions.watchos_x64 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS=1 \
+  KONAN_X64=1 KONAN_CORE_SYMBOLICATION=1 KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS=1
+
 # Linux x86-64.
 llvmHome.linux_x64 = $llvm.linux_x64.dev
 libffiDir.linux_x64 = libffi-3.2.1-2-linux-x86-64
@@ -355,7 +391,8 @@ quadruple.linux_x64 = x86_64-unknown-linux-gnu
 targetSysRoot.linux_x64 = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu/sysroot
 # targetSysroot-relative.
 libGcc.linux_x64 = ../../lib/gcc/x86_64-unknown-linux-gnu/4.8.5
-clangFlags.linux_x64 = -cc1 -target-cpu x86-64 -emit-obj -disable-llvm-optzns -x ir
+targetCpu.linux_x64 = x86-64
+clangFlags.linux_x64 = -cc1 -target-cpu $targetCpu.linux_x64 -emit-obj -disable-llvm-optzns -x ir
 clangNooptFlags.linux_x64 = -O1
 clangOptFlags.linux_x64 = -O3 -ffunction-sections
 clangDebugFlags.linux_x64 = -O0
@@ -398,7 +435,9 @@ linkerKonanFlags.linux_arm32_hfp = -Bstatic -lstdc++ -Bdynamic -ldl -lm -lpthrea
   --defsym __cxa_demangle=Konan_cxa_demangle --no-threads
 # targetSysroot-relative.
 libGcc.linux_arm32_hfp = lib/gcc/arm-linux-gnueabihf/4.8.3
-clangFlags.linux_arm32_hfp = -cc1 -target-cpu arm1136jf-s -mfloat-abi hard -emit-obj -disable-llvm-optzns -x ir
+targetCpu.linux_arm32_hfp = arm1136jf-s
+targetCpuFeatures.linux_arm32_hfp = +dsp,+strict-align,+vfp2,-crypto,-d16,-fp-armv8,-fp-only-sp,-fp16,-neon,-thumb-mode,-vfp3,-vfp4
+clangFlags.linux_arm32_hfp = -cc1 -target-cpu $targetCpu.linux_arm32_hfp -mfloat-abi hard -emit-obj -disable-llvm-optzns -x ir
 clangNooptFlags.linux_arm32_hfp = -O1
 clangOptFlags.linux_arm32_hfp = -O3 -ffunction-sections
 clangDebugFlags.linux_arm32_hfp = -O0
@@ -440,6 +479,7 @@ linkerKonanFlags.linux_arm64 = -Bstatic -lstdc++ -Bdynamic -ldl -lm -lpthread \
   --defsym __cxa_demangle=Konan_cxa_demangle --no-threads
 # targetSysroot-relative.
 libGcc.linux_arm64 = usr/lib
+targetCpu.linux_arm64 = generic
 clangFlags.linux_arm64 = -cc1 -target-cpu cortex-a57 -emit-obj -disable-llvm-optzns -x ir
 clangNooptFlags.linux_arm64 = -O1
 clangOptFlags.linux_arm64 = -O3 -ffunction-sections
@@ -470,7 +510,8 @@ linkerKonanFlags.linux_mips32 = -Bstatic -lstdc++ -Bdynamic -ldl -lm -lpthread \
   --defsym __cxa_demangle=Konan_cxa_demangle  -z notext
 # targetSysroot-relative.
 libGcc.linux_mips32 = lib/gcc/mips-unknown-linux-gnu/4.9.4
-clangFlags.linux_mips32 = -cc1 -emit-obj -disable-llvm-optzns -x ir -target-cpu mips32r2
+targetCpu.linux_mips32 = mips32r2
+clangFlags.linux_mips32 = -cc1 -emit-obj -disable-llvm-optzns -x ir -target-cpu $targetCpu.linux_mips32
 clangNooptFlags.linux_mips32 = -O1
 clangOptFlags.linux_mips32 = -O3 -ffunction-sections
 clangDebugFlags.linux_mips32 = -O0
@@ -498,7 +539,8 @@ linkerKonanFlags.linux_mipsel32 = -Bstatic -lstdc++ -Bdynamic -ldl -lm -lpthread
   --defsym __cxa_demangle=Konan_cxa_demangle -z notext
 # targetSysroot-relative.
 libGcc.linux_mipsel32 = lib/gcc/mipsel-unknown-linux-gnu/4.9.4
-clangFlags.linux_mipsel32 = -cc1 -emit-obj -disable-llvm-optzns -x ir -target-cpu mips32r2
+targetCpu.linux_mipsel32 = mips32r2
+clangFlags.linux_mipsel32 = -cc1 -emit-obj -disable-llvm-optzns -x ir -target-cpu targetCpu.linux_mipsel32
 clangNooptFlags.linux_mipsel32 = -O1
 clangOptFlags.linux_mipsel32 = -O3 -ffunction-sections
 clangDebugFlags.linux_mipsel32 = -O0
@@ -528,7 +570,9 @@ dependencies.mingw_x64-android_arm32 = \
     libffi-3.2.1-mingw-w64-x86-64
 
 quadruple.android_arm32 = arm-linux-androideabi
-clangFlags.android_arm32 = -cc1 -target-cpu arm7tdmi -emit-obj -disable-llvm-optzns -x ir -femulated-tls -mrelocation-model pic
+targetCpu.android_arm32 = arm7tdmi
+targetCpuFeatures.android_arm32 = +soft-float,+strict-align,-crypto,-neon,-thumb-mode
+clangFlags.android_arm32 = -cc1 -target-cpu $targetCpu.android_arm32 -emit-obj -disable-llvm-optzns -x ir -femulated-tls -mrelocation-model pic
 clangOptFlags.android_arm32 = -O3 -ffunction-sections
 linkerNoDebugFlags.android_arm32 = -Wl,-S
 clangNooptFlags.android_arm32 = -O1
@@ -555,7 +599,8 @@ dependencies.mingw_x64-android_arm64 = \
     libffi-3.2.1-mingw-w64-x86-64
 
 quadruple.android_arm64 = aarch64-linux-android
-clangFlags.android_arm64 = -cc1 -target-cpu cortex-a57 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
+targetCpu.android_arm64 = cortex-a57
+clangFlags.android_arm64 = -cc1 -target-cpu $targetCpu.android_arm64 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
 clangOptFlags.android_arm64 = -O3 -ffunction-sections
 clangNooptFlags.android_arm64 = -O1
 targetSysRoot.android_arm64 = target-sysroot-1-android_ndk
@@ -582,12 +627,12 @@ dependencies.mingw_x64-android_x86 = \
     libffi-3.2.1-mingw-w64-x86-64
 
 quadruple.android_x86 = i686-linux-android
-
 # -target-cpu pentium4 makes sure that cogenerator knows which CPU flavour to emit code for.
 # Can be seen on optimized build and FP tests, where value is passed on stack
 # by Kotlin and taken from SSE registers by C code.
 # TODO: once this information is available in function attributes, we can set target CPU to i686.
-clangFlags.android_x86 = -cc1 -target-cpu pentium4 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
+targetCpu.android_x86 = pentium4
+clangFlags.android_x86 = -cc1 -target-cpu targetCpu.android_x86 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
 clangOptFlags.android_x86 = -O3 -ffunction-sections
 clangNooptFlags.android_x86 = -O1
 targetSysRoot.android_x86 = target-sysroot-1-android_ndk
@@ -614,7 +659,8 @@ dependencies.mingw_x64-android_x64 = \
     libffi-3.2.1-mingw-w64-x86-64
 
 quadruple.android_x64 = x86_64-linux-android
-clangFlags.android_x64 = -cc1 -target-cpu x86-64 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
+targetCpu.android_x64 = x86-64
+clangFlags.android_x64 = -cc1 -target-cpu $targetCpu.android_x64 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
 clangOptFlags.android_x64 = -O3 -ffunction-sections
 clangNooptFlags.android_x64 = -O1
 targetSysRoot.android_x64 = target-sysroot-1-android_ndk
@@ -641,10 +687,11 @@ dependencies.macos_x64-mingw_x64 = \
 
 quadruple.mingw_x64 = x86_64-w64-mingw32
 targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
+targetCpu.mingw_x64 = x86-64
 # For using with Universal Windows Platform (UWP) we need to use this slower option.
 # See https://youtrack.jetbrains.com/issue/KT-27654.
 # TODO: remove, once fixed in mingw, check with the bug testcase.
-clangFlags.mingw_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir -femulated-tls -target-cpu x86-64
+clangFlags.mingw_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir -femulated-tls -target-cpu $targetCpu.mingw_x64
 clangOptFlags.mingw_x64 = -O3 -ffunction-sections
 clangNooptFlags.mingw_x64 = -O1
 linkerNoDebugFlags.mingw_x64 = -Wl,-S
@@ -677,11 +724,12 @@ targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
 # For using with Universal Windows Platform (UWP) we need to use slower -emulated-tls option.
 # See https://youtrack.jetbrains.com/issue/KT-27654.
 # TODO: remove, once fixed in mingw, check with the bug testcase.
-# -target-cpu pentium4 makes sure that cogenerator knows which CPU flavour to emit code for.
+# -target-cpu pentium4 makes sure that code-generator knows which CPU flavour to emit code for.
 # Can be seen on optimized build and FP tests, where value is passed in coprocessor registers
 # by Kotlin and taken from SSE registers by C code.
 # TODO: once this information is available in function attributes, we can remove this flag.
-clangFlags.mingw_x86 = -cc1 -emit-obj -disable-llvm-passes -x ir -femulated-tls -target-cpu pentium4
+targetCpu.mingw_x86 = pentium4
+clangFlags.mingw_x86 = -cc1 -emit-obj -disable-llvm-passes -x ir -femulated-tls -target-cpu $targetCpu.mingw_x86
 clangOptFlags.mingw_x86 = -O3 -ffunction-sections
 clangNooptFlags.mingw_x86 = -O1
 linkerNoDebugFlags.mingw_x86 = -Wl,-S
@@ -716,6 +764,7 @@ dependencies.mingw_x64-wasm32 = \
 
 quadruple.wasm32 = wasm32-unknown-unknown
 targetSysRoot.wasm32 = target-sysroot-4-embedded
+targetCpu.wasm32 = generic
 clangFlags.wasm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir
 clangNooptFlags.wasm32 = -O1
 clangOptFlags.wasm32 = -O3
diff --git a/kotlin-native/llvmDebugInfoC/src/scripts/konan_lldb.py b/kotlin-native/llvmDebugInfoC/src/scripts/konan_lldb.py
index 549f9521507..e688c2d397f 100644
--- a/kotlin-native/llvmDebugInfoC/src/scripts/konan_lldb.py
+++ b/kotlin-native/llvmDebugInfoC/src/scripts/konan_lldb.py
@@ -25,32 +25,53 @@ import lldb
 import struct
 import re
 import sys
+import os
+import time
+import io
+import traceback
 
 NULL = 'null'
+logging=False
+exe_logging=False
+bench_logging=False
 
 def log(msg):
-    if False:
-        print(msg(), file=sys.stderr)
+    if logging:
+        sys.stderr.write(msg())
+        sys.stderr.write('\n')
+    exelog(msg)
 
 def exelog(stmt):
-    if False:
+    if exe_logging:
         f = open(os.getenv('HOME', '') + "/lldbexelog.txt", "a")
         f.write(stmt())
         f.write("\n")
         f.close()
 
-def lldb_val_to_ptr(lldb_val):
-    addr = lldb_val.GetValueAsUnsigned()
-    return '((struct ObjHeader *) {:#x})'.format(addr)
-
+def bench(start, msg):
+    if bench_logging:
+        print("{}: {}".format(msg(), time.monotonic() - start))
 
 def evaluate(expr):
-    result = lldb.debugger.GetSelectedTarget().EvaluateExpression(expr, lldb.SBExpressionOptions())
-    evallog = lambda : "{} => {}".format(expr, result)
-    log(evallog)
-    exelog(evallog)
+    result = lldb.debugger.GetSelectedTarget().EvaluateExpression(expr)
+    log(lambda : "evaluate: {} => {}".format(expr, result))
     return result
 
+
+class DebuggerException(Exception):
+    pass
+
+
+_OUTPUT_MAX_CHILDREN = re.compile(r"target.max-children-count \(int\) = (.*)\n")
+def _max_children_count():
+    result = lldb.SBCommandReturnObject()
+    lldb.debugger.GetCommandInterpreter().HandleCommand("settings show target.max-children-count", result, False)
+    if not result.Succeeded():
+        raise DebuggerException()
+    v = _OUTPUT_MAX_CHILDREN.search(result.GetOutput()).group(1)
+    return int(v)
+
+
 def _symbol_loaded_address(name, debugger = lldb.debugger):
     target = debugger.GetSelectedTarget()
     process = target.GetProcess()
@@ -72,18 +93,26 @@ def _type_info_by_address(address, debugger = lldb.debugger):
     return candidates
 
 def is_instance_of(addr, typeinfo):
-    return evaluate("(bool)IsInstance({}, {:#x})".format(addr, typeinfo)).GetValue() == "true"
+    return evaluate("(bool)IsInstance({:#x}, {:#x})".format(addr, typeinfo)).GetValue() == "true"
 
 def is_string_or_array(value):
-    return evaluate("(int)IsInstance({0}, {1}) ? 1 : ((int)Konan_DebugIsArray({0}) ? 2 : 0)".format(lldb_val_to_ptr(value), _symbol_loaded_address('kclass:kotlin.String'))).unsigned
+    start = time.monotonic()
+    soa = evaluate("(int)IsInstance({0:#x}, {1:#x}) ? 1 : ((int)Konan_DebugIsArray({0:#x})) ? 2 : 0)"
+                   .format(value.unsigned, _symbol_loaded_address('kclass:kotlin.String'))).unsigned
+    log(lambda: "is_string_or_array:{:#x}:{}".format(value.unsigned, soa))
+    bench(start, lambda: "is_string_or_array({:#x}) = {}".format(value.unsigned, soa))
+    return soa
 
 def type_info(value):
     """This method checks self-referencing of pointer of first member of TypeInfo including case when object has an
     meta-object pointed by TypeInfo. Two lower bits are reserved for memory management needs see runtime/src/main/cpp/Memory.h."""
+    log(lambda: "type_info({:#x}: {})".format(value.unsigned, value.GetTypeName()))
     if value.GetTypeName() != "ObjHeader *":
-        return False
-    expr = "*(void **)((uintptr_t)(*(void**){0:#x}) & ~0x3) == **(void***)((uintptr_t)(*(void**){0:#x}) & ~0x3) ? *(void **)((uintptr_t)(*(void**){0:#x}) & ~0x3) : (void *)0".format(value.unsigned)
+        return None
+    expr = "*(void **)((uintptr_t)(*(void**){0:#x}) & ~0x3) == **(void***)((uintptr_t)(*(void**){0:#x}) & ~0x3) " \
+           "? *(void **)((uintptr_t)(*(void**){0:#x}) & ~0x3) : (void *)0".format(value.unsigned)
     result = evaluate(expr)
+
     return result.unsigned if result.IsValid() and result.unsigned != 0 else None
 
 
@@ -95,128 +124,138 @@ SYNTHETIC_OBJECT_LAYOUT_CACHE = {}
 TO_STRING_DEPTH = 2
 ARRAY_TO_STRING_LIMIT = 10
 
+_TYPE_CONVERSION = [
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(void *){:#x}".format(address)),
+     lambda obj, value, address, name: value.CreateValueFromAddress(name, address, value.type),
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(int8_t *){:#x}".format(address)),
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(int16_t *){:#x}".format(address)),
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(int32_t *){:#x}".format(address)),
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(int64_t *){:#x}".format(address)),
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(float *){:#x}".format(address)),
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(double *){:#x}".format(address)),
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(void **){:#x}".format(address)),
+     lambda obj, value, address, name: value.CreateValueFromExpression(name, "(bool *){:#x}".format(address)),
+     lambda obj, value, address, name: None]
+
+_TYPES = [
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeVoid).GetPointerType(),
+      lambda x: x.GetType(),
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeChar),
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeShort),
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeInt),
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeLongLong),
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeFloat),
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeDouble),
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeVoid).GetPointerType(),
+      lambda x: x.GetType().GetBasicType(lldb.eBasicTypeBool)
+]
+
 def kotlin_object_type_summary(lldb_val, internal_dict = {}):
     """Hook that is run by lldb to display a Kotlin object."""
-    log(lambda: "kotlin_object_type_summary({:#x}, {})".format(lldb_val.unsigned, internal_dict))
+    start = time.monotonic()
+    log(lambda: "kotlin_object_type_summary({:#x}: {})".format(lldb_val.unsigned, lldb_val.type.name))
     fallback = lldb_val.GetValue()
-    if str(lldb_val.type) != "struct ObjHeader *":
+    if lldb_val.GetTypeName() != "ObjHeader *":
         if lldb_val.GetValue() is None:
+            bench(start, lambda: "kotlin_object_type_summary:({:#x}) = NULL".format(lldb_val.unsigned))
             return NULL
-        return lldb_val.GetValueAsSigned()
+        bench(start, lambda: "kotlin_object_type_summary:({:#x}) = {}".format(lldb_val.unsigned, lldb_val.signed))
+        return lldb_val.value
 
     if lldb_val.unsigned == 0:
+            bench(start, lambda: "kotlin_object_type_summary:({:#x}) = NULL".format(lldb_val.unsigned))
             return NULL
     tip = internal_dict["type_info"] if "type_info" in internal_dict.keys() else type_info(lldb_val)
 
     if not tip:
+        bench(start, lambda: "kotlin_object_type_summary:({0:#x}) = falback:{0:#x}".format(lldb_val.unsigned))
         return fallback
 
-    return select_provider(lldb_val, tip, internal_dict).to_string()
+    value = select_provider(lldb_val, tip, internal_dict)
+    bench(start, lambda: "kotlin_object_type_summary:({:#x}) = value:{:#x}".format(lldb_val.unsigned, value._valobj.unsigned))
+    start = time.monotonic()
+    str0 = value.to_short_string()
+    bench(start, lambda: "kotlin_object_type_summary:({:#x}) = str:'{}...'".format(lldb_val.unsigned, str0[:3]))
+    return str0
 
 
 def select_provider(lldb_val, tip, internal_dict):
-    log(lambda : "select_provider: name:{} : {}, {}".format(lldb_val.name, lldb_val, internal_dict))
+    start = time.monotonic()
+    log(lambda : "select_provider: {:#x} name:{} tip:{:#x}".format(lldb_val.unsigned, lldb_val.name, tip))
     soa = is_string_or_array(lldb_val)
-    log(lambda : "select_provider: {} : soa: {}".format(lldb_val, soa))
-    return __FACTORY['string'](lldb_val, tip, internal_dict) if soa == 1 else __FACTORY['array'](lldb_val, tip, internal_dict) if soa == 2 \
+    log(lambda : "select_provider: {:#x} : soa: {}".format(lldb_val.unsigned, soa))
+    ret = __FACTORY['string'](lldb_val, tip, internal_dict) if soa == 1 \
+        else __FACTORY['array'](lldb_val, tip, internal_dict) if soa == 2 \
         else __FACTORY['object'](lldb_val, tip, internal_dict)
+    log(lambda: "select_provider({:#x}) = {}".format(lldb_val.unsigned, ret))
+    bench(start, lambda: "select_provider({:#x})".format(lldb_val.unsigned))
+    return ret
 
 class KonanHelperProvider(lldb.SBSyntheticValueProvider):
     def __init__(self, valobj, amString, internal_dict = {}):
         self._target = lldb.debugger.GetSelectedTarget()
         self._process = self._target.GetProcess()
         self._valobj = valobj
-        self._ptr = lldb_val_to_ptr(self._valobj)
+        self._internal_dict = internal_dict.copy()
         if amString:
             return
-        self._internal_dict = internal_dict.copy()
-        self._to_string_depth = TO_STRING_DEPTH if "to_string_depth" not in self._internal_dict.keys() else  self._internal_dict["to_string_depth"]
         if self._children_count == 0:
-            self._children_count = evaluate("(int)Konan_DebugGetFieldCount({})".format(self._ptr)).signed
-        self._children = []
-        self._type_conversion = [
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(void *){:#x}".format(address)),
-            lambda address, name: self._create_synthetic_child(address, name),
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(int8_t *){:#x}".format(address)),
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(int16_t *){:#x}".format(address)),
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(int32_t *){:#x}".format(address)),
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(int64_t *){:#x}".format(address)),
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(float *){:#x}".format(address)),
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(double *){:#x}".format(address)),
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(void **){:#x}".format(address)),
-            lambda address, name: self._valobj.CreateValueFromExpression(name, "(bool *){:#x}".format(address)),
-            lambda address, name: None]
-
-        self._types = [
-            valobj.GetType().GetBasicType(lldb.eBasicTypeVoid).GetPointerType(),
-            valobj.GetType(),
-            valobj.GetType().GetBasicType(lldb.eBasicTypeChar),
-            valobj.GetType().GetBasicType(lldb.eBasicTypeShort),
-            valobj.GetType().GetBasicType(lldb.eBasicTypeInt),
-            valobj.GetType().GetBasicType(lldb.eBasicTypeLongLong),
-            valobj.GetType().GetBasicType(lldb.eBasicTypeFloat),
-            valobj.GetType().GetBasicType(lldb.eBasicTypeDouble),
-            valobj.GetType().GetBasicType(lldb.eBasicTypeVoid).GetPointerType(),
-            valobj.GetType().GetBasicType(lldb.eBasicTypeBool)
-        ]
+            children_count = evaluate("(int)Konan_DebugGetFieldCount({:#x})".format(self._valobj.unsigned)).signed
+            log(lambda: "(int)[{}].Konan_DebugGetFieldCount({:#x}) = {}".format(self._valobj.name,
+                                                                                self._valobj.unsigned, children_count))
+            self._children_count = children_count
 
     def _read_string(self, expr, error):
         return self._process.ReadCStringFromMemory(evaluate(expr).unsigned, 0x1000, error)
 
     def _read_value(self, index):
-        value_type = self._children[index].type()
-        address = self._valobj.unsigned + self._children[index].offset()
-        return self._type_conversion[int(value_type)](address, str(self._children[index].name()))
-
-    def _create_synthetic_child(self, address, name):
-        if self._to_string_depth == 0:
-           return None
-        index = self.get_child_index(name)
-        value = self._valobj.CreateChildAtOffset(str(name),
-                                                 self._children[index].offset(),
-                                                 self._read_type(index))
-        value.SetSyntheticChildrenGenerated(True)
-        value.SetPreferSyntheticValue(True)
-        return value
+        value_type = self._field_type(index)
+        address = self._field_address(index)
+        log(lambda: "_read_value: [{}, type:{}, address:{:#x}]".format(index, value_type, address))
+        return _TYPE_CONVERSION[int(value_type)](self, self._valobj, address, str(self._field_name(index)))
 
     def _read_type(self, index):
-        type = self._types[self._children[index].type()]
-        log(lambda: "type:{0} of {1:#x} of {2:#x}".format(type, self._valobj.unsigned, self._valobj.unsigned + self._children[index].offset()))
+        type = _TYPES[self._field_type(index)](self._valobj)
+        log(lambda: "type:{0} of {1:#x} of {2:#x}".format(type, self._valobj.unsigned,
+                                                          self._valobj.unsigned + self._children[index].offset()))
         return type
 
-    def _deref_or_obj_summary(self, index, internal_dict):
-        value = self._values[index]
+    def _deref_or_obj_summary(self, index, internal_dict = {}):
+        value = self._read_value(index)
         if not value:
             log(lambda : "_deref_or_obj_summary: value none, index:{}, type:{}".format(index, self._children[index].type()))
             return None
-
-        tip = type_info(value)
-        if tip:
-            internal_dict["type_info"] = tip
-            return kotlin_object_type_summary(value, internal_dict)
-        tip = type_info(value.deref)
-
-        if tip:
-            internal_dict["type_info"] = tip
-            return kotlin_object_type_summary(value.deref, internal_dict)
-
-        return kotlin_object_type_summary(value.deref, internal_dict)
+        return value.value if type_info(value) else value.deref.value
 
     def _field_address(self, index):
-        return evaluate("(void *)Konan_DebugGetFieldAddress({}, {})".format(self._ptr, index)).unsigned
+        return evaluate("(void *)Konan_DebugGetFieldAddress({:#x}, {})".format(self._valobj.unsigned, index)).unsigned
 
     def _field_type(self, index):
-        return evaluate("(int)Konan_DebugGetFieldType({}, {})".format(self._ptr, index)).unsigned
+        return evaluate("(int)Konan_DebugGetFieldType({:#x}, {})".format(self._valobj.unsigned, index)).unsigned
+
+    def to_string(self, representation):
+        writer = io.StringIO()
+        max_children_count=_max_children_count()
+        limit = min(self._children_count, max_children_count)
+        for i in range(limit):
+            writer.write(representation(i))
+            if (i != limit - 1):
+                writer.write(", ")
+        if max_children_count < self._children_count:
+            writer.write(', ...')
+        return "[{}]".format(writer.getvalue())
+
 
 class KonanStringSyntheticProvider(KonanHelperProvider):
     def __init__(self, valobj):
+        log(lambda: "KonanStringSyntheticProvider:{:#x} name:{}".format(valobj.unsigned, valobj.name))
         self._children_count = 0
         super(KonanStringSyntheticProvider, self).__init__(valobj, True)
         fallback = valobj.GetValue()
         buff_addr = evaluate("(void *)Konan_DebugBuffer()").unsigned
         buff_len = evaluate(
-            '(int)Konan_DebugObjectToUtf8Array({}, (void *){:#x}, (int)Konan_DebugBufferSize());'.format(
-                self._ptr, buff_addr)
+            '(int)Konan_DebugObjectToUtf8Array({:#x}, (void *){:#x}, (int)Konan_DebugBufferSize());'.format(
+                self._valobj.unsigned, buff_addr)
         ).signed
 
         if not buff_len:
@@ -245,150 +284,179 @@ class KonanStringSyntheticProvider(KonanHelperProvider):
     def get_child_at_index(self, _):
         return None
 
+    def to_short_string(self):
+        return self._representation
+
     def to_string(self):
         return self._representation
 
 
-class DebuggerException(Exception):
-    pass
-
-class MemberLayout:
-    def __init__(self, name, type, offset):
-        self._name = name
-        self._type = type
-        self._offset = offset
-
-    def name(self):
-        return self._name
-
-    def type(self):
-        return self._type
-
-    def offset(self):
-        return self._offset
-
 class KonanObjectSyntheticProvider(KonanHelperProvider):
     def __init__(self, valobj, tip, internal_dict):
         # Save an extra call into the process
-        if tip in SYNTHETIC_OBJECT_LAYOUT_CACHE:
-            log(lambda : "TIP: {:#x} EARLYHIT".format(tip))
-            self._children = SYNTHETIC_OBJECT_LAYOUT_CACHE[tip]
-            self._children_count = len(self._children)
-        else:
-            self._children_count = 0
-
+        log(lambda: "KonanObjectSyntheticProvider({:#x})".format(valobj.unsigned))
+        self._children_count = 0
         super(KonanObjectSyntheticProvider, self).__init__(valobj, False, internal_dict)
-
-        if not tip in SYNTHETIC_OBJECT_LAYOUT_CACHE:
-            SYNTHETIC_OBJECT_LAYOUT_CACHE[tip] = [
-                MemberLayout(self._field_name(i), self._field_type(i), self._field_address(i) - self._valobj.unsigned)
-                for i in range(self._children_count)]
-            log(lambda : "TIP: {:#x} MISSED".format(tip))
-        else:
-            log(lambda : "TIP: {:#x} HIT".format(tip))
-        self._children = SYNTHETIC_OBJECT_LAYOUT_CACHE[tip]
-        self._values = [self._read_value(index) for index in range(self._children_count)]
-
+        self._children = [self._field_name(i) for i in range(self._children_count)]
+        log(lambda: "KonanObjectSyntheticProvider::__init__({:#x}) _children:{}".format(self._valobj.unsigned,
+                                                                                        self._children))
 
     def _field_name(self, index):
+        log(lambda: "KonanObjectSyntheticProvider::_field_name({:#x}, {})".format(self._valobj.unsigned, index))
         error = lldb.SBError()
-        name =  self._read_string("(void *)Konan_DebugGetFieldName({}, (int){})".format(self._ptr, index), error)
+        name =  self._read_string("(char *)Konan_DebugGetFieldName({:#x}, (int){})".format(self._valobj.unsigned,
+                                                                                           index),
+                                  error)
         if not error.Success():
             raise DebuggerException()
+        log(lambda: "KonanObjectSyntheticProvider::_field_name({:#x}, {}) = {}".format(self._valobj.unsigned,
+                                                                                       index, name))
         return name
 
     def num_children(self):
+        log(lambda: "KonanObjectSyntheticProvider::num_children({:#x}) = {}".format(self._valobj.unsigned,
+                                                                                    self._children_count))
         return self._children_count
 
     def has_children(self):
+        log(lambda: "KonanObjectSyntheticProvider::has_children({:#x}) = {}".format(self._valobj.unsigned,
+                                                                                    self._children_count > 0))
         return self._children_count > 0
 
     def get_child_index(self, name):
-        def __none(iterable, f):
-            return not any(f(x) for x in iterable)
-        if __none(self._children, lambda x: x.name() == name):
-            return -1
-        return next(i for i,v in enumerate(self._children) if v.name() == name)
+        log(lambda: "KonanObjectSyntheticProvider::get_child_index({:#x}, {})".format(self._valobj.unsigned, name))
+        index = self._children.index(name)
+        log(lambda: "KonanObjectSyntheticProvider::get_child_index({:#x}) index={}".format(self._valobj.unsigned,
+                                                                                           index))
+        return index
 
     def get_child_at_index(self, index):
-        result = self._values[index]
-        if result is None:
-            result = self._read_value(index)
-            self._values[index] = result
-        return result
+        log(lambda: "KonanObjectSyntheticProvider::get_child_at_index({:#x}, {})".format(self._valobj.unsigned, index))
+        return self._read_value(index)
 
+    def to_short_string(self):
+        log(lambda: "to_short_string:{:#x}".format(self._valobj.unsigned))
+        return super().to_string(lambda index: "{}: ...".format(self._field_name(index)))
 
-    # TODO: fix cyclic structures stringification.
     def to_string(self):
-        if self._to_string_depth == 0:
-            return "..."
-        else:
-            internal_dict = self._internal_dict.copy()
-            internal_dict["to_string_depth"] = self._to_string_depth - 1
-            return dict([(self._children[i].name(), self._deref_or_obj_summary(i, internal_dict)) for i in range(self._children_count)])
+        log(lambda: "to_string:{:#x}".format(self._valobj.unsigned))
+        return super().to_string(lambda index: "{}: {}".format(self._field_name(index),
+                                                               self._deref_or_obj_summary(index)))
 
 class KonanArraySyntheticProvider(KonanHelperProvider):
     def __init__(self, valobj, internal_dict):
         self._children_count = 0
         super(KonanArraySyntheticProvider, self).__init__(valobj, False, internal_dict)
-        if self._ptr is None:
+        log(lambda: "KonanArraySyntheticProvider: valobj:{:#x}".format(valobj.unsigned))
+        if self._valobj is None:
             return
         valobj.SetSyntheticChildrenGenerated(True)
         type = self._field_type(0)
-        zerro_address = self._field_address(0)
-        first_address = self._field_address(1)
-        offset = zerro_address - valobj.unsigned
-        size = first_address - zerro_address
-        self._children = [MemberLayout(str(x), type, offset + x * size) for x in range(self.num_children())]
-        self._values = [self._read_value(i) for i in range(min(ARRAY_TO_STRING_LIMIT, self._children_count))]
-
-
-    def cap_children_count(self):
-        return self._children_count
 
     def num_children(self):
-        return self.cap_children_count()
+        log(lambda: "KonanArraySyntheticProvider::num_children({:#x}) = {}".format(self._valobj.unsigned,
+                                                                                   self._children_count))
+        return self._children_count
 
     def has_children(self):
+        log(lambda: "KonanArraySyntheticProvider::has_children({:#x}) = {}".format(self._valobj.unsigned,
+                                                                                   self._children_count> 0))
         return self._children_count > 0
 
     def get_child_index(self, name):
+        log(lambda: "KonanArraySyntheticProvider::get_child_index({:#x}, {})".format(self._valobj.unsigned, name))
         index = int(name)
         return index if (0 <= index < self._children_count) else -1
 
     def get_child_at_index(self, index):
-        result = self._values[index]
-        if result is None:
-            result = self._read_value(index)
-            self._values[index] = result
-        return result
+        log(lambda: "KonanArraySyntheticProvider::get_child_at_index({:#x}, {})".format(self._valobj.unsigned, index))
+        return self._read_value(index)
+
+    def _field_name(self, index):
+        log(lambda: "KonanArraySyntheticProvider::_field_name({:#x}, {})".format(self._valobj.unsigned, index))
+        return str(index)
+
+    def to_short_string(self):
+        log(lambda: "to_short_string:{:#x}".format(self._valobj.unsigned))
+        return super().to_string(lambda index: "...")
 
     def to_string(self):
-        return [self._deref_or_obj_summary(i, self._internal_dict.copy()) for i in range(min(ARRAY_TO_STRING_LIMIT, self._children_count))]
+        log(lambda: "to_string:{self._valobj.unsigned:#x}")
+        return super().to_string(lambda index: "{}".format(self._deref_or_obj_summary(index)))
+
+class KonanZerroSyntheticProvider(lldb.SBSyntheticValueProvider):
+    def __init__(self, valobj):
+        log(lambda: "KonanZerroSyntheticProvider::__init__ {}".format(valobj.name))
+
+
+    def num_children(self):
+        log(lambda: "KonanZerroSyntheticProvider::num_children")
+        return 0
+
+    def has_children(self):
+        log(lambda: "KonanZerroSyntheticProvider::has_children")
+        return False
+
+    def get_child_index(self, name):
+        log(lambda: "KonanZerroSyntheticProvider::get_child_index")
+        return 0
+
+    def get_child_at_index(self, index):
+        log(lambda: "KonanZerroSyntheticProvider::get_child_at_index")
+        return None
+
+    def to_string(self):
+        log(lambda: "KonanZerroSyntheticProvider::to_string")
+        return NULL
+
+    def to_short_string(self):
+        log(lambda: "KonanZerroSyntheticProvider::to_short_string")
+        return NULL
+
+    def __getattr__(self, item):
+        pass
+
+class KonanNullSyntheticProvider(KonanZerroSyntheticProvider):
+    def __init__(self, valobj):
+        super(KonanNullSyntheticProvider, self).__init__(valobj)
+
+class KonanNotInitializedObjectSyntheticProvider(KonanZerroSyntheticProvider):
+    def __init__(self, valobj):
+        super(KonanNotInitializedObjectSyntheticProvider, self).__init__(valobj)
 
 
 class KonanProxyTypeProvider:
     def __init__(self, valobj, internal_dict):
-        log(lambda : "KonanProxyTypeProvider: {:#x}".format(valobj.unsigned))
-        tip = type_info(valobj)
+        start = time.monotonic()
+        log(lambda : "KonanProxyTypeProvider:{:#x}, name: {}".format(valobj.unsigned, valobj.name))
+        if valobj.unsigned == 0:
+           log(lambda : "KonanProxyTypeProvider:{:#x}, name: {} NULL syntectic {}".format(valobj.unsigned, valobj.name,
+                                                                                          valobj.IsValid()))
+           bench(start, lambda: "KonanProxyTypeProvider({:#x})".format(valobj.unsigned))
+           self._proxy = KonanNullSyntheticProvider(valobj)
+           return
 
+        tip = type_info(valobj)
         if not tip:
-            return
-        log(lambda : "KonanProxyTypeProvider: tip: {:#x}".format(tip))
+           log(lambda : "KonanProxyTypeProvider:{:#x}, name: {} not initialized syntectic {}".format(valobj.unsigned,
+                                                                                                     valobj.name,
+                                                                                                     valobj.IsValid()))
+           bench(start, lambda: "KonanProxyTypeProvider({:#x})".format(valobj.unsigned))
+           self._proxy = KonanNotInitializedObjectSyntheticProvider(valobj)
+           return
+        log(lambda : "KonanProxyTypeProvider:{:#x} tip: {:#x}".format(valobj.unsigned, tip))
         self._proxy = select_provider(valobj, tip, internal_dict)
-        log(lambda: "KonanProxyTypeProvider: _proxy: {}".format(self._proxy.__class__.__name__))
-        self.update()
+        bench(start, lambda: "KonanProxyTypeProvider({:#x})".format(valobj.unsigned))
+        log(lambda: "KonanProxyTypeProvider:{:#x} _proxy: {}".format(valobj.unsigned, self._proxy.__class__.__name__))
 
     def __getattr__(self, item):
-        return getattr(self._proxy, item)
-
-def clear_cache_command(debugger, command, result, internal_dict):
-    SYNTHETIC_OBJECT_LAYOUT_CACHE.clear()
+       return getattr(self._proxy, item)
 
 
 def type_name_command(debugger, command, result, internal_dict):
     result.AppendMessage(evaluate('(char *)Konan_DebugGetTypeName({})'.format(command)).summary)
 
+
 __KONAN_VARIABLE = re.compile('kvar:(.*)#internal')
 __KONAN_VARIABLE_TYPE = re.compile('^kfun:<get-(.*)>\\(\\)(.*)$')
 __TYPES_KONAN_TO_C = {
@@ -406,6 +474,7 @@ __TYPES_KONAN_TO_C = {
    'kotlin.Double': ('double', lambda v: v.value)
 }
 
+
 def type_by_address_command(debugger, command, result, internal_dict):
     result.AppendMessage("DEBUG: {}".format(command))
     tokens = command.split()
@@ -417,6 +486,7 @@ def type_by_address_command(debugger, command, result, internal_dict):
     for t in types:
         result.AppendMessage("{}: {:#x}".format(t.name, t.GetStartAddress().GetLoadAddress(target)))
 
+
 def symbol_by_name_command(debugger, command, result, internal_dict):
     target = debugger.GetSelectedTarget()
     process = target.GetProcess()
@@ -433,6 +503,7 @@ def symbol_by_name_command(debugger, command, result, internal_dict):
        visited.append(name)
        result.AppendMessage("{}: {:#x}".format(name, symbol.GetStartAddress().GetLoadAddress(target)))
 
+
 def konan_globals_command(debugger, command, result, internal_dict):
     target = debugger.GetSelectedTarget()
     process = target.GetProcess()
@@ -459,12 +530,14 @@ def konan_globals_command(debugger, command, result, internal_dict):
 
        address = getter_functions[0].function.GetStartAddress().GetLoadAddress(target)
        type = __KONAN_VARIABLE_TYPE.search(getters[0].name).group(2)
-       (c_type, extractor) = __TYPES_KONAN_TO_C[type] if type in __TYPES_KONAN_TO_C.keys() else ('struct ObjHeader *', lambda v: kotlin_object_type_summary(v))
+       (c_type, extractor) = __TYPES_KONAN_TO_C[type] if type in __TYPES_KONAN_TO_C.keys() else ('ObjHeader *', lambda v: kotlin_object_type_summary(v))
        value = evaluate('(({0} (*)()){1:#x})()'.format(c_type, address))
        str_value = extractor(value)
        result.AppendMessage('{} {}: {}'.format(type, name, str_value))
 
+
 def __lldb_init_module(debugger, _):
+    log(lambda: "init start")
     __FACTORY['object'] = lambda x, y, z: KonanObjectSyntheticProvider(x, y, z)
     __FACTORY['array'] = lambda x, y, z: KonanArraySyntheticProvider(x, z)
     __FACTORY['string'] = lambda x, y, _: KonanStringSyntheticProvider(x)
@@ -473,18 +546,17 @@ def __lldb_init_module(debugger, _):
         --no-value \
         --expand \
         --python-function konan_lldb.kotlin_object_type_summary \
-        "struct ObjHeader *" \
+        "ObjHeader *" \
         --category Kotlin\
     ')
     debugger.HandleCommand('\
         type synthetic add \
-        --python-class konan_lldb.KonanProxyTypeProvider\
+        --python-class konan_lldb.KonanProxyTypeProvider \
         "ObjHeader *" \
         --category Kotlin\
     ')
     debugger.HandleCommand('type category enable Kotlin')
-    debugger.HandleCommand('command script add -f {}.clear_cache_command clear_kotlin_cache'.format(__name__))
     debugger.HandleCommand('command script add -f {}.type_name_command type_name'.format(__name__))
     debugger.HandleCommand('command script add -f {}.type_by_address_command type_by_address'.format(__name__))
     debugger.HandleCommand('command script add -f {}.symbol_by_name_command symbol_by_name'.format(__name__))
-
+    log(lambda: "init end")
diff --git a/kotlin-native/performance/KotlinVsSwift/build.gradle b/kotlin-native/performance/KotlinVsSwift/build.gradle
index 712a7278933..504eabda699 100644
--- a/kotlin-native/performance/KotlinVsSwift/build.gradle
+++ b/kotlin-native/performance/KotlinVsSwift/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    apply from: "$rootProject.projectDir/gradle/kotlinGradlePlugin.gradle"
+    apply from: "$rootProject.projectDir/../gradle/kotlinGradlePlugin.gradle"
     repositories {
         maven {
             url 'https://cache-redirector.jetbrains.com/jcenter'
diff --git a/kotlin-native/performance/KotlinVsSwift/ring/build.gradle.kts b/kotlin-native/performance/KotlinVsSwift/ring/build.gradle.kts
index bb82af8837a..ce32c193cf5 100644
--- a/kotlin-native/performance/KotlinVsSwift/ring/build.gradle.kts
+++ b/kotlin-native/performance/KotlinVsSwift/ring/build.gradle.kts
@@ -18,5 +18,4 @@ swiftBenchmark {
     swiftSources = File("$projectDir/src").list().map { "$projectDir/src/$it" }.toList()
     compileTasks = listOf("buildSwift")
     useCodeSize = CodeSizeEntity.EXECUTABLE
-    dependencies.common(project(":endorsedLibraries:kotlinx.cli"))
 }
\ No newline at end of file
diff --git a/kotlin-native/performance/build.gradle b/kotlin-native/performance/build.gradle
index f60a564661a..1f4e52f2ea6 100644
--- a/kotlin-native/performance/build.gradle
+++ b/kotlin-native/performance/build.gradle
@@ -4,16 +4,27 @@ import org.jetbrains.kotlin.BuildRegister
 import org.jetbrains.kotlin.MPPTools
 
 buildscript {
-    apply from: "$rootProject.projectDir/gradle/kotlinGradlePlugin.gradle"
+    ext.rootBuildDirectory = file('..')
+
+    apply from: "$rootBuildDirectory/gradle/loadRootProperties.gradle"
+    apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
     repositories {
-        maven {
-            url 'https://cache-redirector.jetbrains.com/jcenter'
-        }
+        maven { url 'https://cache-redirector.jetbrains.com/jcenter'}
+        maven { url 'https://cache-redirector.jetbrains.com/maven-central' }
+        mavenCentral()
+        maven { url buildKotlinCompilerRepo }
+        maven { url kotlinCompilerRepo }
         jcenter()
+        maven { url "https://kotlin.bintray.com/kotlinx" }
+        maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-native-build-tools:$konanVersion"
     }
 }
 
-def rootBuildDirectory = rootProject.projectDir
+def rootBuildDirectory = projectDir.parentFile
 
 task konanRun {
     subprojects.each {
@@ -48,7 +59,7 @@ private static String getAnalyzerTargetName() {
 }
 
 private String findAnalyzerBinary() {
-    String result = "${rootProject.projectDir}/${analyzerToolDirectory}/${getAnalyzerTargetName()}/" +
+    String result = "${projectDir}/../${analyzerToolDirectory}/${getAnalyzerTargetName()}/" +
             "${analyzerTool}ReleaseExecutable/${analyzerTool}${MPPTools.getNativeProgramExtension()}"
 
     if (file(result).exists()) return result
diff --git a/kotlin-native/performance/cinterop/build.gradle.kts b/kotlin-native/performance/cinterop/build.gradle.kts
index f885f4325ba..446dc4b5ce0 100644
--- a/kotlin-native/performance/cinterop/build.gradle.kts
+++ b/kotlin-native/performance/cinterop/build.gradle.kts
@@ -20,7 +20,6 @@ benchmark {
     mingwSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/posix")
     buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
-    dependencies.common(project(":endorsedLibraries:kotlinx.cli"))
 }
 
 val native = kotlin.targets.getByName("native") as KotlinNativeTarget
diff --git a/kotlin-native/performance/framework/build.gradle b/kotlin-native/performance/framework/build.gradle
index 75433d7c607..1c985d73866 100644
--- a/kotlin-native/performance/framework/build.gradle
+++ b/kotlin-native/performance/framework/build.gradle
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.RunJvmTask
 import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
 
 buildscript {
-    apply from: "$rootProject.projectDir/gradle/kotlinGradlePlugin.gradle"
+    apply from: "$rootProject.projectDir/../gradle/kotlinGradlePlugin.gradle"
 
     repositories {
         maven {
@@ -42,8 +42,8 @@ kotlin {
             }
             kotlin.srcDir "$toolsPath/benchmarks/shared/src"
             kotlin.srcDir "$toolsPath/benchmarksAnalyzer/src/main/kotlin"
-            kotlin.srcDir "$rootProject.projectDir/endorsedLibraries/kotlinx.cli/src/main/kotlin"
-            kotlin.srcDir "$rootProject.projectDir/endorsedLibraries/kotlinx.cli/src/main/kotlin-native"
+            kotlin.srcDir "$rootProject.projectDir/../endorsedLibraries/kotlinx.cli/src/main/kotlin"
+            kotlin.srcDir "$rootProject.projectDir/../endorsedLibraries/kotlinx.cli/src/main/kotlin-native"
             kotlin.srcDir "$toolsPath/benchmarksAnalyzer/src/main/kotlin-native"
         }
     }
diff --git a/kotlin-native/performance/numerical/build.gradle.kts b/kotlin-native/performance/numerical/build.gradle.kts
index ede81d6f69c..d56ffc5a8af 100644
--- a/kotlin-native/performance/numerical/build.gradle.kts
+++ b/kotlin-native/performance/numerical/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.benchmark.BenchmarkingPlugin
 import org.jetbrains.kotlin.ExecClang
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
-import org.jetbrains.kotlin.konan.target.HostManager
+import org.jetbrains.kotlin.konan.target.*
 
 plugins {
     id("benchmarking")
@@ -22,24 +22,7 @@ benchmark {
     nativeSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/common")
     mingwSrcDirs = listOf("../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("../shared/src/main/kotlin-native/posix")
-    linkerOpts = listOf("$buildDir/pi.o")
     buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
-
-    dependencies.common(project(":endorsedLibraries:kotlinx.cli"))
-}
-
-val compileLibary by tasks.creating {
-    doFirst {
-        mkdir(buildDir)
-
-        project.withConvention(ExecClang::class) {
-            execKonanClang(HostManager.host) {
-                args("-O3")
-                args("-c", "$projectDir/src/nativeInterop/cinterop/pi.c")
-                args("-o", "$buildDir/pi.o")
-            }
-        }
-    }
 }
 
 val native = kotlin.targets.getByName("native") as KotlinNativeTarget
@@ -47,7 +30,8 @@ native.apply {
     compilations["main"].cinterops {
         create("cinterop") {
             headers("$projectDir/src/nativeInterop/cinterop/pi.h")
+            extraOpts("-Xcompile-source", "$projectDir/src/nativeInterop/cinterop/pi.c")
+            extraOpts("-Xsource-compiler-option", "-O3")
         }
     }
-    binaries.getExecutable(BenchmarkingPlugin.NATIVE_EXECUTABLE_NAME, "RELEASE").linkTask.dependsOn(compileLibary)
 }
diff --git a/kotlin-native/performance/numerical/src/main/kotlin-native/launcher.kt b/kotlin-native/performance/numerical/src/main/kotlin-native/launcher.kt
index af7cdef7fb7..245d06d1025 100644
--- a/kotlin-native/performance/numerical/src/main/kotlin-native/launcher.kt
+++ b/kotlin-native/performance/numerical/src/main/kotlin-native/launcher.kt
@@ -22,6 +22,8 @@ fun konanBellardPi() {
 }
 
 fun clangBellardPi() {
-    for (n in 1 .. 1000 step 9)
-            cinterop.pi_nth_digit(n)
+    for (n in 1 .. 1000 step 9) {
+        val result = cinterop.pi_nth_digit(n)
+        Blackhole.consume(result)
+    }
 }
diff --git a/kotlin-native/performance/numerical/src/nativeInterop/cinterop/pi.c b/kotlin-native/performance/numerical/src/nativeInterop/cinterop/pi.c
index 129e8a976aa..d22f3994ecd 100644
--- a/kotlin-native/performance/numerical/src/nativeInterop/cinterop/pi.c
+++ b/kotlin-native/performance/numerical/src/nativeInterop/cinterop/pi.c
@@ -15,6 +15,7 @@
  */
 
 #include <math.h>
+#include "pi.h"
 
 /* uncomment the following line to use 'long long' integers */
 #define HAS_LONG_LONG
diff --git a/kotlin-native/performance/numerical/src/nativeInterop/cinterop/pi.h b/kotlin-native/performance/numerical/src/nativeInterop/cinterop/pi.h
index 5703de71b38..5528a38c176 100644
--- a/kotlin-native/performance/numerical/src/nativeInterop/cinterop/pi.h
+++ b/kotlin-native/performance/numerical/src/nativeInterop/cinterop/pi.h
@@ -11,6 +11,12 @@
 #ifndef _BELLARD_PI_H
 #define _BELLARD_PI_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 int pi_nth_digit(int n);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /*_BELLARD_PI_H*/
diff --git a/kotlin-native/performance/objcinterop/build.gradle.kts b/kotlin-native/performance/objcinterop/build.gradle.kts
index 71c4c7322f1..b106bb8c1f2 100644
--- a/kotlin-native/performance/objcinterop/build.gradle.kts
+++ b/kotlin-native/performance/objcinterop/build.gradle.kts
@@ -22,32 +22,17 @@ benchmark {
     nativeSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/common")
     mingwSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/posix")
-    linkerOpts = listOf("-L$buildDir", "-lcomplexnumbers")
     buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
-
-    dependencies.common(project(":endorsedLibraries:kotlinx.cli"))
 }
 
-val compileLibary by tasks.creating {
-    doFirst {
-        mkdir(buildDir)
-
-        project.withConvention(ExecClang::class) {
-            execKonanClang(HostManager.host) {
-                args("$projectDir/src/nativeInterop/cinterop/complexNumbers.m")
-                args("-lobjc", "-fobjc-arc")
-                args("-fPIC", "-shared", "-o", "$buildDir/libcomplexnumbers.dylib")
-            }
-        }
-    }
-}
 
 val native = kotlin.targets.getByName("native") as KotlinNativeTarget
 native.apply {
     compilations["main"].cinterops {
         create("classes") {
             headers("$projectDir/src/nativeInterop/cinterop/complexNumbers.h")
+            extraOpts("-Xcompile-source", "$projectDir/src/nativeInterop/cinterop/complexNumbers.m")
+            extraOpts("-Xsource-compiler-option", "-lobjc", "-Xsource-compiler-option", "-fobjc-arc")
         }
     }
-    binaries.getExecutable(BenchmarkingPlugin.NATIVE_EXECUTABLE_NAME, "RELEASE").linkTask.dependsOn(compileLibary)
 }
\ No newline at end of file
diff --git a/kotlin-native/performance/ring/build.gradle.kts b/kotlin-native/performance/ring/build.gradle.kts
index 2eda534e016..600c4631d94 100644
--- a/kotlin-native/performance/ring/build.gradle.kts
+++ b/kotlin-native/performance/ring/build.gradle.kts
@@ -19,6 +19,4 @@ benchmark {
     mingwSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/posix")
     buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
-
-    dependencies.common(project(":endorsedLibraries:kotlinx.cli"))
 }
diff --git a/kotlin-native/performance/settings.gradle b/kotlin-native/performance/settings.gradle
new file mode 100644
index 00000000000..cfe05270f35
--- /dev/null
+++ b/kotlin-native/performance/settings.gradle
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+include ':ring'
+include ':cinterop'
+include ':helloworld'
+include ':numerical'
+include ':videoplayer'
+include ':framework'
+include ':startup'
+if (System.getProperty("os.name") == "Mac OS X") {
+    include ':objcinterop'
+    include ':swiftinterop'
+    if (hasProperty("runExcludedBenchmarks")) {
+        include ':KotlinVsSwift'
+        include ':KotlinVsSwift:ring'
+    }
+}
+
+includeBuild '../build-tools'
+
diff --git a/kotlin-native/performance/shared/src/main/kotlin/org/jetbrains/benchmarksLauncher/launcher.kt b/kotlin-native/performance/shared/src/main/kotlin/org/jetbrains/benchmarksLauncher/launcher.kt
index e0749222915..000b810c4aa 100644
--- a/kotlin-native/performance/shared/src/main/kotlin/org/jetbrains/benchmarksLauncher/launcher.kt
+++ b/kotlin-native/performance/shared/src/main/kotlin/org/jetbrains/benchmarksLauncher/launcher.kt
@@ -76,7 +76,7 @@ abstract class Launcher {
         val benchmarkInstance = (benchmark as? BenchmarkEntryWithInit)?.ctor?.invoke()
         logger.log("Warm up iterations for benchmark $name\n")
         runBenchmark(benchmarkInstance, benchmark, numWarmIterations)
-        val expectedDuration = 2000L * 1_000_000 // 2s
+        val expectedDuration = 1000L * 1_000_000 // 1s
         var autoEvaluatedNumberOfMeasureIteration = 1
         if (benchmark.useAutoEvaluatedNumberOfMeasure) {
             val time = runBenchmark(benchmarkInstance, benchmark, 1)
diff --git a/kotlin-native/performance/startup/build.gradle.kts b/kotlin-native/performance/startup/build.gradle.kts
index df66b9598f2..90ab3df90c7 100644
--- a/kotlin-native/performance/startup/build.gradle.kts
+++ b/kotlin-native/performance/startup/build.gradle.kts
@@ -22,6 +22,4 @@ benchmark {
     posixSrcDirs = listOf("../shared/src/main/kotlin-native/posix")
     buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
     repeatingType = BenchmarkRepeatingType.EXTERNAL
-
-    dependencies.common(project(":endorsedLibraries:kotlinx.cli"))
 }
diff --git a/kotlin-native/performance/swiftinterop/build.gradle.kts b/kotlin-native/performance/swiftinterop/build.gradle.kts
index e5149a22829..a028d76868c 100644
--- a/kotlin-native/performance/swiftinterop/build.gradle.kts
+++ b/kotlin-native/performance/swiftinterop/build.gradle.kts
@@ -1,5 +1,5 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
-
+import org.jetbrains.kotlin.konan.target.*
 /*
  * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the LICENSE file.
@@ -12,7 +12,7 @@ plugins {
 val toolsPath = "../../tools"
 val targetExtension = "Macos"
 val defaultBuildType = NativeBuildType.RELEASE
-
+project.extra["platformManager"] = PlatformManager(projectDir.parentFile.parentFile.absolutePath, false)
 swiftBenchmark {
     applicationName = "swiftInterop"
     commonSrcDirs = listOf("$toolsPath/benchmarks/shared/src/main/kotlin/report", "src", "../shared/src/main/kotlin")
@@ -20,6 +20,5 @@ swiftBenchmark {
     swiftSources = listOf("$projectDir/swiftSrc/benchmarks.swift", "$projectDir/swiftSrc/main.swift")
     compileTasks = listOf("compileKotlinNative", "linkBenchmarkReleaseFrameworkNative")
     buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
-
-    dependencies.common(project(":endorsedLibraries:kotlinx.cli"))
+    cleanBeforeRunTask = "compileKotlinNative"
 }
\ No newline at end of file
diff --git a/kotlin-native/platformLibs/src/platform/mingw/windows.def b/kotlin-native/platformLibs/src/platform/mingw/windows.def
index 07e3b8c3eaa..1ea77d68630 100644
--- a/kotlin-native/platformLibs/src/platform/mingw/windows.def
+++ b/kotlin-native/platformLibs/src/platform/mingw/windows.def
@@ -3,6 +3,6 @@ headers = wtypes.h minwindef.h windows.h commctrl.h dwmapi.h shlobj.h shlwapi.h
     urlmon.h usp10.h uxtheme.h vfw.h wininet.h winsock2.h ws2tcpip.h ws2def.h
 compilerOpts = -DUNICODE -DWINVER=0x0601 -D_WIN32_WINNT=0x0601 -DWINAPI_FAMILY=3 -DOEMRESOURCE \
     -Wno-incompatible-pointer-types -Wno-deprecated-declarations
-linkerOpts = -lcomctl32 -lcrypt32 -lshlwapi -lshell32 -limm32 -lusp10 -lwininet -lgdi32 -luser32 -lkernel32 -lbcrypt -luuid
+linkerOpts = -lcomctl32 -lcrypt32 -lshlwapi -lshell32 -limm32 -lusp10 -lwininet -lgdi32 -luser32 -lkernel32 -lbcrypt -luuid -ldwmapi
 noStringConversion = LoadCursorA LoadBitmapA LoadIconA LoadImageA LoadCursorW LoadBitmapW LoadIconW LoadImageW
 depends = posix
diff --git a/kotlin-native/platformLibs/src/platform/osx/Hypervisor.def b/kotlin-native/platformLibs/src/platform/osx/Hypervisor.def
deleted file mode 100644
index 9bdff403baf..00000000000
--- a/kotlin-native/platformLibs/src/platform/osx/Hypervisor.def
+++ /dev/null
@@ -1,7 +0,0 @@
-depends = darwin posix
-language = Objective-C
-package = platform.Hypervisor
-modules = Hypervisor
-
-compilerOpts = -framework Hypervisor
-linkerOpts = -framework Hypervisor
diff --git a/kotlin-native/platformLibs/src/platform/osx/Hypervisor.def.disabled b/kotlin-native/platformLibs/src/platform/osx/Hypervisor.def.disabled
new file mode 100644
index 00000000000..c7426077811
--- /dev/null
+++ b/kotlin-native/platformLibs/src/platform/osx/Hypervisor.def.disabled
@@ -0,0 +1,11 @@
+depends = darwin posix
+language = Objective-C
+package = platform.Hypervisor
+modules = Hypervisor
+
+compilerOpts = -framework Hypervisor
+linkerOpts = -framework Hypervisor
+#Disabled: doesn't work with macOS 11.0 SDK (Xcode 12.2).
+#Fixing this requires to switch this lib from modules to headers,
+#but previous versions don't have an umbrella header.
+#TODO: fix and enable after updating to Xcode 12.2.
diff --git a/kotlin-native/platformLibs/src/platform/osx/IOBluetoothUI.def b/kotlin-native/platformLibs/src/platform/osx/IOBluetoothUI.def
index 4121ca80836..73c5a5a4cb8 100644
--- a/kotlin-native/platformLibs/src/platform/osx/IOBluetoothUI.def
+++ b/kotlin-native/platformLibs/src/platform/osx/IOBluetoothUI.def
@@ -3,5 +3,6 @@ language = Objective-C
 package = platform.IOBluetoothUI
 modules = IOBluetoothUI
 
-compilerOpts = -framework IOBluetoothUI
+# -DAPI_UNAVAILABLE_BEGIN workarounds bug in IOBluetoothUI headers which use this macro before importing it.
+compilerOpts = -framework IOBluetoothUI -DAPI_UNAVAILABLE_BEGIN=__API_UNAVAILABLE_BEGIN
 linkerOpts = -framework IOBluetoothUI
diff --git a/kotlin-native/platformLibs/src/platform/watchos/set_depends.sh b/kotlin-native/platformLibs/src/platform/watchos/set_depends.sh
index 78e459849bd..8e43a0db23d 100755
--- a/kotlin-native/platformLibs/src/platform/watchos/set_depends.sh
+++ b/kotlin-native/platformLibs/src/platform/watchos/set_depends.sh
@@ -2,8 +2,7 @@
 ../../../../dist/bin/run_konan defFileDependencies \
   -target watchos_arm32 \
   -target watchos_x86 \
+  -target watchos_arm64 \
+  -target watchos_x64 \
   *.def
 
-#TODO: Reenable targets
-#  -target watchos_arm64 \
-#  -target watchos_x64 \
diff --git a/kotlin-native/runtime/build.gradle.kts b/kotlin-native/runtime/build.gradle.kts
index ada106b7faa..3cbd1d847b7 100644
--- a/kotlin-native/runtime/build.gradle.kts
+++ b/kotlin-native/runtime/build.gradle.kts
@@ -149,7 +149,9 @@ targetList.forEach { targetName ->
                 "${targetName}Mimalloc",
                 "${targetName}OptAlloc"
             )
-    )
+    ) {
+        includeRuntime()
+    }
 
     tasks.register("${targetName}RuntimeTests") {
         dependsOn("${targetName}StdAllocRuntimeTests")
diff --git a/kotlin-native/runtime/src/launcher/cpp/androidLauncher.cpp b/kotlin-native/runtime/src/launcher/cpp/androidLauncher.cpp
index ebbd8a4d636..be29a9776ec 100644
--- a/kotlin-native/runtime/src/launcher/cpp/androidLauncher.cpp
+++ b/kotlin-native/runtime/src/launcher/cpp/androidLauncher.cpp
@@ -81,6 +81,7 @@ void launchMain() {
     Konan_start(args.obj());
   }
 
+  // TODO: Can we shutdown runtime here?
   Kotlin_deinitRuntimeIfNeeded();
 }
 
diff --git a/kotlin-native/runtime/src/launcher/cpp/launcher.cpp b/kotlin-native/runtime/src/launcher/cpp/launcher.cpp
index c102a537106..669d40275ed 100644
--- a/kotlin-native/runtime/src/launcher/cpp/launcher.cpp
+++ b/kotlin-native/runtime/src/launcher/cpp/launcher.cpp
@@ -14,7 +14,6 @@
   * limitations under the License.
   */
 
-#include "Cleaner.h"
 #include "Memory.h"
 #include "Natives.h"
 #include "Runtime.h"
@@ -58,17 +57,7 @@ extern "C" RUNTIME_USED int Init_and_run_start(int argc, const char** argv, int
   KInt exitStatus = Konan_run_start(argc, argv);
 
   if (memoryDeInit) {
-      if (Kotlin_cleanersLeakCheckerEnabled()) {
-          // Make sure to collect any lingering cleaners.
-          PerformFullGC();
-          // Execute all the cleaner blocks and stop the Cleaner worker.
-          ShutdownCleaners(true);
-      } else {
-          // Stop the cleaner worker without executing remaining cleaner blocks.
-          ShutdownCleaners(false);
-      }
-      if (Kotlin_memoryLeakCheckerEnabled()) WaitNativeWorkersTermination();
-      Kotlin_deinitRuntimeIfNeeded();
+      Kotlin_shutdownRuntime();
   }
 
   return exitStatus;
diff --git a/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp b/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
index b23ed452b96..a812fc6931b 100644
--- a/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
+++ b/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
@@ -41,10 +41,11 @@
 #include "KString.h"
 #include "Memory.h"
 #include "MemoryPrivate.hpp"
+#include "Mutex.hpp"
 #include "Natives.h"
 #include "Porting.h"
 #include "Runtime.h"
-#include "Utils.h"
+#include "Utils.hpp"
 #include "WorkerBoundReference.h"
 #include "Weak.h"
 
@@ -150,20 +151,16 @@ KBoolean g_hasCyclicCollector = true;
 #endif  // USE_CYCLIC_GC
 
 // TODO: Consider using ObjHolder.
-class ScopedRefHolder {
+class ScopedRefHolder : private kotlin::MoveOnly {
  public:
   ScopedRefHolder() = default;
 
   explicit ScopedRefHolder(KRef obj);
 
-  ScopedRefHolder(const ScopedRefHolder&) = delete;
-
   ScopedRefHolder(ScopedRefHolder&& other) noexcept: obj_(other.obj_) {
     other.obj_ = nullptr;
   }
 
-  ScopedRefHolder& operator=(const ScopedRefHolder&) = delete;
-
   ScopedRefHolder& operator=(ScopedRefHolder&& other) noexcept {
     ScopedRefHolder tmp(std::move(other));
     swap(tmp);
@@ -191,7 +188,7 @@ struct CycleDetectorRootset {
   KStdVector<ScopedRefHolder> heldRefs;
 };
 
-class CycleDetector {
+class CycleDetector : private kotlin::Pinned {
  public:
   static void insertCandidateIfNeeded(KRef object) {
     if (canBeACandidate(object))
@@ -208,10 +205,6 @@ class CycleDetector {
  private:
   CycleDetector() = default;
   ~CycleDetector() = default;
-  CycleDetector(const CycleDetector&) = delete;
-  CycleDetector(CycleDetector&&) = delete;
-  CycleDetector& operator=(const CycleDetector&) = delete;
-  CycleDetector& operator=(CycleDetector&&) = delete;
 
   static CycleDetector& instance() {
     // Only store a pointer to CycleDetector in .bss
@@ -576,7 +569,7 @@ private:
         if (atomicGet(&aliveMemoryStatesCount) == 0)
           return;
 
-        memoryState = InitMemory(); // Required by ReleaseHeapRef.
+        memoryState = InitMemory(false); // Required by ReleaseHeapRef.
       }
 
       processEnqueuedReleaseRefsWith([](ObjHeader* obj) {
@@ -585,7 +578,7 @@ private:
 
       if (hadNoStateInitialized) {
         // Discard the memory state.
-        DeinitMemory(memoryState);
+        DeinitMemory(memoryState, false);
       }
     }
   }
@@ -641,6 +634,8 @@ struct MemoryState {
   // A stack of initializing singletons.
   KStdVector<std::pair<ObjHeader**, ObjHeader*>> initializingSingletons;
 
+  bool isMainThread = false;
+
 #if COLLECT_STATISTIC
   #define CONTAINER_ALLOC_STAT(state, size, container) state->statistic.incAlloc(size, container);
   #define CONTAINER_DESTROY_STAT(state, container) \
@@ -1976,7 +1971,7 @@ void deinitForeignRef(ObjHeader* object, ForeignRefManager* manager) {
   }
 }
 
-MemoryState* initMemory() {
+MemoryState* initMemory(bool firstRuntime) {
   RuntimeAssert(offsetof(ArrayHeader, typeInfoOrMeta_)
                 ==
                 offsetof(ObjHeader,   typeInfoOrMeta_),
@@ -2003,21 +1998,38 @@ MemoryState* initMemory() {
   memoryState->tlsMap = konanConstructInstance<KThreadLocalStorageMap>();
   memoryState->foreignRefManager = ForeignRefManager::create();
   bool firstMemoryState = atomicAdd(&aliveMemoryStatesCount, 1) == 1;
-  if (firstMemoryState) {
+  switch (Kotlin_getDestroyRuntimeMode()) {
+    case DESTROY_RUNTIME_LEGACY:
+      firstRuntime = firstMemoryState;
+      break;
+    case DESTROY_RUNTIME_ON_SHUTDOWN:
+      // Nothing to do.
+      break;
+  }
+  if (firstRuntime) {
 #if USE_CYCLIC_GC
     cyclicInit();
 #endif  // USE_CYCLIC_GC
+    memoryState->isMainThread = true;
   }
   return memoryState;
 }
 
-void deinitMemory(MemoryState* memoryState) {
+void deinitMemory(MemoryState* memoryState, bool destroyRuntime) {
   static int pendingDeinit = 0;
   atomicAdd(&pendingDeinit, 1);
 #if USE_GC
   bool lastMemoryState = atomicAdd(&aliveMemoryStatesCount, -1) == 0;
-  bool checkLeaks = Kotlin_memoryLeakCheckerEnabled() && lastMemoryState;
-  if (lastMemoryState) {
+  switch (Kotlin_getDestroyRuntimeMode()) {
+    case DESTROY_RUNTIME_LEGACY:
+      destroyRuntime = lastMemoryState;
+      break;
+    case DESTROY_RUNTIME_ON_SHUTDOWN:
+      // Nothing to do
+      break;
+  }
+  bool checkLeaks = Kotlin_memoryLeakCheckerEnabled() && destroyRuntime;
+  if (destroyRuntime) {
    garbageCollect(memoryState, true);
 #if USE_CYCLIC_GC
    // If there are other pending deinits (rare situation) - just skip the leak checker.
@@ -2048,7 +2060,7 @@ void deinitMemory(MemoryState* memoryState) {
   atomicAdd(&pendingDeinit, -1);
 
 #if TRACE_MEMORY
-  if (IsStrictMemoryModel && lastMemoryState && allocCount > 0) {
+  if (IsStrictMemoryModel && destroyRuntime && allocCount > 0) {
     MEMORY_LOG("*** Memory leaks, leaked %d containers ***\n", allocCount);
     dumpReachable("", memoryState->containers);
   }
@@ -3190,17 +3202,17 @@ bool TryAddHeapRef(const ObjHeader* object) {
   return tryAddHeapRef(object);
 }
 
-void ReleaseHeapRefStrict(const ObjHeader* object) {
+RUNTIME_NOTHROW void ReleaseHeapRefStrict(const ObjHeader* object) {
   releaseHeapRef<true>(const_cast<ObjHeader*>(object));
 }
-void ReleaseHeapRefRelaxed(const ObjHeader* object) {
+RUNTIME_NOTHROW void ReleaseHeapRefRelaxed(const ObjHeader* object) {
   releaseHeapRef<false>(const_cast<ObjHeader*>(object));
 }
 
-void ReleaseHeapRefNoCollectStrict(const ObjHeader* object) {
+RUNTIME_NOTHROW void ReleaseHeapRefNoCollectStrict(const ObjHeader* object) {
   releaseHeapRef<true, /* CanCollect = */ false>(const_cast<ObjHeader*>(object));
 }
-void ReleaseHeapRefNoCollectRelaxed(const ObjHeader* object) {
+RUNTIME_NOTHROW void ReleaseHeapRefNoCollectRelaxed(const ObjHeader* object) {
   releaseHeapRef<false, /* CanCollect = */ false>(const_cast<ObjHeader*>(object));
 }
 
@@ -3228,12 +3240,12 @@ void AdoptReferenceFromSharedVariable(ObjHeader* object) {
 }
 
 // Public memory interface.
-MemoryState* InitMemory() {
-  return initMemory();
+MemoryState* InitMemory(bool firstRuntime) {
+    return initMemory(firstRuntime);
 }
 
-void DeinitMemory(MemoryState* memoryState) {
-  deinitMemory(memoryState);
+void DeinitMemory(MemoryState* memoryState, bool destroyRuntime) {
+    deinitMemory(memoryState, destroyRuntime);
 }
 
 void RestoreMemory(MemoryState* memoryState) {
@@ -3273,60 +3285,60 @@ OBJ_GETTER(InitSharedInstanceRelaxed,
   RETURN_RESULT_OF(initSharedInstance<false>, location, typeInfo, ctor);
 }
 
-void SetStackRefStrict(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void SetStackRefStrict(ObjHeader** location, const ObjHeader* object) {
   setStackRef<true>(location, object);
 }
-void SetStackRefRelaxed(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void SetStackRefRelaxed(ObjHeader** location, const ObjHeader* object) {
   setStackRef<false>(location, object);
 }
 
-void SetHeapRefStrict(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void SetHeapRefStrict(ObjHeader** location, const ObjHeader* object) {
   setHeapRef<true>(location, object);
 }
-void SetHeapRefRelaxed(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void SetHeapRefRelaxed(ObjHeader** location, const ObjHeader* object) {
   setHeapRef<false>(location, object);
 }
 
-void ZeroHeapRef(ObjHeader** location) {
+RUNTIME_NOTHROW void ZeroHeapRef(ObjHeader** location) {
   zeroHeapRef(location);
 }
 
-void ZeroStackRefStrict(ObjHeader** location) {
+RUNTIME_NOTHROW void ZeroStackRefStrict(ObjHeader** location) {
   zeroStackRef<true>(location);
 }
-void ZeroStackRefRelaxed(ObjHeader** location) {
+RUNTIME_NOTHROW void ZeroStackRefRelaxed(ObjHeader** location) {
   zeroStackRef<false>(location);
 }
 
-void UpdateStackRefStrict(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateStackRefStrict(ObjHeader** location, const ObjHeader* object) {
   updateStackRef<true>(location, object);
 }
-void UpdateStackRefRelaxed(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateStackRefRelaxed(ObjHeader** location, const ObjHeader* object) {
   updateStackRef<false>(location, object);
 }
 
-void UpdateHeapRefStrict(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateHeapRefStrict(ObjHeader** location, const ObjHeader* object) {
   updateHeapRef<true>(location, object);
 }
-void UpdateHeapRefRelaxed(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateHeapRefRelaxed(ObjHeader** location, const ObjHeader* object) {
   updateHeapRef<false>(location, object);
 }
 
-void UpdateReturnRefStrict(ObjHeader** returnSlot, const ObjHeader* value) {
+RUNTIME_NOTHROW void UpdateReturnRefStrict(ObjHeader** returnSlot, const ObjHeader* value) {
   updateReturnRef<true>(returnSlot, value);
 }
-void UpdateReturnRefRelaxed(ObjHeader** returnSlot, const ObjHeader* value) {
+RUNTIME_NOTHROW void UpdateReturnRefRelaxed(ObjHeader** returnSlot, const ObjHeader* value) {
   updateReturnRef<false>(returnSlot, value);
 }
 
-void ZeroArrayRefs(ArrayHeader* array) {
+RUNTIME_NOTHROW void ZeroArrayRefs(ArrayHeader* array) {
   for (uint32_t index = 0; index < array->count_; ++index) {
     ObjHeader** location = ArrayAddressOfElementAt(array, index);
     zeroHeapRef(location);
   }
 }
 
-void UpdateHeapRefIfNull(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateHeapRefIfNull(ObjHeader** location, const ObjHeader* object) {
   updateHeapRefIfNull(location, object);
 }
 
@@ -3335,7 +3347,7 @@ OBJ_GETTER(SwapHeapRefLocked,
   RETURN_RESULT_OF(swapHeapRefLocked, location, expectedValue, newValue, spinlock, cookie);
 }
 
-void SetHeapRefLocked(ObjHeader** location, ObjHeader* newValue, int32_t* spinlock, int32_t* cookie) {
+RUNTIME_NOTHROW void SetHeapRefLocked(ObjHeader** location, ObjHeader* newValue, int32_t* spinlock, int32_t* cookie) {
   setHeapRefLocked(location, newValue, spinlock, cookie);
 }
 
@@ -3347,17 +3359,17 @@ OBJ_GETTER(ReadHeapRefNoLock, ObjHeader* object, KInt index) {
   RETURN_RESULT_OF(readHeapRefNoLock, object, index);
 }
 
-void EnterFrameStrict(ObjHeader** start, int parameters, int count) {
+RUNTIME_NOTHROW void EnterFrameStrict(ObjHeader** start, int parameters, int count) {
   enterFrame<true>(start, parameters, count);
 }
-void EnterFrameRelaxed(ObjHeader** start, int parameters, int count) {
+RUNTIME_NOTHROW void EnterFrameRelaxed(ObjHeader** start, int parameters, int count) {
   enterFrame<false>(start, parameters, count);
 }
 
-void LeaveFrameStrict(ObjHeader** start, int parameters, int count) {
+RUNTIME_NOTHROW void LeaveFrameStrict(ObjHeader** start, int parameters, int count) {
   leaveFrame<true>(start, parameters, count);
 }
-void LeaveFrameRelaxed(ObjHeader** start, int parameters, int count) {
+RUNTIME_NOTHROW void LeaveFrameRelaxed(ObjHeader** start, int parameters, int count) {
   leaveFrame<false>(start, parameters, count);
 }
 
@@ -3473,11 +3485,11 @@ OBJ_GETTER(Kotlin_native_internal_GC_findCycle, KRef, KRef root) {
 #endif
 }
 
-KNativePtr CreateStablePointer(KRef any) {
+RUNTIME_NOTHROW KNativePtr CreateStablePointer(KRef any) {
   return createStablePointer(any);
 }
 
-void DisposeStablePointer(KNativePtr pointer) {
+RUNTIME_NOTHROW void DisposeStablePointer(KNativePtr pointer) {
   disposeStablePointer(pointer);
 }
 
@@ -3489,7 +3501,7 @@ OBJ_GETTER(AdoptStablePointer, KNativePtr pointer) {
   RETURN_RESULT_OF(adoptStablePointer, pointer);
 }
 
-bool ClearSubgraphReferences(ObjHeader* root, bool checked) {
+RUNTIME_NOTHROW bool ClearSubgraphReferences(ObjHeader* root, bool checked) {
   return clearSubgraphReferences(root, checked);
 }
 
@@ -3506,7 +3518,7 @@ void MutationCheck(ObjHeader* obj) {
     ThrowInvalidMutabilityException(obj);
 }
 
-void CheckLifetimesConstraint(ObjHeader* obj, ObjHeader* pointee) {
+RUNTIME_NOTHROW void CheckLifetimesConstraint(ObjHeader* obj, ObjHeader* pointee) {
   if (!obj->local() && pointee != nullptr && pointee->local()) {
     konan::consolePrintf("Attempt to store a stack object %p into a heap object %p\n", pointee, obj);
     konan::consolePrintf("This is a compiler bug, please report it to https://kotl.in/issue\n");
@@ -3522,7 +3534,7 @@ void Kotlin_Any_share(ObjHeader* obj) {
   shareAny(obj);
 }
 
-void AddTLSRecord(MemoryState* memory, void** key, int size) {
+RUNTIME_NOTHROW void AddTLSRecord(MemoryState* memory, void** key, int size) {
   auto* tlsMap = memory->tlsMap;
   auto it = tlsMap->find(key);
   if (it != tlsMap->end()) {
@@ -3533,7 +3545,7 @@ void AddTLSRecord(MemoryState* memory, void** key, int size) {
   tlsMap->emplace(key, std::make_pair(start, size));
 }
 
-void ClearTLSRecord(MemoryState* memory, void** key) {
+RUNTIME_NOTHROW void ClearTLSRecord(MemoryState* memory, void** key) {
   auto* tlsMap = memory->tlsMap;
   auto it = tlsMap->find(key);
   if (it != tlsMap->end()) {
@@ -3547,7 +3559,7 @@ void ClearTLSRecord(MemoryState* memory, void** key) {
   }
 }
 
-KRef* LookupTLS(void** key, int index) {
+RUNTIME_NOTHROW KRef* LookupTLS(void** key, int index) {
   auto* state = memoryState;
   auto* tlsMap = state->tlsMap;
   // In many cases there is only one module, so this one element cache.
@@ -3564,19 +3576,19 @@ KRef* LookupTLS(void** key, int index) {
 }
 
 
-void GC_RegisterWorker(void* worker) {
+RUNTIME_NOTHROW void GC_RegisterWorker(void* worker) {
 #if USE_CYCLIC_GC
   cyclicAddWorker(worker);
 #endif  // USE_CYCLIC_GC
 }
 
-void GC_UnregisterWorker(void* worker) {
+RUNTIME_NOTHROW void GC_UnregisterWorker(void* worker) {
 #if USE_CYCLIC_GC
   cyclicRemoveWorker(worker, g_hasCyclicCollector);
 #endif  // USE_CYCLIC_GC
 }
 
-void GC_CollectorCallback(void* worker) {
+RUNTIME_NOTHROW void GC_CollectorCallback(void* worker) {
 #if USE_CYCLIC_GC
   if (g_hasCyclicCollector)
     cyclicCollectorCallback(worker);
@@ -3604,8 +3616,13 @@ bool Kotlin_Any_isShareable(KRef thiz) {
     return thiz == nullptr || isShareable(containerFor(thiz));
 }
 
-void PerformFullGC() {
-    garbageCollect(::memoryState, true);
+RUNTIME_NOTHROW void PerformFullGC(MemoryState* memory) {
+    garbageCollect(memory, true);
+}
+
+void CheckGlobalsAccessible() {
+    if (!::memoryState->isMainThread)
+        ThrowIncorrectDereferenceException();
 }
 
 } // extern "C"
diff --git a/kotlin-native/runtime/src/main/cpp/ArraysTest.cpp b/kotlin-native/runtime/src/main/cpp/ArraysTest.cpp
deleted file mode 100644
index 978ecdc5d73..00000000000
--- a/kotlin-native/runtime/src/main/cpp/ArraysTest.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the LICENSE file.
- */
-
-#include "gtest/gtest.h"
-
-#include "Porting.h"
-
-// TODO: Replace these tests with real ones.
-
-TEST(ArraysTest, GoodTest) {
-    konan::consolePrintf("I'm a good test\n");
-    EXPECT_EQ(true, true);
-}
-
-TEST(ArraysTest, BadTest) {
-    GTEST_SKIP();
-    konan::consolePrintf("I'm a bad test\n");
-    EXPECT_EQ(true, false);
-}
diff --git a/kotlin-native/runtime/src/main/cpp/CompilerExport.cpp b/kotlin-native/runtime/src/main/cpp/CompilerExport.cpp
index de52a26e227..5263d6df773 100644
--- a/kotlin-native/runtime/src/main/cpp/CompilerExport.cpp
+++ b/kotlin-native/runtime/src/main/cpp/CompilerExport.cpp
@@ -41,4 +41,5 @@ void EnsureDeclarationsEmitted() {
     ensureUsed(CheckLifetimesConstraint);
     ensureUsed(FreezeSubgraph);
     ensureUsed(FreezeSubgraph);
+    ensureUsed(CheckGlobalsAccessible);
 }
diff --git a/kotlin-native/runtime/src/main/cpp/CppSupport.hpp b/kotlin-native/runtime/src/main/cpp/CppSupport.hpp
new file mode 100644
index 00000000000..9f04f544c41
--- /dev/null
+++ b/kotlin-native/runtime/src/main/cpp/CppSupport.hpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_CPP_SUPPORT_H
+#define RUNTIME_CPP_SUPPORT_H
+
+#include <type_traits>
+#include <memory>
+
+// A collection of backported utilities from future C++ versions.
+
+namespace kotlin {
+namespace std_support {
+
+////////////////////////// C++14 //////////////////////////
+
+template <typename T, typename... Args>
+std::unique_ptr<T> make_unique(Args&&... args) {
+    return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+template <typename T>
+using make_unsigned_t = typename std::make_unsigned<T>::type;
+
+////////////////////////// C++17 //////////////////////////
+
+template <typename T>
+constexpr bool is_trivially_destructible_v = std::is_trivially_destructible<T>::value;
+template <typename T>
+constexpr bool is_nothrow_default_constructible_v = std::is_nothrow_default_constructible<T>::value;
+template <typename T>
+constexpr bool is_nothrow_destructible_v = std::is_nothrow_destructible<T>::value;
+template <typename T>
+constexpr bool is_copy_constructible_v = std::is_copy_constructible<T>::value;
+template <typename T>
+constexpr bool is_copy_assignable_v = std::is_copy_assignable<T>::value;
+template <typename T>
+constexpr bool is_move_constructible_v = std::is_move_constructible<T>::value;
+template <typename T>
+constexpr bool is_move_assignable_v = std::is_move_assignable<T>::value;
+template <typename T>
+constexpr bool is_nothrow_move_constructible_v = std::is_nothrow_move_constructible<T>::value;
+template <typename T>
+constexpr bool is_nothrow_move_assignable_v = std::is_nothrow_move_assignable<T>::value;
+
+} // namespace std_support
+} // namespace kotlin
+
+#endif // RUNTIME_CPP_SUPPORT_H
diff --git a/kotlin-native/runtime/src/main/cpp/Exceptions.cpp b/kotlin-native/runtime/src/main/cpp/Exceptions.cpp
index 29501c5d49c..a4c8625fcb9 100644
--- a/kotlin-native/runtime/src/main/cpp/Exceptions.cpp
+++ b/kotlin-native/runtime/src/main/cpp/Exceptions.cpp
@@ -38,11 +38,12 @@
 #include "Exceptions.h"
 #include "ExecFormat.h"
 #include "Memory.h"
+#include "Mutex.hpp"
 #include "Natives.h"
 #include "KString.h"
 #include "SourceInfo.h"
 #include "Types.h"
-#include "Utils.h"
+#include "Utils.hpp"
 #include "ObjCExceptions.h"
 
 namespace {
@@ -279,7 +280,8 @@ RUNTIME_NORETURN void TerminateWithUnhandledException(KRef throwable) {
 #if KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS
 
 namespace {
-class TerminateHandler {
+// Copy, move and assign would be safe, but not much useful, so let's delete all (rule of 5)
+class TerminateHandler : private kotlin::Pinned {
 
   // In fact, it's safe to call my_handler directly from outside: it will do the job and then invoke original handler,
   // even if it has not been initialized yet. So one may want to make it public and/or not the class member
@@ -313,11 +315,6 @@ class TerminateHandler {
     return singleton;
   }
 
-  // Copy, move and assign would be safe, but not much useful, so let's delete all (rule of 5)
-  TerminateHandler(const TerminateHandler&) = delete;
-  TerminateHandler(TerminateHandler&&) = delete;
-  TerminateHandler& operator=(const TerminateHandler&) = delete;
-  TerminateHandler& operator=(TerminateHandler&&) = delete;
   // Dtor might be in use to restore original handler. However, consequent install
   // will not reconstruct handler anyway, so let's keep dtor deleted to avoid confusion.
   ~TerminateHandler() = delete;
diff --git a/kotlin-native/runtime/src/main/cpp/Memory.h b/kotlin-native/runtime/src/main/cpp/Memory.h
index 57fa71c511f..be5ab005796 100644
--- a/kotlin-native/runtime/src/main/cpp/Memory.h
+++ b/kotlin-native/runtime/src/main/cpp/Memory.h
@@ -122,8 +122,8 @@ extern "C" {
 
 struct MemoryState;
 
-MemoryState* InitMemory();
-void DeinitMemory(MemoryState*);
+MemoryState* InitMemory(bool firstRuntime);
+void DeinitMemory(MemoryState*, bool destroyRuntime);
 void RestoreMemory(MemoryState*);
 
 //
@@ -236,7 +236,7 @@ void GC_UnregisterWorker(void* worker) RUNTIME_NOTHROW;
 void GC_CollectorCallback(void* worker) RUNTIME_NOTHROW;
 
 bool Kotlin_Any_isShareable(ObjHeader* thiz);
-void PerformFullGC() RUNTIME_NOTHROW;
+void PerformFullGC(MemoryState* memory) RUNTIME_NOTHROW;
 
 bool TryAddHeapRef(const ObjHeader* object);
 
@@ -254,6 +254,8 @@ bool IsForeignRefAccessible(ObjHeader* object, ForeignRefContext context);
 // and there's nothing else keeping the object alive.
 void AdoptReferenceFromSharedVariable(ObjHeader* object);
 
+void CheckGlobalsAccessible();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/kotlin-native/runtime/src/main/cpp/MemorySharedRefs.hpp b/kotlin-native/runtime/src/main/cpp/MemorySharedRefs.hpp
index c6d8fc8c82c..7e2e45b7113 100644
--- a/kotlin-native/runtime/src/main/cpp/MemorySharedRefs.hpp
+++ b/kotlin-native/runtime/src/main/cpp/MemorySharedRefs.hpp
@@ -8,6 +8,7 @@
 
 #include <type_traits>
 
+#include "CppSupport.hpp"
 #include "Memory.h"
 
 // TODO: Generalize for uses outside this file.
@@ -37,8 +38,8 @@ class KRefSharedHolder {
   ForeignRefContext context_;
 };
 
-static_assert(std::is_trivially_destructible<KRefSharedHolder>::value,
-    "KRefSharedHolder destructor is not guaranteed to be called.");
+static_assert(
+        kotlin::std_support::is_trivially_destructible_v<KRefSharedHolder>, "KRefSharedHolder destructor is not guaranteed to be called.");
 
 class BackRefFromAssociatedObject {
  public:
@@ -66,7 +67,8 @@ class BackRefFromAssociatedObject {
   volatile int refCount;
 };
 
-static_assert(std::is_trivially_destructible<BackRefFromAssociatedObject>::value,
-    "BackRefFromAssociatedObject destructor is not guaranteed to be called.");
+static_assert(
+        kotlin::std_support::is_trivially_destructible_v<BackRefFromAssociatedObject>,
+        "BackRefFromAssociatedObject destructor is not guaranteed to be called.");
 
 #endif // RUNTIME_MEMORYSHAREDREFS_HPP
diff --git a/kotlin-native/runtime/src/main/cpp/Utils.h b/kotlin-native/runtime/src/main/cpp/Mutex.hpp
similarity index 89%
rename from kotlin-native/runtime/src/main/cpp/Utils.h
rename to kotlin-native/runtime/src/main/cpp/Mutex.hpp
index ae3e4952c7e..87778b15ce4 100644
--- a/kotlin-native/runtime/src/main/cpp/Utils.h
+++ b/kotlin-native/runtime/src/main/cpp/Mutex.hpp
@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
+#ifndef RUNTIME_MUTEX_H
+#define RUNTIME_MUTEX_H
+
 #include <cstdint>
 #include "KAssert.h"
+#include "Utils.hpp"
 
 class SimpleMutex {
  private:
@@ -37,7 +41,7 @@ class SimpleMutex {
 
 // TODO: use std::lock_guard instead?
 template <class Mutex>
-class LockGuard {
+class LockGuard : private kotlin::Pinned {
  public:
   explicit LockGuard(Mutex& mutex_) : mutex(mutex_) {
     mutex.lock();
@@ -49,7 +53,6 @@ class LockGuard {
 
  private:
   Mutex& mutex;
-
-  LockGuard(const LockGuard&) = delete;
-  LockGuard& operator=(const LockGuard&) = delete;
 };
+
+#endif // RUNTIME_MUTEX_H
diff --git a/kotlin-native/runtime/src/main/cpp/Natives.cpp b/kotlin-native/runtime/src/main/cpp/Natives.cpp
index c0e339c5b66..565963aac16 100644
--- a/kotlin-native/runtime/src/main/cpp/Natives.cpp
+++ b/kotlin-native/runtime/src/main/cpp/Natives.cpp
@@ -21,6 +21,7 @@
 #include <limits>
 #include <type_traits>
 
+#include "CppSupport.hpp"
 #include "KAssert.h"
 #include "Exceptions.h"
 #include "Memory.h"
@@ -50,7 +51,7 @@ OBJ_GETTER0(Kotlin_native_internal_undefined) {
 }
 
 void* Kotlin_interop_malloc(KLong size, KInt align) {
-  if (size < 0 || static_cast<std::make_unsigned<decltype(size)>::type>(size) > std::numeric_limits<size_t>::max()) {
+  if (size < 0 || static_cast<kotlin::std_support::make_unsigned_t<decltype(size)>>(size) > std::numeric_limits<size_t>::max()) {
     return nullptr;
   }
   RuntimeAssert(align > 0, "Unsupported alignment");
diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExport.mm b/kotlin-native/runtime/src/main/cpp/ObjCExport.mm
index fde6e386b7b..e98988da83c 100644
--- a/kotlin-native/runtime/src/main/cpp/ObjCExport.mm
+++ b/kotlin-native/runtime/src/main/cpp/ObjCExport.mm
@@ -39,7 +39,7 @@
 #import "ObjCExportPrivate.h"
 #import "ObjCMMAPI.h"
 #import "Runtime.h"
-#import "Utils.h"
+#import "Mutex.hpp"
 #import "Exceptions.h"
 
 struct ObjCToKotlinMethodAdapter {
diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm b/kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm
index d7c0a273500..b41d4453c57 100644
--- a/kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm
+++ b/kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm
@@ -24,7 +24,7 @@
 #import "ObjCExport.h"
 #import "Porting.h"
 #import "Runtime.h"
-#import "Utils.h"
+#import "Mutex.hpp"
 
 #import "ObjCExportErrors.h"
 
diff --git a/kotlin-native/runtime/src/main/cpp/ObjCInterop.mm b/kotlin-native/runtime/src/main/cpp/ObjCInterop.mm
index 73a48003f5d..d2da6eb3743 100644
--- a/kotlin-native/runtime/src/main/cpp/ObjCInterop.mm
+++ b/kotlin-native/runtime/src/main/cpp/ObjCInterop.mm
@@ -31,8 +31,9 @@
 #include "Natives.h"
 #include "ObjCInterop.h"
 #include "ObjCExportPrivate.h"
+#include "ObjCMMAPI.h"
 #include "Types.h"
-#include "Utils.h"
+#include "Mutex.hpp"
 
 // Replaced in ObjCExportCodeGenerator.
 __attribute__((weak)) const char* Kotlin_ObjCInterop_uniquePrefix = nullptr;
@@ -309,6 +310,13 @@ id objc_allocWithZone(Class clazz);
 id objc_retain(id ptr);
 void objc_release(id ptr);
 
+konan::AutoreleasePool::AutoreleasePool()
+  : handle(objc_autoreleasePoolPush()) {}
+
+konan::AutoreleasePool::~AutoreleasePool() {
+  objc_autoreleasePoolPop(handle);
+}
+
 void* Kotlin_objc_autoreleasePoolPush() {
   return objc_autoreleasePoolPush();
 }
diff --git a/kotlin-native/runtime/src/main/cpp/ObjCMMAPI.h b/kotlin-native/runtime/src/main/cpp/ObjCMMAPI.h
index 2e7d00c95c9..3478e0b0e68 100644
--- a/kotlin-native/runtime/src/main/cpp/ObjCMMAPI.h
+++ b/kotlin-native/runtime/src/main/cpp/ObjCMMAPI.h
@@ -7,11 +7,23 @@
 #define RUNTIME_OBJCMMAPI_H
 
 #include "Common.h"
+#include "Utils.hpp"
 
 #if KONAN_OBJC_INTEROP
 
 extern "C" ALWAYS_INLINE void Kotlin_ObjCExport_releaseAssociatedObject(void* associatedObject);
 
+namespace konan {
+class AutoreleasePool : private kotlin::Pinned {
+ public:
+  AutoreleasePool();
+  ~AutoreleasePool();
+
+ private:
+  void* handle;
+};
+} // namespace konan
+
 #endif // KONAN_OBJC_INTEROP
 
 #endif // RUNTIME_OBJCMMAPI_H
diff --git a/kotlin-native/runtime/src/main/cpp/Runtime.cpp b/kotlin-native/runtime/src/main/cpp/Runtime.cpp
index 1457e92e1c1..9c81ded50df 100644
--- a/kotlin-native/runtime/src/main/cpp/Runtime.cpp
+++ b/kotlin-native/runtime/src/main/cpp/Runtime.cpp
@@ -31,6 +31,13 @@ struct InitNode {
   InitNode* next;
 };
 
+// This global is overriden by the compiler.
+RUNTIME_WEAK DestroyRuntimeMode Kotlin_destroyRuntimeMode = DESTROY_RUNTIME_ON_SHUTDOWN;
+
+DestroyRuntimeMode Kotlin_getDestroyRuntimeMode() {
+    return Kotlin_destroyRuntimeMode;
+}
+
 namespace {
 
 InitNode* initHeadNode = nullptr;
@@ -65,11 +72,11 @@ void InitOrDeinitGlobalVariables(int initialize, MemoryState* memory) {
 
 KBoolean g_checkLeaks = KonanNeedDebugInfo;
 KBoolean g_checkLeakedCleaners = KonanNeedDebugInfo;
+KBoolean g_forceCheckedShutdown = false;
 
 constexpr RuntimeState* kInvalidRuntime = nullptr;
 
 THREAD_LOCAL_VARIABLE RuntimeState* runtimeState = kInvalidRuntime;
-THREAD_LOCAL_VARIABLE int isMainThread = 0;
 
 inline bool isValidRuntime() {
   return ::runtimeState != kInvalidRuntime;
@@ -77,18 +84,44 @@ inline bool isValidRuntime() {
 
 volatile int aliveRuntimesCount = 0;
 
+enum GlobalRuntimeStatus {
+    kGlobalRuntimeUninitialized = 0,
+    kGlobalRuntimeRunning,
+    kGlobalRuntimeShutdown,
+};
+
+volatile GlobalRuntimeStatus globalRuntimeStatus = kGlobalRuntimeUninitialized;
+
 RuntimeState* initRuntime() {
   SetKonanTerminateHandler();
   RuntimeState* result = konanConstructInstance<RuntimeState>();
   if (!result) return kInvalidRuntime;
   RuntimeCheck(!isValidRuntime(), "No active runtimes allowed");
   ::runtimeState = result;
-  result->memoryState = InitMemory();
-  result->worker = WorkerInit(true);
-  bool firstRuntime = atomicAdd(&aliveRuntimesCount, 1) == 1;
+
+  bool firstRuntime = false;
+  switch (Kotlin_getDestroyRuntimeMode()) {
+      case DESTROY_RUNTIME_LEGACY:
+          compareAndSwap(&globalRuntimeStatus, kGlobalRuntimeUninitialized, kGlobalRuntimeRunning);
+          result->memoryState = InitMemory(false); // The argument will be ignored for legacy DestroyRuntimeMode
+          result->worker = WorkerInit(true);
+          firstRuntime = atomicAdd(&aliveRuntimesCount, 1) == 1;
+          break;
+      case DESTROY_RUNTIME_ON_SHUTDOWN:
+          // First update `aliveRuntimesCount` and then update `globalRuntimeStatus`, for synchronization with
+          // runtime shutdown, which does it the other way around.
+          atomicAdd(&aliveRuntimesCount, 1);
+          auto lastStatus = compareAndSwap(&globalRuntimeStatus, kGlobalRuntimeUninitialized, kGlobalRuntimeRunning);
+          if (Kotlin_forceCheckedShutdown()) {
+              RuntimeAssert(lastStatus != kGlobalRuntimeShutdown, "Kotlin runtime was shut down. Cannot create new runtimes.");
+          }
+          firstRuntime = lastStatus == kGlobalRuntimeUninitialized;
+          result->memoryState = InitMemory(firstRuntime);
+          result->worker = WorkerInit(true);
+  }
+
   // Keep global variables in state as well.
   if (firstRuntime) {
-    isMainThread = 1;
     konan::consoleInit();
 #if KONAN_OBJC_INTEROP
     Kotlin_ObjCExport_initialize();
@@ -101,25 +134,33 @@ RuntimeState* initRuntime() {
   return result;
 }
 
-void deinitRuntime(RuntimeState* state) {
+void deinitRuntime(RuntimeState* state, bool destroyRuntime) {
   RuntimeAssert(state->status == RuntimeStatus::kRunning, "Runtime must be in the running state");
   state->status = RuntimeStatus::kDestroying;
   // This may be called after TLS is zeroed out, so ::memoryState in Memory cannot be trusted.
   RestoreMemory(state->memoryState);
   bool lastRuntime = atomicAdd(&aliveRuntimesCount, -1) == 0;
+  switch (Kotlin_getDestroyRuntimeMode()) {
+    case DESTROY_RUNTIME_LEGACY:
+      destroyRuntime = lastRuntime;
+      break;
+    case DESTROY_RUNTIME_ON_SHUTDOWN:
+      // Nothing to do.
+      break;
+  }
   InitOrDeinitGlobalVariables(DEINIT_THREAD_LOCAL_GLOBALS, state->memoryState);
-  if (lastRuntime)
+  if (destroyRuntime)
     InitOrDeinitGlobalVariables(DEINIT_GLOBALS, state->memoryState);
   auto workerId = GetWorkerId(state->worker);
   WorkerDeinit(state->worker);
-  DeinitMemory(state->memoryState);
+  DeinitMemory(state->memoryState, destroyRuntime);
   konanDestructInstance(state);
   WorkerDestroyThreadDataIfNeeded(workerId);
 }
 
 void Kotlin_deinitRuntimeCallback(void* argument) {
   auto* state = reinterpret_cast<RuntimeState*>(argument);
-  deinitRuntime(state);
+  deinitRuntime(state, false);
 }
 
 }  // namespace
@@ -146,14 +187,61 @@ void Kotlin_initRuntimeIfNeeded() {
 
 void Kotlin_deinitRuntimeIfNeeded() {
   if (isValidRuntime()) {
-    deinitRuntime(::runtimeState);
+    deinitRuntime(::runtimeState, false);
     ::runtimeState = kInvalidRuntime;
   }
 }
 
-void CheckIsMainThread() {
-  if (!isMainThread)
-    ThrowIncorrectDereferenceException();
+// TODO: Consider exporting it to interop API.
+void Kotlin_shutdownRuntime() {
+    auto* runtime = ::runtimeState;
+    RuntimeAssert(runtime != kInvalidRuntime, "Current thread must have Kotlin runtime initialized on it");
+
+    bool needsFullShutdown = false;
+    switch (Kotlin_getDestroyRuntimeMode()) {
+        case DESTROY_RUNTIME_LEGACY:
+            needsFullShutdown = true;
+            break;
+        case DESTROY_RUNTIME_ON_SHUTDOWN:
+            needsFullShutdown = Kotlin_forceCheckedShutdown() || Kotlin_memoryLeakCheckerEnabled() || Kotlin_cleanersLeakCheckerEnabled();
+            break;
+    }
+    if (!needsFullShutdown) {
+        auto lastStatus = compareAndSwap(&globalRuntimeStatus, kGlobalRuntimeRunning, kGlobalRuntimeShutdown);
+        RuntimeAssert(lastStatus == kGlobalRuntimeRunning, "Invalid runtime status for shutdown");
+        return;
+    }
+
+    if (Kotlin_cleanersLeakCheckerEnabled()) {
+        // Make sure to collect any lingering cleaners.
+        PerformFullGC(runtime->memoryState);
+    }
+
+    // Stop cleaner worker. Only execute the cleaners if checker is enabled.
+    ShutdownCleaners(Kotlin_cleanersLeakCheckerEnabled());
+
+    // Cleaners are now done, disallow new runtimes.
+    auto lastStatus = compareAndSwap(&globalRuntimeStatus, kGlobalRuntimeRunning, kGlobalRuntimeShutdown);
+    RuntimeAssert(lastStatus == kGlobalRuntimeRunning, "Invalid runtime status for shutdown");
+
+    // TODO: When legacy mode is gone, this `if` will become unnecessary.
+    if (Kotlin_forceCheckedShutdown() || Kotlin_memoryLeakCheckerEnabled() || Kotlin_cleanersLeakCheckerEnabled()) {
+        // First make sure workers are gone.
+        WaitNativeWorkersTermination();
+
+        if (Kotlin_forceCheckedShutdown()) {
+            // Now check for existence of any other runtimes.
+            auto otherRuntimesCount = atomicGet(&aliveRuntimesCount) - 1;
+            RuntimeAssert(otherRuntimesCount >= 0, "Cannot be negative");
+            if (otherRuntimesCount > 0) {
+                konan::consoleErrorf("Cannot run checkers when there are %d alive runtimes at the shutdown", otherRuntimesCount);
+                konan::abort();
+            }
+        }
+    }
+
+    deinitRuntime(runtime, true);
+    ::runtimeState = kInvalidRuntime;
 }
 
 KInt Konan_Platform_canAccessUnaligned() {
@@ -224,11 +312,6 @@ KBoolean Konan_Platform_isDebugBinary() {
   return KonanNeedDebugInfo ? true : false;
 }
 
-void Kotlin_zeroOutTLSGlobals() {
-  if (runtimeState != nullptr && runtimeState->memoryState != nullptr)
-    InitOrDeinitGlobalVariables(DEINIT_THREAD_LOCAL_GLOBALS, runtimeState->memoryState);
-}
-
 bool Kotlin_memoryLeakCheckerEnabled() {
   return g_checkLeaks;
 }
@@ -253,4 +336,23 @@ void Konan_Platform_setCleanersLeakChecker(KBoolean value) {
     g_checkLeakedCleaners = value;
 }
 
+bool Kotlin_forceCheckedShutdown() {
+    return g_forceCheckedShutdown;
+}
+
+KBoolean Kotlin_Debugging_getForceCheckedShutdown() {
+    return g_forceCheckedShutdown;
+}
+
+void Kotlin_Debugging_setForceCheckedShutdown(KBoolean value) {
+    switch (Kotlin_getDestroyRuntimeMode()) {
+        case DESTROY_RUNTIME_LEGACY:
+            // Only applicable to ON_SHUTDOWN modes.
+            return;
+        case DESTROY_RUNTIME_ON_SHUTDOWN:
+            break;
+    }
+    g_forceCheckedShutdown = value;
+}
+
 }  // extern "C"
diff --git a/kotlin-native/runtime/src/main/cpp/Runtime.h b/kotlin-native/runtime/src/main/cpp/Runtime.h
index 1b296f7b7ea..d5779db9b10 100644
--- a/kotlin-native/runtime/src/main/cpp/Runtime.h
+++ b/kotlin-native/runtime/src/main/cpp/Runtime.h
@@ -25,19 +25,32 @@ struct InitNode;
 extern "C" {
 #endif
 
+// Must match DestroyRuntimeMode in DestroyRuntimeMode.kt
+enum DestroyRuntimeMode {
+    DESTROY_RUNTIME_LEGACY = 0,
+    DESTROY_RUNTIME_ON_SHUTDOWN = 1,
+};
+
+DestroyRuntimeMode Kotlin_getDestroyRuntimeMode();
+
 void Kotlin_initRuntimeIfNeeded();
 void Kotlin_deinitRuntimeIfNeeded();
 
+// Can only be called once.
+// No new runtimes can be initialized on any thread after this.
+// Must be called on a thread with active runtime.
+// Using already initialized runtimes on any thread after this is undefined behaviour.
+void Kotlin_shutdownRuntime();
+
 // Appends given node to an initializer list.
 void AppendToInitializersTail(struct InitNode*);
 
-// Zero out all Kotlin thread local globals.
-void Kotlin_zeroOutTLSGlobals();
-
 bool Kotlin_memoryLeakCheckerEnabled();
 
 bool Kotlin_cleanersLeakCheckerEnabled();
 
+bool Kotlin_forceCheckedShutdown();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/kotlin-native/runtime/src/main/cpp/SingleLockList.hpp b/kotlin-native/runtime/src/main/cpp/SingleLockList.hpp
new file mode 100644
index 00000000000..06cbdaee316
--- /dev/null
+++ b/kotlin-native/runtime/src/main/cpp/SingleLockList.hpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_SINGLE_LOCK_LIST_H
+#define RUNTIME_SINGLE_LOCK_LIST_H
+
+#include <cstddef>
+#include <memory>
+#include <mutex>
+
+#include "CppSupport.hpp"
+#include "Mutex.hpp"
+#include "Utils.hpp"
+
+namespace kotlin {
+
+// TODO: Consider different locking mechanisms.
+template <typename Value, typename Mutex = SimpleMutex>
+class SingleLockList : private Pinned {
+public:
+    class Node : Pinned {
+    public:
+        Value* Get() noexcept { return &value; }
+
+    private:
+        friend class SingleLockList;
+
+        template <typename... Args>
+        Node(Args... args) noexcept : value(args...) {}
+
+        Value value;
+        std::unique_ptr<Node> next;
+        Node* previous = nullptr; // weak
+    };
+
+    class Iterator {
+    public:
+        explicit Iterator(Node* node) noexcept : node_(node) {}
+
+        Value& operator*() noexcept { return node_->value; }
+
+        Iterator& operator++() noexcept {
+            node_ = node_->next.get();
+            return *this;
+        }
+
+        bool operator==(const Iterator& rhs) const noexcept { return node_ == rhs.node_; }
+
+        bool operator!=(const Iterator& rhs) const noexcept { return node_ != rhs.node_; }
+
+    private:
+        Node* node_;
+    };
+
+    class Iterable : private MoveOnly {
+    public:
+        explicit Iterable(SingleLockList* list) noexcept : list_(list), guard_(list->mutex_) {}
+
+        Iterator begin() noexcept { return Iterator(list_->root_.get()); }
+
+        Iterator end() noexcept { return Iterator(nullptr); }
+
+    private:
+        SingleLockList* list_;
+        std::unique_lock<Mutex> guard_;
+    };
+
+    template <typename... Args>
+    Node* Emplace(Args... args) noexcept {
+        auto* nodePtr = new Node(args...);
+        std::unique_ptr<Node> node(nodePtr);
+        LockGuard<Mutex> guard(mutex_);
+        if (root_) {
+            root_->previous = node.get();
+        }
+        node->next = std::move(root_);
+        root_ = std::move(node);
+        return nodePtr;
+    }
+
+    // Using `node` including its referred `Value` after `Erase` is undefined behaviour.
+    void Erase(Node* node) noexcept {
+        LockGuard<Mutex> guard(mutex_);
+        if (root_.get() == node) {
+            root_ = std::move(node->next);
+            if (root_) {
+                root_->previous = nullptr;
+            }
+            return;
+        }
+        auto* previous = node->previous;
+        RuntimeAssert(previous != nullptr, "Only the root node doesn't have the previous node");
+        auto ownedNode = std::move(previous->next);
+        previous->next = std::move(node->next);
+        if (auto& next = previous->next) {
+            next->previous = previous;
+        }
+    }
+
+    // Returned value locks `this` to perform safe iteration. `this` unlocks when
+    // `Iterable` gets out of scope. Example usage:
+    // for (auto& value: list.Iter()) {
+    //    // Do something with `value`, there's a guarantee that it'll not be
+    //    // destroyed mid-iteration.
+    // }
+    // // At this point `list` is unlocked.
+    Iterable Iter() noexcept { return Iterable(this); }
+
+private:
+    std::unique_ptr<Node> root_;
+    Mutex mutex_;
+};
+
+} // namespace kotlin
+
+#endif // RUNTIME_SINGLE_LOCK_LIST_H
diff --git a/kotlin-native/runtime/src/main/cpp/SingleLockListTest.cpp b/kotlin-native/runtime/src/main/cpp/SingleLockListTest.cpp
new file mode 100644
index 00000000000..2fd1d93b338
--- /dev/null
+++ b/kotlin-native/runtime/src/main/cpp/SingleLockListTest.cpp
@@ -0,0 +1,297 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "SingleLockList.hpp"
+
+#include <atomic>
+#include <deque>
+#include <thread>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+using namespace kotlin;
+
+namespace {
+
+using IntList = SingleLockList<int>;
+
+} // namespace
+
+TEST(SingleLockListTest, Emplace) {
+    IntList list;
+    constexpr int kFirst = 1;
+    constexpr int kSecond = 2;
+    constexpr int kThird = 3;
+    auto* firstNode = list.Emplace(kFirst);
+    auto* secondNode = list.Emplace(kSecond);
+    auto* thirdNode = list.Emplace(kThird);
+    int* first = firstNode->Get();
+    int* second = secondNode->Get();
+    int* third = thirdNode->Get();
+    EXPECT_THAT(*first, kFirst);
+    EXPECT_THAT(*second, kSecond);
+    EXPECT_THAT(*third, kThird);
+}
+
+TEST(SingleLockListTest, EmplaceAndIter) {
+    IntList list;
+    constexpr int kFirst = 1;
+    constexpr int kSecond = 2;
+    constexpr int kThird = 3;
+    list.Emplace(kFirst);
+    list.Emplace(kSecond);
+    list.Emplace(kThird);
+
+    std::vector<int> actual;
+    for (int element : list.Iter()) {
+        actual.push_back(element);
+    }
+
+    EXPECT_THAT(actual, testing::ElementsAre(kThird, kSecond, kFirst));
+}
+
+TEST(SingleLockListTest, EmplaceEraseAndIter) {
+    IntList list;
+    constexpr int kFirst = 1;
+    constexpr int kSecond = 2;
+    constexpr int kThird = 3;
+    list.Emplace(kFirst);
+    auto* secondNode = list.Emplace(kSecond);
+    list.Emplace(kThird);
+    list.Erase(secondNode);
+
+    std::vector<int> actual;
+    for (int element : list.Iter()) {
+        actual.push_back(element);
+    }
+
+    EXPECT_THAT(actual, testing::ElementsAre(kThird, kFirst));
+}
+
+TEST(SingleLockListTest, IterEmpty) {
+    IntList list;
+
+    std::vector<int> actual;
+    for (int element : list.Iter()) {
+        actual.push_back(element);
+    }
+
+    EXPECT_THAT(actual, testing::IsEmpty());
+}
+
+TEST(SingleLockListTest, EraseToEmptyEmplaceAndIter) {
+    IntList list;
+    constexpr int kFirst = 1;
+    constexpr int kSecond = 2;
+    constexpr int kThird = 3;
+    constexpr int kFourth = 4;
+    auto* firstNode = list.Emplace(kFirst);
+    auto* secondNode = list.Emplace(kSecond);
+    list.Erase(firstNode);
+    list.Erase(secondNode);
+    list.Emplace(kThird);
+    list.Emplace(kFourth);
+
+    std::vector<int> actual;
+    for (int element : list.Iter()) {
+        actual.push_back(element);
+    }
+
+    EXPECT_THAT(actual, testing::ElementsAre(kFourth, kThird));
+}
+
+TEST(SingleLockListTest, ConcurrentEmplace) {
+    IntList list;
+    constexpr int kThreadCount = 100;
+    std::atomic<bool> canStart(false);
+    std::vector<std::thread> threads;
+    std::vector<int> expected;
+    for (int i = 0; i < kThreadCount; ++i) {
+        expected.push_back(i);
+        threads.emplace_back([i, &list, &canStart]() {
+            while (!canStart) {
+            }
+            list.Emplace(i);
+        });
+    }
+
+    canStart = true;
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    std::vector<int> actual;
+    for (int element : list.Iter()) {
+        actual.push_back(element);
+    }
+
+    EXPECT_THAT(actual, testing::UnorderedElementsAreArray(expected));
+}
+
+TEST(SingleLockListTest, ConcurrentErase) {
+    IntList list;
+    constexpr int kThreadCount = 100;
+    std::vector<IntList::Node*> items;
+    for (int i = 0; i < kThreadCount; ++i) {
+        items.push_back(list.Emplace(i));
+    }
+
+    std::atomic<bool> canStart(false);
+    std::vector<std::thread> threads;
+    for (auto* item : items) {
+        threads.emplace_back([item, &list, &canStart]() {
+            while (!canStart) {
+            }
+            list.Erase(item);
+        });
+    }
+
+    canStart = true;
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    std::vector<int> actual;
+    for (int element : list.Iter()) {
+        actual.push_back(element);
+    }
+
+    EXPECT_THAT(actual, testing::IsEmpty());
+}
+
+TEST(SingleLockListTest, IterWhileConcurrentEmplace) {
+    IntList list;
+    constexpr int kStartCount = 50;
+    constexpr int kThreadCount = 100;
+
+    std::deque<int> expectedBefore;
+    std::vector<int> expectedAfter;
+    for (int i = 0; i < kStartCount; ++i) {
+        expectedBefore.push_front(i);
+        expectedAfter.push_back(i);
+        list.Emplace(i);
+    }
+
+    std::atomic<bool> canStart(false);
+    std::atomic<int> startedCount(0);
+    std::vector<std::thread> threads;
+    for (int i = 0; i < kThreadCount; ++i) {
+        int j = i + kStartCount;
+        expectedAfter.push_back(j);
+        threads.emplace_back([j, &list, &canStart, &startedCount]() {
+            while (!canStart) {
+            }
+            ++startedCount;
+            list.Emplace(j);
+        });
+    }
+
+    std::vector<int> actualBefore;
+    {
+        auto iter = list.Iter();
+        canStart = true;
+        while (startedCount < kThreadCount) {
+        }
+
+        for (int element : iter) {
+            actualBefore.push_back(element);
+        }
+    }
+
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    EXPECT_THAT(actualBefore, testing::ElementsAreArray(expectedBefore));
+
+    std::vector<int> actualAfter;
+    for (int element : list.Iter()) {
+        actualAfter.push_back(element);
+    }
+
+    EXPECT_THAT(actualAfter, testing::UnorderedElementsAreArray(expectedAfter));
+}
+
+TEST(SingleLockListTest, IterWhileConcurrentErase) {
+    IntList list;
+    constexpr int kThreadCount = 100;
+
+    std::deque<int> expectedBefore;
+    std::vector<IntList::Node*> items;
+    for (int i = 0; i < kThreadCount; ++i) {
+        expectedBefore.push_front(i);
+        items.push_back(list.Emplace(i));
+    }
+
+    std::atomic<bool> canStart(false);
+    std::atomic<int> startedCount(0);
+    std::vector<std::thread> threads;
+    for (auto* item : items) {
+        threads.emplace_back([item, &list, &canStart, &startedCount]() {
+            while (!canStart) {
+            }
+            ++startedCount;
+            list.Erase(item);
+        });
+    }
+
+    std::vector<int> actualBefore;
+    {
+        auto iter = list.Iter();
+        canStart = true;
+        while (startedCount < kThreadCount) {
+        }
+
+        for (int element : iter) {
+            actualBefore.push_back(element);
+        }
+    }
+
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    EXPECT_THAT(actualBefore, testing::ElementsAreArray(expectedBefore));
+
+    std::vector<int> actualAfter;
+    for (int element : list.Iter()) {
+        actualAfter.push_back(element);
+    }
+
+    EXPECT_THAT(actualAfter, testing::IsEmpty());
+}
+
+namespace {
+
+class PinnedType : private Pinned {
+public:
+    PinnedType(int value) : value_(value) {}
+
+    int value() const { return value_; }
+
+private:
+    int value_;
+};
+
+} // namespace
+
+TEST(SingleLockListTest, PinnedType) {
+    SingleLockList<PinnedType> list;
+    constexpr int kFirst = 1;
+
+    auto* itemNode = list.Emplace(kFirst);
+    PinnedType* item = itemNode->Get();
+    EXPECT_THAT(item->value(), kFirst);
+
+    list.Erase(itemNode);
+
+    std::vector<PinnedType*> actualAfter;
+    for (auto& element : list.Iter()) {
+        actualAfter.push_back(&element);
+    }
+
+    EXPECT_THAT(actualAfter, testing::IsEmpty());
+}
diff --git a/kotlin-native/runtime/src/main/cpp/TestSupportCompilerGenerated.hpp b/kotlin-native/runtime/src/main/cpp/TestSupportCompilerGenerated.hpp
index d685f32c16e..26fccdb0838 100644
--- a/kotlin-native/runtime/src/main/cpp/TestSupportCompilerGenerated.hpp
+++ b/kotlin-native/runtime/src/main/cpp/TestSupportCompilerGenerated.hpp
@@ -9,24 +9,22 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include "CppSupport.hpp"
 #include "Types.h"
+#include "Utils.hpp"
 
 template <class F>
-class ScopedStrictMockFunction {
+class ScopedStrictMockFunction : private kotlin::MoveOnly {
 public:
     using Mock = testing::StrictMock<testing::MockFunction<F>>;
 
     explicit ScopedStrictMockFunction(Mock** globalMockLocation) : globalMockLocation_(globalMockLocation) {
         RuntimeCheck(globalMockLocation != nullptr, "ScopedStrictMockFunction needs non-null global mock location");
         RuntimeCheck(*globalMockLocation == nullptr, "ScopedStrictMockFunction needs null global mock");
-        // TODO: Use make_unique when sysroots on Linux get updated.
-        mock_ = std::unique_ptr<Mock>(new Mock());
+        mock_ = kotlin::std_support::make_unique<Mock>();
         *globalMockLocation_ = mock_.get();
     }
 
-    ScopedStrictMockFunction(const ScopedStrictMockFunction&) = delete;
-    ScopedStrictMockFunction& operator=(const ScopedStrictMockFunction&) = delete;
-
     ScopedStrictMockFunction(ScopedStrictMockFunction&& rhs) : globalMockLocation_(rhs.globalMockLocation_), mock_(std::move(rhs.mock_)) {
         rhs.globalMockLocation_ = nullptr;
     }
diff --git a/kotlin-native/runtime/src/main/cpp/Utils.hpp b/kotlin-native/runtime/src/main/cpp/Utils.hpp
new file mode 100644
index 00000000000..e6b94f5a2f8
--- /dev/null
+++ b/kotlin-native/runtime/src/main/cpp/Utils.hpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_UTILS_H
+#define RUNTIME_UTILS_H
+
+#include "CppSupport.hpp"
+
+namespace kotlin {
+
+// A helper for implementing classes with disabled copy constructor and copy assignment.
+// Usage:
+// class A: private MoveOnly {
+//     ...
+// };
+// Prefer private inheritance to discourage casting instances of `A` to instances
+// of `MoveOnly`.
+class MoveOnly {
+    // Hide constructors, assignments and destructor, to discourage operating on an instance of `MoveOnly`.
+protected:
+    MoveOnly() noexcept = default;
+    MoveOnly(const MoveOnly&) = delete;
+    MoveOnly(MoveOnly&&) noexcept = default;
+
+    MoveOnly& operator=(const MoveOnly&) = delete;
+    MoveOnly& operator=(MoveOnly&&) noexcept = default;
+
+    // Not virtual by design. Since this class hides this destructor, no one can destroy an
+    // instance of `MoveOnly` directly, so this destructor is never called in a virtual manner.
+    ~MoveOnly() = default;
+};
+
+// A helper for implementing classes with disabled copy and move constructors, and copy and move assignments.
+// Usage:
+// class A: private Pinned {
+//     ...
+// };
+// Prefer private inheritance to discourage casting instances of `A` to instances
+// of `Pinned`.
+class Pinned {
+    // Hide constructors, assignments and destructor, to discourage operating on an instance of `Pinned`.
+protected:
+    Pinned() noexcept = default;
+    Pinned(const Pinned&) = delete;
+    Pinned(Pinned&&) = delete;
+
+    Pinned& operator=(const Pinned&) = delete;
+    Pinned& operator=(Pinned&&) = delete;
+
+    // Not virtual by design. Since this class hides this destructor, no one can destroy an
+    // instance of `Pinned` directly, so this destructor is never called in a virtual manner.
+    ~Pinned() = default;
+};
+
+} // namespace kotlin
+
+#endif // RUNTIME_UTILS_H
diff --git a/kotlin-native/runtime/src/main/cpp/UtilsTest.cpp b/kotlin-native/runtime/src/main/cpp/UtilsTest.cpp
new file mode 100644
index 00000000000..5ba0aea917c
--- /dev/null
+++ b/kotlin-native/runtime/src/main/cpp/UtilsTest.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "Utils.hpp"
+
+#include "gtest/gtest.h"
+
+#include "CppSupport.hpp"
+
+using namespace kotlin;
+
+namespace {
+
+struct A {
+    int field;
+};
+
+class MoveOnlyImpl : private MoveOnly {
+public:
+    A a;
+};
+
+class PinnedImpl : private Pinned {
+public:
+    A a;
+};
+
+} // namespace
+
+TEST(UtilsTest, MoveOnlyImpl) {
+    static_assert(std_support::is_nothrow_default_constructible_v<MoveOnlyImpl>, "Must be nothrow default constructible");
+    static_assert(std_support::is_nothrow_destructible_v<MoveOnlyImpl>, "Must be nothrow destructible");
+    static_assert(!std_support::is_copy_constructible_v<MoveOnlyImpl>, "Must not be copy constructible");
+    static_assert(!std_support::is_copy_assignable_v<MoveOnlyImpl>, "Must not be copy assignable");
+    static_assert(std_support::is_nothrow_move_constructible_v<MoveOnlyImpl>, "Must be nothrow move constructible");
+    static_assert(std_support::is_nothrow_move_assignable_v<MoveOnlyImpl>, "Must be nothrow move assignable");
+    static_assert(sizeof(MoveOnlyImpl) == sizeof(A), "Must not increase size");
+}
+
+TEST(UtilsTest, PinnedImpl) {
+    static_assert(std_support::is_nothrow_default_constructible_v<PinnedImpl>, "Must be nothrow default constructible");
+    static_assert(std_support::is_nothrow_destructible_v<PinnedImpl>, "Must be nothrow destructible");
+    static_assert(!std_support::is_copy_constructible_v<PinnedImpl>, "Must not be copy constructible");
+    static_assert(!std_support::is_copy_assignable_v<PinnedImpl>, "Must not be copy assignable");
+    static_assert(!std_support::is_move_constructible_v<PinnedImpl>, "Must not be move constructible");
+    static_assert(!std_support::is_move_assignable_v<PinnedImpl>, "Must not be move assignable");
+    static_assert(sizeof(PinnedImpl) == sizeof(A), "Must not increase size");
+}
diff --git a/kotlin-native/runtime/src/main/cpp/Worker.cpp b/kotlin-native/runtime/src/main/cpp/Worker.cpp
index 1da5f31ee9d..2f9175f7dd0 100644
--- a/kotlin-native/runtime/src/main/cpp/Worker.cpp
+++ b/kotlin-native/runtime/src/main/cpp/Worker.cpp
@@ -31,6 +31,7 @@
 #include "Exceptions.h"
 #include "KAssert.h"
 #include "Memory.h"
+#include "ObjCMMAPI.h"
 #include "Runtime.h"
 #include "Types.h"
 #include "Worker.h"
@@ -814,10 +815,6 @@ void* workerRoutine(void* argument) {
     if (worker->processQueueElement(true) == JOB_TERMINATE) break;
   } while (true);
 
-  // Runtime deinit callback could be called when TLS is already zeroed out, so clear memory
-  // here explicitly. to make sure leak detector properly works.
-  Kotlin_zeroOutTLSGlobals();
-
   return nullptr;
 }
 
@@ -956,6 +953,9 @@ JobKind Worker::processQueueElement(bool blocking) {
       ObjHolder operationHolder, dummyHolder;
       KRef obj = DerefStablePointer(job.executeAfter.operation, operationHolder.slot());
       try {
+#if KONAN_OBJC_INTEROP
+        konan::AutoreleasePool autoreleasePool;
+#endif
         WorkerLaunchpad(obj, dummyHolder.slot());
       } catch (ExceptionObjHolder& e) {
         if (errorReporting())
@@ -969,6 +969,9 @@ JobKind Worker::processQueueElement(bool blocking) {
       KNativePtr result = nullptr;
       bool ok = true;
       try {
+#if KONAN_OBJC_INTEROP
+        konan::AutoreleasePool autoreleasePool;
+#endif
         job.regularJob.function(argument, resultHolder.slot());
         argumentHolder.clear();
         // Transfer the result.
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/Throwable.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/Throwable.kt
index 55dc6e660cb..391a1ba273a 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/Throwable.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/Throwable.kt
@@ -69,7 +69,7 @@ public open class Throwable(open val message: String?, open val cause: Throwable
                 println(this)
                 clear()
             } else {
-                appendln()
+                appendLine()
             }
         }
 
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/HashMap.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/HashMap.kt
index 22384f69b74..d9f52a67aec 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/HashMap.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/HashMap.kt
@@ -630,31 +630,54 @@ internal class HashMapValues<V> internal constructor(
     }
 }
 
-internal class HashMapEntrySet<K, V> internal constructor(
+/**
+ * Note: intermediate class with [E] `: Map.Entry<K, V>` is required to support
+ * [contains] for values that are [Map.Entry] but not [MutableMap.MutableEntry],
+ * and probably same for other functions.
+ * This is important because an instance of this class can be used as a result of [Map.entries],
+ * which should support [contains] for [Map.Entry].
+ * For example, this happens when upcasting [MutableMap] to [Map].
+ *
+ * The compiler enables special type-safe barriers to methods like [contains], which has [UnsafeVariance].
+ * Changing type from [MutableMap.MutableEntry] to [E] makes the compiler generate barriers checking that
+ * argument `is` [E] (so technically `is` [Map.Entry]) instead of `is` [MutableMap.MutableEntry].
+ *
+ * See also [KT-42248](https://youtrack.jetbrains.com/issue/KT-42428).
+ */
+internal abstract class HashMapEntrySetBase<K, V, E : Map.Entry<K, V>> internal constructor(
         val backing: HashMap<K, V>
-) : MutableSet<MutableMap.MutableEntry<K, V>>, kotlin.native.internal.KonanSet<MutableMap.MutableEntry<K, V>>, AbstractMutableSet<MutableMap.MutableEntry<K, V>>() {
+) : MutableSet<E>, kotlin.native.internal.KonanSet<E>, AbstractMutableSet<E>() {
 
     override val size: Int get() = backing.size
     override fun isEmpty(): Boolean = backing.isEmpty()
-    override fun contains(element: MutableMap.MutableEntry<K, V>): Boolean = backing.containsEntry(element)
-    override fun getElement(element: MutableMap.MutableEntry<K, V>): MutableMap.MutableEntry<K, V>? = backing.getEntry(element)
+    override fun contains(element: E): Boolean = backing.containsEntry(element)
+    override fun getElement(element: E): E? = getEntry(element)
+    protected abstract fun getEntry(element: Map.Entry<K, V>): E?
     override fun clear() = backing.clear()
-    override fun add(element: MutableMap.MutableEntry<K, V>): Boolean = throw UnsupportedOperationException()
-    override fun addAll(elements: Collection<MutableMap.MutableEntry<K, V>>): Boolean = throw UnsupportedOperationException()
-    override fun remove(element: MutableMap.MutableEntry<K, V>): Boolean = backing.removeEntry(element)
-    override fun iterator(): MutableIterator<MutableMap.MutableEntry<K, V>> = backing.entriesIterator()
-    override fun containsAll(elements: Collection<MutableMap.MutableEntry<K, V>>): Boolean = backing.containsAllEntries(elements)
+    override fun add(element: E): Boolean = throw UnsupportedOperationException()
+    override fun addAll(elements: Collection<E>): Boolean = throw UnsupportedOperationException()
+    override fun remove(element: E): Boolean = backing.removeEntry(element)
+    override fun containsAll(elements: Collection<E>): Boolean = backing.containsAllEntries(elements)
 
-    override fun removeAll(elements: Collection<MutableMap.MutableEntry<K, V>>): Boolean {
+    override fun removeAll(elements: Collection<E>): Boolean {
         backing.checkIsMutable()
         return super.removeAll(elements)
     }
 
-    override fun retainAll(elements: Collection<MutableMap.MutableEntry<K, V>>): Boolean {
+    override fun retainAll(elements: Collection<E>): Boolean {
         backing.checkIsMutable()
         return super.retainAll(elements)
     }
 }
 
+internal class HashMapEntrySet<K, V> internal constructor(
+        backing: HashMap<K, V>
+) : HashMapEntrySetBase<K, V, MutableMap.MutableEntry<K, V>>(backing) {
+
+    override fun getEntry(element: Map.Entry<K, V>): MutableMap.MutableEntry<K, V>? = backing.getEntry(element)
+
+    override fun iterator(): MutableIterator<MutableMap.MutableEntry<K, V>> = backing.entriesIterator()
+}
+
 // This hash map keeps insertion order.
 actual typealias LinkedHashMap<K, V> = HashMap<K, V>
\ No newline at end of file
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/coroutines/cancellation/CancellationException.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/coroutines/cancellation/CancellationException.kt
index 445742edda1..13e8c4215c4 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/coroutines/cancellation/CancellationException.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/coroutines/cancellation/CancellationException.kt
@@ -5,7 +5,6 @@
 
 package kotlin.coroutines.cancellation
 
-@ExperimentalStdlibApi
 @SinceKotlin("1.4")
 public actual open class CancellationException : IllegalStateException {
     actual constructor() : super()
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/native/concurrent/Lazy.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/native/concurrent/Lazy.kt
index 767d8d2f17c..e71e6ffc4b5 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/native/concurrent/Lazy.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/native/concurrent/Lazy.kt
@@ -41,8 +41,7 @@ internal class FreezeAwareLazyImpl<out T>(initializer: () -> T) : Lazy<T> {
         }
         // Set value_ to actual one.
         value_.value = result
-        @Suppress("UNCHECKED_CAST")
-        return result as T
+        return result
     }
 
     override val value: T
@@ -118,4 +117,4 @@ internal class AtomicLazyImpl<out T>(initializer: () -> T) : Lazy<T> {
  * leak memory, so it is recommended to use `atomicLazy` in cases of objects living forever,
  * such as object signletons, or in cases where it's guaranteed not to have cyclical garbage.
  */
-public fun <T> atomicLazy(initializer: () -> T): Lazy<T> = AtomicLazyImpl(initializer)
\ No newline at end of file
+public fun <T> atomicLazy(initializer: () -> T): Lazy<T> = AtomicLazyImpl(initializer)
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/native/internal/Debugging.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/native/internal/Debugging.kt
new file mode 100644
index 00000000000..638e0363df9
--- /dev/null
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/native/internal/Debugging.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+package kotlin.native.internal
+
+/*
+ * Internal utilities for debugging K/N compiler and runtime.
+ */
+public object Debugging {
+    public var forceCheckedShutdown: Boolean
+        get() = Debugging_getForceCheckedShutdown()
+        set(value) = Debugging_setForceCheckedShutdown(value)
+}
+
+@SymbolName("Kotlin_Debugging_getForceCheckedShutdown")
+private external fun Debugging_getForceCheckedShutdown(): Boolean
+
+@SymbolName("Kotlin_Debugging_setForceCheckedShutdown")
+private external fun Debugging_setForceCheckedShutdown(value: Boolean): Unit
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/native/internal/test/TestRunner.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/native/internal/test/TestRunner.kt
index 6ca30decc49..91a81e18a04 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/native/internal/test/TestRunner.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/native/internal/test/TestRunner.kt
@@ -16,6 +16,7 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
     private var logger: TestLogger = GTestLogger()
     private var runTests = true
     private var useExitCode = true
+    private var reportExcludedTestSuites = true
     var iterations = 1
         private set
     var exitCode = 0
@@ -37,6 +38,7 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
                         logger.log(help); runTests = false
                     }
                     "--ktest_no_exit_code" -> useExitCode = false
+                    "--ktest_no_excluded_test_suites" -> reportExcludedTestSuites = false
                     else -> throw IllegalArgumentException("Unknown option: $it\n$help")
                 }
                 2 -> {
@@ -217,6 +219,9 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
             |--ktest_logger=GTEST|TEAMCITY|SIMPLE|SILENT         - Use the specified output format. The default one is GTEST.
             |
             |--ktest_no_exit_code                                - Don't return a non-zero exit code if there are failing tests.
+            |
+            |--ktest_no_excluded_test_suites                     - Don't report test suites that don't match the filter.
+            |                                                      Has no effect when filter is not specified.
         """.trimMargin()
 
     private inline fun sendToListeners(event: TestListener.() -> Unit) {
@@ -252,7 +257,9 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
         val iterationTime = measureTimeMillis {
             suitesFiltered.forEach {
                 if (it.ignored) {
-                    sendToListeners { ignoreSuite(it) }
+                    if (reportExcludedTestSuites) {
+                        sendToListeners { ignoreSuite(it) }
+                    }
                 } else {
                     sendToListeners { startSuite(it) }
                     val time = measureTimeMillis { it.run() }
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Lexer.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Lexer.kt
index fe7ccd23f08..ccb088c87f3 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Lexer.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Lexer.kt
@@ -457,7 +457,7 @@ internal class Lexer(val patternString: String, flags: Int) {
             // Word/whitespace/digit.
             'w', 's', 'd', 'W', 'S', 'D' -> {
                 lookAheadSpecialToken = AbstractCharClass.getPredefinedClass(
-                        String(pattern, prevNonWhitespaceIndex, 1),
+                        pattern.concatToString(prevNonWhitespaceIndex, prevNonWhitespaceIndex + 1),
                         false
                 )
                 lookAhead = 0
@@ -724,12 +724,12 @@ internal class Lexer(val patternString: String, flags: Int) {
         val CHAR_PREVIOUS_MATCH       = 0x80000000.toInt() or 'G'.toInt()
         val CHAR_END_OF_INPUT         = 0x80000000.toInt() or 'z'.toInt()
         val CHAR_END_OF_LINE          = 0x80000000.toInt() or 'Z'.toInt()
-        
+
         // Quantifier modes.
         val QMOD_GREEDY     = 0xe0000000.toInt()
         val QMOD_RELUCTANT  = 0xc0000000.toInt()
         val QMOD_POSSESSIVE = 0x80000000.toInt()
-        
+
         // Quantifiers.
         val QUANT_STAR   = QMOD_GREEDY or '*'.toInt()
         val QUANT_STAR_P = QMOD_POSSESSIVE or '*'.toInt()
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Pattern.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Pattern.kt
index e114670218d..c1a46eb0f76 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Pattern.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Pattern.kt
@@ -794,7 +794,7 @@ internal class Pattern(val pattern: String, flags: Int = 0) {
         val isSupplCodePoint = Char.isSupplementaryCodePoint(ch)
 
         return when {
-            isSupplCodePoint -> SequenceSet(String(Char.toChars(ch), 0, 2), hasFlag(CASE_INSENSITIVE))
+            isSupplCodePoint -> SequenceSet(Char.toChars(ch).concatToString(0, 2), hasFlag(CASE_INSENSITIVE))
             ch.toChar().isLowSurrogate() ->  LowSurrogateCharSet(ch.toChar())
             ch.toChar().isHighSurrogate() -> HighSurrogateCharSet(ch.toChar())
             else -> CharSet(ch.toChar(), hasFlag(CASE_INSENSITIVE))
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/FSets.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/FSets.kt
index 701b70f65ca..f197ce213d5 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/FSets.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/FSets.kt
@@ -67,7 +67,7 @@ open internal class FSet(val groupIndex: Int) : SimpleSet() {
     }
 
     companion object {
-        var possessiveFSet = PossessiveFSet()
+        val possessiveFSet = PossessiveFSet()
     }
 }
 
@@ -156,4 +156,4 @@ internal class AtomicFSet(groupIndex: Int) : FSet(groupIndex) {
     override fun hasConsumed(matchResult: MatchResultImpl): Boolean {
         return false
     }
-}
\ No newline at end of file
+}
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/HangulDecomposedCharSet.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/HangulDecomposedCharSet.kt
index 39a6101ceb5..058d0bcaddc 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/HangulDecomposedCharSet.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/HangulDecomposedCharSet.kt
@@ -43,7 +43,7 @@ internal class HangulDecomposedCharSet(
      * String representing syllable
      */
     private val decomposedCharUTF16: String by lazy {
-        String(decomposedChar, 0, decomposedChar.size)
+        decomposedChar.concatToString(0, decomposedChar.size)
     }
 
     override val name: String
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/SupplementaryCharSet.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/SupplementaryCharSet.kt
index 089baf9d571..b6b9b9dc427 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/SupplementaryCharSet.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/SupplementaryCharSet.kt
@@ -91,7 +91,7 @@ package kotlin.text.regex
  * Represents node accepting single supplementary codepoint.
  */
 internal class SupplementaryCharSet(val codePoint: Int, ignoreCase: Boolean)
-    : SequenceSet(String(Char.toChars(codePoint), 0, 2), ignoreCase) {
+    : SequenceSet(Char.toChars(codePoint).concatToString(0, 2), ignoreCase) {
 
     override val name: String
         get() = patternString
diff --git a/kotlin-native/runtime/src/mm/cpp/GlobalData.cpp b/kotlin-native/runtime/src/mm/cpp/GlobalData.cpp
new file mode 100644
index 00000000000..73347e58e6f
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/GlobalData.cpp
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "GlobalData.hpp"
+
+using namespace kotlin;
+
+mm::GlobalData::GlobalData() = default;
+mm::GlobalData::~GlobalData() = default;
+
+// static
+mm::GlobalData mm::GlobalData::instance_;
diff --git a/kotlin-native/runtime/src/mm/cpp/GlobalData.hpp b/kotlin-native/runtime/src/mm/cpp/GlobalData.hpp
new file mode 100644
index 00000000000..a75f67ce962
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/GlobalData.hpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_MM_GLOBAL_DATA_H
+#define RUNTIME_MM_GLOBAL_DATA_H
+
+#include "ThreadRegistry.hpp"
+#include "Utils.hpp"
+
+namespace kotlin {
+namespace mm {
+
+// Global (de)initialization is undefined in C++. Use single global singleton to define it for simplicity.
+class GlobalData : private Pinned {
+public:
+    static GlobalData& Instance() noexcept { return instance_; }
+
+    ThreadRegistry& threadRegistry() { return threadRegistry_; }
+
+private:
+    GlobalData();
+    ~GlobalData();
+
+    static GlobalData instance_;
+
+    ThreadRegistry threadRegistry_;
+};
+
+} // namespace mm
+} // namespace kotlin
+
+#endif // RUNTIME_MM_GLOBAL_DATA_H
diff --git a/kotlin-native/runtime/src/mm/cpp/Memory.cpp b/kotlin-native/runtime/src/mm/cpp/Memory.cpp
new file mode 100644
index 00000000000..dd192ee8404
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/Memory.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "Memory.h"
+
+#include "ThreadData.hpp"
+#include "ThreadRegistry.hpp"
+#include "Utils.hpp"
+
+using namespace kotlin;
+
+// Delete all means of creating this type directly as it only serves
+// as a typedef for `mm::ThreadRegistry::Node`.
+extern "C" struct MemoryState : Pinned {
+    MemoryState() = delete;
+    ~MemoryState() = delete;
+};
+
+namespace {
+
+// `reinterpret_cast` to it and back to the same type
+// will yield precisely the same pointer, so it's safe.
+ALWAYS_INLINE MemoryState* ToMemoryState(mm::ThreadRegistry::Node* data) {
+    return reinterpret_cast<MemoryState*>(data);
+}
+
+ALWAYS_INLINE mm::ThreadRegistry::Node* FromMemoryState(MemoryState* state) {
+    return reinterpret_cast<mm::ThreadRegistry::Node*>(state);
+}
+
+} // namespace
+
+extern "C" MemoryState* InitMemory(bool firstRuntime) {
+    return ToMemoryState(mm::ThreadRegistry::Instance().RegisterCurrentThread());
+}
+
+extern "C" void DeinitMemory(MemoryState* state, bool destroyRuntime) {
+    mm::ThreadRegistry::Instance().Unregister(FromMemoryState(state));
+}
diff --git a/kotlin-native/runtime/src/mm/cpp/Stubs.cpp b/kotlin-native/runtime/src/mm/cpp/Stubs.cpp
index 9f13af5ede2..57bd6ab0bed 100644
--- a/kotlin-native/runtime/src/mm/cpp/Stubs.cpp
+++ b/kotlin-native/runtime/src/mm/cpp/Stubs.cpp
@@ -47,16 +47,8 @@ static void destroyMetaObject(TypeInfo** location) {
 
 extern "C" {
 
-MemoryState* InitMemory() {
-    RuntimeCheck(false, "Unimplemented");
-}
-
-void DeinitMemory(MemoryState*) {
-    RuntimeCheck(false, "Unimplemented");
-}
-
-void RestoreMemory(MemoryState* memoryState) {
-    RuntimeCheck(false, "Unimplemented");
+void RestoreMemory(MemoryState*) {
+    // TODO: Remove this function when legacy MM is gone.
 }
 
 RUNTIME_NOTHROW OBJ_GETTER(AllocInstance, const TypeInfo* type_info) {
@@ -198,7 +190,7 @@ bool Kotlin_Any_isShareable(ObjHeader* thiz) {
     RuntimeCheck(false, "Unimplemented");
 }
 
-RUNTIME_NOTHROW void PerformFullGC() {
+RUNTIME_NOTHROW void PerformFullGC(MemoryState* memory) {
     RuntimeCheck(false, "Unimplemented");
 }
 
@@ -234,4 +226,8 @@ void AdoptReferenceFromSharedVariable(ObjHeader* object) {
     RuntimeCheck(false, "Unimplemented");
 }
 
+void CheckGlobalsAccessible() {
+    // Globals are always accessible.
+}
+
 } // extern "C"
diff --git a/kotlin-native/runtime/src/mm/cpp/ThreadData.hpp b/kotlin-native/runtime/src/mm/cpp/ThreadData.hpp
new file mode 100644
index 00000000000..3dac2cbd733
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ThreadData.hpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_MM_THREAD_DATA_H
+#define RUNTIME_MM_THREAD_DATA_H
+
+#include <pthread.h>
+
+#include "Utils.hpp"
+
+namespace kotlin {
+namespace mm {
+
+// `ThreadData` is supposed to be thread local singleton.
+// Pin it in memory to prevent accidental copying.
+class ThreadData final : private Pinned {
+public:
+    ThreadData(pthread_t threadId) noexcept : threadId_(threadId) {}
+
+    ~ThreadData() = default;
+
+    pthread_t threadId() const noexcept { return threadId_; }
+
+private:
+    const pthread_t threadId_;
+};
+
+} // namespace mm
+} // namespace kotlin
+
+#endif // RUNTIME_MM_THREAD_DATA_H
diff --git a/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.cpp b/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.cpp
new file mode 100644
index 00000000000..f0fe50a8aa5
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "ThreadRegistry.hpp"
+
+#include "GlobalData.hpp"
+#include "ThreadData.hpp"
+
+using namespace kotlin;
+
+// static
+mm::ThreadRegistry& mm::ThreadRegistry::Instance() noexcept {
+    return mm::GlobalData::Instance().threadRegistry();
+}
+
+mm::ThreadRegistry::Node* mm::ThreadRegistry::RegisterCurrentThread() noexcept {
+    auto* threadDataNode = list_.Emplace(pthread_self());
+    ThreadData*& currentData = currentThreadData_;
+    RuntimeAssert(currentData == nullptr, "This thread already had some data assigned to it.");
+    currentData = threadDataNode->Get();
+    return threadDataNode;
+}
+
+void mm::ThreadRegistry::Unregister(Node* threadDataNode) noexcept {
+    list_.Erase(threadDataNode);
+    // Do not touch `currentThreadData_` as TLS may already have been deallocated.
+}
+
+mm::ThreadRegistry::Iterable mm::ThreadRegistry::Iter() noexcept {
+    return list_.Iter();
+}
+
+mm::ThreadRegistry::ThreadRegistry() = default;
+mm::ThreadRegistry::~ThreadRegistry() = default;
+
+// static
+thread_local mm::ThreadData* mm::ThreadRegistry::currentThreadData_ = nullptr;
diff --git a/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.hpp b/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.hpp
new file mode 100644
index 00000000000..58b494b9ced
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.hpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_MM_THREAD_REGISTRY_H
+#define RUNTIME_MM_THREAD_REGISTRY_H
+
+#include <pthread.h>
+
+#include "SingleLockList.hpp"
+#include "Utils.hpp"
+
+namespace kotlin {
+namespace mm {
+
+class ThreadData;
+
+class ThreadRegistry final : private Pinned {
+public:
+    using Node = SingleLockList<ThreadData>::Node;
+    using Iterable = SingleLockList<ThreadData>::Iterable;
+
+    static ThreadRegistry& Instance() noexcept;
+
+    Node* RegisterCurrentThread() noexcept;
+
+    // `ThreadData` associated with `threadDataNode` cannot be used after this call.
+    void Unregister(Node* threadDataNode) noexcept;
+
+    // Locks `ThreadRegistry` for safe iteration.
+    Iterable Iter() noexcept;
+
+    // Try not to use it very often, as (1) thread local access can be slow on some platforms,
+    // (2) TLS gets deallocated before our thread destruction hooks run.
+    // Using this after `Unregister` for the thread has been called is undefined behaviour.
+    ThreadData* CurrentThreadData() const noexcept { return currentThreadData_; }
+
+private:
+    friend class GlobalData;
+
+    ThreadRegistry();
+    ~ThreadRegistry();
+
+    static thread_local ThreadData* currentThreadData_;
+
+    SingleLockList<ThreadData> list_;
+};
+
+} // namespace mm
+} // namespace kotlin
+
+#endif // RUNTIME_MM_THREAD_REGISTRY_H
diff --git a/kotlin-native/runtime/src/mm/cpp/ThreadRegistryTest.cpp b/kotlin-native/runtime/src/mm/cpp/ThreadRegistryTest.cpp
new file mode 100644
index 00000000000..11fd9b033eb
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ThreadRegistryTest.cpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "ThreadRegistry.hpp"
+
+#include <pthread.h>
+#include <thread>
+
+#include "gtest/gtest.h"
+
+#include "ThreadData.hpp"
+
+using namespace kotlin;
+
+TEST(ThreadRegistryTest, RegisterCurrentThread) {
+    std::thread t([]() {
+        auto* node = mm::ThreadRegistry::Instance().RegisterCurrentThread();
+        auto* threadData = node->Get();
+        EXPECT_EQ(pthread_self(), threadData->threadId());
+        EXPECT_EQ(threadData, mm::ThreadRegistry::Instance().CurrentThreadData());
+    });
+    t.join();
+}
diff --git a/kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm b/kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm
index bbe2641770a..911008d2596 100644
--- a/kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm
+++ b/kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm
@@ -22,7 +22,7 @@
 #import "ObjCExportInit.h"
 #import "ObjCExportPrivate.h"
 #import "Runtime.h"
-#import "Utils.h"
+#import "Mutex.hpp"
 #import "Exceptions.h"
 
 extern "C" id objc_retainAutoreleaseReturnValue(id self);
diff --git a/kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm b/kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm
index e721dab6991..4ca3850029a 100644
--- a/kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm
+++ b/kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm
@@ -23,7 +23,7 @@
 
 #import "ObjCExport.h"
 #import "Runtime.h"
-#import "Utils.h"
+#import "Mutex.hpp"
 
 extern "C" {
 
diff --git a/kotlin-native/runtime/src/relaxed/cpp/MemoryImpl.cpp b/kotlin-native/runtime/src/relaxed/cpp/MemoryImpl.cpp
index 09993333d4e..c0b0b074faf 100644
--- a/kotlin-native/runtime/src/relaxed/cpp/MemoryImpl.cpp
+++ b/kotlin-native/runtime/src/relaxed/cpp/MemoryImpl.cpp
@@ -29,43 +29,43 @@ OBJ_GETTER(InitSharedInstance,
   RETURN_RESULT_OF(InitSharedInstanceRelaxed, location, typeInfo, ctor);
 }
 
-void ReleaseHeapRef(const ObjHeader* object) {
+RUNTIME_NOTHROW void ReleaseHeapRef(const ObjHeader* object) {
   ReleaseHeapRefRelaxed(object);
 }
 
-void ReleaseHeapRefNoCollect(const ObjHeader* object) {
+RUNTIME_NOTHROW void ReleaseHeapRefNoCollect(const ObjHeader* object) {
   ReleaseHeapRefNoCollectRelaxed(object);
 }
 
-void ZeroStackRef(ObjHeader** location) {
+RUNTIME_NOTHROW void ZeroStackRef(ObjHeader** location) {
   ZeroStackRefRelaxed(location);
 }
 
-void SetStackRef(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void SetStackRef(ObjHeader** location, const ObjHeader* object) {
   SetStackRefRelaxed(location, object);
 }
 
-void SetHeapRef(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void SetHeapRef(ObjHeader** location, const ObjHeader* object) {
   SetHeapRefRelaxed(location, object);
 }
 
-void UpdateHeapRef(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateHeapRef(ObjHeader** location, const ObjHeader* object) {
   UpdateHeapRefRelaxed(location, object);
 }
 
-void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) {
   UpdateReturnRefRelaxed(returnSlot, object);
 }
 
-void EnterFrame(ObjHeader** start, int parameters, int count) {
+RUNTIME_NOTHROW void EnterFrame(ObjHeader** start, int parameters, int count) {
   EnterFrameRelaxed(start, parameters, count);
 }
 
-void LeaveFrame(ObjHeader** start, int parameters, int count) {
+RUNTIME_NOTHROW void LeaveFrame(ObjHeader** start, int parameters, int count) {
   LeaveFrameRelaxed(start, parameters, count);
 }
 
-void UpdateStackRef(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateStackRef(ObjHeader** location, const ObjHeader* object) {
     UpdateStackRefRelaxed(location, object);
 }
 
diff --git a/kotlin-native/runtime/src/strict/cpp/MemoryImpl.cpp b/kotlin-native/runtime/src/strict/cpp/MemoryImpl.cpp
index ce7af356dc1..0b46ae9c20e 100644
--- a/kotlin-native/runtime/src/strict/cpp/MemoryImpl.cpp
+++ b/kotlin-native/runtime/src/strict/cpp/MemoryImpl.cpp
@@ -29,43 +29,43 @@ OBJ_GETTER(InitSharedInstance,
   RETURN_RESULT_OF(InitSharedInstanceStrict, location, typeInfo, ctor);
 }
 
-void ReleaseHeapRef(const ObjHeader* object) {
+RUNTIME_NOTHROW void ReleaseHeapRef(const ObjHeader* object) {
   ReleaseHeapRefStrict(object);
 }
 
-void ReleaseHeapRefNoCollect(const ObjHeader* object) {
+RUNTIME_NOTHROW void ReleaseHeapRefNoCollect(const ObjHeader* object) {
   ReleaseHeapRefNoCollectStrict(object);
 }
 
-void SetStackRef(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void SetStackRef(ObjHeader** location, const ObjHeader* object) {
   SetStackRefStrict(location, object);
 }
 
-void SetHeapRef(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void SetHeapRef(ObjHeader** location, const ObjHeader* object) {
   SetHeapRefStrict(location, object);
 }
 
-void ZeroStackRef(ObjHeader** location) {
+RUNTIME_NOTHROW void ZeroStackRef(ObjHeader** location) {
   ZeroStackRefStrict(location);
 }
 
-void UpdateHeapRef(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateHeapRef(ObjHeader** location, const ObjHeader* object) {
   UpdateHeapRefStrict(location, object);
 }
 
-void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) {
   UpdateReturnRefStrict(returnSlot, object);
 }
 
-void EnterFrame(ObjHeader** start, int parameters, int count) {
+RUNTIME_NOTHROW void EnterFrame(ObjHeader** start, int parameters, int count) {
   EnterFrameStrict(start, parameters, count);
 }
 
-void LeaveFrame(ObjHeader** start, int parameters, int count) {
+RUNTIME_NOTHROW void LeaveFrame(ObjHeader** start, int parameters, int count) {
   LeaveFrameStrict(start, parameters, count);
 }
 
-void UpdateStackRef(ObjHeader** location, const ObjHeader* object) {
+RUNTIME_NOTHROW void UpdateStackRef(ObjHeader** location, const ObjHeader* object) {
     UpdateStackRefStrict(location, object);
 }
 
diff --git a/kotlin-native/samples/androidNativeActivity/gradle/wrapper/gradle-wrapper.properties b/kotlin-native/samples/androidNativeActivity/gradle/wrapper/gradle-wrapper.properties
index 12d38de6a48..be52383ef49 100644
--- a/kotlin-native/samples/androidNativeActivity/gradle/wrapper/gradle-wrapper.properties
+++ b/kotlin-native/samples/androidNativeActivity/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin-native/samples/calculator/gradle/wrapper/gradle-wrapper.properties b/kotlin-native/samples/calculator/gradle/wrapper/gradle-wrapper.properties
index 12d38de6a48..be52383ef49 100644
--- a/kotlin-native/samples/calculator/gradle/wrapper/gradle-wrapper.properties
+++ b/kotlin-native/samples/calculator/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin-native/samples/cocoapods/kotlin-library/gradle/wrapper/gradle-wrapper.properties b/kotlin-native/samples/cocoapods/kotlin-library/gradle/wrapper/gradle-wrapper.properties
index 12d38de6a48..be52383ef49 100644
--- a/kotlin-native/samples/cocoapods/kotlin-library/gradle/wrapper/gradle-wrapper.properties
+++ b/kotlin-native/samples/cocoapods/kotlin-library/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin-native/samples/gradle/wrapper/gradle-wrapper.properties b/kotlin-native/samples/gradle/wrapper/gradle-wrapper.properties
index 12d38de6a48..be52383ef49 100644
--- a/kotlin-native/samples/gradle/wrapper/gradle-wrapper.properties
+++ b/kotlin-native/samples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin-native/samples/tensorflow/src/tensorflowMain/kotlin/HelloTensorflow.kt b/kotlin-native/samples/tensorflow/src/tensorflowMain/kotlin/HelloTensorflow.kt
index 04adda9bc89..ec65851f152 100644
--- a/kotlin-native/samples/tensorflow/src/tensorflowMain/kotlin/HelloTensorflow.kt
+++ b/kotlin-native/samples/tensorflow/src/tensorflowMain/kotlin/HelloTensorflow.kt
@@ -37,11 +37,15 @@ fun scalarTensor(value: Int): Tensor {
     val data = nativeHeap.allocArray<IntVar>(1)
     data[0] = value
 
-    return TF_NewTensor(TF_INT32,
-            dims = null, num_dims = 0,
-            data = data, len = IntVar.size.convert(),
-            deallocator = staticCFunction { dataToFree, _, _ -> nativeHeap.free(dataToFree!!.reinterpret<IntVar>()) },
-            deallocator_arg = null)!!
+    return TF_NewTensor(
+            TF_INT32,
+            /* dims = */ null,
+            /* num_dims = */ 0,
+            /* data = */ data,
+            /* len = */ IntVar.size.convert(),
+            /* deallocator = */ staticCFunction { dataToFree, _, _ -> nativeHeap.free(dataToFree!!.reinterpret<IntVar>()) },
+            /* deallocator_arg = */ null
+    )!!
 }
 
 val Tensor.scalarIntValue: Int get() {
diff --git a/kotlin-native/settings.gradle b/kotlin-native/settings.gradle
index adcc72637d6..607d407711a 100644
--- a/kotlin-native/settings.gradle
+++ b/kotlin-native/settings.gradle
@@ -33,23 +33,6 @@ include ':utilities:basic-utils'
 include ':utilities:cli-runner'
 include ':dependencyPacker'
 
-include ':performance'
-include ':performance:ring'
-include ':performance:cinterop'
-include ':performance:helloworld'
-include ':performance:numerical'
-include ':performance:videoplayer'
-include ':performance:framework'
-include ':performance:startup'
-if (System.getProperty("os.name") == "Mac OS X") {
-    include ':performance:objcinterop'
-    include ':performance:swiftinterop'
-    if (hasProperty("runExcludedBenchmarks")) {
-        include ':performance:KotlinVsSwift'
-        include ':performance:KotlinVsSwift:ring'
-    }
-}
-
 include ':platformLibs'
 include ':endorsedLibraries'
 include ':endorsedLibraries:kotlinx.cli'
diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
index da61e9703b2..5acc8ef73aa 100644
--- a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
+++ b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
@@ -11,31 +11,27 @@ import org.jetbrains.kotlin.library.impl.createKotlinLibrary
 import org.jetbrains.kotlin.util.DummyLogger
 import org.jetbrains.kotlin.util.Logger
 
-interface SearchPathResolverWithTarget<L: KotlinLibrary>: SearchPathResolverWithAttributes<L> {
+interface SearchPathResolverWithTarget<L: KotlinLibrary>: SearchPathResolver<L> {
     val target: KonanTarget
 }
 
 fun defaultResolver(
         repositories: List<String>,
         target: KonanTarget,
-        distribution: Distribution,
-        compatibleCompilerVersions: List<CompilerVersion> = emptyList()
-): SearchPathResolverWithTarget<KonanLibrary> = defaultResolver(repositories, emptyList(), target, distribution, compatibleCompilerVersions)
+        distribution: Distribution
+): SearchPathResolverWithTarget<KonanLibrary> = defaultResolver(repositories, emptyList(), target, distribution)
 
 fun defaultResolver(
     repositories: List<String>,
     directLibs: List<String>,
     target: KonanTarget,
     distribution: Distribution,
-    compatibleCompilerVersions: List<CompilerVersion> = emptyList(),
     logger: Logger = DummyLogger,
     skipCurrentDir: Boolean = false
 ): SearchPathResolverWithTarget<KonanLibrary> = KonanLibraryProperResolver(
         repositories,
         directLibs,
         target,
-        listOf(KotlinAbiVersion.CURRENT),
-        compatibleCompilerVersions,
         distribution.klib,
         distribution.localKonanDir.absolutePath,
         skipCurrentDir,
@@ -65,16 +61,12 @@ internal class KonanLibraryProperResolver(
     repositories: List<String>,
     directLibs: List<String>,
     override val target: KonanTarget,
-    knownAbiVersions: List<KotlinAbiVersion>?,
-    knownCompilerVersions: List<CompilerVersion>?,
     distributionKlib: String?,
     localKonanDir: String?,
     skipCurrentDir: Boolean,
     override val logger: Logger
 ) : KotlinLibraryProperResolverWithAttributes<KonanLibrary>(
     repositories, directLibs,
-    knownAbiVersions,
-    knownCompilerVersions,
     distributionKlib,
     localKonanDir,
     skipCurrentDir,
diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt
index 87b74b05d20..be0b9207369 100644
--- a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt
+++ b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt
@@ -42,9 +42,7 @@ open class TargetedLibraryImpl(
         }
 
     override val manifestProperties: Properties by lazy {
-        val properties = access.inPlace {
-            it.manifestFile.loadProperties()
-        }
+        val properties = base.manifestProperties
         target?.let { substitute(properties, defaultTargetSubstitutions(it)) }
         properties
     }
diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt
index 47ae615b5b7..f2db585c3bf 100644
--- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt
+++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.konan.KonanExternalToolFailure
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.lang.ProcessBuilder.Redirect
+import java.nio.file.Files
 
 
 open class Command(initialCommand: List<String>) {
@@ -83,7 +84,7 @@ open class Command(initialCommand: List<String>) {
     fun getResult(withErrors: Boolean, handleError: Boolean = false): Result {
         log()
 
-        val outputFile = createTempFile()
+        val outputFile = Files.createTempFile(null, null).toFile()
         outputFile.deleteOnExit()
 
         try {
diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
index 0628d57271b..9216ffcda4e 100644
--- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
@@ -104,7 +104,8 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
                 KonanTarget.WATCHOS_X86 ->
                     listOf("-stdlib=libc++", "-arch", "i386", "-isysroot", absoluteTargetSysRoot, "-mwatchos-simulator-version-min=$osVersionMin")
 
-                KonanTarget.WATCHOS_X64 -> TODO("implement me")
+                KonanTarget.WATCHOS_X64 ->
+                    listOf("-stdlib=libc++", "-isysroot", absoluteTargetSysRoot, "-mwatchos-simulator-version-min=$osVersionMin")
 
                 KonanTarget.ANDROID_ARM32, KonanTarget.ANDROID_ARM64,
                 KonanTarget.ANDROID_X86, KonanTarget.ANDROID_X64 -> {
diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
index b9165e57345..1aea7b129bb 100644
--- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
+++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
@@ -53,6 +53,10 @@ interface Configurables : TargetableExternalStorage {
     val absoluteTargetToolchain get() = absolute(targetToolchain)
     val absoluteLlvmHome get() = absolute(llvmHome)
 
+    val targetCpu get() = targetString("targetCpu")
+    val targetCpuFeatures get() = targetString("targetCpuFeatures")
+    val llvmInlineThreshold get() = targetString("llvmInlineThreshold")
+
     val runtimeDefinitions get() = targetList("runtimeDefinitions")
 }
 
@@ -77,6 +81,7 @@ interface GccConfigurables : TargetableConfigurables, ClangFlags {
     val libGcc get() = targetString("libGcc")!!
     val dynamicLinker get() = targetString("dynamicLinker")!!
     val abiSpecificLibraries get() = targetList("abiSpecificLibraries")
+    val linkerGccFlags get() = targetList("linkerGccFlags")
 }
 
 interface AndroidConfigurables : TargetableConfigurables, ClangFlags
@@ -85,6 +90,5 @@ interface WasmConfigurables : TargetableConfigurables, ClangFlags, LldFlags
 
 interface ZephyrConfigurables : TargetableConfigurables, ClangFlags {
     val boardSpecificClangFlags get() = targetList("boardSpecificClangFlags")
-    val targetCpu get() = targetString("targetCpu")
     val targetAbi get() = targetString("targetAbi")
 }
\ No newline at end of file
diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
index ebf18a94095..b95dc2db6cc 100644
--- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
@@ -369,8 +369,7 @@ class GccBasedLinker(targetProperties: GccConfigurables)
             // https://github.com/llvm/llvm-project/blob/21e270a479a24738d641e641115bce6af6ed360a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp#L930
             if (needsProfileLibrary) +listOf("-u__llvm_profile_runtime", profileLibrary!!)
             +linkerKonanFlags
-            +listOf("-lgcc", "--as-needed", "-lgcc_s", "--no-as-needed",
-                    "-lc", "-lgcc", "--as-needed", "-lgcc_s", "--no-as-needed")
+            +linkerGccFlags
             +if (dynamic) "$libGcc/crtendS.o" else "$libGcc/crtend.o"
             +"$absoluteTargetSysRoot/$crtPrefix/crtn.o"
             +libraries
diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt
index 18bff4655bb..6d790f607e7 100644
--- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt
+++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt
@@ -34,7 +34,7 @@ class PlatformManager(private val distribution: Distribution, experimental: Bool
 
     constructor(konanHome: String, experimental: Boolean = false): this(Distribution(konanHome), experimental)
 
-    private val loaders = filteredOutEnabledButNotSupported.map {
+    private val loaders = enabled.map {
         it to loadConfigurables(it, distribution.properties, DependencyProcessor.defaultDependenciesRoot.absolutePath)
     }.toMap()
 
@@ -46,11 +46,5 @@ class PlatformManager(private val distribution: Distribution, experimental: Bool
     val hostPlatform = platforms.getValue(host)
 
     fun loader(target: KonanTarget) = loaders.getValue(target)
-
-    /**
-     * TODO: Don't forget to delete this field and replace all its usages to `enabled`.
-     */
-    val filteredOutEnabledButNotSupported
-        get() = enabled.filterNot { it == KonanTarget.WATCHOS_X64 }
 }
 
diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
index b26a217fd81..64fcbef9392 100644
--- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
+++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.konan.target.Family
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.konan.util.DependencyProcessor
+import java.nio.file.Files
 
 internal interface KonanToolRunner: Named {
     val mainClass: String
@@ -135,16 +136,12 @@ internal class KonanCompilerRunner(
             return args
         }
 
-        val argFile = createTempFile(prefix = "konancArgs", suffix = ".lst").apply {
-            deleteOnExit()
-        }
-        argFile.printWriter().use { writer ->
-            args.forEach {
-                writer.println(it)
-            }
+        val argFile = Files.createTempFile("konancArgs", ".lst").toAbsolutePath().apply {
+            toFile().deleteOnExit()
         }
+        Files.write(argFile, args)
 
-        return listOf("@${argFile.absolutePath}")
+        return listOf("@${argFile}")
     }
 }
 
diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/PathSpecification.groovy b/kotlin-native/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/PathSpecification.groovy
index 19b576aa078..901525e68d4 100644
--- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/PathSpecification.groovy
+++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/PathSpecification.groovy
@@ -32,7 +32,7 @@ class PathSpecification extends BaseKonanSpecification {
         expect:
         def project = KonanProject.createEmpty(
                 projectDirectory,
-                platformManager.filteredOutEnabledButNotSupported.collect { t -> t.visibleName }
+                platformManager.enabled.collect { t -> t.visibleName }
         ) { KonanProject it ->
             it.generateSrcFile("main.kt")
             it.generateDefFile("interop.def", "")
diff --git a/kotlin-native/utilities/basic-utils/src/main/kotlin/NativeMemoryAllocator.kt b/kotlin-native/utilities/basic-utils/src/main/kotlin/NativeMemoryAllocator.kt
new file mode 100644
index 00000000000..2b9821ccc7f
--- /dev/null
+++ b/kotlin-native/utilities/basic-utils/src/main/kotlin/NativeMemoryAllocator.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+package org.jetbrains.kotlin.konan.util
+
+import sun.misc.Unsafe
+
+private val allocatorHolder = ThreadLocal<NativeMemoryAllocator>()
+val nativeMemoryAllocator: NativeMemoryAllocator
+    get() = allocatorHolder.get() ?: NativeMemoryAllocator().also { allocatorHolder.set(it) }
+
+fun disposeNativeMemoryAllocator() {
+    allocatorHolder.get()?.freeAll()
+    allocatorHolder.remove()
+}
+
+// 256 buckets for sizes <= 2048 padded to 8
+// 256 buckets for sizes <= 64KB padded to 256
+// 256 buckets for sizes <= 1MB padded to 4096
+private const val ChunkBucketSize = 256
+// Alignments are such that overhead is approx 10%.
+private const val SmallChunksSizeAlignment = 8
+private const val MediumChunksSizeAlignment = 256
+private const val BigChunksSizeAlignment = 4096
+private const val MaxSmallSize = ChunkBucketSize * SmallChunksSizeAlignment
+private const val MaxMediumSize = ChunkBucketSize * MediumChunksSizeAlignment
+private const val MaxBigSize = ChunkBucketSize * BigChunksSizeAlignment
+private const val ChunkHeaderSize = 2 * Int.SIZE_BYTES // chunk size + alignment hop size.
+
+private const val RawChunkSize: Long = 4 * 1024 * 1024
+
+class NativeMemoryAllocator {
+    private fun alignUp(x: Long, align: Int) = (x + align - 1) and (align - 1).toLong().inv()
+    private fun alignUp(x: Int, align: Int) = (x + align - 1) and (align - 1).inv()
+
+    private val smallChunks = LongArray(ChunkBucketSize)
+    private val mediumChunks = LongArray(ChunkBucketSize)
+    private val bigChunks = LongArray(ChunkBucketSize)
+
+    // Chunk layout: [chunk size,...padding...,diff to start,aligned data start,.....data.....]
+    fun alloc(size: Long, align: Int): Long {
+        val totalChunkSize = ChunkHeaderSize + size + align
+        val ptr = ChunkHeaderSize + when {
+            totalChunkSize <= MaxSmallSize -> allocFromFreeList(totalChunkSize.toInt(), SmallChunksSizeAlignment, smallChunks)
+            totalChunkSize <= MaxMediumSize -> allocFromFreeList(totalChunkSize.toInt(), MediumChunksSizeAlignment, mediumChunks)
+            totalChunkSize <= MaxBigSize -> allocFromFreeList(totalChunkSize.toInt(), BigChunksSizeAlignment, bigChunks)
+            else -> unsafe.allocateMemory(totalChunkSize).also {
+                // The actual size is not used. Just put value bigger than the biggest threshold.
+                unsafe.putInt(it, Int.MAX_VALUE)
+            }
+        }
+        val alignedPtr = alignUp(ptr, align)
+        unsafe.putInt(alignedPtr - Int.SIZE_BYTES, (alignedPtr - ptr).toInt())
+        return alignedPtr
+    }
+
+    private fun allocFromFreeList(size: Int, align: Int, freeList: LongArray): Long {
+        val paddedSize = alignUp(size, align)
+        val index = paddedSize / align - 1
+        val chunk = freeList[index]
+        val ptr = if (chunk == 0L)
+            allocRaw(paddedSize)
+        else {
+            val nextChunk = unsafe.getLong(chunk)
+            freeList[index] = nextChunk
+            chunk
+        }
+        unsafe.putInt(ptr, paddedSize)
+        return ptr
+    }
+
+    private fun freeToFreeList(paddedSize: Int, align: Int, freeList: LongArray, chunk: Long) {
+        require(paddedSize > 0 && paddedSize % align == 0)
+        val index = paddedSize / align - 1
+        unsafe.putLong(chunk, freeList[index])
+        freeList[index] = chunk
+    }
+
+    private val rawChunks = mutableListOf<Long>()
+    private var rawOffset = 0
+
+    private fun allocRaw(size: Int): Long {
+        if (rawChunks.isEmpty() || rawOffset + size > RawChunkSize) {
+            val newRawChunk = unsafe.allocateMemory(RawChunkSize)
+            rawChunks.add(newRawChunk)
+            rawOffset = size
+            return newRawChunk
+        }
+        return (rawChunks.last() + rawOffset).also { rawOffset += size }
+    }
+
+    fun free(mem: Long) {
+        val chunkStart = mem - ChunkHeaderSize - unsafe.getInt(mem - Int.SIZE_BYTES)
+        val chunkSize = unsafe.getInt(chunkStart)
+        when {
+            chunkSize <= MaxSmallSize -> freeToFreeList(chunkSize, SmallChunksSizeAlignment, smallChunks, chunkStart)
+            chunkSize <= MaxMediumSize -> freeToFreeList(chunkSize, MediumChunksSizeAlignment, mediumChunks, chunkStart)
+            chunkSize <= MaxBigSize -> freeToFreeList(chunkSize, BigChunksSizeAlignment, bigChunks, chunkStart)
+            else -> unsafe.freeMemory(chunkStart)
+        }
+    }
+
+    fun freeAll() {
+        for (i in 0 until ChunkBucketSize) {
+            smallChunks[i] = 0L
+            mediumChunks[i] = 0L
+            bigChunks[i] = 0L
+        }
+        for (chunk in rawChunks)
+            unsafe.freeMemory(chunk)
+        rawChunks.clear()
+    }
+
+    private val unsafe = with(Unsafe::class.java.getDeclaredField("theUnsafe")) {
+        isAccessible = true
+        return@with this.get(null) as Unsafe
+    }
+}
\ No newline at end of file
diff --git a/kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt b/kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt
index 47220bbabe0..e86c72d9c7b 100644
--- a/kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt
+++ b/kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt
@@ -25,6 +25,8 @@ import org.jetbrains.kotlin.native.interop.tool.CommonInteropArguments.Companion
 import org.jetbrains.kotlin.native.interop.tool.SHORT_MODULE_NAME
 import java.io.PrintWriter
 import java.io.StringWriter
+import java.nio.file.Files
+import java.nio.file.Paths
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.system.exitProcess
 import java.io.File as JFile
@@ -175,11 +177,11 @@ private class DefFile(val name: String, val depends: MutableList<DefFile>) {
 }
 
 private fun createTempDir(prefix: String, parent: File): File =
-        File(createTempDir(prefix, directory = JFile(parent.absolutePath)).absolutePath)
+        File(Files.createTempDirectory(Paths.get(parent.absolutePath), prefix).toString())
 
 private fun File.deleteAtomicallyIfPossible(tmpDirectory: File) {
     // Try to atomically delete the old directory.
-    val tmpToDelete = createTempFile(directory = JFile(tmpDirectory.absolutePath))
+    val tmpToDelete = Files.createTempFile(Paths.get(tmpDirectory.absolutePath), null, null).toFile()
     if (renameAtomic(this.absolutePath, tmpToDelete.absolutePath, replaceExisting = true)) {
         tmpToDelete.deleteRecursively()
     } else {
diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index d62878cac3e..23357b2fe3c 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -198,7 +198,7 @@ ext.configureLegacyPublishing = { Project project ->
 ext.configureJvmIrBackend = { Project project ->
     project.tasks.withType(KotlinCompile.class) { task ->
         task.kotlinOptions {
-            if (CommonUtilKt.getBooleanProperty(project, "kotlin.build.useIRForLibraries")) {
+            if (project.kotlinBuildProperties.useIRForLibraries) {
                 useIR = true
                 freeCompilerArgs += ["-Xir-binary-with-stable-abi"]
             } else {
diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle
index c8203486d59..30c5736ef14 100644
--- a/libraries/kotlin.test/junit/build.gradle
+++ b/libraries/kotlin.test/junit/build.gradle
@@ -31,7 +31,8 @@ configureSourcesJar()
 configureJavadocJar()
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle
index 1c96aff858b..51526ca91e4 100644
--- a/libraries/kotlin.test/junit5/build.gradle
+++ b/libraries/kotlin.test/junit5/build.gradle
@@ -41,7 +41,8 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
 }
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index a0c3f31a358..651c29bb822 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -45,8 +45,8 @@ configureJavadocJar()
 
 compileKotlin {
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable",
-                                      "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-                                      "-module-name", project.archivesBaseName, ]
+                                      "-Xopt-in=kotlin.contracts.ExperimentalContracts"]
+    kotlinOptions.moduleName = project.archivesBaseName
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle
index 68a5a3e371c..968b937bef9 100644
--- a/libraries/kotlin.test/testng/build.gradle
+++ b/libraries/kotlin.test/testng/build.gradle
@@ -34,7 +34,8 @@ configureSourcesJar()
 configureJavadocJar()
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writers.kt b/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writers.kt
index bddb1c83ed1..a7616e55a69 100644
--- a/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writers.kt
+++ b/libraries/kotlinx-metadata/src/kotlinx/metadata/impl/writers.kt
@@ -215,8 +215,8 @@ fun writeProperty(
             t.flags = flags
         }
         // TODO: do not write getterFlags/setterFlags if not needed
-        t.getterFlags = getterFlags
-        t.setterFlags = setterFlags
+        if (Flag.Property.HAS_GETTER(flags)) t.getterFlags = getterFlags
+        if (Flag.Property.HAS_SETTER(flags)) t.setterFlags = setterFlags
         output(t)
     }
 }
diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle
index 389ec0c47fb..c9526386db7 100644
--- a/libraries/reflect/api/build.gradle
+++ b/libraries/reflect/api/build.gradle
@@ -47,8 +47,8 @@ compileKotlin {
                             "-Xnormalize-constructor-calls=enable",
                             "-Xno-optimized-callable-references",
                             "-Xno-kotlin-nothing-value-exception",
-                            "-Xopt-in=kotlin.RequiresOptIn",
-                            "-module-name", "kotlin-reflection"]
+                            "-Xopt-in=kotlin.RequiresOptIn"]
+        moduleName = "kotlin-reflection"
     }
 }
 
diff --git a/libraries/scripting/dependencies/test/kotlin/script/experimental/test/ResolversTest.kt b/libraries/scripting/dependencies/test/kotlin/script/experimental/test/ResolversTest.kt
index 697625dd4cc..c45ba215eb1 100644
--- a/libraries/scripting/dependencies/test/kotlin/script/experimental/test/ResolversTest.kt
+++ b/libraries/scripting/dependencies/test/kotlin/script/experimental/test/ResolversTest.kt
@@ -6,6 +6,7 @@
 package kotlin.script.experimental.test
 
 import java.io.File
+import java.nio.file.Files
 import kotlin.contracts.ExperimentalContracts
 import kotlin.script.experimental.dependencies.*
 import kotlin.script.experimental.api.ResultWithDiagnostics
@@ -17,8 +18,7 @@ import kotlin.script.experimental.dependencies.impl.makeResolveFailureResult
 class ResolversTest : ResolversTestBase() {
 
     private fun <T> withTempFile(body: (file: File) -> T): T {
-        createTempFile()
-        val file = createTempFile()
+        val file = Files.createTempFile(null, null).toFile()
         file.deleteOnExit()
         try {
             return body(file)
diff --git a/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/ReplTest.kt b/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/ReplTest.kt
index 60d5bbf5d11..bd72817ec26 100644
--- a/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/ReplTest.kt
+++ b/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/ReplTest.kt
@@ -143,7 +143,10 @@ abstract class AbstractReplTestRunner : TestCase() {
                 var t = 2 * 2
                 class A(val value: Int = 5) {
                     fun bar(): Int {
-                        var q = 4
+                        class B(val value: Int = 4) {
+                            fun baz(): Int = value
+                        }
+                        var q = B().baz()
                         var w = 1
                         return q + w
                     }
@@ -221,9 +224,11 @@ abstract class AbstractReplTestRunner : TestCase() {
                 if (compileResult !is ReplCompileResult.CompiledClasses) return compileResult.toString()
 
                 val evalResult = tester.evaluate(compileResult)
-                if (evalResult !is ReplEvalResult.ValueResult) return evalResult.toString()
-
-                result = evalResult.value
+                when (evalResult) {
+                    is ReplEvalResult.Error.Runtime -> return evalResult.cause.toString()
+                    !is ReplEvalResult.ValueResult -> return evalResult.toString()
+                    else -> result = evalResult.value
+                }
             }
         }
         return result
diff --git a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/CachingTest.kt b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/CachingTest.kt
index 842f9513d94..4bfc1e102cc 100644
--- a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/CachingTest.kt
+++ b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/CachingTest.kt
@@ -13,6 +13,7 @@ import java.io.File
 import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 import java.security.MessageDigest
+import java.util.ArrayList
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.host.toScriptSource
 import kotlin.script.experimental.host.with
@@ -172,7 +173,7 @@ class CachingTest : TestCase() {
             val cachedScriptClass = cachedScriptClassRes.valueOrThrow()
 
             Assert.assertEquals(compiledScriptClass.qualifiedName, cachedScriptClass.qualifiedName)
-            Assert.assertEquals(compiledScriptClass.supertypes, cachedScriptClass.supertypes)
+            Assert.assertEquals(compiledScriptClass.java.supertypes(), cachedScriptClass.java.supertypes())
 
             val output2 = captureOut {
                 runBlocking {
@@ -299,3 +300,12 @@ private fun File.readCompiledScript(): CompiledScript {
 
 private fun ByteArray.toHexString(): String = joinToString("", transform = { "%02x".format(it) })
 
+private fun Class<*>.supertypes(): MutableList<Class<*>> = when {
+    superclass == null -> interfaces.toMutableList() ?: mutableListOf()
+    interfaces.isEmpty() -> mutableListOf(superclass)
+    else -> ArrayList<Class<*>>(interfaces.size + 1).apply {
+        interfaces.toCollection(this@apply)
+        add(superclass)
+    }
+}
+
diff --git a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ClassPathTest.kt b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ClassPathTest.kt
index fa075374a81..8fb16286615 100644
--- a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ClassPathTest.kt
+++ b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ClassPathTest.kt
@@ -3,17 +3,20 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(ExperimentalPathApi::class)
+
 package kotlin.script.experimental.jvmhost.test
 
 import junit.framework.TestCase
 import org.junit.Assert
 import org.junit.Test
 import java.io.File
-import java.io.FileOutputStream
 import java.net.URLClassLoader
+import java.nio.file.Path
 import java.util.jar.JarEntry
 import java.util.jar.JarOutputStream
 import java.util.jar.Manifest
+import kotlin.io.path.*
 import kotlin.script.experimental.jvm.util.classPathFromTypicalResourceUrls
 import kotlin.script.experimental.jvm.util.classpathFromClass
 import kotlin.script.experimental.jvm.util.classpathFromClassloader
@@ -21,22 +24,22 @@ import kotlin.script.experimental.jvm.util.scriptCompilationClasspathFromContext
 
 class ClassPathTest : TestCase() {
 
-    lateinit var tempDir: File
+    lateinit var tempDir: Path
 
     override fun setUp() {
-        tempDir = createTempDir(ClassPathTest::class.simpleName!!)
+        tempDir = createTempDirectory(ClassPathTest::class.simpleName!!)
         super.setUp()
     }
 
     override fun tearDown() {
         super.tearDown()
-        tempDir.deleteRecursively()
+        tempDir.toFile().deleteRecursively()
     }
 
     @Test
     fun testExtractFromFat() {
-        val collection = createTempFile("col", ".jar", directory = tempDir).apply { createCollectionJar(emulatedCollectionFiles, "BOOT-INF") }
-        val cl = URLClassLoader(arrayOf(collection.toURI().toURL()), null)
+        val collection = createTempFile(directory = tempDir, "col", ".jar").apply { createCollectionJar(emulatedCollectionFiles, "BOOT-INF") }
+        val cl = URLClassLoader(arrayOf(collection.toUri().toURL()), null)
         val cp = classpathFromClassloader(cl, true)
         Assert.assertTrue(cp != null && cp.isNotEmpty())
 
@@ -45,40 +48,40 @@ class ClassPathTest : TestCase() {
 
     @Test
     fun testDetectClasspathFromResources() {
-        val root1 = createTempDir("root1", directory = tempDir)
-        val jar = createTempFile("jar1", ".jar", directory = tempDir).apply { createJarWithManifest() }
+        val root1 = createTempDirectory(directory = tempDir, "root1")
+        val jar = createTempFile(directory = tempDir, "jar1", ".jar").apply { createJarWithManifest() }
         val cl = URLClassLoader(
-            (emulatedClasspath.map { File(root1, it).apply { mkdirs() }.toURI().toURL() }
-                    + jar.toURI().toURL()).toTypedArray(),
+            (emulatedClasspath.map { (root1 / it).apply { createDirectories() }.toUri().toURL() }
+                    + jar.toUri().toURL()).toTypedArray(),
             null
         )
         val cp = cl.classPathFromTypicalResourceUrls().toList().map { it.canonicalFile }
 
-        Assert.assertTrue(cp.contains(jar.canonicalFile))
+        Assert.assertTrue(cp.contains(jar.toFile().canonicalFile))
         for (el in emulatedClasspath) {
-            Assert.assertTrue(cp.contains(File(root1, el).canonicalFile))
+            Assert.assertTrue(cp.contains((root1 / el).toFile().canonicalFile))
         }
     }
 
     @Test
     fun testFilterClasspath() {
-        val tempDir = createTempDir().canonicalFile
+        val tempDir = createTempDirectory().toRealPath()
         try {
             val files = listOf(
-                File(tempDir, "projX/classes"),
-                File(tempDir, "projX/test-classes"),
-                File(tempDir, "projY/classes")
+                (tempDir / "projX/classes"),
+                (tempDir / "projX/test-classes"),
+                (tempDir / "projY/classes")
             )
-            files.forEach { it.mkdirs() }
+            files.forEach { it.createDirectories() }
 
-            val classloader = URLClassLoader(files.map { it.toURI().toURL() }.toTypedArray(), null)
+            val classloader = URLClassLoader(files.map { it.toUri().toURL() }.toTypedArray(), null)
 
             val classpath =
-                scriptCompilationClasspathFromContextOrNull("projX", classLoader = classloader)!!.map { it.toRelativeString(tempDir) }
+                scriptCompilationClasspathFromContextOrNull("projX", classLoader = classloader)!!.map { it.toPath().relativeTo(tempDir) }
 
-            Assert.assertEquals(files.dropLast(1).map { it.toRelativeString(tempDir) }, classpath)
+            Assert.assertEquals(files.dropLast(1).map { it.relativeTo(tempDir) }, classpath)
         } finally {
-            tempDir.deleteRecursively()
+            tempDir.toFile().deleteRecursively()
         }
     }
 
@@ -103,8 +106,8 @@ private val emulatedClasspath = arrayOf(
     "module2/classes/java/test/"
 )
 
-fun File.createCollectionJar(fileNames: Array<String>, infDirName: String) {
-    FileOutputStream(this).use { fileStream ->
+fun Path.createCollectionJar(fileNames: Array<String>, infDirName: String) {
+    this.outputStream().use { fileStream ->
         val jarStream = JarOutputStream(fileStream)
         jarStream.putNextEntry(JarEntry("$infDirName/classes/"))
         jarStream.putNextEntry(JarEntry("$infDirName/lib/"))
@@ -131,8 +134,8 @@ fun testUnpackedCollection(classpath: List<File>, fileNames: Array<String>) {
     jars.checkFiles(cpJars.first().parentFile.parentFile)
 }
 
-fun File.createJarWithManifest() {
-    FileOutputStream(this).use { fileStream ->
+fun Path.createJarWithManifest() {
+    this.outputStream().use { fileStream ->
         val jarStream = JarOutputStream(fileStream, Manifest())
         jarStream.finish()
     }
diff --git a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ConstructorArgumentOrderTest.kt b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ConstructorArgumentOrderTest.kt
index 5ea135d1eca..a86b9817971 100644
--- a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ConstructorArgumentOrderTest.kt
+++ b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ConstructorArgumentOrderTest.kt
@@ -6,6 +6,7 @@
 package kotlin.script.experimental.jvmhost.test
 
 import org.junit.Test
+import kotlin.script.experimental.api.EvaluationResult
 import kotlin.script.experimental.api.ResultWithDiagnostics
 import kotlin.script.experimental.api.implicitReceivers
 import kotlin.script.experimental.api.providedProperties
@@ -21,7 +22,7 @@ class ConstructorArgumentsOrderTest {
 
         assertTrue(
             res is ResultWithDiagnostics.Success,
-            "test failed:\n  ${res.reports.joinToString("\n  ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}"
+            "test failed:\n  ${res.render()}"
         )
     }
 
@@ -33,7 +34,7 @@ class ConstructorArgumentsOrderTest {
 
         assertTrue(
             res is ResultWithDiagnostics.Success,
-            "test failed:\n  ${res.reports.joinToString("\n  ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}"
+            "test failed:\n  ${res.render()}"
         )
     }
 
@@ -46,7 +47,10 @@ class ConstructorArgumentsOrderTest {
 
         assertTrue(
             res is ResultWithDiagnostics.Success,
-            "test failed:\n  ${res.reports.joinToString("\n  ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}"
+            "test failed:\n  ${res.render()}"
         )
     }
+
+    private fun ResultWithDiagnostics<EvaluationResult>.render() =
+        reports.joinToString("\n  ") { it.message + if (it.exception == null) "" else ": ${it.exception!!.printStackTrace()}" }
 }
diff --git a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt
index 31478ff2e37..ea125bec3c7 100644
--- a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt
+++ b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt
@@ -66,7 +66,8 @@ class ScriptingHostTest : TestCase() {
 
     @Test
     fun testValueResult() {
-        val resVal = evalScriptWithResult("42") as ResultValue.Value
+        val evalScriptWithResult = evalScriptWithResult("42")
+        val resVal = evalScriptWithResult as ResultValue.Value
         Assert.assertEquals(42, resVal.value)
         Assert.assertEquals("\$\$result", resVal.name)
         Assert.assertEquals("kotlin.Int", resVal.type)
diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts
index 69e883e00bf..1c4d0375587 100644
--- a/libraries/scripting/jvm/build.gradle.kts
+++ b/libraries/scripting/jvm/build.gradle.kts
@@ -4,7 +4,9 @@ plugins {
     id("jps-compatible")
 }
 
+val JDK_16: String by project
 jvmTarget = "1.6"
+javaHome = JDK_16
 
 dependencies {
     compile(project(":kotlin-script-runtime"))
@@ -22,6 +24,10 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
     kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
 }
 
+tasks.withType<Test> {
+    executable = "$JDK_16/bin/java"
+}
+
 publish()
 
 runtimeJar()
diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt
index 9470beff944..9dfd226d341 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt
@@ -59,9 +59,18 @@ class ClasspathExtractionException(message: String) : Exception(message)
 fun classpathFromClassloader(currentClassLoader: ClassLoader, unpackJarCollections: Boolean = false): List<File>? {
     val processedJars = hashSetOf<File>()
     val unpackJarCollectionsDir by lazy {
-        createTempDir("unpackedJarCollections").canonicalFile.also {
+        File.createTempFile("unpackedJarCollections", null).canonicalFile.apply {
+            delete()
+            mkdir()
+            setReadable(false, false)
+            setWritable(false, false)
+            setExecutable(false, false)
+            setReadable(true, true)
+            setWritable(true, true)
+            setExecutable(true, true)
+
             Runtime.getRuntime().addShutdownHook(Thread {
-                it.deleteRecursively()
+                deleteRecursively()
             })
         }
     }
@@ -144,8 +153,12 @@ fun ClassLoader.classPathFromTypicalResourceUrls(): Sequence<File> =
         .distinct()
         .filter { it.isValidClasspathFile() }
 
-private fun File.unpackJarCollection(rootTempDir: File?): Sequence<File> {
-    val targetDir = createTempDir(nameWithoutExtension, directory = rootTempDir)
+private fun File.unpackJarCollection(rootTempDir: File): Sequence<File> {
+    val targetDir = File.createTempFile(nameWithoutExtension, null, rootTempDir).apply {
+        delete()
+        mkdir()
+    }
+
     return try {
         ArrayList<File>().apply {
             JarInputStream(FileInputStream(this@unpackJarCollection)).use { jarInputStream ->
diff --git a/libraries/stdlib/api/js-v1/kotlin.collections.kt b/libraries/stdlib/api/js-v1/kotlin.collections.kt
index 86f30b74d14..d6dabf51c6b 100644
--- a/libraries/stdlib/api/js-v1/kotlin.collections.kt
+++ b/libraries/stdlib/api/js-v1/kotlin.collections.kt
@@ -4159,155 +4159,155 @@ public inline fun <K, V, R> kotlin.collections.Map<out K, V>.mapValues(transform
 
 public inline fun <K, V, R, M : kotlin.collections.MutableMap<in K, in R>> kotlin.collections.Map<out K, V>.mapValuesTo(destination: M, transform: (kotlin.collections.Map.Entry<K, V>) -> R): M
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.Array<out T>.max(): T?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.Array<out kotlin.Double>.max(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.Array<out kotlin.Float>.max(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ByteArray.max(): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharArray.max(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.DoubleArray.max(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.FloatArray.max(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.IntArray.max(): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.LongArray.max(): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ShortArray.max(): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UByteArray.max(): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UIntArray.max(): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.ULongArray.max(): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UShortArray.max(): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.collections.Iterable<T>.max(): T?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.collections.Iterable<kotlin.Double>.max(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.collections.Iterable<kotlin.Float>.max(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.Array<out T>.maxBy(selector: (T) -> R): T?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.BooleanArray.maxBy(selector: (kotlin.Boolean) -> R): kotlin.Boolean?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.ByteArray.maxBy(selector: (kotlin.Byte) -> R): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.CharArray.maxBy(selector: (kotlin.Char) -> R): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.DoubleArray.maxBy(selector: (kotlin.Double) -> R): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.FloatArray.maxBy(selector: (kotlin.Float) -> R): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.IntArray.maxBy(selector: (kotlin.Int) -> R): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.LongArray.maxBy(selector: (kotlin.Long) -> R): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.ShortArray.maxBy(selector: (kotlin.Short) -> R): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UByteArray.maxBy(selector: (kotlin.UByte) -> R): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UIntArray.maxBy(selector: (kotlin.UInt) -> R): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.ULongArray.maxBy(selector: (kotlin.ULong) -> R): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UShortArray.maxBy(selector: (kotlin.UShort) -> R): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>.maxBy(selector: (T) -> R): T?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.internal.InlineOnly
 public inline fun <K, V, R : kotlin.Comparable<R>> kotlin.collections.Map<out K, V>.maxBy(selector: (kotlin.collections.Map.Entry<K, V>) -> R): kotlin.collections.Map.Entry<K, V>?
@@ -5053,71 +5053,71 @@ public fun kotlin.collections.Iterable<kotlin.Double>.maxOrNull(): kotlin.Double
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.collections.Iterable<kotlin.Float>.maxOrNull(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.Array<out T>.maxWith(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.BooleanArray.maxWith(comparator: kotlin.Comparator<in kotlin.Boolean>): kotlin.Boolean?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ByteArray.maxWith(comparator: kotlin.Comparator<in kotlin.Byte>): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharArray.maxWith(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.DoubleArray.maxWith(comparator: kotlin.Comparator<in kotlin.Double>): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.FloatArray.maxWith(comparator: kotlin.Comparator<in kotlin.Float>): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.IntArray.maxWith(comparator: kotlin.Comparator<in kotlin.Int>): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.LongArray.maxWith(comparator: kotlin.Comparator<in kotlin.Long>): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ShortArray.maxWith(comparator: kotlin.Comparator<in kotlin.Short>): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UByteArray.maxWith(comparator: kotlin.Comparator<in kotlin.UByte>): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UIntArray.maxWith(comparator: kotlin.Comparator<in kotlin.UInt>): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.ULongArray.maxWith(comparator: kotlin.Comparator<in kotlin.ULong>): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UShortArray.maxWith(comparator: kotlin.Comparator<in kotlin.UShort>): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.collections.Iterable<T>.maxWith(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.internal.InlineOnly
 public inline fun <K, V> kotlin.collections.Map<out K, V>.maxWith(comparator: kotlin.Comparator<in kotlin.collections.Map.Entry<K, V>>): kotlin.collections.Map.Entry<K, V>?
@@ -5172,155 +5172,155 @@ public fun <T> kotlin.collections.Iterable<T>.maxWithOrNull(comparator: kotlin.C
 @kotlin.internal.InlineOnly
 public inline fun <K, V> kotlin.collections.Map<out K, V>.maxWithOrNull(comparator: kotlin.Comparator<in kotlin.collections.Map.Entry<K, V>>): kotlin.collections.Map.Entry<K, V>?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.Array<out T>.min(): T?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.Array<out kotlin.Double>.min(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.Array<out kotlin.Float>.min(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ByteArray.min(): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharArray.min(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.DoubleArray.min(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.FloatArray.min(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.IntArray.min(): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.LongArray.min(): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ShortArray.min(): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UByteArray.min(): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UIntArray.min(): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.ULongArray.min(): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UShortArray.min(): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.collections.Iterable<T>.min(): T?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.collections.Iterable<kotlin.Double>.min(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.collections.Iterable<kotlin.Float>.min(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.Array<out T>.minBy(selector: (T) -> R): T?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.BooleanArray.minBy(selector: (kotlin.Boolean) -> R): kotlin.Boolean?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.ByteArray.minBy(selector: (kotlin.Byte) -> R): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.CharArray.minBy(selector: (kotlin.Char) -> R): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.DoubleArray.minBy(selector: (kotlin.Double) -> R): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.FloatArray.minBy(selector: (kotlin.Float) -> R): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.IntArray.minBy(selector: (kotlin.Int) -> R): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.LongArray.minBy(selector: (kotlin.Long) -> R): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.ShortArray.minBy(selector: (kotlin.Short) -> R): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UByteArray.minBy(selector: (kotlin.UByte) -> R): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UIntArray.minBy(selector: (kotlin.UInt) -> R): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.ULongArray.minBy(selector: (kotlin.ULong) -> R): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UShortArray.minBy(selector: (kotlin.UShort) -> R): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>.minBy(selector: (T) -> R): T?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <K, V, R : kotlin.Comparable<R>> kotlin.collections.Map<out K, V>.minBy(selector: (kotlin.collections.Map.Entry<K, V>) -> R): kotlin.collections.Map.Entry<K, V>?
 
@@ -6065,71 +6065,71 @@ public fun kotlin.collections.Iterable<kotlin.Double>.minOrNull(): kotlin.Double
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.collections.Iterable<kotlin.Float>.minOrNull(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.Array<out T>.minWith(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.BooleanArray.minWith(comparator: kotlin.Comparator<in kotlin.Boolean>): kotlin.Boolean?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ByteArray.minWith(comparator: kotlin.Comparator<in kotlin.Byte>): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharArray.minWith(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.DoubleArray.minWith(comparator: kotlin.Comparator<in kotlin.Double>): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.FloatArray.minWith(comparator: kotlin.Comparator<in kotlin.Float>): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.IntArray.minWith(comparator: kotlin.Comparator<in kotlin.Int>): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.LongArray.minWith(comparator: kotlin.Comparator<in kotlin.Long>): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ShortArray.minWith(comparator: kotlin.Comparator<in kotlin.Short>): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UByteArray.minWith(comparator: kotlin.Comparator<in kotlin.UByte>): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UIntArray.minWith(comparator: kotlin.Comparator<in kotlin.UInt>): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.ULongArray.minWith(comparator: kotlin.Comparator<in kotlin.ULong>): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UShortArray.minWith(comparator: kotlin.Comparator<in kotlin.UShort>): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.collections.Iterable<T>.minWith(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <K, V> kotlin.collections.Map<out K, V>.minWith(comparator: kotlin.Comparator<in kotlin.collections.Map.Entry<K, V>>): kotlin.collections.Map.Entry<K, V>?
 
diff --git a/libraries/stdlib/api/js-v1/kotlin.coroutines.cancellation.kt b/libraries/stdlib/api/js-v1/kotlin.coroutines.cancellation.kt
index 7c780a279df..fe258a7c943 100644
--- a/libraries/stdlib/api/js-v1/kotlin.coroutines.cancellation.kt
+++ b/libraries/stdlib/api/js-v1/kotlin.coroutines.cancellation.kt
@@ -1,4 +1,3 @@
-@kotlin.ExperimentalStdlibApi
 @kotlin.SinceKotlin(version = "1.4")
 public open class CancellationException : kotlin.IllegalStateException {
     public constructor CancellationException()
diff --git a/libraries/stdlib/api/js-v1/kotlin.sequences.kt b/libraries/stdlib/api/js-v1/kotlin.sequences.kt
index 1adde3a98d2..76bff5201f7 100644
--- a/libraries/stdlib/api/js-v1/kotlin.sequences.kt
+++ b/libraries/stdlib/api/js-v1/kotlin.sequences.kt
@@ -245,21 +245,21 @@ public inline fun <T, R : kotlin.Any, C : kotlin.collections.MutableCollection<i
 
 public inline fun <T, R, C : kotlin.collections.MutableCollection<in R>> kotlin.sequences.Sequence<T>.mapTo(destination: C, transform: (T) -> R): C
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.sequences.Sequence<T>.max(): T?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.sequences.Sequence<kotlin.Double>.max(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.sequences.Sequence<kotlin.Float>.max(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.sequences.Sequence<T>.maxBy(selector: (T) -> R): T?
 
@@ -315,28 +315,28 @@ public fun kotlin.sequences.Sequence<kotlin.Double>.maxOrNull(): kotlin.Double?
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.sequences.Sequence<kotlin.Float>.maxOrNull(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.sequences.Sequence<T>.maxWith(comparator: kotlin.Comparator<in T>): T?
 
 @kotlin.SinceKotlin(version = "1.4")
 public fun <T> kotlin.sequences.Sequence<T>.maxWithOrNull(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.sequences.Sequence<T>.min(): T?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.sequences.Sequence<kotlin.Double>.min(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.sequences.Sequence<kotlin.Float>.min(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.sequences.Sequence<T>.minBy(selector: (T) -> R): T?
 
@@ -392,7 +392,7 @@ public fun kotlin.sequences.Sequence<kotlin.Double>.minOrNull(): kotlin.Double?
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.sequences.Sequence<kotlin.Float>.minOrNull(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.sequences.Sequence<T>.minWith(comparator: kotlin.Comparator<in T>): T?
 
diff --git a/libraries/stdlib/api/js-v1/kotlin.text.kt b/libraries/stdlib/api/js-v1/kotlin.text.kt
index 4615e4aee9d..be5c956b7d8 100644
--- a/libraries/stdlib/api/js-v1/kotlin.text.kt
+++ b/libraries/stdlib/api/js-v1/kotlin.text.kt
@@ -406,11 +406,11 @@ public inline infix fun kotlin.CharSequence.matches(regex: kotlin.text.Regex): k
 
 public fun kotlin.String.matches(regex: kotlin.String): kotlin.Boolean
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharSequence.max(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.CharSequence.maxBy(selector: (kotlin.Char) -> R): kotlin.Char?
 
@@ -460,18 +460,18 @@ public inline fun <R> kotlin.CharSequence.maxOfWithOrNull(comparator: kotlin.Com
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.CharSequence.maxOrNull(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharSequence.maxWith(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.CharSequence.maxWithOrNull(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharSequence.min(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.CharSequence.minBy(selector: (kotlin.Char) -> R): kotlin.Char?
 
@@ -521,7 +521,7 @@ public inline fun <R> kotlin.CharSequence.minOfWithOrNull(comparator: kotlin.Com
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.CharSequence.minOrNull(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharSequence.minWith(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
diff --git a/libraries/stdlib/api/js/kotlin.collections.kt b/libraries/stdlib/api/js/kotlin.collections.kt
index f440e17d762..40691210af3 100644
--- a/libraries/stdlib/api/js/kotlin.collections.kt
+++ b/libraries/stdlib/api/js/kotlin.collections.kt
@@ -4129,155 +4129,155 @@ public inline fun <K, V, R> kotlin.collections.Map<out K, V>.mapValues(transform
 
 public inline fun <K, V, R, M : kotlin.collections.MutableMap<in K, in R>> kotlin.collections.Map<out K, V>.mapValuesTo(destination: M, transform: (kotlin.collections.Map.Entry<K, V>) -> R): M
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.Array<out T>.max(): T?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.Array<out kotlin.Double>.max(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.Array<out kotlin.Float>.max(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ByteArray.max(): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharArray.max(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.DoubleArray.max(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.FloatArray.max(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.IntArray.max(): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.LongArray.max(): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ShortArray.max(): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UByteArray.max(): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UIntArray.max(): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.ULongArray.max(): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UShortArray.max(): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.collections.Iterable<T>.max(): T?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.collections.Iterable<kotlin.Double>.max(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.collections.Iterable<kotlin.Float>.max(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.Array<out T>.maxBy(selector: (T) -> R): T?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.BooleanArray.maxBy(selector: (kotlin.Boolean) -> R): kotlin.Boolean?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.ByteArray.maxBy(selector: (kotlin.Byte) -> R): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.CharArray.maxBy(selector: (kotlin.Char) -> R): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.DoubleArray.maxBy(selector: (kotlin.Double) -> R): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.FloatArray.maxBy(selector: (kotlin.Float) -> R): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.IntArray.maxBy(selector: (kotlin.Int) -> R): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.LongArray.maxBy(selector: (kotlin.Long) -> R): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.ShortArray.maxBy(selector: (kotlin.Short) -> R): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UByteArray.maxBy(selector: (kotlin.UByte) -> R): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UIntArray.maxBy(selector: (kotlin.UInt) -> R): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.ULongArray.maxBy(selector: (kotlin.ULong) -> R): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UShortArray.maxBy(selector: (kotlin.UShort) -> R): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>.maxBy(selector: (T) -> R): T?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.internal.InlineOnly
 public inline fun <K, V, R : kotlin.Comparable<R>> kotlin.collections.Map<out K, V>.maxBy(selector: (kotlin.collections.Map.Entry<K, V>) -> R): kotlin.collections.Map.Entry<K, V>?
@@ -5023,71 +5023,71 @@ public fun kotlin.collections.Iterable<kotlin.Double>.maxOrNull(): kotlin.Double
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.collections.Iterable<kotlin.Float>.maxOrNull(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.Array<out T>.maxWith(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.BooleanArray.maxWith(comparator: kotlin.Comparator<in kotlin.Boolean>): kotlin.Boolean?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ByteArray.maxWith(comparator: kotlin.Comparator<in kotlin.Byte>): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharArray.maxWith(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.DoubleArray.maxWith(comparator: kotlin.Comparator<in kotlin.Double>): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.FloatArray.maxWith(comparator: kotlin.Comparator<in kotlin.Float>): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.IntArray.maxWith(comparator: kotlin.Comparator<in kotlin.Int>): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.LongArray.maxWith(comparator: kotlin.Comparator<in kotlin.Long>): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ShortArray.maxWith(comparator: kotlin.Comparator<in kotlin.Short>): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UByteArray.maxWith(comparator: kotlin.Comparator<in kotlin.UByte>): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UIntArray.maxWith(comparator: kotlin.Comparator<in kotlin.UInt>): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.ULongArray.maxWith(comparator: kotlin.Comparator<in kotlin.ULong>): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UShortArray.maxWith(comparator: kotlin.Comparator<in kotlin.UShort>): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.collections.Iterable<T>.maxWith(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.internal.InlineOnly
 public inline fun <K, V> kotlin.collections.Map<out K, V>.maxWith(comparator: kotlin.Comparator<in kotlin.collections.Map.Entry<K, V>>): kotlin.collections.Map.Entry<K, V>?
@@ -5142,155 +5142,155 @@ public fun <T> kotlin.collections.Iterable<T>.maxWithOrNull(comparator: kotlin.C
 @kotlin.internal.InlineOnly
 public inline fun <K, V> kotlin.collections.Map<out K, V>.maxWithOrNull(comparator: kotlin.Comparator<in kotlin.collections.Map.Entry<K, V>>): kotlin.collections.Map.Entry<K, V>?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.Array<out T>.min(): T?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.Array<out kotlin.Double>.min(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.Array<out kotlin.Float>.min(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ByteArray.min(): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharArray.min(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.DoubleArray.min(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.FloatArray.min(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.IntArray.min(): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.LongArray.min(): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ShortArray.min(): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UByteArray.min(): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UIntArray.min(): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.ULongArray.min(): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UShortArray.min(): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.collections.Iterable<T>.min(): T?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.collections.Iterable<kotlin.Double>.min(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.collections.Iterable<kotlin.Float>.min(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.Array<out T>.minBy(selector: (T) -> R): T?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.BooleanArray.minBy(selector: (kotlin.Boolean) -> R): kotlin.Boolean?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.ByteArray.minBy(selector: (kotlin.Byte) -> R): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.CharArray.minBy(selector: (kotlin.Char) -> R): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.DoubleArray.minBy(selector: (kotlin.Double) -> R): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.FloatArray.minBy(selector: (kotlin.Float) -> R): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.IntArray.minBy(selector: (kotlin.Int) -> R): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.LongArray.minBy(selector: (kotlin.Long) -> R): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.ShortArray.minBy(selector: (kotlin.Short) -> R): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UByteArray.minBy(selector: (kotlin.UByte) -> R): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UIntArray.minBy(selector: (kotlin.UInt) -> R): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.ULongArray.minBy(selector: (kotlin.ULong) -> R): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 @kotlin.internal.InlineOnly
 public inline fun <R : kotlin.Comparable<R>> kotlin.UShortArray.minBy(selector: (kotlin.UShort) -> R): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>.minBy(selector: (T) -> R): T?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <K, V, R : kotlin.Comparable<R>> kotlin.collections.Map<out K, V>.minBy(selector: (kotlin.collections.Map.Entry<K, V>) -> R): kotlin.collections.Map.Entry<K, V>?
 
@@ -6035,71 +6035,71 @@ public fun kotlin.collections.Iterable<kotlin.Double>.minOrNull(): kotlin.Double
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.collections.Iterable<kotlin.Float>.minOrNull(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.Array<out T>.minWith(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.BooleanArray.minWith(comparator: kotlin.Comparator<in kotlin.Boolean>): kotlin.Boolean?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ByteArray.minWith(comparator: kotlin.Comparator<in kotlin.Byte>): kotlin.Byte?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharArray.minWith(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.DoubleArray.minWith(comparator: kotlin.Comparator<in kotlin.Double>): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.FloatArray.minWith(comparator: kotlin.Comparator<in kotlin.Float>): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.IntArray.minWith(comparator: kotlin.Comparator<in kotlin.Int>): kotlin.Int?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.LongArray.minWith(comparator: kotlin.Comparator<in kotlin.Long>): kotlin.Long?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.ShortArray.minWith(comparator: kotlin.Comparator<in kotlin.Short>): kotlin.Short?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UByteArray.minWith(comparator: kotlin.Comparator<in kotlin.UByte>): kotlin.UByte?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UIntArray.minWith(comparator: kotlin.Comparator<in kotlin.UInt>): kotlin.UInt?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.ULongArray.minWith(comparator: kotlin.Comparator<in kotlin.ULong>): kotlin.ULong?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
 public fun kotlin.UShortArray.minWith(comparator: kotlin.Comparator<in kotlin.UShort>): kotlin.UShort?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.collections.Iterable<T>.minWith(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <K, V> kotlin.collections.Map<out K, V>.minWith(comparator: kotlin.Comparator<in kotlin.collections.Map.Entry<K, V>>): kotlin.collections.Map.Entry<K, V>?
 
diff --git a/libraries/stdlib/api/js/kotlin.coroutines.cancellation.kt b/libraries/stdlib/api/js/kotlin.coroutines.cancellation.kt
index 7c780a279df..fe258a7c943 100644
--- a/libraries/stdlib/api/js/kotlin.coroutines.cancellation.kt
+++ b/libraries/stdlib/api/js/kotlin.coroutines.cancellation.kt
@@ -1,4 +1,3 @@
-@kotlin.ExperimentalStdlibApi
 @kotlin.SinceKotlin(version = "1.4")
 public open class CancellationException : kotlin.IllegalStateException {
     public constructor CancellationException()
diff --git a/libraries/stdlib/api/js/kotlin.sequences.kt b/libraries/stdlib/api/js/kotlin.sequences.kt
index 1adde3a98d2..76bff5201f7 100644
--- a/libraries/stdlib/api/js/kotlin.sequences.kt
+++ b/libraries/stdlib/api/js/kotlin.sequences.kt
@@ -245,21 +245,21 @@ public inline fun <T, R : kotlin.Any, C : kotlin.collections.MutableCollection<i
 
 public inline fun <T, R, C : kotlin.collections.MutableCollection<in R>> kotlin.sequences.Sequence<T>.mapTo(destination: C, transform: (T) -> R): C
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.sequences.Sequence<T>.max(): T?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.sequences.Sequence<kotlin.Double>.max(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.sequences.Sequence<kotlin.Float>.max(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.sequences.Sequence<T>.maxBy(selector: (T) -> R): T?
 
@@ -315,28 +315,28 @@ public fun kotlin.sequences.Sequence<kotlin.Double>.maxOrNull(): kotlin.Double?
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.sequences.Sequence<kotlin.Float>.maxOrNull(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.sequences.Sequence<T>.maxWith(comparator: kotlin.Comparator<in T>): T?
 
 @kotlin.SinceKotlin(version = "1.4")
 public fun <T> kotlin.sequences.Sequence<T>.maxWithOrNull(comparator: kotlin.Comparator<in T>): T?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : kotlin.Comparable<T>> kotlin.sequences.Sequence<T>.min(): T?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.sequences.Sequence<kotlin.Double>.min(): kotlin.Double?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.SinceKotlin(version = "1.1")
 public fun kotlin.sequences.Sequence<kotlin.Float>.min(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : kotlin.Comparable<R>> kotlin.sequences.Sequence<T>.minBy(selector: (T) -> R): T?
 
@@ -392,7 +392,7 @@ public fun kotlin.sequences.Sequence<kotlin.Double>.minOrNull(): kotlin.Double?
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.sequences.Sequence<kotlin.Float>.minOrNull(): kotlin.Float?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> kotlin.sequences.Sequence<T>.minWith(comparator: kotlin.Comparator<in T>): T?
 
diff --git a/libraries/stdlib/api/js/kotlin.text.kt b/libraries/stdlib/api/js/kotlin.text.kt
index 4615e4aee9d..be5c956b7d8 100644
--- a/libraries/stdlib/api/js/kotlin.text.kt
+++ b/libraries/stdlib/api/js/kotlin.text.kt
@@ -406,11 +406,11 @@ public inline infix fun kotlin.CharSequence.matches(regex: kotlin.text.Regex): k
 
 public fun kotlin.String.matches(regex: kotlin.String): kotlin.Boolean
 
-@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use maxOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharSequence.max(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use maxByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.CharSequence.maxBy(selector: (kotlin.Char) -> R): kotlin.Char?
 
@@ -460,18 +460,18 @@ public inline fun <R> kotlin.CharSequence.maxOfWithOrNull(comparator: kotlin.Com
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.CharSequence.maxOrNull(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "maxWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use maxWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.maxWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharSequence.maxWith(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.CharSequence.maxWithOrNull(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minOrNull()", imports = {}))
+@kotlin.Deprecated(message = "Use minOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minOrNull()", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharSequence.min(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minByOrNull(selector)", imports = {}))
+@kotlin.Deprecated(message = "Use minByOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minByOrNull(selector)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : kotlin.Comparable<R>> kotlin.CharSequence.minBy(selector: (kotlin.Char) -> R): kotlin.Char?
 
@@ -521,7 +521,7 @@ public inline fun <R> kotlin.CharSequence.minOfWithOrNull(comparator: kotlin.Com
 @kotlin.SinceKotlin(version = "1.4")
 public fun kotlin.CharSequence.minOrNull(): kotlin.Char?
 
-@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "minWithOrNull(comparator)", imports = {}))
+@kotlin.Deprecated(message = "Use minWithOrNull instead.", replaceWith = kotlin.ReplaceWith(expression = "this.minWithOrNull(comparator)", imports = {}))
 @kotlin.DeprecatedSinceKotlin(warningSince = "1.4")
 public fun kotlin.CharSequence.minWith(comparator: kotlin.Comparator<in kotlin.Char>): kotlin.Char?
 
diff --git a/libraries/stdlib/common/src/generated/_Arrays.kt b/libraries/stdlib/common/src/generated/_Arrays.kt
index 16a879f12d9..a9139866a6a 100644
--- a/libraries/stdlib/common/src/generated/_Arrays.kt
+++ b/libraries/stdlib/common/src/generated/_Arrays.kt
@@ -1801,7 +1801,10 @@ public inline fun CharArray.indexOfLast(predicate: (Char) -> Boolean): Int {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun <T> Array<out T>.last(): T {
     if (isEmpty())
@@ -1811,7 +1814,10 @@ public fun <T> Array<out T>.last(): T {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun ByteArray.last(): Byte {
     if (isEmpty())
@@ -1821,7 +1827,10 @@ public fun ByteArray.last(): Byte {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun ShortArray.last(): Short {
     if (isEmpty())
@@ -1831,7 +1840,10 @@ public fun ShortArray.last(): Short {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun IntArray.last(): Int {
     if (isEmpty())
@@ -1841,7 +1853,10 @@ public fun IntArray.last(): Int {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun LongArray.last(): Long {
     if (isEmpty())
@@ -1851,7 +1866,10 @@ public fun LongArray.last(): Long {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun FloatArray.last(): Float {
     if (isEmpty())
@@ -1861,7 +1879,10 @@ public fun FloatArray.last(): Float {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun DoubleArray.last(): Double {
     if (isEmpty())
@@ -1871,7 +1892,10 @@ public fun DoubleArray.last(): Double {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun BooleanArray.last(): Boolean {
     if (isEmpty())
@@ -1881,7 +1905,10 @@ public fun BooleanArray.last(): Boolean {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun CharArray.last(): Char {
     if (isEmpty())
@@ -1891,7 +1918,10 @@ public fun CharArray.last(): Char {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun <T> Array<out T>.last(predicate: (T) -> Boolean): T {
     for (index in this.indices.reversed()) {
@@ -1903,7 +1933,10 @@ public inline fun <T> Array<out T>.last(predicate: (T) -> Boolean): T {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun ByteArray.last(predicate: (Byte) -> Boolean): Byte {
     for (index in this.indices.reversed()) {
@@ -1915,7 +1948,10 @@ public inline fun ByteArray.last(predicate: (Byte) -> Boolean): Byte {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun ShortArray.last(predicate: (Short) -> Boolean): Short {
     for (index in this.indices.reversed()) {
@@ -1927,7 +1963,10 @@ public inline fun ShortArray.last(predicate: (Short) -> Boolean): Short {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun IntArray.last(predicate: (Int) -> Boolean): Int {
     for (index in this.indices.reversed()) {
@@ -1939,7 +1978,10 @@ public inline fun IntArray.last(predicate: (Int) -> Boolean): Int {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun LongArray.last(predicate: (Long) -> Boolean): Long {
     for (index in this.indices.reversed()) {
@@ -1951,7 +1993,10 @@ public inline fun LongArray.last(predicate: (Long) -> Boolean): Long {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun FloatArray.last(predicate: (Float) -> Boolean): Float {
     for (index in this.indices.reversed()) {
@@ -1963,7 +2008,10 @@ public inline fun FloatArray.last(predicate: (Float) -> Boolean): Float {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun DoubleArray.last(predicate: (Double) -> Boolean): Double {
     for (index in this.indices.reversed()) {
@@ -1975,7 +2023,10 @@ public inline fun DoubleArray.last(predicate: (Double) -> Boolean): Double {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun BooleanArray.last(predicate: (Boolean) -> Boolean): Boolean {
     for (index in this.indices.reversed()) {
@@ -1987,7 +2038,10 @@ public inline fun BooleanArray.last(predicate: (Boolean) -> Boolean): Boolean {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun CharArray.last(predicate: (Char) -> Boolean): Char {
     for (index in this.indices.reversed()) {
@@ -2119,6 +2173,8 @@ public fun CharArray.lastIndexOf(element: Char): Int {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun <T> Array<out T>.lastOrNull(): T? {
     return if (isEmpty()) null else this[size - 1]
@@ -2126,6 +2182,8 @@ public fun <T> Array<out T>.lastOrNull(): T? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun ByteArray.lastOrNull(): Byte? {
     return if (isEmpty()) null else this[size - 1]
@@ -2133,6 +2191,8 @@ public fun ByteArray.lastOrNull(): Byte? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun ShortArray.lastOrNull(): Short? {
     return if (isEmpty()) null else this[size - 1]
@@ -2140,6 +2200,8 @@ public fun ShortArray.lastOrNull(): Short? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun IntArray.lastOrNull(): Int? {
     return if (isEmpty()) null else this[size - 1]
@@ -2147,6 +2209,8 @@ public fun IntArray.lastOrNull(): Int? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun LongArray.lastOrNull(): Long? {
     return if (isEmpty()) null else this[size - 1]
@@ -2154,6 +2218,8 @@ public fun LongArray.lastOrNull(): Long? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun FloatArray.lastOrNull(): Float? {
     return if (isEmpty()) null else this[size - 1]
@@ -2161,6 +2227,8 @@ public fun FloatArray.lastOrNull(): Float? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun DoubleArray.lastOrNull(): Double? {
     return if (isEmpty()) null else this[size - 1]
@@ -2168,6 +2236,8 @@ public fun DoubleArray.lastOrNull(): Double? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun BooleanArray.lastOrNull(): Boolean? {
     return if (isEmpty()) null else this[size - 1]
@@ -2175,6 +2245,8 @@ public fun BooleanArray.lastOrNull(): Boolean? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun CharArray.lastOrNull(): Char? {
     return if (isEmpty()) null else this[size - 1]
@@ -2182,6 +2254,8 @@ public fun CharArray.lastOrNull(): Char? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun <T> Array<out T>.lastOrNull(predicate: (T) -> Boolean): T? {
     for (index in this.indices.reversed()) {
@@ -2193,6 +2267,8 @@ public inline fun <T> Array<out T>.lastOrNull(predicate: (T) -> Boolean): T? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun ByteArray.lastOrNull(predicate: (Byte) -> Boolean): Byte? {
     for (index in this.indices.reversed()) {
@@ -2204,6 +2280,8 @@ public inline fun ByteArray.lastOrNull(predicate: (Byte) -> Boolean): Byte? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun ShortArray.lastOrNull(predicate: (Short) -> Boolean): Short? {
     for (index in this.indices.reversed()) {
@@ -2215,6 +2293,8 @@ public inline fun ShortArray.lastOrNull(predicate: (Short) -> Boolean): Short? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun IntArray.lastOrNull(predicate: (Int) -> Boolean): Int? {
     for (index in this.indices.reversed()) {
@@ -2226,6 +2306,8 @@ public inline fun IntArray.lastOrNull(predicate: (Int) -> Boolean): Int? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun LongArray.lastOrNull(predicate: (Long) -> Boolean): Long? {
     for (index in this.indices.reversed()) {
@@ -2237,6 +2319,8 @@ public inline fun LongArray.lastOrNull(predicate: (Long) -> Boolean): Long? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun FloatArray.lastOrNull(predicate: (Float) -> Boolean): Float? {
     for (index in this.indices.reversed()) {
@@ -2248,6 +2332,8 @@ public inline fun FloatArray.lastOrNull(predicate: (Float) -> Boolean): Float? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun DoubleArray.lastOrNull(predicate: (Double) -> Boolean): Double? {
     for (index in this.indices.reversed()) {
@@ -2259,6 +2345,8 @@ public inline fun DoubleArray.lastOrNull(predicate: (Double) -> Boolean): Double
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun BooleanArray.lastOrNull(predicate: (Boolean) -> Boolean): Boolean? {
     for (index in this.indices.reversed()) {
@@ -2270,6 +2358,8 @@ public inline fun BooleanArray.lastOrNull(predicate: (Boolean) -> Boolean): Bool
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun CharArray.lastOrNull(predicate: (Char) -> Boolean): Char? {
     for (index in this.indices.reversed()) {
@@ -13562,117 +13652,117 @@ public inline fun CharArray.forEachIndexed(action: (index: Int, Char) -> Unit):
     for (item in this) action(index++, item)
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Array<out Double>.max(): Double? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Array<out Float>.max(): Float? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : Comparable<T>> Array<out T>.max(): T? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun ByteArray.max(): Byte? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun ShortArray.max(): Short? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun IntArray.max(): Int? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun LongArray.max(): Long? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun FloatArray.max(): Float? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun DoubleArray.max(): Double? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun CharArray.max(): Char? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : Comparable<R>> Array<out T>.maxBy(selector: (T) -> R): T? {
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> ByteArray.maxBy(selector: (Byte) -> R): Byte? {
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> ShortArray.maxBy(selector: (Short) -> R): Short? {
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> IntArray.maxBy(selector: (Int) -> R): Int? {
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> LongArray.maxBy(selector: (Long) -> R): Long? {
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> FloatArray.maxBy(selector: (Float) -> R): Float? {
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> DoubleArray.maxBy(selector: (Double) -> R): Double? {
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> BooleanArray.maxBy(selector: (Boolean) -> R): Boolean? {
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> CharArray.maxBy(selector: (Char) -> R): Char? {
     return maxByOrNull(selector)
@@ -15545,55 +15635,55 @@ public fun CharArray.maxOrNull(): Char? {
     return max
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> Array<out T>.maxWith(comparator: Comparator<in T>): T? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun ByteArray.maxWith(comparator: Comparator<in Byte>): Byte? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun ShortArray.maxWith(comparator: Comparator<in Short>): Short? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun IntArray.maxWith(comparator: Comparator<in Int>): Int? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun LongArray.maxWith(comparator: Comparator<in Long>): Long? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun FloatArray.maxWith(comparator: Comparator<in Float>): Float? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun DoubleArray.maxWith(comparator: Comparator<in Double>): Double? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun BooleanArray.maxWith(comparator: Comparator<in Boolean>): Boolean? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun CharArray.maxWith(comparator: Comparator<in Char>): Char? {
     return maxWithOrNull(comparator)
@@ -15725,117 +15815,117 @@ public fun CharArray.maxWithOrNull(comparator: Comparator<in Char>): Char? {
     return max
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Array<out Double>.min(): Double? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Array<out Float>.min(): Float? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : Comparable<T>> Array<out T>.min(): T? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun ByteArray.min(): Byte? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun ShortArray.min(): Short? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun IntArray.min(): Int? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun LongArray.min(): Long? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun FloatArray.min(): Float? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun DoubleArray.min(): Double? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun CharArray.min(): Char? {
     return minOrNull()
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : Comparable<R>> Array<out T>.minBy(selector: (T) -> R): T? {
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> ByteArray.minBy(selector: (Byte) -> R): Byte? {
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> ShortArray.minBy(selector: (Short) -> R): Short? {
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> IntArray.minBy(selector: (Int) -> R): Int? {
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> LongArray.minBy(selector: (Long) -> R): Long? {
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> FloatArray.minBy(selector: (Float) -> R): Float? {
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> DoubleArray.minBy(selector: (Double) -> R): Double? {
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> BooleanArray.minBy(selector: (Boolean) -> R): Boolean? {
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> CharArray.minBy(selector: (Char) -> R): Char? {
     return minByOrNull(selector)
@@ -17708,55 +17798,55 @@ public fun CharArray.minOrNull(): Char? {
     return min
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> Array<out T>.minWith(comparator: Comparator<in T>): T? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun ByteArray.minWith(comparator: Comparator<in Byte>): Byte? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun ShortArray.minWith(comparator: Comparator<in Short>): Short? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun IntArray.minWith(comparator: Comparator<in Int>): Int? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun LongArray.minWith(comparator: Comparator<in Long>): Long? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun FloatArray.minWith(comparator: Comparator<in Float>): Float? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun DoubleArray.minWith(comparator: Comparator<in Double>): Double? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun BooleanArray.minWith(comparator: Comparator<in Boolean>): Boolean? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun CharArray.minWith(comparator: Comparator<in Char>): Char? {
     return minWithOrNull(comparator)
diff --git a/libraries/stdlib/common/src/generated/_Collections.kt b/libraries/stdlib/common/src/generated/_Collections.kt
index 1816156f3a8..4d2004e1fda 100644
--- a/libraries/stdlib/common/src/generated/_Collections.kt
+++ b/libraries/stdlib/common/src/generated/_Collections.kt
@@ -354,7 +354,10 @@ public inline fun <T> List<T>.indexOfLast(predicate: (T) -> Boolean): Int {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the collection is empty.
+ * 
+ * @throws NoSuchElementException if the collection is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun <T> Iterable<T>.last(): T {
     when (this) {
@@ -373,7 +376,10 @@ public fun <T> Iterable<T>.last(): T {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the list is empty.
+ * 
+ * @throws NoSuchElementException if the list is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun <T> List<T>.last(): T {
     if (isEmpty())
@@ -383,7 +389,10 @@ public fun <T> List<T>.last(): T {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun <T> Iterable<T>.last(predicate: (T) -> Boolean): T {
     var last: T? = null
@@ -401,7 +410,10 @@ public inline fun <T> Iterable<T>.last(predicate: (T) -> Boolean): T {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun <T> List<T>.last(predicate: (T) -> Boolean): T {
     val iterator = this.listIterator(size)
@@ -438,6 +450,8 @@ public fun <@kotlin.internal.OnlyInputTypes T> List<T>.lastIndexOf(element: T):
 
 /**
  * Returns the last element, or `null` if the collection is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun <T> Iterable<T>.lastOrNull(): T? {
     when (this) {
@@ -456,6 +470,8 @@ public fun <T> Iterable<T>.lastOrNull(): T? {
 
 /**
  * Returns the last element, or `null` if the list is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun <T> List<T>.lastOrNull(): T? {
     return if (isEmpty()) null else this[size - 1]
@@ -463,6 +479,8 @@ public fun <T> List<T>.lastOrNull(): T? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun <T> Iterable<T>.lastOrNull(predicate: (T) -> Boolean): T? {
     var last: T? = null
@@ -476,6 +494,8 @@ public inline fun <T> Iterable<T>.lastOrNull(predicate: (T) -> Boolean): T? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun <T> List<T>.lastOrNull(predicate: (T) -> Boolean): T? {
     val iterator = this.listIterator(size)
@@ -1809,27 +1829,27 @@ public inline fun <T> Iterable<T>.forEachIndexed(action: (index: Int, T) -> Unit
     for (item in this) action(checkIndexOverflow(index++), item)
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Iterable<Double>.max(): Double? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Iterable<Float>.max(): Float? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : Comparable<T>> Iterable<T>.max(): T? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : Comparable<R>> Iterable<T>.maxBy(selector: (T) -> R): T? {
     return maxByOrNull(selector)
@@ -2083,7 +2103,7 @@ public fun <T : Comparable<T>> Iterable<T>.maxOrNull(): T? {
     return max
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> Iterable<T>.maxWith(comparator: Comparator<in T>): T? {
     return maxWithOrNull(comparator)
@@ -2104,27 +2124,27 @@ public fun <T> Iterable<T>.maxWithOrNull(comparator: Comparator<in T>): T? {
     return max
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Iterable<Double>.min(): Double? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Iterable<Float>.min(): Float? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : Comparable<T>> Iterable<T>.min(): T? {
     return minOrNull()
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : Comparable<R>> Iterable<T>.minBy(selector: (T) -> R): T? {
     return minByOrNull(selector)
@@ -2378,7 +2398,7 @@ public fun <T : Comparable<T>> Iterable<T>.minOrNull(): T? {
     return min
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> Iterable<T>.minWith(comparator: Comparator<in T>): T? {
     return minWithOrNull(comparator)
@@ -2908,7 +2928,7 @@ public fun <T : Any> List<T?>.requireNoNulls(): List<T> {
 /**
  * Splits this collection into a list of lists each not exceeding the given [size].
  * 
- * The last list in the resulting list may have less elements than the given [size].
+ * The last list in the resulting list may have fewer elements than the given [size].
  * 
  * @param size the number of elements to take in each list, must be positive and can be greater than the number of elements in this collection.
  * 
@@ -2927,7 +2947,7 @@ public fun <T> Iterable<T>.chunked(size: Int): List<List<T>> {
  * 
  * Note that the list passed to the [transform] function is ephemeral and is valid only inside that function.
  * You should not store it or allow it to escape in some way, unless you made a snapshot of it.
- * The last list may have less elements than the given [size].
+ * The last list may have fewer elements than the given [size].
  * 
  * @param size the number of elements to take in each list, must be positive and can be greater than the number of elements in this collection.
  * 
@@ -3123,7 +3143,7 @@ public inline fun <T> Collection<T>.plusElement(element: T): List<T> {
  * sliding along this collection with the given [step], where each
  * snapshot is a list.
  * 
- * Several last lists may have less elements than the given [size].
+ * Several last lists may have fewer elements than the given [size].
  * 
  * Both [size] and [step] must be positive and can be greater than the number of elements in this collection.
  * @param size the number of elements to take in each window
@@ -3163,7 +3183,7 @@ public fun <T> Iterable<T>.windowed(size: Int, step: Int = 1, partialWindows: Bo
  * 
  * Note that the list passed to the [transform] function is ephemeral and is valid only inside that function.
  * You should not store it or allow it to escape in some way, unless you made a snapshot of it.
- * Several last lists may have less elements than the given [size].
+ * Several last lists may have fewer elements than the given [size].
  * 
  * Both [size] and [step] must be positive and can be greater than the number of elements in this collection.
  * @param size the number of elements to take in each window
diff --git a/libraries/stdlib/common/src/generated/_Maps.kt b/libraries/stdlib/common/src/generated/_Maps.kt
index ea5229ae72f..a9314a02973 100644
--- a/libraries/stdlib/common/src/generated/_Maps.kt
+++ b/libraries/stdlib/common/src/generated/_Maps.kt
@@ -181,7 +181,7 @@ public inline fun <K, V> Map<out K, V>.forEach(action: (Map.Entry<K, V>) -> Unit
     for (element in this) action(element)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.internal.InlineOnly
 public inline fun <K, V, R : Comparable<R>> Map<out K, V>.maxBy(selector: (Map.Entry<K, V>) -> R): Map.Entry<K, V>? {
@@ -311,7 +311,7 @@ public inline fun <K, V, R> Map<out K, V>.maxOfWithOrNull(comparator: Comparator
     return entries.maxOfWithOrNull(comparator, selector)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @kotlin.internal.InlineOnly
 public inline fun <K, V> Map<out K, V>.maxWith(comparator: Comparator<in Map.Entry<K, V>>): Map.Entry<K, V>? {
@@ -327,7 +327,7 @@ public inline fun <K, V> Map<out K, V>.maxWithOrNull(comparator: Comparator<in M
     return entries.maxWithOrNull(comparator)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <K, V, R : Comparable<R>> Map<out K, V>.minBy(selector: (Map.Entry<K, V>) -> R): Map.Entry<K, V>? {
     return minByOrNull(selector)
@@ -456,7 +456,7 @@ public inline fun <K, V, R> Map<out K, V>.minOfWithOrNull(comparator: Comparator
     return entries.minOfWithOrNull(comparator, selector)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <K, V> Map<out K, V>.minWith(comparator: Comparator<in Map.Entry<K, V>>): Map.Entry<K, V>? {
     return minWithOrNull(comparator)
diff --git a/libraries/stdlib/common/src/generated/_Sequences.kt b/libraries/stdlib/common/src/generated/_Sequences.kt
index b1ccb2d1536..ea87d1d46c5 100644
--- a/libraries/stdlib/common/src/generated/_Sequences.kt
+++ b/libraries/stdlib/common/src/generated/_Sequences.kt
@@ -196,9 +196,12 @@ public inline fun <T> Sequence<T>.indexOfLast(predicate: (T) -> Boolean): Int {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the sequence is empty.
  *
  * The operation is _terminal_.
+ * 
+ * @throws NoSuchElementException if the sequence is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun <T> Sequence<T>.last(): T {
     val iterator = iterator()
@@ -212,9 +215,12 @@ public fun <T> Sequence<T>.last(): T {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
  *
  * The operation is _terminal_.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun <T> Sequence<T>.last(predicate: (T) -> Boolean): T {
     var last: T? = null
@@ -251,6 +257,8 @@ public fun <@kotlin.internal.OnlyInputTypes T> Sequence<T>.lastIndexOf(element:
  * Returns the last element, or `null` if the sequence is empty.
  *
  * The operation is _terminal_.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public fun <T> Sequence<T>.lastOrNull(): T? {
     val iterator = iterator()
@@ -266,6 +274,8 @@ public fun <T> Sequence<T>.lastOrNull(): T? {
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
  *
  * The operation is _terminal_.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 public inline fun <T> Sequence<T>.lastOrNull(predicate: (T) -> Boolean): T? {
     var last: T? = null
@@ -1258,27 +1268,27 @@ public inline fun <T> Sequence<T>.forEachIndexed(action: (index: Int, T) -> Unit
     for (item in this) action(checkIndexOverflow(index++), item)
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Sequence<Double>.max(): Double? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Sequence<Float>.max(): Float? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : Comparable<T>> Sequence<T>.max(): T? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : Comparable<R>> Sequence<T>.maxBy(selector: (T) -> R): T? {
     return maxByOrNull(selector)
@@ -1556,7 +1566,7 @@ public fun <T : Comparable<T>> Sequence<T>.maxOrNull(): T? {
     return max
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> Sequence<T>.maxWith(comparator: Comparator<in T>): T? {
     return maxWithOrNull(comparator)
@@ -1579,27 +1589,27 @@ public fun <T> Sequence<T>.maxWithOrNull(comparator: Comparator<in T>): T? {
     return max
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Sequence<Double>.min(): Double? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.1")
 public fun Sequence<Float>.min(): Float? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T : Comparable<T>> Sequence<T>.min(): T? {
     return minOrNull()
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <T, R : Comparable<R>> Sequence<T>.minBy(selector: (T) -> R): T? {
     return minByOrNull(selector)
@@ -1877,7 +1887,7 @@ public fun <T : Comparable<T>> Sequence<T>.minOrNull(): T? {
     return min
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun <T> Sequence<T>.minWith(comparator: Comparator<in T>): T? {
     return minWithOrNull(comparator)
@@ -2352,7 +2362,7 @@ public fun <T : Any> Sequence<T?>.requireNoNulls(): Sequence<T> {
 /**
  * Splits this sequence into a sequence of lists each not exceeding the given [size].
  * 
- * The last list in the resulting sequence may have less elements than the given [size].
+ * The last list in the resulting sequence may have fewer elements than the given [size].
  * 
  * @param size the number of elements to take in each list, must be positive and can be greater than the number of elements in this sequence.
  *
@@ -2373,7 +2383,7 @@ public fun <T> Sequence<T>.chunked(size: Int): Sequence<List<T>> {
  * 
  * Note that the list passed to the [transform] function is ephemeral and is valid only inside that function.
  * You should not store it or allow it to escape in some way, unless you made a snapshot of it.
- * The last list may have less elements than the given [size].
+ * The last list may have fewer elements than the given [size].
  * 
  * @param size the number of elements to take in each list, must be positive and can be greater than the number of elements in this sequence.
  *
@@ -2559,7 +2569,7 @@ public inline fun <T> Sequence<T>.plusElement(element: T): Sequence<T> {
  * sliding along this sequence with the given [step], where each
  * snapshot is a list.
  * 
- * Several last lists may have less elements than the given [size].
+ * Several last lists may have fewer elements than the given [size].
  * 
  * Both [size] and [step] must be positive and can be greater than the number of elements in this sequence.
  * @param size the number of elements to take in each window
@@ -2581,7 +2591,7 @@ public fun <T> Sequence<T>.windowed(size: Int, step: Int = 1, partialWindows: Bo
  * 
  * Note that the list passed to the [transform] function is ephemeral and is valid only inside that function.
  * You should not store it or allow it to escape in some way, unless you made a snapshot of it.
- * Several last lists may have less elements than the given [size].
+ * Several last lists may have fewer elements than the given [size].
  * 
  * Both [size] and [step] must be positive and can be greater than the number of elements in this sequence.
  * @param size the number of elements to take in each window
diff --git a/libraries/stdlib/common/src/generated/_Strings.kt b/libraries/stdlib/common/src/generated/_Strings.kt
index af555f2b813..b86a799c3b9 100644
--- a/libraries/stdlib/common/src/generated/_Strings.kt
+++ b/libraries/stdlib/common/src/generated/_Strings.kt
@@ -139,7 +139,10 @@ public inline fun CharSequence.indexOfLast(predicate: (Char) -> Boolean): Int {
 
 /**
  * Returns the last character.
- * @throws [NoSuchElementException] if the char sequence is empty.
+ * 
+ * @throws NoSuchElementException if the char sequence is empty.
+ * 
+ * @sample samples.text.Strings.last
  */
 public fun CharSequence.last(): Char {
     if (isEmpty())
@@ -149,7 +152,10 @@ public fun CharSequence.last(): Char {
 
 /**
  * Returns the last character matching the given [predicate].
- * @throws [NoSuchElementException] if no such character is found.
+ * 
+ * @throws NoSuchElementException if no such character is found.
+ * 
+ * @sample samples.text.Strings.last
  */
 public inline fun CharSequence.last(predicate: (Char) -> Boolean): Char {
     for (index in this.indices.reversed()) {
@@ -161,6 +167,8 @@ public inline fun CharSequence.last(predicate: (Char) -> Boolean): Char {
 
 /**
  * Returns the last character, or `null` if the char sequence is empty.
+ * 
+ * @sample samples.text.Strings.last
  */
 public fun CharSequence.lastOrNull(): Char? {
     return if (isEmpty()) null else this[length - 1]
@@ -168,6 +176,8 @@ public fun CharSequence.lastOrNull(): Char? {
 
 /**
  * Returns the last character matching the given [predicate], or `null` if no such character was found.
+ * 
+ * @sample samples.text.Strings.last
  */
 public inline fun CharSequence.lastOrNull(predicate: (Char) -> Boolean): Char? {
     for (index in this.indices.reversed()) {
@@ -1139,13 +1149,13 @@ public inline fun CharSequence.forEachIndexed(action: (index: Int, Char) -> Unit
     for (item in this) action(index++, item)
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun CharSequence.max(): Char? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> CharSequence.maxBy(selector: (Char) -> R): Char? {
     return maxByOrNull(selector)
@@ -1356,7 +1366,7 @@ public fun CharSequence.maxOrNull(): Char? {
     return max
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun CharSequence.maxWith(comparator: Comparator<in Char>): Char? {
     return maxWithOrNull(comparator)
@@ -1376,13 +1386,13 @@ public fun CharSequence.maxWithOrNull(comparator: Comparator<in Char>): Char? {
     return max
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun CharSequence.min(): Char? {
     return minOrNull()
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public inline fun <R : Comparable<R>> CharSequence.minBy(selector: (Char) -> R): Char? {
     return minByOrNull(selector)
@@ -1593,7 +1603,7 @@ public fun CharSequence.minOrNull(): Char? {
     return min
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 public fun CharSequence.minWith(comparator: Comparator<in Char>): Char? {
     return minWithOrNull(comparator)
@@ -2081,7 +2091,7 @@ public inline fun CharSequence.sumOf(selector: (Char) -> ULong): ULong {
 /**
  * Splits this char sequence into a list of strings each not exceeding the given [size].
  * 
- * The last string in the resulting list may have less characters than the given [size].
+ * The last string in the resulting list may have fewer characters than the given [size].
  * 
  * @param size the number of elements to take in each string, must be positive and can be greater than the number of elements in this char sequence.
  * 
@@ -2100,7 +2110,7 @@ public fun CharSequence.chunked(size: Int): List<String> {
  * 
  * Note that the char sequence passed to the [transform] function is ephemeral and is valid only inside that function.
  * You should not store it or allow it to escape in some way, unless you made a snapshot of it.
- * The last char sequence may have less characters than the given [size].
+ * The last char sequence may have fewer characters than the given [size].
  * 
  * @param size the number of elements to take in each char sequence, must be positive and can be greater than the number of elements in this char sequence.
  * 
@@ -2114,7 +2124,7 @@ public fun <R> CharSequence.chunked(size: Int, transform: (CharSequence) -> R):
 /**
  * Splits this char sequence into a sequence of strings each not exceeding the given [size].
  * 
- * The last string in the resulting sequence may have less characters than the given [size].
+ * The last string in the resulting sequence may have fewer characters than the given [size].
  * 
  * @param size the number of elements to take in each string, must be positive and can be greater than the number of elements in this char sequence.
  * 
@@ -2133,7 +2143,7 @@ public fun CharSequence.chunkedSequence(size: Int): Sequence<String> {
  * 
  * Note that the char sequence passed to the [transform] function is ephemeral and is valid only inside that function.
  * You should not store it or allow it to escape in some way, unless you made a snapshot of it.
- * The last char sequence may have less characters than the given [size].
+ * The last char sequence may have fewer characters than the given [size].
  * 
  * @param size the number of elements to take in each char sequence, must be positive and can be greater than the number of elements in this char sequence.
  * 
@@ -2189,7 +2199,7 @@ public inline fun String.partition(predicate: (Char) -> Boolean): Pair<String, S
  * sliding along this char sequence with the given [step], where each
  * snapshot is a string.
  * 
- * Several last strings may have less characters than the given [size].
+ * Several last strings may have fewer characters than the given [size].
  * 
  * Both [size] and [step] must be positive and can be greater than the number of elements in this char sequence.
  * @param size the number of elements to take in each window
@@ -2211,7 +2221,7 @@ public fun CharSequence.windowed(size: Int, step: Int = 1, partialWindows: Boole
  * 
  * Note that the char sequence passed to the [transform] function is ephemeral and is valid only inside that function.
  * You should not store it or allow it to escape in some way, unless you made a snapshot of it.
- * Several last char sequences may have less characters than the given [size].
+ * Several last char sequences may have fewer characters than the given [size].
  * 
  * Both [size] and [step] must be positive and can be greater than the number of elements in this char sequence.
  * @param size the number of elements to take in each window
@@ -2242,7 +2252,7 @@ public fun <R> CharSequence.windowed(size: Int, step: Int = 1, partialWindows: B
  * sliding along this char sequence with the given [step], where each
  * snapshot is a string.
  * 
- * Several last strings may have less characters than the given [size].
+ * Several last strings may have fewer characters than the given [size].
  * 
  * Both [size] and [step] must be positive and can be greater than the number of elements in this char sequence.
  * @param size the number of elements to take in each window
@@ -2264,7 +2274,7 @@ public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindow
  * 
  * Note that the char sequence passed to the [transform] function is ephemeral and is valid only inside that function.
  * You should not store it or allow it to escape in some way, unless you made a snapshot of it.
- * Several last char sequences may have less characters than the given [size].
+ * Several last char sequences may have fewer characters than the given [size].
  * 
  * Both [size] and [step] must be positive and can be greater than the number of elements in this char sequence.
  * @param size the number of elements to take in each window
diff --git a/libraries/stdlib/common/src/generated/_UArrays.kt b/libraries/stdlib/common/src/generated/_UArrays.kt
index 271977e22e7..f911da0a238 100644
--- a/libraries/stdlib/common/src/generated/_UArrays.kt
+++ b/libraries/stdlib/common/src/generated/_UArrays.kt
@@ -884,7 +884,10 @@ public inline fun UShortArray.indexOfLast(predicate: (UShort) -> Boolean): Int {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -895,7 +898,10 @@ public inline fun UIntArray.last(): UInt {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -906,7 +912,10 @@ public inline fun ULongArray.last(): ULong {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -917,7 +926,10 @@ public inline fun UByteArray.last(): UByte {
 
 /**
  * Returns the last element.
- * @throws [NoSuchElementException] if the array is empty.
+ * 
+ * @throws NoSuchElementException if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -928,7 +940,10 @@ public inline fun UShortArray.last(): UShort {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -943,7 +958,10 @@ public inline fun UIntArray.last(predicate: (UInt) -> Boolean): UInt {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -958,7 +976,10 @@ public inline fun ULongArray.last(predicate: (ULong) -> Boolean): ULong {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -973,7 +994,10 @@ public inline fun UByteArray.last(predicate: (UByte) -> Boolean): UByte {
 
 /**
  * Returns the last element matching the given [predicate].
- * @throws [NoSuchElementException] if no such element is found.
+ * 
+ * @throws NoSuchElementException if no such element is found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -1028,6 +1052,8 @@ public inline fun UShortArray.lastIndexOf(element: UShort): Int {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -1037,6 +1063,8 @@ public fun UIntArray.lastOrNull(): UInt? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -1046,6 +1074,8 @@ public fun ULongArray.lastOrNull(): ULong? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -1055,6 +1085,8 @@ public fun UByteArray.lastOrNull(): UByte? {
 
 /**
  * Returns the last element, or `null` if the array is empty.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -1064,6 +1096,8 @@ public fun UShortArray.lastOrNull(): UShort? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -1078,6 +1112,8 @@ public inline fun UIntArray.lastOrNull(predicate: (UInt) -> Boolean): UInt? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -1092,6 +1128,8 @@ public inline fun ULongArray.lastOrNull(predicate: (ULong) -> Boolean): ULong? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -1106,6 +1144,8 @@ public inline fun UByteArray.lastOrNull(predicate: (UByte) -> Boolean): UByte? {
 
 /**
  * Returns the last element matching the given [predicate], or `null` if no such element was found.
+ * 
+ * @sample samples.collections.Collections.Elements.last
  */
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -5902,7 +5942,7 @@ public inline fun UShortArray.forEachIndexed(action: (index: Int, UShort) -> Uni
     for (item in this) action(index++, item)
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -5910,7 +5950,7 @@ public fun UIntArray.max(): UInt? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -5918,7 +5958,7 @@ public fun ULongArray.max(): ULong? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -5926,7 +5966,7 @@ public fun UByteArray.max(): UByte? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxOrNull instead.", ReplaceWith("maxOrNull()"))
+@Deprecated("Use maxOrNull instead.", ReplaceWith("this.maxOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -5934,7 +5974,7 @@ public fun UShortArray.max(): UShort? {
     return maxOrNull()
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -5943,7 +5983,7 @@ public inline fun <R : Comparable<R>> UIntArray.maxBy(selector: (UInt) -> R): UI
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -5952,7 +5992,7 @@ public inline fun <R : Comparable<R>> ULongArray.maxBy(selector: (ULong) -> R):
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -5961,7 +6001,7 @@ public inline fun <R : Comparable<R>> UByteArray.maxBy(selector: (UByte) -> R):
     return maxByOrNull(selector)
 }
 
-@Deprecated("Use maxByOrNull instead.", ReplaceWith("maxByOrNull(selector)"))
+@Deprecated("Use maxByOrNull instead.", ReplaceWith("this.maxByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6834,7 +6874,7 @@ public fun UShortArray.maxOrNull(): UShort? {
     return max
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6842,7 +6882,7 @@ public fun UIntArray.maxWith(comparator: Comparator<in UInt>): UInt? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6850,7 +6890,7 @@ public fun ULongArray.maxWith(comparator: Comparator<in ULong>): ULong? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6858,7 +6898,7 @@ public fun UByteArray.maxWith(comparator: Comparator<in UByte>): UByte? {
     return maxWithOrNull(comparator)
 }
 
-@Deprecated("Use maxWithOrNull instead.", ReplaceWith("maxWithOrNull(comparator)"))
+@Deprecated("Use maxWithOrNull instead.", ReplaceWith("this.maxWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6926,7 +6966,7 @@ public fun UShortArray.maxWithOrNull(comparator: Comparator<in UShort>): UShort?
     return max
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6934,7 +6974,7 @@ public fun UIntArray.min(): UInt? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6942,7 +6982,7 @@ public fun ULongArray.min(): ULong? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6950,7 +6990,7 @@ public fun UByteArray.min(): UByte? {
     return minOrNull()
 }
 
-@Deprecated("Use minOrNull instead.", ReplaceWith("minOrNull()"))
+@Deprecated("Use minOrNull instead.", ReplaceWith("this.minOrNull()"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6958,7 +6998,7 @@ public fun UShortArray.min(): UShort? {
     return minOrNull()
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6967,7 +7007,7 @@ public inline fun <R : Comparable<R>> UIntArray.minBy(selector: (UInt) -> R): UI
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6976,7 +7016,7 @@ public inline fun <R : Comparable<R>> ULongArray.minBy(selector: (ULong) -> R):
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -6985,7 +7025,7 @@ public inline fun <R : Comparable<R>> UByteArray.minBy(selector: (UByte) -> R):
     return minByOrNull(selector)
 }
 
-@Deprecated("Use minByOrNull instead.", ReplaceWith("minByOrNull(selector)"))
+@Deprecated("Use minByOrNull instead.", ReplaceWith("this.minByOrNull(selector)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -7858,7 +7898,7 @@ public fun UShortArray.minOrNull(): UShort? {
     return min
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -7866,7 +7906,7 @@ public fun UIntArray.minWith(comparator: Comparator<in UInt>): UInt? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -7874,7 +7914,7 @@ public fun ULongArray.minWith(comparator: Comparator<in ULong>): ULong? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
@@ -7882,7 +7922,7 @@ public fun UByteArray.minWith(comparator: Comparator<in UByte>): UByte? {
     return minWithOrNull(comparator)
 }
 
-@Deprecated("Use minWithOrNull instead.", ReplaceWith("minWithOrNull(comparator)"))
+@Deprecated("Use minWithOrNull instead.", ReplaceWith("this.minWithOrNull(comparator)"))
 @DeprecatedSinceKotlin(warningSince = "1.4")
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
diff --git a/libraries/stdlib/coroutines-experimental/build.gradle.kts b/libraries/stdlib/coroutines-experimental/build.gradle.kts
index 0ebeb1b702e..98c75f39c5c 100644
--- a/libraries/stdlib/coroutines-experimental/build.gradle.kts
+++ b/libraries/stdlib/coroutines-experimental/build.gradle.kts
@@ -51,9 +51,9 @@ tasks {
                 "-Xopt-in=kotlin.contracts.ExperimentalContracts",
                 "-Xcoroutines=enable",
                 "-XXLanguage:-ReleaseCoroutines",
-                "-Xno-use-ir",
-                "-module-name", "kotlin-coroutines-experimental-compat"
+                "-Xno-use-ir"
             )
+            moduleName = "kotlin-coroutines-experimental-compat"
         }
     }
     val compileTestKotlin by existing(KotlinCompile::class) {
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 24b83374380..1e56622188d 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -76,9 +76,10 @@ compileKotlin {
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
             "-Xnormalize-constructor-calls=enable",
-            "-module-name", project.name,
+            "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=kotlin.contracts.ExperimentalContracts",
     ]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
@@ -88,6 +89,7 @@ compileTestKotlin {
             "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
             "-Xopt-in=kotlin.ExperimentalStdlibApi",
+            "-Xopt-in=kotlin.io.path.ExperimentalPathApi",
     ]
 }
 
diff --git a/libraries/stdlib/jdk7/java9/module-info.java b/libraries/stdlib/jdk7/java9/module-info.java
index b786aa09f83..1741813c0c6 100644
--- a/libraries/stdlib/jdk7/java9/module-info.java
+++ b/libraries/stdlib/jdk7/java9/module-info.java
@@ -3,6 +3,7 @@ module kotlin.stdlib.jdk7 {
     requires transitive kotlin.stdlib;
 
     exports kotlin.jdk7;
+    exports kotlin.io.path;
 
     exports kotlin.internal.jdk7 to kotlin.stdlib.jdk8;
     opens kotlin.internal.jdk7 to kotlin.stdlib;
diff --git a/libraries/stdlib/jdk7/src/kotlin/io/path/ExperimentalPathApi.kt b/libraries/stdlib/jdk7/src/kotlin/io/path/ExperimentalPathApi.kt
new file mode 100644
index 00000000000..8425718e384
--- /dev/null
+++ b/libraries/stdlib/jdk7/src/kotlin/io/path/ExperimentalPathApi.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.io.path
+
+import kotlin.annotation.AnnotationTarget.*
+
+/**
+ * This annotation marks the extensions and top-level functions for working with [java.nio.file.Path] considered experimental.
+ *
+ * > Beware using the annotated API especially if you're developing a library, since your library might become binary incompatible
+ * with the future versions of the standard library.
+ *
+ * Any usage of a declaration annotated with `@ExperimentalPathAPI` must be accepted either by
+ * annotating that usage with the [OptIn] annotation, e.g. `@OptIn(ExperimentalPathAPI::class)`,
+ * or by using the compiler argument `-Xopt-in=kotlin.io.path.ExperimentalPathAPI`.
+ */
+@RequiresOptIn(level = RequiresOptIn.Level.ERROR)
+@Retention(AnnotationRetention.BINARY)
+@Target(
+    CLASS,
+    ANNOTATION_CLASS,
+    PROPERTY,
+    FIELD,
+    LOCAL_VARIABLE,
+    VALUE_PARAMETER,
+    CONSTRUCTOR,
+    FUNCTION,
+    PROPERTY_GETTER,
+    PROPERTY_SETTER,
+    TYPEALIAS
+)
+@MustBeDocumented
+@SinceKotlin("1.4")
+public annotation class ExperimentalPathApi
diff --git a/libraries/stdlib/jdk7/src/kotlin/io/path/PathReadWrite.kt b/libraries/stdlib/jdk7/src/kotlin/io/path/PathReadWrite.kt
new file mode 100644
index 00000000000..4692f8618ae
--- /dev/null
+++ b/libraries/stdlib/jdk7/src/kotlin/io/path/PathReadWrite.kt
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "RedundantVisibilityModifier", "RedundantUnitReturnType", "SameParameterValue")
+@file:JvmMultifileClass
+@file:JvmName("PathsKt")
+
+package kotlin.io.path
+
+import java.io.*
+import java.nio.charset.Charset
+import java.nio.file.Files
+import java.nio.file.OpenOption
+import java.nio.file.Path
+import java.nio.file.StandardOpenOption
+
+/**
+ * Returns a new [InputStreamReader] for reading the content of this file.
+ *
+ * @param charset character set to use for reading text, UTF-8 by default.
+ * @param options options to determine how the file is opened.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.reader(charset: Charset = Charsets.UTF_8, vararg options: OpenOption): InputStreamReader {
+    return InputStreamReader(Files.newInputStream(this, *options), charset)
+}
+
+/**
+ * Returns a new [BufferedReader] for reading the content of this file.
+ *
+ * @param charset character set to use for reading text, UTF-8 by default.
+ * @param bufferSize necessary size of the buffer.
+ * @param options options to determine how the file is opened.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.bufferedReader(
+    charset: Charset = Charsets.UTF_8,
+    bufferSize: Int = DEFAULT_BUFFER_SIZE,
+    vararg options: OpenOption
+): BufferedReader {
+    return BufferedReader(
+        InputStreamReader(
+            Files.newInputStream(this, *options),
+            charset
+        ),
+        bufferSize)
+}
+
+/**
+ * Returns a new [OutputStreamWriter] for writing the content of this file.
+ *
+ * @param charset character set to use for writing text, UTF-8 by default.
+ * @param options options to determine how the file is opened.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.writer(charset: Charset = Charsets.UTF_8, vararg options: OpenOption): OutputStreamWriter {
+    return OutputStreamWriter(Files.newOutputStream(this, *options), charset)
+}
+
+/**
+ * Returns a new [BufferedWriter] for writing the content of this file.
+ *
+ * @param charset character set to use for writing text, UTF-8 by default.
+ * @param bufferSize necessary size of the buffer.
+ * @param options options to determine how the file is opened.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.bufferedWriter(
+    charset: Charset = Charsets.UTF_8,
+    bufferSize: Int = DEFAULT_BUFFER_SIZE,
+    vararg options: OpenOption
+): BufferedWriter {
+    return BufferedWriter(
+        OutputStreamWriter(
+            Files.newOutputStream(this, *options),
+            charset),
+        bufferSize)
+}
+
+/**
+ * Gets the entire content of this file as a byte array.
+ *
+ * It's not recommended to use this function on huge files.
+ * It has an internal limitation of approximately 2 GB byte array size.
+ * For reading large files or files of unknown size, open an [InputStream][Path.inputStream] and read blocks sequentially.
+ *
+ * @return the entire content of this file as a byte array.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.readBytes(): ByteArray {
+    return Files.readAllBytes(this)
+}
+
+/**
+ * Writes an [array] of bytes to this file.
+ *
+ * By default, the file will be overwritten if it already exists, but you can control this behavior
+ * with [options].
+ *
+ * @param array byte array to write into this file.
+ * @param options options to determine how the file is opened.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.writeBytes(array: ByteArray, vararg options: OpenOption): Unit {
+    Files.write(this, array, *options)
+}
+
+/**
+ * Appends an [array] of bytes to the content of this file.
+ *
+ * @param array byte array to append to this file.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.appendBytes(array: ByteArray) {
+    Files.write(this, array, StandardOpenOption.APPEND)
+}
+
+/**
+ * Gets the entire content of this file as a String using UTF-8 or the specified [charset].
+ *
+ * It's not recommended to use this function on huge files.
+ * For reading large files or files of unknown size, open a [Reader][Path.reader] and read blocks of text sequentially.
+ *
+ * @param charset character set to use for reading text, UTF-8 by default.
+ * @return the entire content of this file as a String.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public fun Path.readText(charset: Charset = Charsets.UTF_8): String =
+    reader(charset).use { it.readText() }
+
+/**
+ * Sets the content of this file as [text] encoded using UTF-8 or the specified [charset].
+ *
+ * By default, the file will be overwritten if it already exists, but you can control this behavior
+ * with [options].
+ *
+ * @param text text to write into file.
+ * @param charset character set to use for writing text, UTF-8 by default.
+ * @param options options to determine how the file is opened.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public fun Path.writeText(text: String, charset: Charset = Charsets.UTF_8, vararg options: OpenOption) {
+    Files.newOutputStream(this, *options).writer(charset).use { it.write(text) }
+}
+
+/**
+ * Appends [text] to the content of this file using UTF-8 or the specified [charset].
+ *
+ * @param text text to append to file.
+ * @param charset character set to use for writing text, UTF-8 by default.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public fun Path.appendText(text: String, charset: Charset = Charsets.UTF_8) {
+    Files.newOutputStream(this, StandardOpenOption.APPEND).writer(charset).use { it.write(text) }
+}
+
+/**
+ * Reads this file line by line using the specified [charset] and calls [action] for each line.
+ * Default charset is UTF-8.
+ *
+ * You may use this function on huge files.
+ *
+ * @param charset character set to use for reading text, UTF-8 by default.
+ * @param action function to process file lines.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.forEachLine(charset: Charset = Charsets.UTF_8, action: (line: String) -> Unit): Unit {
+    // cannot use non-inline forEachLine
+    Files.newBufferedReader(this, charset).useLines { it.forEach(action) }
+}
+
+/**
+ * Constructs a new InputStream of this file and returns it as a result.
+ *
+ * The [options] parameter determines how the file is opened. If no options are present then it is
+ * equivalent to opening the file with the [READ][StandardOpenOption.READ] option.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.inputStream(vararg options: OpenOption): InputStream {
+    return Files.newInputStream(this, *options)
+}
+
+/**
+ * Constructs a new OutputStream of this file and returns it as a result.
+ *
+ * The [options] parameter determines how the file is opened. If no options are present then it is
+ * equivalent to opening the file with the [CREATE][StandardOpenOption.CREATE],
+ * [TRUNCATE_EXISTING][StandardOpenOption.TRUNCATE_EXISTING], and [WRITE][StandardOpenOption.WRITE]
+ * options.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.outputStream(vararg options: OpenOption): OutputStream {
+    return Files.newOutputStream(this, *options)
+}
+
+/**
+ * Reads the file content as a list of lines.
+ *
+ * It's not recommended to use this function on huge files.
+ * For reading lines of a large file or a file of unknown size, use [Path.forEachLine] or [Path.useLines].
+ *
+ * @param charset character set to use for reading text, UTF-8 by default.
+ * @return list of file lines.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.readLines(charset: Charset = Charsets.UTF_8): List<String> {
+    return Files.readAllLines(this, charset)
+}
+
+/**
+ * Calls the [block] callback giving it a sequence of all the lines in this file and closes the reader once
+ * the processing is complete.
+
+ * @param charset character set to use for reading text, UTF-8 by default.
+ * @return the value returned by [block].
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun <T> Path.useLines(charset: Charset = Charsets.UTF_8, block: (Sequence<String>) -> T): T {
+    return Files.newBufferedReader(this, charset).use { block(it.lineSequence()) }
+}
+
+/**
+ * Write the specified collection of char sequences [lines] to a file terminating each one with the platform's line separator.
+ *
+ * By default, the file will be overwritten if it already exists, but you can control this behavior
+ * with [options].
+ *
+ * @param charset character set to use for writing text, UTF-8 by default.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.writeLines(lines: Iterable<CharSequence>, charset: Charset = Charsets.UTF_8, vararg options: OpenOption): Path {
+    return Files.write(this, lines, charset, *options)
+}
+
+/**
+ * Write the specified sequence of char sequences [lines] to a file terminating each one with the platform's line separator.
+ *
+ * By default, the file will be overwritten if it already exists, but you can control this behavior
+ * with [options].
+ *
+ * @param charset character set to use for writing text, UTF-8 by default.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.writeLines(lines: Sequence<CharSequence>, charset: Charset = Charsets.UTF_8, vararg options: OpenOption): Path {
+    return Files.write(this, lines.asIterable(), charset, *options)
+}
+
+/**
+ * Appends the specified collection of char sequences [lines] to a file terminating each one with the platform's line separator.
+ *
+ * @param charset character set to use for writing text, UTF-8 by default.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.appendLines(lines: Iterable<CharSequence>, charset: Charset = Charsets.UTF_8): Path {
+    return Files.write(this, lines, charset, StandardOpenOption.APPEND)
+}
+
+/**
+ * Appends the specified sequence of char sequences [lines] to a file terminating each one with the platform's line separator.
+ *
+ * @param charset character set to use for writing text, UTF-8 by default.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.appendLines(lines: Sequence<CharSequence>, charset: Charset = Charsets.UTF_8): Path {
+    return Files.write(this, lines.asIterable(), charset, StandardOpenOption.APPEND)
+}
+
+
diff --git a/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt b/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt
new file mode 100644
index 00000000000..4316fb8ee1b
--- /dev/null
+++ b/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt
@@ -0,0 +1,906 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "RedundantVisibilityModifier")
+@file:JvmMultifileClass
+@file:JvmName("PathsKt")
+
+package kotlin.io.path
+
+import java.io.IOException
+import java.net.URI
+import java.nio.file.*
+import java.nio.file.FileAlreadyExistsException
+import java.nio.file.NoSuchFileException
+import java.nio.file.attribute.*
+
+/**
+ * Returns the name of the file or directory denoted by this path as a string,
+ * or an empty string if this path has zero path elements.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public val Path.name: String
+    get() = fileName?.toString().orEmpty()
+
+/**
+ * Returns the [name][Path.name] of this file or directory without an extension,
+ * or an empty string if this path has zero path elements.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public val Path.nameWithoutExtension: String
+    get() = fileName?.toString()?.substringBeforeLast(".") ?: ""
+
+/**
+ * Returns the extension of this path (not including the dot),
+ * or an empty string if it doesn't have one.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public val Path.extension: String
+    get() = fileName?.toString()?.substringAfterLast('.', "") ?: ""
+
+/**
+ * Returns this path as a [String] using the invariant separator '/' to
+ * separate the names in the name sequence.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public val Path.invariantSeparatorsPath: String
+    get() {
+        val separator = fileSystem.separator
+        return if (separator != "/") toString().replace(separator, "/") else toString()
+    }
+
+
+/**
+ * Calculates the relative path for this path from a [base] path.
+ *
+ * Note that the [base] path is treated as a directory.
+ * If this path matches the [base] path, then a [Path] with an empty path will be returned.
+ *
+ * @return the relative path from [base] to this.
+ *
+ * @throws IllegalArgumentException if this and base paths have different roots.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public fun Path.relativeTo(base: Path): Path = try {
+    PathRelativizer.tryRelativeTo(this, base)
+} catch (e: IllegalArgumentException) {
+    throw IllegalArgumentException(e.message + "\nthis path: $this\nbase path: $base", e)
+}
+
+/**
+ * Calculates the relative path for this path from a [base] path.
+ *
+ * Note that the [base] path is treated as a directory.
+ * If this path matches the [base] path, then a [Path] with an empty path will be returned.
+ *
+ * @return the relative path from [base] to this, or `this` if this and base paths have different roots.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public fun Path.relativeToOrSelf(base: Path): Path =
+    relativeToOrNull(base) ?: this
+
+/**
+ * Calculates the relative path for this path from a [base] path.
+ *
+ * Note that the [base] path is treated as a directory.
+ * If this path matches the [base] path, then a [Path] with an empty path will be returned.
+ *
+ * @return the relative path from [base] to this, or `null` if this and base paths have different roots.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public fun Path.relativeToOrNull(base: Path): Path? = try {
+    PathRelativizer.tryRelativeTo(this, base)
+} catch (e: IllegalArgumentException) {
+    null
+}
+
+private object PathRelativizer {
+    private val emptyPath = Paths.get("")
+    private val parentPath = Paths.get("..")
+
+    // Workarounds some bugs in Path.relativize that were fixed only in JDK9
+    fun tryRelativeTo(path: Path, base: Path): Path {
+        val bn = base.normalize()
+        val pn = path.normalize()
+        val rn = bn.relativize(pn)
+        // work around https://bugs.openjdk.java.net/browse/JDK-8066943
+        for (i in 0 until minOf(bn.nameCount, pn.nameCount)) {
+            if (bn.getName(i) != parentPath) break
+            if (pn.getName(i) != parentPath) throw IllegalArgumentException("Unable to compute relative path")
+        }
+        // work around https://bugs.openjdk.java.net/browse/JDK-8072495
+        val r = if (pn != bn && bn == emptyPath) {
+            pn
+        } else {
+            val rnString = rn.toString()
+            // drop invalid dangling separator from path string https://bugs.openjdk.java.net/browse/JDK-8140449
+            if (rnString.endsWith(rn.fileSystem.separator))
+                rn.fileSystem.getPath(rnString.dropLast(rn.fileSystem.separator.length))
+            else
+                rn
+        }
+        return r
+    }
+}
+
+/**
+ * Copies a file or directory located by this path to the given [target] path.
+ *
+ * Unlike `File.copyTo`, if some directories on the way to the [target] are missing, then they won't be created automatically.
+ * You can use the following approach to ensure that required intermediate directories are created:
+ * ```
+ * sourcePath.copyTo(destinationPath.apply { parent?.createDirectories() })
+ * ```
+ *
+ * If the [target] path already exists, this function will fail unless [overwrite] argument is set to `true`.
+ *
+ * When [overwrite] is `true` and [target] is a directory, it is replaced only if it is empty.
+ *
+ * If this path is a directory, it is copied without its content, i.e. an empty [target] directory is created.
+ * If you want to copy directory including its contents, use [copyRecursively].
+ *
+ * The operation doesn't preserve copied file attributes such as creation/modification date, permissions, etc.
+ *
+ * @param overwrite `true` if destination overwrite is allowed.
+ * @return the [target] path.
+ * @throws NoSuchFileException if the source path doesn't exist.
+ * @throws FileAlreadyExistsException if the destination path already exists and [overwrite] argument is set to `false`.
+ * @throws DirectoryNotEmptyException if the destination path point to an existing directory and [overwrite] argument is `true`,
+ *   when the directory being replaced is not empty.
+ * @throws IOException if any errors occur while copying.
+ *
+ * @see Files.copy
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.copyTo(target: Path, overwrite: Boolean = false): Path {
+    val options = if (overwrite) arrayOf<CopyOption>(StandardCopyOption.REPLACE_EXISTING) else emptyArray()
+    return Files.copy(this, target, *options)
+}
+
+/**
+ * Copies a file or directory located by this path to the given [target] path.
+ *
+ * Unlike `File.copyTo`, if some directories on the way to the [target] are missing, then they won't be created automatically.
+ * You can use the following approach to ensure that required intermediate directories are created:
+ * ```
+ * sourcePath.copyTo(destinationPath.apply { parent?.createDirectories() })
+ * ```
+ *
+ * If the [target] path already exists, this function will fail unless the
+ * [REPLACE_EXISTING][StandardCopyOption.REPLACE_EXISTING] is option is used.
+ *
+ * When [REPLACE_EXISTING][StandardCopyOption.REPLACE_EXISTING] is used and [target] is a directory,
+ * it is replaced only if it is empty.
+ *
+ * If this path is a directory, it is copied *without* its content, i.e. an empty [target] directory is created.
+ * If you want to copy a directory including its contents, use [copyRecursively].
+ *
+ * The operation doesn't preserve copied file attributes such as creation/modification date,
+ * permissions, etc. unless [COPY_ATTRIBUTES][StandardCopyOption.COPY_ATTRIBUTES] is used.
+ *
+ * @param options options to control how the path is copied.
+ * @return the [target] path.
+ * @throws NoSuchFileException if the source path doesn't exist.
+ * @throws FileAlreadyExistsException if the destination path already exists and [REPLACE_EXISTING][StandardCopyOption.REPLACE_EXISTING] is not used.
+ * @throws DirectoryNotEmptyException if the destination path point to an existing directory and [REPLACE_EXISTING][StandardCopyOption.REPLACE_EXISTING] is used,
+ *   when the directory being replaced is not empty.
+ * @throws IOException if any errors occur while copying.
+ *
+ * @see Files.copy
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.copyTo(target: Path, vararg options: CopyOption): Path {
+    return Files.copy(this, target, *options)
+}
+
+/**
+ * Checks if the file located by this path exists.
+ *
+ * @return `true`, if the file definitely exists, `false` otherwise,
+ * including situations when the existence cannot be determined.
+ *
+ * @param options options to control how symbolic links are handled.
+ *
+ * @see Files.exists
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.exists(vararg options: LinkOption): Boolean = Files.exists(this, *options)
+
+/**
+ * Checks if the file located by this path does not exist.
+ *
+ * @return `true`, if the file definitely does not exist, `false` otherwise,
+ * including situations when the existence cannot be determined.
+ *
+ * @param options options to control how symbolic links are handled.
+ *
+ * @see Files.notExists
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.notExists(vararg options: LinkOption): Boolean = Files.notExists(this, *options)
+
+/**
+ * Checks if the file located by this path is a regular file.
+ *
+ * @param options options to control how symbolic links are handled.
+ *
+ * @see Files.isRegularFile
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.isRegularFile(vararg options: LinkOption): Boolean = Files.isRegularFile(this, *options)
+
+/**
+ * Checks if the file located by this path is a directory.
+ *
+ * By default, symbolic links in the path are followed.
+ *
+ * @param options options to control how symbolic links are handled.
+ *
+ * @see Files.isDirectory
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.isDirectory(vararg options: LinkOption): Boolean = Files.isDirectory(this, *options)
+
+/**
+ * Checks if the file located by this path exists and is a symbolic link.
+ *
+ * @see Files.isSymbolicLink
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.isSymbolicLink(): Boolean = Files.isSymbolicLink(this)
+
+/**
+ * Checks if the file located by this path exists and is executable.
+ *
+ * @see Files.isExecutable
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.isExecutable(): Boolean = Files.isExecutable(this)
+
+/**
+ * Checks if the file located by this path is considered hidden.
+ *
+ * This check is dependant on the current filesystem. For example, on UNIX-like operating systems, a
+ * path is considered hidden if its name begins with a dot. On Windows, file attributes are checked.
+ *
+ * @see Files.isHidden
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.isHidden(): Boolean = Files.isHidden(this)
+
+/**
+ * Checks if the file located by this path exists and is readable.
+ *
+ * @see Files.isReadable
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.isReadable(): Boolean = Files.isReadable(this)
+
+/**
+ * Checks if the file located by this path exists and is writable.
+ *
+ * @see Files.isWritable
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.isWritable(): Boolean = Files.isWritable(this)
+
+/**
+ * Checks if the file located by this path points to the same file or directory as [other].
+ *
+ * @see Files.isSameFile
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.isSameFileAs(other: Path): Boolean = Files.isSameFile(this, other)
+
+/**
+ * Returns a list of the entries in this directory optionally filtered by matching against the specified [glob] pattern.
+ *
+ * @param glob the globbing pattern. The syntax is specified by the [FileSystem.getPathMatcher] method.
+ *
+ * @throws java.util.regex.PatternSyntaxException if the glob pattern is invalid.
+ * @throws NotDirectoryException If this path does not refer to a directory.
+ * @throws IOException If an I/O error occurs.
+ *
+ * @see Files.newDirectoryStream
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+public fun Path.listDirectoryEntries(glob: String = "*"): List<Path> {
+    return Files.newDirectoryStream(this, glob).use { it.toList() }
+}
+
+/**
+ * Calls the [block] callback with a sequence of all entries in this directory
+ * optionally filtered by matching against the specified [glob] pattern.
+ *
+ * @param glob the globbing pattern. The syntax is specified by the [FileSystem.getPathMatcher] method.
+ *
+ * @throws java.util.regex.PatternSyntaxException if the glob pattern is invalid.
+ * @throws NotDirectoryException If this path does not refer to a directory.
+ * @throws IOException If an I/O error occurs.
+ * @return the value returned by [block].
+ *
+ * @see Files.newDirectoryStream
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun <T> Path.useDirectoryEntries(glob: String = "*", block: (Sequence<Path>) -> T): T {
+    return Files.newDirectoryStream(this, glob).use { block(it.asSequence()) }
+}
+
+/**
+ * Performs the given [action] on each entry in this directory optionally filtered by matching against the specified [glob] pattern.
+ *
+ * @param glob the globbing pattern. The syntax is specified by the [FileSystem.getPathMatcher] method.
+ *
+ * @throws java.util.regex.PatternSyntaxException if the glob pattern is invalid.
+ * @throws NotDirectoryException If this path does not refer to a directory.
+ * @throws IOException If an I/O error occurs.
+ *
+ * @see Files.newDirectoryStream
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.forEachDirectoryEntry(glob: String = "*", action: (Path) -> Unit) {
+    return Files.newDirectoryStream(this, glob).use { it.forEach(action) }
+}
+
+/**
+ * Returns the size of a regular file as a [Long] value of bytes or throws an exception if the file doesn't exist.
+ *
+ * @throws IOException if an I/O error occurred.
+ * @see Files.size
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.fileSize(): Long =
+    Files.size(this)
+
+/**
+ * Deletes the existing file or empty directory specified by this path.
+ *
+ * @throws NoSuchFileException if the file or directory does not exist.
+ * @throws DirectoryNotEmptyException if the directory exists but is not empty.
+ *
+ * @see Files.delete
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.deleteExisting() {
+    Files.delete(this)
+}
+
+/**
+ * Deletes the file or empty directory specified by this path if it exists.
+ *
+ * @return `true` if the existing file was successfully deleted, `false` if the file does not exist.
+ *
+ * @throws DirectoryNotEmptyException if the directory exists but is not empty
+ *
+ * @see Files.deleteIfExists
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.deleteIfExists() =
+    Files.deleteIfExists(this)
+
+/**
+ * Creates a new directory or throws an exception if there is already a file or directory located by this path.
+ *
+ * Note that the parent directory where this directory is going to be created must already exist.
+ * If you need to create all non-existent parent directories, use [Path.createDirectories].
+ *
+ * @param attributes an optional list of file attributes to set atomically when creating the directory.
+ *
+ * @throws FileAlreadyExistsException if there is already a file or directory located by this path
+ * (optional specific exception, some implementations may throw more general [IOException]).
+ * @throws IOException if an I/O error occurs or the parent directory does not exist.
+ * @throws UnsupportedOperationException if the [attributes ]array contains an attribute that cannot be set atomically
+ *   when creating the directory.
+ *
+ * @see Files.createDirectory
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.createDirectory(vararg attributes: FileAttribute<*>): Path =
+    Files.createDirectory(this, *attributes)
+
+/**
+ * Creates a directory ensuring that all nonexistent parent directories exist by creating them first.
+ *
+ * If the directory already exists, this function does not throw an exception, unlike [Path.createDirectory].
+ *
+ * @param attributes an optional list of file attributes to set atomically when creating the directory.
+ *
+ * @throws FileAlreadyExistsException if there is already a file located by this path
+ * (optional specific exception, some implementations may throw more general [IOException]).
+ * @throws IOException if an I/O error occurs.
+ * @throws UnsupportedOperationException if the [attributes ]array contains an attribute that cannot be set atomically
+ *   when creating the directory.
+ *
+ * @see Files.createDirectories
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.createDirectories(vararg attributes: FileAttribute<*>): Path =
+    Files.createDirectories(this, *attributes)
+
+
+/**
+ * Moves or renames the file located by this path to the [target] path.
+ *
+ * @param options options specifying how the move should be done, see [StandardCopyOption], [LinkOption].
+ *
+ * @throws FileAlreadyExistsException if the target file exists but cannot be replaced because the
+ *   [StandardCopyOption.REPLACE_EXISTING] option is not specified (optional specific exception).
+ * @throws DirectoryNotEmptyException the [StandardCopyOption.REPLACE_EXISTING] option is specified but the file
+ *   cannot be replaced because it is a non-empty directory, or the
+ *   source is a non-empty directory containing entries that would
+ *   be required to be moved (optional specific exception).
+ *
+ * @see Files.move
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.moveTo(target: Path, vararg options: CopyOption): Path =
+    Files.move(this, target, *options)
+
+/**
+ * Moves or renames the file located by this path to the [target] path.
+ *
+ * @param overwrite allows to overwrite the target if it already exists.
+ *
+ * @throws FileAlreadyExistsException if the target file exists but cannot be replaced because the
+ *   `overwrite = true` option is not specified (optional specific exception).
+ * @throws DirectoryNotEmptyException the `overwrite = true` option is specified but the file
+ *   cannot be replaced because it is a non-empty directory, or the
+ *   source is a non-empty directory containing entries that would
+ *   be required to be moved (optional specific exception).
+ *
+ * @see Files.move
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.moveTo(target: Path, overwrite: Boolean = false): Path {
+    val options = if (overwrite) arrayOf<CopyOption>(StandardCopyOption.REPLACE_EXISTING) else emptyArray()
+    return Files.move(this, target, *options)
+}
+
+/**
+ * Returns the [FileStore] representing the file store where a file is located.
+ *
+ * @see Files.getFileStore
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.fileStore(): FileStore =
+    Files.getFileStore(this)
+
+/**
+ * Reads the value of a file attribute.
+ *
+ * The attribute name is specified with the [attribute] parameter optionally prefixed with the attribute view name:
+ * ```
+ * [view_name:]attribute_name
+ * ```
+ * When the view name is not specified, it defaults to `basic`.
+ *
+ * @throws UnsupportedOperationException if the attribute view is not supported.
+ * @throws IllegalArgumentException if the attribute name is not specified or is not recognized.
+ * @see Files.getAttribute
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.getAttribute(attribute: String, vararg options: LinkOption): Any? =
+    Files.getAttribute(this, attribute, *options)
+
+/**
+ * Sets the value of a file attribute.
+ *
+ * The attribute name is specified with the [attribute] parameter optionally prefixed with the attribute view name:
+ * ```
+ * [view_name:]attribute_name
+ * ```
+ * When the view name is not specified, it defaults to `basic`.
+ *
+ * @throws UnsupportedOperationException if the attribute view is not supported.
+ * @throws IllegalArgumentException if the attribute name is not specified or is not recognized, or
+ *   the attribute value is of the correct type but has an inappropriate value.
+ * @throws ClassCastException if the attribute value is not of the expected type
+ * @see Files.setAttribute
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.setAttribute(attribute: String, value: Any?, vararg options: LinkOption): Path =
+    Files.setAttribute(this, attribute, value, *options)
+
+/**
+ * Returns a file attributes view of a given type [V]
+ * or `null` if the requested attribute view type is not available.
+ *
+ * The returned view allows to read and optionally to modify attributes of a file.
+ *
+ * @param V the reified type of the desired attribute view.
+ *
+ * @see Files.getFileAttributeView
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun <reified V : FileAttributeView> Path.fileAttributesViewOrNull(vararg options: LinkOption): V? =
+    Files.getFileAttributeView(this, V::class.java, *options)
+
+/**
+ * Returns a file attributes view of a given type [V]
+ * or throws an [UnsupportedOperationException] if the requested attribute view type is not available..
+ *
+ * The returned view allows to read and optionally to modify attributes of a file.
+ *
+ * @param V the reified type of the desired attribute view, a subtype of [FileAttributeView].
+ *
+ * @see Files.getFileAttributeView
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun <reified V : FileAttributeView> Path.fileAttributesView(vararg options: LinkOption): V =
+    Files.getFileAttributeView(this, V::class.java, *options) ?: fileAttributeViewNotAvailable(this, V::class.java)
+
+@PublishedApi
+internal fun fileAttributeViewNotAvailable(path: Path, attributeViewClass: Class<*>): Nothing =
+    throw UnsupportedOperationException("The desired attribute view type $attributeViewClass is not available for the file $path.")
+
+/**
+ * Reads a file's attributes of the specified type [A] in bulk.
+ *
+ * @param A the reified type of the desired attributes, a subtype of [BasicFileAttributes].
+ *
+ * @throws UnsupportedOperationException if the given attributes type [A] is not supported.
+ * @see Files.readAttributes
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun <reified A : BasicFileAttributes> Path.readAttributes(vararg options: LinkOption): A =
+    Files.readAttributes(this, A::class.java, *options)
+
+/**
+ * Reads the specified list of attributes of a file in bulk.
+ *
+ * The list of [attributes] to read is specified in the following string form:
+ * ```
+ * [view:]attribute_name1[,attribute_name2...]
+ * ```
+ * So the names are comma-separated and optionally prefixed by the attribute view type name, `basic` by default.
+ * The special `*` attribute name can be used to read all attributes of the specified view.
+ *
+ * @return a [Map<String, Any?>][Map] having an entry for an each attribute read, where the key is the attribute name and the value is the attribute value.
+ * @throws UnsupportedOperationException if the attribute view is not supported.
+ * @throws IllegalArgumentException if no attributes are specified or an unrecognized attribute is specified.
+ * @see Files.readAttributes
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.readAttributes(attributes: String, vararg options: LinkOption): Map<String, Any?> =
+    Files.readAttributes(this, attributes, *options)
+
+/**
+ * Returns the last modified time of the file located by this path.
+ *
+ * If the file system does not support modification timestamps, some implementation-specific default is returned.
+ *
+ * @see Files.getLastModifiedTime
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.getLastModifiedTime(vararg options: LinkOption): FileTime =
+    Files.getLastModifiedTime(this, *options)
+
+/**
+ * Sets the last modified time attribute for the file located by this path.
+ *
+ * If the file system does not support modification timestamps, the behavior of this method is not defined.
+ *
+ * @see Files.setLastModifiedTime
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.setLastModifiedTime(value: FileTime): Path =
+    Files.setLastModifiedTime(this, value)
+
+/**
+ * Returns the owner of a file.
+ *
+ * @throws UnsupportedOperationException if the associated file system does not support the [FileOwnerAttributeView].
+ *
+ * @see Files.getOwner
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.getOwner(vararg options: LinkOption): UserPrincipal? =
+    Files.getOwner(this, *options)
+
+/**
+ * Sets the file owner to the specified [value].
+ *
+ * @throws UnsupportedOperationException if the associated file system does not support the [FileOwnerAttributeView].
+ *
+ * @see Files.setOwner
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.setOwner(value: UserPrincipal): Path =
+    Files.setOwner(this, value)
+
+/**
+ * Returns the POSIX file permissions of the file located by this path.
+ *
+ * @throws UnsupportedOperationException if the associated file system does not support the [PosixFileAttributeView].
+ *
+ * @see Files.getPosixFilePermissions
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.getPosixFilePermissions(vararg options: LinkOption): Set<PosixFilePermission> =
+    Files.getPosixFilePermissions(this, *options)
+
+/**
+ * Sets the POSIX file permissions for the file located by this path.
+ *
+ * @throws UnsupportedOperationException if the associated file system does not support the [PosixFileAttributeView].
+ *
+ * @see Files.setPosixFilePermissions
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.setPosixFilePermissions(value: Set<PosixFilePermission>): Path =
+    Files.setPosixFilePermissions(this, value)
+
+/**
+ * Creates a new link (directory entry) located by this path for the existing file [target].
+ *
+ * Calling this function may require the process to be started with implementation specific privileges to create hard links
+ * or to create links to directories.
+ *
+ * @throws FileAlreadyExistsException if a file with this name already exists
+ *   (optional specific exception, some implementations may throw a more general one).
+ * @throws  UnsupportedOperationException if the implementation does not support creating a hard link.
+ *
+ * @see Files.createLink
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.createLinkPointingTo(target: Path): Path =
+    Files.createLink(this, target)
+
+/**
+ * Creates a new symbolic link located by this path to the given [target].
+ *
+ * Calling this function may require the process to be started with implementation specific privileges to
+ * create symbolic links.
+ *
+ * @throws FileAlreadyExistsException if a file with this name already exists
+ *   (optional specific exception, some implementations may throw a more general one).
+ * @throws UnsupportedOperationException if the implementation does not support symbolic links or the
+ *   [attributes] array contains an attribute that cannot be set atomically when creating the symbolic link.
+ *
+ * @see Files.createSymbolicLink
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.createSymbolicLinkPointingTo(target: Path, vararg attributes: FileAttribute<*>): Path =
+    Files.createSymbolicLink(this, target, *attributes)
+
+/**
+ * Reads the target of a symbolic link located by this path.
+ *
+ * @throws UnsupportedOperationException if symbolic links are not supported by this implementation.
+ * @throws NotLinkException if the target is not a symbolic link
+ *   (optional specific exception, some implementations may throw a more general one).
+ *
+ * @see Files.readSymbolicLink
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.readSymbolicLink(): Path =
+    Files.readSymbolicLink(this)
+
+/**
+ * Creates a new and empty file specified by this path, failing if the file already exists.
+ *
+ * @param attributes an optional list of file attributes to set atomically when creating the file.
+ *
+ * @throws  FileAlreadyExistsException if a file specified by this path already exists
+ *   (optional specific exception, some implementations may throw more general [IOException]).
+ * @throws  UnsupportedOperationException if the [attributes] array contains an attribute that cannot be set atomically
+ *   when creating the file.
+ *
+ * @see Files.createFile
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path.createFile(vararg attributes: FileAttribute<*>): Path =
+    Files.createFile(this, *attributes)
+
+/**
+ * Creates an empty file in the default temp directory, using
+ * the given [prefix] and [suffix] to generate its name.
+ *
+ * @param attributes an optional list of file attributes to set atomically when creating the file.
+ * @return the path to the newly created file that did not exist before.
+ *
+ * @throws  UnsupportedOperationException if the array contains an attribute that cannot be set atomically
+ *   when creating the file.
+ *
+ * @see Files.createTempFile
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun createTempFile(prefix: String? = null, suffix: String? = null, vararg attributes: FileAttribute<*>): Path =
+    Files.createTempFile(prefix, suffix, *attributes)
+
+/**
+ * Creates an empty file in the specified [directory], using
+ * the given [prefix] and [suffix] to generate its name.
+ *
+ * @param attributes an optional list of file attributes to set atomically when creating the file.
+ * @return the path to the newly created file that did not exist before.
+ *
+ * @throws  UnsupportedOperationException if the array contains an attribute that cannot be set atomically
+ *   when creating the file.
+ *
+ * @see Files.createTempFile
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun createTempFile(directory: Path, prefix: String? = null, suffix: String? = null, vararg attributes: FileAttribute<*>): Path =
+    Files.createTempFile(directory, prefix, suffix, *attributes)
+
+/**
+ * Creates a new directory in the default temp directory, using the given [prefix] to generate its name.
+ *
+ * @param attributes an optional list of file attributes to set atomically when creating the directory.
+ * @return the path to the newly created directory that did not exist before.
+ *
+ * @throws  UnsupportedOperationException if the array contains an attribute that cannot be set atomically
+ *   when creating the directory.
+ *
+ * @see Files.createTempDirectory
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun createTempDirectory(prefix: String? = null, vararg attributes: FileAttribute<*>): Path =
+    Files.createTempDirectory(prefix, *attributes)
+
+/**
+ * Creates a new directory in the specified [directory], using the given [prefix] to generate its name.
+ *
+ * @param attributes an optional list of file attributes to set atomically when creating the directory.
+ * @return the path to the newly created directory that did not exist before.
+ *
+ * @throws  UnsupportedOperationException if the array contains an attribute that cannot be set atomically
+ *   when creating the directory.
+ *
+ * @see Files.createTempDirectory
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun createTempDirectory(directory: Path, prefix: String? = null, vararg attributes: FileAttribute<*>): Path =
+    Files.createTempDirectory(directory, prefix, *attributes)
+
+/**
+ * Resolves the given [other] path against this path.
+ *
+ * This operator is a shortcut for the [Path.resolve] function.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline operator fun Path.div(other: Path): Path =
+    this.resolve(other)
+
+/**
+ * Resolves the given [other] path string against this path.
+ *
+ * This operator is a shortcut for the [Path.resolve] function.
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline operator fun Path.div(other: String): Path =
+    this.resolve(other)
+
+
+/**
+ * Converts the provided [path] string to a [Path] object of the [default][FileSystems.getDefault] filesystem.
+ *
+ * @see Paths.get
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path(path: String): Path =
+    Paths.get(path)
+
+/**
+ * Converts the name sequence specified with the [base] path string and a number of [subpaths] additional names
+ * to a [Path] object of the [default][FileSystems.getDefault] filesystem.
+ *
+ * @see Paths.get
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun Path(base: String, vararg subpaths: String): Path =
+    Paths.get(base, *subpaths)
+
+/**
+ * Converts this URI to a [Path] object.
+ *
+ * @see Paths.get
+ */
+@SinceKotlin("1.4")
+@ExperimentalPathApi
+@kotlin.internal.InlineOnly
+public inline fun URI.toPath(): Path =
+    Paths.get(this)
diff --git a/libraries/stdlib/jdk7/test/AbstractPathTest.kt b/libraries/stdlib/jdk7/test/AbstractPathTest.kt
new file mode 100644
index 00000000000..189f874fd81
--- /dev/null
+++ b/libraries/stdlib/jdk7/test/AbstractPathTest.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.jdk7.test
+import java.nio.file.Path
+import kotlin.io.path.deleteIfExists
+import kotlin.test.*
+
+abstract class AbstractPathTest {
+    private val cleanUpActions = mutableListOf<Pair<Path, (Path) -> Unit>>()
+
+    fun Path.cleanup(): Path {
+        cleanUpActions.add(this to { it.deleteIfExists() })
+        return this
+    }
+
+    fun Path.cleanupRecursively(): Path {
+        cleanUpActions.add(this to { it.toFile().deleteRecursively() })
+        return this
+    }
+
+    @AfterTest
+    fun cleanUp() {
+        for ((path, action) in cleanUpActions) {
+            try {
+                action(path)
+            } catch (e: Throwable) {
+                println("Failed to execute cleanup action for $path")
+            }
+        }
+    }
+}
diff --git a/libraries/stdlib/jdk7/test/PathExtensionsTest.kt b/libraries/stdlib/jdk7/test/PathExtensionsTest.kt
new file mode 100644
index 00000000000..e7fda78b02b
--- /dev/null
+++ b/libraries/stdlib/jdk7/test/PathExtensionsTest.kt
@@ -0,0 +1,565 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.jdk7.test
+
+import java.io.IOException
+import java.nio.file.*
+import java.nio.file.attribute.*
+import kotlin.io.path.*
+import kotlin.random.Random
+import kotlin.test.*
+
+class PathExtensionsTest : AbstractPathTest() {
+    private val isCaseInsensitiveFileSystem = Path("C:/") == Path("c:/")
+    private val isBackslashSeparator = FileSystems.getDefault().separator == "\\"
+
+    @Test
+    fun filenameComponents() {
+        fun check(path: String, name: String, nameNoExt: String, extension: String) {
+            val p = Path(path)
+            assertEquals(name, p.name, "name")
+            assertEquals(nameNoExt, p.nameWithoutExtension, "nameWithoutExtension")
+            assertEquals(extension, p.extension, "extension")
+        }
+
+        check(path = "aaa.bbb", name = "aaa.bbb", nameNoExt = "aaa", extension = "bbb")
+        check(path = "aaa", name = "aaa", nameNoExt = "aaa", extension = "")
+        check(path = "aaa.", name = "aaa.", nameNoExt = "aaa", extension = "")
+        check(path = ".aaa", name = ".aaa", nameNoExt = "", extension = "aaa")
+        check(path = "/dir.ext/aaa.bbb", name = "aaa.bbb", nameNoExt = "aaa", extension = "bbb")
+        check(path = "/dir.ext/aaa", name = "aaa", nameNoExt = "aaa", extension = "")
+        check(path = "/", name = "", nameNoExt = "", extension = "")
+        check(path = "", name = "", nameNoExt = "", extension = "")
+    }
+
+    @Test
+    fun invariantSeparators() {
+        val path = Path("base") / "nested" / "leaf"
+        assertEquals("base/nested/leaf", path.invariantSeparatorsPath)
+
+        val path2 = Path("base", "nested", "leaf")
+        assertEquals("base/nested/leaf", path2.invariantSeparatorsPath)
+    }
+
+    @Test
+    fun createNewFile() {
+        val dir = createTempDirectory().cleanupRecursively()
+
+        val file = dir / "new-file"
+
+        assertTrue(file.notExists())
+
+        file.createFile()
+        assertTrue(file.exists())
+        assertTrue(file.isRegularFile())
+
+        assertFailsWith<FileAlreadyExistsException> { file.createFile() }
+    }
+
+    @Test
+    fun copyTo() {
+        val root = createTempDirectory("copyTo-root").cleanupRecursively()
+        val srcFile = createTempFile(root, "src")
+        val dstFile = createTempFile(root, "dst")
+
+        srcFile.writeText("Hello, World!")
+        assertFailsWith<FileAlreadyExistsException>("copy do not overwrite existing file") {
+            srcFile.copyTo(dstFile)
+        }
+
+        var dst = srcFile.copyTo(dstFile, overwrite = true)
+        assertSame(dst, dstFile)
+        compareFiles(srcFile, dst, "copy with overwrite over existing file")
+
+        srcFile.copyTo(srcFile)
+        srcFile.copyTo(srcFile, overwrite = true)
+        compareFiles(dst, srcFile, "copying file to itself leaves it intact")
+
+        assertTrue(dstFile.deleteIfExists())
+        dst = srcFile.copyTo(dstFile)
+        compareFiles(srcFile, dst, "copy to new file")
+
+        val subDst = dstFile.resolve("foo/bar")
+        assertFailsWith<FileSystemException> { srcFile.copyTo(subDst) }
+        assertFailsWith<FileSystemException> { srcFile.copyTo(subDst, overwrite = true) }
+        assertTrue(dstFile.deleteIfExists())
+        assertFailsWith<FileSystemException> { srcFile.copyTo(subDst) }
+
+        dstFile.createDirectory()
+        val child = dstFile.resolve("child").createFile()
+        assertFailsWith<DirectoryNotEmptyException>("copy with overwrite do not overwrite non-empty dir") {
+            srcFile.copyTo(dstFile, overwrite = true)
+        }
+        child.deleteExisting()
+
+        srcFile.copyTo(dstFile, overwrite = true)
+        assertEquals(srcFile.readText(), dstFile.readText(), "copy with overwrite over empty dir")
+
+        assertTrue(srcFile.deleteIfExists())
+        assertTrue(dstFile.deleteIfExists())
+
+        assertFailsWith<NoSuchFileException> {
+            srcFile.copyTo(dstFile)
+        }
+
+        srcFile.createDirectory()
+        srcFile.resolve("somefile").writeText("some content")
+        dstFile.writeText("")
+        assertFailsWith<FileAlreadyExistsException>("copy dir do not overwrite file") {
+            srcFile.copyTo(dstFile)
+        }
+        srcFile.copyTo(dstFile, overwrite = true)
+        assertTrue(dstFile.isDirectory())
+        assertTrue(dstFile.listDirectoryEntries().isEmpty(), "only directory is copied, but not its content")
+
+        assertFailsWith<FileAlreadyExistsException>("copy dir do not overwrite dir") {
+            srcFile.copyTo(dstFile)
+        }
+
+        srcFile.copyTo(dstFile, overwrite = true)
+        assertTrue(dstFile.isDirectory())
+        assertTrue(dstFile.listDirectoryEntries().isEmpty(), "only directory is copied, but not its content")
+
+        dstFile.resolve("somefile2").writeText("some content2")
+        assertFailsWith<DirectoryNotEmptyException>("copy dir do not overwrite non-empty dir") {
+            srcFile.copyTo(dstFile, overwrite = true)
+        }
+    }
+
+    @Test
+    fun copyToNameWithoutParent() {
+        val currentDir = Path("").toAbsolutePath()
+        val srcFile = createTempFile().cleanup()
+        val dstFile = createTempFile(directory = currentDir).cleanup()
+
+        srcFile.writeText("Hello, World!", Charsets.UTF_8)
+        dstFile.deleteExisting()
+
+        val dstRelative = Path(dstFile.name)
+
+        srcFile.copyTo(dstRelative)
+
+        assertEquals(srcFile.readText(), dstFile.readText())
+    }
+
+    @Test
+    fun moveTo() {
+        val root = createTempDirectory("moveTo-root").cleanupRecursively()
+        val original = createTempFile(root, "original")
+        val srcFile = createTempFile(root, "src")
+        val dstFile = createTempFile(root, "dst")
+        fun restoreSrcFile() { original.copyTo(srcFile, overwrite = true) }
+        original.writeText("Hello, World!")
+        restoreSrcFile()
+
+        assertFailsWith<FileAlreadyExistsException>("do not overwrite existing file") {
+            srcFile.moveTo(dstFile)
+        }
+
+        var dst = srcFile.moveTo(dstFile, overwrite = true)
+        assertSame(dst, dstFile)
+        compareFiles(original, dst, "move with overwrite over existing file")
+        assertTrue(srcFile.notExists())
+
+        restoreSrcFile()
+        srcFile.moveTo(srcFile)
+        srcFile.moveTo(srcFile, overwrite = true)
+
+        compareFiles(original, srcFile, "move file to itself leaves it intact")
+
+        assertTrue(dstFile.deleteIfExists())
+        dst = srcFile.moveTo(dstFile)
+        compareFiles(original, dst, "move to new file")
+
+        restoreSrcFile()
+        val subDst = dstFile.resolve("foo/bar")
+        assertFailsWith<FileSystemException> { srcFile.moveTo(subDst) }
+        assertFailsWith<FileSystemException> { srcFile.moveTo(subDst, overwrite = true) }
+        assertTrue(dstFile.deleteIfExists())
+        assertFailsWith<FileSystemException> { srcFile.moveTo(subDst) }
+
+        dstFile.createDirectory()
+        val child = dstFile.resolve("child").createFile()
+        assertFailsWith<DirectoryNotEmptyException>("move with overwrite do not overwrite non-empty dir") {
+            srcFile.moveTo(dstFile, overwrite = true)
+        }
+        child.deleteExisting()
+
+        srcFile.moveTo(dstFile, overwrite = true)
+        compareFiles(original, dstFile, "move with overwrite over empty dir")
+
+        assertTrue(srcFile.notExists())
+        assertTrue(dstFile.deleteIfExists())
+
+        assertFailsWith<NoSuchFileException> {
+            srcFile.moveTo(dstFile)
+        }
+
+        srcFile.createDirectory()
+        srcFile.resolve("somefile").writeText("some content")
+        dstFile.writeText("")
+        assertFailsWith<FileAlreadyExistsException>("move dir do not overwrite file") {
+            srcFile.moveTo(dstFile)
+        }
+        srcFile.moveTo(dstFile, overwrite = true)
+        assertTrue(dstFile.isDirectory())
+        assertEquals(listOf(dstFile / "somefile"), dstFile.listDirectoryEntries(), "directory is moved with its content")
+    }
+
+    private fun compareFiles(src: Path, dst: Path, message: String? = null) {
+        assertTrue(dst.exists())
+        assertEquals(src.isRegularFile(), dst.isRegularFile(), message)
+        assertEquals(src.isDirectory(), dst.isDirectory(), message)
+        if (dst.isRegularFile()) {
+            assertTrue(src.readBytes().contentEquals(dst.readBytes()), message)
+        }
+    }
+
+    @Test
+    fun fileSize() {
+        val file = createTempFile().cleanup()
+        assertEquals(0, file.fileSize())
+
+        file.writeBytes(ByteArray(100))
+        assertEquals(100, file.fileSize())
+
+        file.appendText("Hello", Charsets.US_ASCII)
+        assertEquals(105, file.fileSize())
+
+        file.deleteExisting()
+        assertFailsWith<NoSuchFileException> { file.fileSize() }
+    }
+
+    @Test
+    fun deleteExisting() {
+        val file = createTempFile().cleanup()
+        file.deleteExisting()
+        assertFailsWith<NoSuchFileException> { file.deleteExisting() }
+
+        val dir = createTempDirectory().cleanup()
+        dir.deleteExisting()
+        assertFailsWith<NoSuchFileException> { dir.deleteExisting() }
+    }
+
+    @Test
+    fun deleteIfExists() {
+        val file = createTempFile().cleanup()
+        assertTrue(file.deleteIfExists())
+        assertFalse(file.deleteIfExists())
+
+        val dir = createTempDirectory().cleanup()
+        assertTrue(dir.deleteIfExists())
+        assertFalse(dir.deleteIfExists())
+    }
+
+    @Test
+    fun attributeGettersOnFile() {
+        val file = createTempFile("temp", ".file").cleanup()
+        assertTrue(file.exists())
+        assertFalse(file.notExists())
+        assertTrue(file.isRegularFile())
+        assertFalse(file.isDirectory())
+        assertFalse(file.isSymbolicLink())
+        assertTrue(file.isReadable())
+        assertTrue(file.isWritable())
+        assertTrue(file.isSameFileAs(file))
+
+        // The default value of these depends on the current operating system, so just check that
+        // they don't throw an exception.
+        file.isExecutable()
+        file.isHidden()
+    }
+
+    @Test
+    fun attributeGettersOnDirectory() {
+        val file = createTempDirectory(".tmpdir").cleanup()
+        assertTrue(file.exists())
+        assertFalse(file.notExists())
+        assertFalse(file.isRegularFile())
+        assertTrue(file.isDirectory())
+        assertFalse(file.isSymbolicLink())
+        assertTrue(file.isReadable())
+        assertTrue(file.isWritable())
+        assertTrue(file.isSameFileAs(file))
+
+        file.isExecutable()
+        file.isHidden()
+    }
+
+    @Test
+    fun attributeGettersOnNonExistentPath() {
+        val file = createTempDirectory().cleanup().resolve("foo")
+        assertFalse(file.exists())
+        assertTrue(file.notExists())
+        assertFalse(file.isRegularFile())
+        assertFalse(file.isDirectory())
+        assertFalse(file.isSymbolicLink())
+        assertFalse(file.isReadable())
+        assertFalse(file.isWritable())
+        assertTrue(file.isSameFileAs(file))
+
+        file.isExecutable()
+        // This function will either throw an exception or return false,
+        // depending on the operating system.
+        try {
+            assertFalse(file.isHidden())
+        } catch (e: IOException) {
+        }
+    }
+
+    private interface SpecialFileAttributesView : FileAttributeView
+    private interface SpecialFileAttributes : BasicFileAttributes
+
+    @Test
+    fun readWriteAttributes() {
+        val file = createTempFile().cleanup()
+        val modifiedTime = file.getLastModifiedTime()
+        assertEquals(modifiedTime, file.getAttribute("lastModifiedTime"))
+        assertEquals(modifiedTime, file.getAttribute("basic:lastModifiedTime"))
+        assertEquals(modifiedTime, file.readAttributes<BasicFileAttributes>().lastModifiedTime())
+        assertEquals(modifiedTime, file.readAttributes("basic:lastModifiedTime,creationTime")["lastModifiedTime"])
+        assertEquals(modifiedTime, file.readAttributes("*")["lastModifiedTime"])
+
+        assertFailsWith<UnsupportedOperationException> { file.readAttributes<SpecialFileAttributes>() }
+        assertFailsWith<UnsupportedOperationException> { file.readAttributes("really_unsupported_view:*") }
+        assertFailsWith<IllegalArgumentException> { file.readAttributes("basic:really_unknown_attribute") }
+
+        val newTime1 = FileTime.fromMillis(modifiedTime.toMillis() + 3600_000)
+        file.setLastModifiedTime(newTime1)
+        assertEquals(newTime1, file.getLastModifiedTime())
+
+        val newTime2 = FileTime.fromMillis(modifiedTime.toMillis() + 2 * 3600_000)
+        file.setAttribute("lastModifiedTime", newTime2)
+        assertEquals(newTime2, file.getLastModifiedTime())
+
+        val newTime3 = FileTime.fromMillis(modifiedTime.toMillis() + 3 * 3600_000)
+        file.fileAttributesView<BasicFileAttributeView>().setTimes(newTime3, null, null)
+        assertEquals(newTime3, file.getLastModifiedTime())
+
+        assertFailsWith<UnsupportedOperationException> { file.fileAttributesView<SpecialFileAttributesView>() }
+        assertNull(file.fileAttributesViewOrNull<SpecialFileAttributesView>())
+
+        file.setAttribute("lastModifiedTime", null)
+        assertEquals(newTime3, file.getLastModifiedTime())
+    }
+
+    @Test
+    fun links() {
+        val dir = createTempDirectory().cleanupRecursively()
+        val original = createTempFile(dir)
+        original.writeBytes(Random.nextBytes(100))
+
+        val link = try {
+            (dir / ("link-" + original.fileName)).createLinkPointingTo(original)
+        } catch (e: IOException) {
+            // may require a privilege
+            println("Creating a link failed with ${e.stackTraceToString()}")
+            return
+        }
+
+        assertTrue(link.isRegularFile())
+        assertTrue(link.isRegularFile(LinkOption.NOFOLLOW_LINKS))
+        assertTrue(original.isSameFileAs(link))
+        compareFiles(original, link)
+        assertFailsWith<NotLinkException> { link.readSymbolicLink() }
+    }
+
+    @Test
+    fun symlinks() {
+        val dir = createTempDirectory().cleanupRecursively()
+        val original = createTempFile(dir)
+        original.writeBytes(Random.nextBytes(100))
+
+        val symlink = try {
+            (dir / ("symlink-" + original.fileName)).createSymbolicLinkPointingTo(original)
+        } catch (e: IOException) {
+            // may require a privilege
+            println("Creating a symlink failed with ${e.stackTraceToString()}")
+            return
+        }
+
+        assertTrue(symlink.isRegularFile())
+        assertFalse(symlink.isRegularFile(LinkOption.NOFOLLOW_LINKS))
+        assertTrue(original.isSameFileAs(symlink))
+        compareFiles(original, symlink)
+        assertEquals(original, symlink.readSymbolicLink())
+    }
+
+    @Test
+    fun directoryEntriesList() {
+        val dir = createTempDirectory().cleanupRecursively()
+        assertEquals(0, dir.listDirectoryEntries().size)
+
+        val file = dir.resolve("f1").createFile()
+        assertEquals(listOf(file), dir.listDirectoryEntries())
+
+        val fileTxt = createTempFile(dir, suffix = ".txt")
+        assertEquals(listOf(fileTxt), dir.listDirectoryEntries("*.txt"))
+
+        assertFailsWith<NotDirectoryException> { file.listDirectoryEntries() }
+    }
+
+    @Test
+    fun directoryEntriesUseSequence() {
+        val dir = createTempDirectory().cleanupRecursively()
+        assertEquals(0, dir.useDirectoryEntries { it.toList() }.size)
+
+        val file = dir.resolve("f1").createFile()
+        assertEquals(listOf(file), dir.useDirectoryEntries { it.toList() })
+
+        val fileTxt = createTempFile(dir, suffix = ".txt")
+        assertEquals(listOf(fileTxt), dir.useDirectoryEntries("*.txt") { it.toList() })
+
+        assertFailsWith<NotDirectoryException> { file.useDirectoryEntries { error("shouldn't get here") } }
+    }
+
+    @Test
+    fun directoryEntriesForEach() {
+        val dir = createTempDirectory().cleanupRecursively()
+        dir.forEachDirectoryEntry { error("shouldn't get here, but received $it") }
+
+        val file = createTempFile(dir)
+        dir.forEachDirectoryEntry { assertEquals(file, it) }
+
+        val fileTxt = createTempFile(dir, suffix = ".txt")
+        dir.forEachDirectoryEntry("*.txt") { assertEquals(fileTxt, it) }
+
+        assertFailsWith<NotDirectoryException> { file.forEachDirectoryEntry { error("shouldn't get here, but received $it") } }
+    }
+
+
+    private fun testRelativeTo(expected: String?, path: String, base: String) =
+        testRelativeTo(expected?.let { Path(it) }, Path(path), Path(base))
+    private fun testRelativeTo(expected: String, path: Path, base: Path) =
+        testRelativeTo(Path(expected), path, base)
+
+    private fun testRelativeTo(expected: Path?, path: Path, base: Path) {
+        val context = "path: '$path', base: '$base'"
+        if (expected != null) {
+            assertEquals(expected, path.relativeTo(base), context)
+        } else {
+            val e = assertFailsWith<IllegalArgumentException>(context) { path.relativeTo(base) }
+            val message = assertNotNull(e.message)
+            assertTrue(path.toString() in message, message)
+            assertTrue(base.toString() in message, message)
+        }
+        assertEquals(expected, path.relativeToOrNull(base), context)
+        assertEquals(expected ?: path, path.relativeToOrSelf(base), context)
+    }
+
+    @Test
+    fun relativeToRooted() {
+        val file1 = "/foo/bar/baz"
+        val file2 = "/foo/baa/ghoo"
+
+        testRelativeTo("../../bar/baz", file1, file2)
+
+        val file3 = "/foo/bar"
+
+        testRelativeTo("baz", file1, file3)
+        testRelativeTo("..", file3, file1)
+
+        val file4 = "/foo/bar/"
+
+        testRelativeTo("baz", file1, file4)
+        testRelativeTo("..", file4, file1)
+        testRelativeTo("", file3, file4)
+        testRelativeTo("", file4, file3)
+
+        val file5 = "/foo/baran"
+
+        testRelativeTo("../bar", file3, file5)
+        testRelativeTo("../baran", file5, file3)
+        testRelativeTo("../bar", file4, file5)
+        testRelativeTo("../baran", file5, file4)
+
+        if (isBackslashSeparator) {
+            val file6 = "C:\\Users\\Me"
+            val file7 = "C:\\Users\\Me\\Documents"
+
+            testRelativeTo("..", file6, file7)
+            testRelativeTo("Documents", file7, file6)
+
+            val file8 = """\\my.host\home/user/documents/vip"""
+            val file9 = """\\my.host\home/other/images/nice"""
+
+            testRelativeTo("../../../user/documents/vip", file8, file9)
+            testRelativeTo("../../../other/images/nice", file9, file8)
+        }
+
+        if (isCaseInsensitiveFileSystem) {
+            testRelativeTo("bar", "C:/bar", "c:/")
+        }
+    }
+
+    @Test
+    fun relativeToRelative() {
+        val nested = Path("foo/bar")
+        val base = Path("foo")
+
+        testRelativeTo("bar", nested, base)
+        testRelativeTo("..", base, nested)
+
+        val empty = Path("")
+        val current = Path(".")
+        val parent = Path("..")
+        val outOfRoot = Path("../bar")
+
+        testRelativeTo("../bar", outOfRoot, empty)
+        testRelativeTo("../../bar", outOfRoot, base)
+        testRelativeTo("bar", outOfRoot, parent)
+        testRelativeTo("..", parent, outOfRoot)
+
+        val root = Path("/root")
+        val files = listOf(nested, base, empty, outOfRoot, current, parent)
+        val bases = listOf(nested, base, empty, current)
+
+        for (file in files)
+            // file should have empty path relative to itself
+            testRelativeTo("", file, file)
+
+        for (file in files) {
+            @Suppress("NAME_SHADOWING")
+            for (base in bases) {
+                val rootedFile = root.resolve(file)
+                val rootedBase = root.resolve(base)
+                assertEquals(rootedFile.relativeTo(rootedBase), file.relativeTo(base), "nested: $file, base: $base")
+            }
+        }
+    }
+
+    @Test
+    fun relativeToFails() {
+        val absolute = Path("/foo/bar/baz")
+        val relative = Path("foo/bar")
+        val networkShare1 = Path("""\\my.host\share1/folder""")
+        val networkShare2 = Path("""\\my.host\share2\folder""")
+
+        val allFiles = listOf(absolute, relative) + if (isBackslashSeparator) listOf(networkShare1, networkShare2) else emptyList()
+        for (file in allFiles) {
+            for (base in allFiles) {
+                if (file != base) testRelativeTo(null, file, base)
+            }
+        }
+
+        if (isBackslashSeparator) {
+            testRelativeTo(null, "C:/dir1", "D:/dir2")
+        }
+
+        testRelativeTo(null, "foo", "..")
+        testRelativeTo(null, "../foo", "../..")
+    }
+
+    @Test
+    fun relativeTo() {
+        testRelativeTo("kotlin", "src/kotlin", "src")
+        testRelativeTo("", "dir", "dir")
+        testRelativeTo("..", "dir", "dir/subdir")
+        testRelativeTo("../../test", "test", "dir/dir")
+        testRelativeTo("foo/bar", "../../foo/bar", "../../sub/../.")
+        testRelativeTo(null, "../../foo/bar", "../../sub/../..")
+    }
+}
diff --git a/libraries/stdlib/jdk7/test/PathReadWriteTest.kt b/libraries/stdlib/jdk7/test/PathReadWriteTest.kt
new file mode 100644
index 00000000000..d014c86c15d
--- /dev/null
+++ b/libraries/stdlib/jdk7/test/PathReadWriteTest.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.jdk7.test
+
+import java.nio.file.StandardOpenOption
+import kotlin.io.path.*
+import kotlin.random.Random
+import kotlin.test.*
+
+class PathReadWriteTest : AbstractPathTest() {
+    @Test
+    fun appendText() {
+        val file = createTempFile().cleanup()
+        file.writeText("Hello\n")
+        file.appendText("World\n")
+        file.writeText("Again", Charsets.US_ASCII, StandardOpenOption.APPEND)
+
+        assertEquals("Hello\nWorld\nAgain", file.readText())
+        assertEquals(listOf("Hello", "World", "Again"), file.readLines(Charsets.UTF_8))
+    }
+
+    @Test
+    fun file() {
+        val file = createTempFile().cleanup()
+        val writer = file.outputStream().writer().buffered()
+
+        writer.write("Hello")
+        writer.newLine()
+        writer.write("World")
+        writer.close()
+
+        val list = ArrayList<String>()
+        file.forEachLine(charset = Charsets.UTF_8) {
+            list.add(it)
+        }
+        assertEquals(listOf("Hello", "World"), list)
+
+        assertEquals(listOf("Hello", "World"), file.readLines())
+
+        file.useLines {
+            assertEquals(listOf("Hello", "World"), it.toList())
+        }
+
+        val text = file.inputStream().reader().readText()
+        assertTrue("Hello" in text)
+        assertTrue("World" in text)
+
+        file.writeText("")
+        var c = 0
+        file.forEachLine { c++ }
+        assertEquals(0, c)
+
+        file.writeText(" ")
+        file.forEachLine { c++ }
+        assertEquals(1, c)
+
+        file.writeText(" \n")
+        c = 0
+        file.forEachLine { c++ }
+        assertEquals(1, c)
+
+        file.writeText(" \n ")
+        c = 0
+        file.forEachLine { c++ }
+        assertEquals(2, c)
+    }
+
+    @Test
+    fun bufferedReader() {
+        val file = createTempFile().cleanup()
+        val lines = listOf("line1", "line2")
+        file.writeLines(lines)
+
+        assertEquals(lines, file.bufferedReader().use { it.readLines() })
+        assertEquals(lines, file.bufferedReader(Charsets.UTF_8, 1024, StandardOpenOption.READ).use { it.readLines() })
+    }
+
+    @Test
+    fun bufferedWriter() {
+        val file = createTempFile().cleanup()
+
+        file.bufferedWriter().use { it.write("line1\n") }
+        file.bufferedWriter(Charsets.UTF_8, 1024, StandardOpenOption.APPEND).use { it.write("line2\n") }
+
+        assertEquals(listOf("line1", "line2"), file.readLines())
+    }
+
+    @Test
+    fun writeBytes() {
+        val file = createTempFile().cleanup()
+        file.writeBytes("Hello".encodeToByteArray())
+        file.appendBytes(" world!".encodeToByteArray())
+        assertEquals(file.readText(), "Hello world!")
+
+        val bytes = Random.nextBytes(100)
+        file.writeBytes(bytes)
+        file.appendBytes(bytes)
+        assertTrue((bytes + bytes) contentEquals file.readBytes())
+    }
+
+    @Test
+    fun writeLines() {
+        val file = createTempFile().cleanup()
+        val lines = listOf("first line", "second line")
+        file.writeLines(lines)
+        assertEquals(lines, file.readLines())
+
+        file.writeLines(lines.asSequence())
+        assertEquals(lines, file.readLines())
+
+        val moreLines = listOf("third line", "the bottom line")
+        file.appendLines(moreLines)
+        assertEquals(lines + moreLines, file.readLines())
+
+        file.appendLines(moreLines.asSequence())
+        assertEquals(lines + moreLines + moreLines, file.readLines())
+    }
+}
+
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index f5d7b28e859..e59fbc30e3b 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -70,8 +70,8 @@ compileKotlin {
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
             "-Xnormalize-constructor-calls=enable",
-            "-module-name", project.name
     ]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
@@ -81,6 +81,7 @@ compileTestKotlin {
             "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
             "-Xopt-in=kotlin.ExperimentalStdlibApi",
+            "-Xopt-in=kotlin.io.path.ExperimentalPathApi",
     ]
 }
 
diff --git a/libraries/stdlib/jdk8/src/kotlin/streams/Streams.kt b/libraries/stdlib/jdk8/src/kotlin/streams/Streams.kt
index 4402d5f55a8..d5ddab2cdd7 100644
--- a/libraries/stdlib/jdk8/src/kotlin/streams/Streams.kt
+++ b/libraries/stdlib/jdk8/src/kotlin/streams/Streams.kt
@@ -24,30 +24,40 @@ import java.util.stream.*
 
 /**
  * Creates a [Sequence] instance that wraps the original stream iterating through its elements.
+ *
+ * @sample samples.streams.Streams.streamAsSequence
  */
 @SinceKotlin("1.2")
 public fun <T> Stream<T>.asSequence(): Sequence<T> = Sequence { iterator() }
 
 /**
  * Creates a [Sequence] instance that wraps the original stream iterating through its elements.
+ *
+ * @sample samples.streams.Streams.intStreamAsSequence
  */
 @SinceKotlin("1.2")
 public fun IntStream.asSequence(): Sequence<Int> = Sequence { iterator() }
 
 /**
  * Creates a [Sequence] instance that wraps the original stream iterating through its elements.
+ *
+ * @sample samples.streams.Streams.longStreamAsSequence
  */
 @SinceKotlin("1.2")
 public fun LongStream.asSequence(): Sequence<Long> = Sequence { iterator() }
 
 /**
  * Creates a [Sequence] instance that wraps the original stream iterating through its elements.
+ *
+ * @sample samples.streams.Streams.doubleStreamAsSequence
  */
 @SinceKotlin("1.2")
 public fun DoubleStream.asSequence(): Sequence<Double> = Sequence { iterator() }
 
 /**
  * Creates a sequential [Stream] instance that produces elements from the original sequence.
+ *
+ * @sample samples.streams.Streams.sequenceAsStream
  */
 @SinceKotlin("1.2")
 public fun <T> Sequence<T>.asStream(): Stream<T> =
@@ -55,24 +65,32 @@ public fun <T> Sequence<T>.asStream(): Stream<T> =
 
 /**
  * Returns a [List] containing all elements produced by this stream.
+ *
+ * @sample samples.streams.Streams.streamToList
  */
 @SinceKotlin("1.2")
 public fun <T> Stream<T>.toList(): List<T> = collect(Collectors.toList<T>())
 
 /**
  * Returns a [List] containing all elements produced by this stream.
+ *
+ * @sample samples.streams.Streams.intStreamToList
  */
 @SinceKotlin("1.2")
 public fun IntStream.toList(): List<Int> = toArray().asList()
 
 /**
  * Returns a [List] containing all elements produced by this stream.
+ *
+ * @sample samples.streams.Streams.longStreamToList
  */
 @SinceKotlin("1.2")
 public fun LongStream.toList(): List<Long> = toArray().asList()
 
 /**
  * Returns a [List] containing all elements produced by this stream.
+ *
+ * @sample samples.streams.Streams.doubleStreamToList
  */
 @SinceKotlin("1.2")
 public fun DoubleStream.toList(): List<Double> = toArray().asList()
diff --git a/libraries/stdlib/js/src/kotlin/coroutines/cancellation/CancellationException.kt b/libraries/stdlib/js/src/kotlin/coroutines/cancellation/CancellationException.kt
index 0438d8b0b19..4f4de5417ca 100644
--- a/libraries/stdlib/js/src/kotlin/coroutines/cancellation/CancellationException.kt
+++ b/libraries/stdlib/js/src/kotlin/coroutines/cancellation/CancellationException.kt
@@ -5,7 +5,6 @@
 
 package kotlin.coroutines.cancellation
 
-@ExperimentalStdlibApi
 @SinceKotlin("1.4")
 public actual open class CancellationException : IllegalStateException {
     actual constructor() : super()
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index 109f7762bce..4bdac657e5a 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -63,13 +63,12 @@ tasks.withType<KotlinCompile> {
     dependsOn(copySources)
     kotlinOptions {
         freeCompilerArgs += listOf(
-            "-module-name",
-            "kotlin-stdlib",
             "-Xallow-kotlin-package",
             "-Xmulti-platform",
             "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=kotlin.contracts.ExperimentalContracts"
         )
+        moduleName = "kotlin-stdlib"
     }
 }
 
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index e7b046ae6a1..af14f044562 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -117,12 +117,13 @@ compileKotlin {
                 "-Xallow-result-return-type",
                 "-Xmultifile-parts-inherit",
                 "-Xnormalize-constructor-calls=enable",
-                "-module-name", "kotlin-stdlib",
                 "-Xopt-in=kotlin.RequiresOptIn",
                 "-Xopt-in=kotlin.ExperimentalMultiplatform",
                 "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-                "-Xinline-classes"
+                "-Xinline-classes",
+                "-Xuse-14-inline-classes-mangling-scheme"
         ]
+        moduleName = "kotlin-stdlib"
     }
 }
 
diff --git a/libraries/stdlib/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt
index 1f8a768b6fa..9effdb546dd 100644
--- a/libraries/stdlib/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt
+++ b/libraries/stdlib/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt
@@ -27,7 +27,6 @@ internal actual constructor(
 
     private companion object {
         @Suppress("UNCHECKED_CAST")
-        @JvmStatic
         private val RESULT = AtomicReferenceFieldUpdater.newUpdater<SafeContinuation<*>, Any?>(
             SafeContinuation::class.java, Any::class.java as Class<Any?>, "result"
         )
diff --git a/libraries/stdlib/jvm/src/kotlin/coroutines/cancellation/CancellationException.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/cancellation/CancellationException.kt
index aad9d70e07e..e6abcec5518 100644
--- a/libraries/stdlib/jvm/src/kotlin/coroutines/cancellation/CancellationException.kt
+++ b/libraries/stdlib/jvm/src/kotlin/coroutines/cancellation/CancellationException.kt
@@ -7,18 +7,15 @@ package kotlin.coroutines.cancellation
 
 import kotlin.internal.InlineOnly
 
-@ExperimentalStdlibApi
 @SinceKotlin("1.4")
 public actual typealias CancellationException = java.util.concurrent.CancellationException
 
 @InlineOnly
-@ExperimentalStdlibApi
 @SinceKotlin("1.4")
 public actual inline fun CancellationException(message: String?, cause: Throwable?): CancellationException {
     return CancellationException(message).also { it.initCause(cause) }
 }
 @InlineOnly
-@ExperimentalStdlibApi
 @SinceKotlin("1.4")
 public actual inline fun CancellationException(cause: Throwable?): CancellationException {
     return CancellationException(cause?.toString()).also { it.initCause(cause) }
diff --git a/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt b/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt
index 1a4a9fa3567..c376916f5af 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -23,11 +23,24 @@ import java.io.IOException
  *
  * To create the new file, the [prefix] and the [suffix] may first be adjusted to fit the limitations of the underlying platform.
  *
+ * **Note:** if the new directory is created in a directory that is shared with all users,
+ * it may get permissions allowing everyone to read it or its content, thus creating a risk of leaking
+ * sensitive information stored in this directory.
+ * To avoid this, it's recommended either to specify an explicit parent [directory] that is not shared widely,
+ * or to use alternative ways of creating temporary files,
+ * such as [java.nio.file.Files.createTempDirectory](https://docs.oracle.com/javase/8/docs/api/java/nio/file/Files.html#createTempDirectory-java.lang.String-java.nio.file.attribute.FileAttribute...-)
+ * or the experimental `createTempDirectory` function in the `kotlin.io.path` package.
+ *
  * @return a file object corresponding to a newly-created directory.
  *
  * @throws IOException in case of input/output error.
  * @throws IllegalArgumentException if [prefix] is shorter than three symbols.
  */
+@Deprecated(
+    "Avoid creating temporary directories in the default temp location with this function " +
+    "due to too wide permissions on the newly created directory. " +
+    "Use kotlin.io.path.createTempDirectory instead."
+)
 public fun createTempDir(prefix: String = "tmp", suffix: String? = null, directory: File? = null): File {
     val dir = File.createTempFile(prefix, suffix, directory)
     dir.delete()
@@ -50,11 +63,24 @@ public fun createTempDir(prefix: String = "tmp", suffix: String? = null, directo
  *
  * To create the new file, the [prefix] and the [suffix] may first be adjusted to fit the limitations of the underlying platform.
  *
+ * **Note:** if the new file is created in a directory that is shared with all users,
+ * it may get permissions allowing everyone to read it, thus creating a risk of leaking
+ * sensitive information stored in this file.
+ * To avoid this, it's recommended either to specify an explicit parent [directory] that is not shared widely,
+ * or to use alternative ways of creating temporary files,
+ * such as [java.nio.file.Files.createTempFile](https://docs.oracle.com/javase/8/docs/api/java/nio/file/Files.html#createTempFile-java.lang.String-java.lang.String-java.nio.file.attribute.FileAttribute...-)
+ * or the experimental `createTempFile` function in the `kotlin.io.path` package.
+ *
  * @return a file object corresponding to a newly-created file.
  *
  * @throws IOException in case of input/output error.
  * @throws IllegalArgumentException if [prefix] is shorter than three symbols.
  */
+@Deprecated(
+    "Avoid creating temporary files in the default temp location with this function " +
+    "due to too wide permissions on the newly created file. " +
+    "Use kotlin.io.path.createTempFile instead or resort to java.io.File.createTempFile."
+)
 public fun createTempFile(prefix: String = "tmp", suffix: String? = null, directory: File? = null): File {
     return File.createTempFile(prefix, suffix, directory)
 }
diff --git a/libraries/stdlib/jvm/src/kotlin/system/Timing.kt b/libraries/stdlib/jvm/src/kotlin/system/Timing.kt
index b4cfdef8bee..2e425cae1ec 100644
--- a/libraries/stdlib/jvm/src/kotlin/system/Timing.kt
+++ b/libraries/stdlib/jvm/src/kotlin/system/Timing.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -10,6 +10,8 @@ import kotlin.contracts.*
 
 /**
  * Executes the given [block] and returns elapsed time in milliseconds.
+ *
+ * @sample samples.system.Timing.measureBlockTimeMillis
  */
 public inline fun measureTimeMillis(block: () -> Unit): Long {
     contract {
@@ -22,6 +24,8 @@ public inline fun measureTimeMillis(block: () -> Unit): Long {
 
 /**
  * Executes the given [block] and returns elapsed time in nanoseconds.
+ *
+ * @sample samples.system.Timing.measureBlockNanoTime
  */
 public inline fun measureNanoTime(block: () -> Unit): Long {
     contract {
diff --git a/libraries/stdlib/jvm/test/io/FileTreeWalks.kt b/libraries/stdlib/jvm/test/io/FileTreeWalks.kt
index a980a58ec7e..8d5ac446cfc 100644
--- a/libraries/stdlib/jvm/test/io/FileTreeWalks.kt
+++ b/libraries/stdlib/jvm/test/io/FileTreeWalks.kt
@@ -16,7 +16,7 @@ class FileTreeWalkTest {
         val referenceFilenames =
                 listOf("1", "1/2", "1/3", "1/3/4.txt", "1/3/5.txt", "6", "7.txt", "8", "8/9.txt")
         fun createTestFiles(): File {
-            val basedir = createTempDir()
+            val basedir = @Suppress("DEPRECATION") createTempDir()
             for (name in referenceFilenames) {
                 val file = basedir.resolve(name)
                 if (file.extension.isEmpty())
@@ -52,7 +52,7 @@ class FileTreeWalkTest {
     }
 
     @Test fun singleFile() {
-        val testFile = createTempFile()
+        val testFile = @Suppress("DEPRECATION") createTempFile()
         val nonExistantFile = testFile.resolve("foo")
         try {
             for (walk in listOf(File::walkTopDown, File::walkBottomUp)) {
@@ -437,6 +437,7 @@ class FileTreeWalkTest {
         }
     }
 
+    @Suppress("DEPRECATION")
     @Test fun streamFileTree() {
         val dir = createTempDir()
         try {
diff --git a/libraries/stdlib/jvm/test/io/Files.kt b/libraries/stdlib/jvm/test/io/Files.kt
index 3248b36dc9c..a5db29691b2 100644
--- a/libraries/stdlib/jvm/test/io/Files.kt
+++ b/libraries/stdlib/jvm/test/io/Files.kt
@@ -17,12 +17,14 @@ class FilesTest {
     private val isBackslashSeparator = File.separatorChar == '\\'
 
 
+    @Suppress("DEPRECATION")
     @Test fun testPath() {
         val fileSuf = System.currentTimeMillis().toString()
         val file1 = createTempFile("temp", fileSuf)
         assertTrue(file1.path.endsWith(fileSuf), file1.path)
     }
 
+    @Suppress("DEPRECATION")
     @Test fun testCreateTempDir() {
         val dirSuf = System.currentTimeMillis().toString()
         val dir1 = createTempDir("temp", dirSuf)
@@ -42,6 +44,7 @@ class FilesTest {
         dir3.delete()
     }
 
+    @Suppress("DEPRECATION")
     @Test fun testCreateTempFile() {
         val fileSuf = System.currentTimeMillis().toString()
         val file1 = createTempFile("temp", fileSuf)
@@ -61,6 +64,7 @@ class FilesTest {
         file3.delete()
     }
 
+    @Suppress("DEPRECATION")
     @Test fun listFilesWithFilter() {
         val dir = createTempDir("temp")
 
@@ -366,7 +370,7 @@ class FilesTest {
     }
 
     @Test fun writeReadText() {
-        val file = createTempFile()
+        val file = @Suppress("DEPRECATION") createTempFile()
         try {
             val expected = String(CharArray(DEFAULT_BUFFER_SIZE * 2) { Random.nextInt(0, 1024).toChar() })
             file.writeText(expected)
@@ -391,7 +395,7 @@ class FilesTest {
     }
 
     @Test fun writeReadBytes() {
-        val file = createTempFile()
+        val file = @Suppress("DEPRECATION") createTempFile()
         try {
             val expected = Random.nextBytes(DEFAULT_BUFFER_SIZE * 4)
             file.writeBytes(expected)
@@ -427,8 +431,8 @@ class FilesTest {
     }
 
     @Test fun testCopyTo() {
-        val srcFile = createTempFile()
-        val dstFile = createTempFile()
+        val srcFile = @Suppress("DEPRECATION") createTempFile()
+        val dstFile = @Suppress("DEPRECATION") createTempFile()
         try {
             srcFile.writeText("Hello, World!")
             assertFailsWith(FileAlreadyExistsException::class, "copy do not overwrite existing file") {
@@ -493,8 +497,8 @@ class FilesTest {
 
     @Test fun copyToNameWithoutParent() {
         val currentDir = File("").absoluteFile!!
-        val srcFile = createTempFile()
-        val dstFile = createTempFile(directory = currentDir)
+        val srcFile = @Suppress("DEPRECATION") createTempFile()
+        val dstFile = @Suppress("DEPRECATION") createTempFile(directory = currentDir)
         try {
             srcFile.writeText("Hello, World!", Charsets.UTF_8)
             dstFile.delete()
@@ -512,7 +516,7 @@ class FilesTest {
     }
 
     @Test fun deleteRecursively() {
-        val dir = createTempDir()
+        val dir = @Suppress("DEPRECATION") createTempDir()
         dir.delete()
         dir.mkdir()
         val subDir = File(dir, "subdir");
@@ -563,6 +567,7 @@ class FilesTest {
         }
     }
 
+    @Suppress("DEPRECATION")
     @Test fun copyRecursively() {
         val src = createTempDir()
         val dst = createTempDir()
@@ -629,6 +634,7 @@ class FilesTest {
         }
     }
 
+    @Suppress("DEPRECATION")
     @Test fun copyRecursivelyWithOverwrite() {
         val src = createTempDir()
         val dst = createTempDir()
@@ -675,7 +681,7 @@ class FilesTest {
     }
 
     @Test fun helpers2() {
-        val file = createTempFile()
+        val file = @Suppress("DEPRECATION") createTempFile()
         val writer = file.printWriter()
         val str1 = "Hello, world!"
         val str2 = "Everything is wonderful!"
diff --git a/libraries/stdlib/jvm/test/io/IOStreams.kt b/libraries/stdlib/jvm/test/io/IOStreams.kt
index d616d886a2b..03d0a6fa32b 100644
--- a/libraries/stdlib/jvm/test/io/IOStreams.kt
+++ b/libraries/stdlib/jvm/test/io/IOStreams.kt
@@ -12,7 +12,7 @@ import kotlin.random.Random
 
 class IOStreamsTest {
     @Test fun testGetStreamOfFile() {
-        val tmpFile = createTempFile()
+        val tmpFile = @Suppress("DEPRECATION") createTempFile()
         var writer: Writer? = null
         try {
             writer = tmpFile.outputStream().writer()
@@ -46,7 +46,7 @@ class IOStreamsTest {
     }
 
     @Test fun readWriteBytes() {
-        val file = createTempFile("temp", Random.nextLong().toString())
+        val file = @Suppress("DEPRECATION") createTempFile("temp", Random.nextLong().toString())
         try {
             val bytes = Random.nextBytes(256_000)
 
diff --git a/libraries/stdlib/samples/test/samples/collections/collections.kt b/libraries/stdlib/samples/test/samples/collections/collections.kt
index 0c7d7fc7be3..509680a3027 100644
--- a/libraries/stdlib/samples/test/samples/collections/collections.kt
+++ b/libraries/stdlib/samples/test/samples/collections/collections.kt
@@ -800,6 +800,19 @@ class Collections {
             val emptyList = emptyList<Int>()
             assertPrints(emptyList.getOrNull(0), "null")
         }
+
+        @Sample
+        fun last() {
+            val list = listOf(1, 2, 3, 4)
+            assertPrints(list.last(), "4")
+            assertPrints(list.last { it % 2 == 1 }, "3")
+            assertPrints(list.lastOrNull { it < 0 }, "null")
+            assertFails { list.last { it < 0 } }
+
+            val emptyList = emptyList<Int>()
+            assertPrints(emptyList.lastOrNull(), "null")
+            assertFails { emptyList.last() }
+        }
     }
 
     class Sorting {
diff --git a/libraries/stdlib/samples/test/samples/misc/preconditions.kt b/libraries/stdlib/samples/test/samples/misc/preconditions.kt
index 8bd1a057fb9..be1943f1866 100644
--- a/libraries/stdlib/samples/test/samples/misc/preconditions.kt
+++ b/libraries/stdlib/samples/test/samples/misc/preconditions.kt
@@ -27,6 +27,31 @@ class Preconditions {
         assertPrints(getIndices(3), "[1, 2, 3]")
     }
 
+    @Sample
+    fun failRequireNotNullWithLazyMessage() {
+
+        fun printRequiredParam(params: Map<String, String?>) {
+            val required: String = requireNotNull(params["required"]) { "Required value must be non-null" } // returns a non-null value
+            println(required)
+            // ...
+        }
+
+        fun printRequiredParamByUpperCase(params: Map<String, String?>) {
+            val requiredParam: String? = params["required"]
+            requireNotNull(requiredParam) { "Required value must be non-null" }
+            // now requiredParam is smartcast to String so that it is unnecessary to use the safe call(?.)
+            println(requiredParam.toUpperCase())
+        }
+
+        val params: MutableMap<String, String?> = mutableMapOf("required" to null)
+        assertFailsWith<IllegalArgumentException> { printRequiredParam(params) }
+        assertFailsWith<IllegalArgumentException> { printRequiredParamByUpperCase(params) }
+
+        params["required"] = "non-empty-param"
+        printRequiredParam(params) // prints "non-empty-param"
+        printRequiredParamByUpperCase(params) // prints "NON-EMPTY-PARAM"
+    }
+
     @Sample
     fun failCheckWithLazyMessage() {
 
diff --git a/libraries/stdlib/samples/test/samples/random/randoms.kt b/libraries/stdlib/samples/test/samples/random/randoms.kt
index 9d7b4e243ae..5bb24b70ec1 100644
--- a/libraries/stdlib/samples/test/samples/random/randoms.kt
+++ b/libraries/stdlib/samples/test/samples/random/randoms.kt
@@ -6,6 +6,7 @@
 package samples.random
 
 import samples.*
+import kotlin.math.sin
 import kotlin.random.Random
 import kotlin.test.assertTrue
 
@@ -38,4 +39,105 @@ class Randoms {
         // random with another seed produce another sequence
         assertPrints(randomValues3, "[14, 48, 57, 67, 82, 7, 61, 27, 14, 59]")
     }
-}
\ No newline at end of file
+
+    @Sample
+    fun nextBits() {
+        // always generates a 0
+        println(Random.nextBits(0))
+        // randomly generates a 0 or 1
+        println(Random.nextBits(1))
+        // generates a random non-negative Int value less than 256
+        println(Random.nextBits(8))
+        // generates a random Int value, may generate a negative value as well
+        println(Random.nextBits(32))
+    }
+
+    @Sample
+    fun nextBoolean() {
+        val presents = listOf("Candy", "Balloon", "Ball")
+        // a random partition, the result may be different every time
+        val (alicePresents, bobPresents) = presents.partition { Random.nextBoolean() }
+
+        println("Alice receives $alicePresents")
+        println("Bob receives $bobPresents")
+    }
+
+    @Sample
+    fun nextBytes() {
+        val bytes = ByteArray(4)
+        assertPrints(bytes.contentToString(), "[0, 0, 0, 0]")
+
+        Random.nextBytes(bytes, 1, 3)
+        // second and third bytes are generated, rest unchanged
+        println(bytes.contentToString())
+
+        Random.nextBytes(bytes)
+        // all bytes are newly generated
+        println(bytes.contentToString())
+
+        val newBytes = Random.nextBytes(5)
+        // a new byte array filled with random values
+        println(newBytes.contentToString())
+    }
+
+    @Sample
+    fun nextDouble() {
+        if (Random.nextDouble() <= 0.3) {
+            println("There was 30% possibility of rainy weather today and it is raining.")
+        } else {
+            println("There was 70% possibility of sunny weather today and the sun is shining.")
+        }
+    }
+
+    @Sample
+    fun nextDoubleFromUntil() {
+        val firstAngle = Random.nextDouble(until = Math.PI / 6);
+        assertTrue(sin(firstAngle) < 0.5)
+
+        val secondAngle = Random.nextDouble(from = Math.PI / 6, until = Math.PI / 2)
+        val sinValue = sin(secondAngle)
+        assertTrue(sinValue >= 0.5 && sinValue < 1.0)
+    }
+
+    @Sample
+    fun nextFloat() {
+        if (Random.nextFloat() <= 0.3) {
+            println("There was 30% possibility of rainy weather today and it is raining.")
+        } else {
+            println("There was 70% possibility of sunny weather today and the sun is shining.")
+        }
+    }
+
+    @Sample
+    fun nextInt() {
+        val randomInts = List(5) { Random.nextInt() }
+        println(randomInts)
+        val sortedRandomInts = randomInts.sorted()
+        println(sortedRandomInts)
+    }
+
+    @Sample
+    fun nextIntFromUntil() {
+        val menu = listOf("Omelette", "Porridge", "Cereal", "Chicken", "Pizza", "Pasta")
+        val forBreakfast = Random.nextInt(until = 3).let { menu[it] }
+        val forLunch = Random.nextInt(from = 3, until = 6).let { menu[it] }
+        // new meals every time
+        println("Today I want $forBreakfast for breakfast, and $forLunch for lunch.")
+    }
+
+    @Sample
+    fun nextLong() {
+        val randomLongs = List(5) { Random.nextLong() }
+        println(randomLongs)
+        val sortedRandomLongs = randomLongs.sorted()
+        println(sortedRandomLongs)
+    }
+
+    @Sample
+    fun nextLongFromUntil() {
+        val fileSize = Random.nextLong(until = 1_099_511_627_776)
+        println("A file of $fileSize bytes fits on a 1TB storage.")
+        val long = Random.nextLong(Int.MAX_VALUE + 1L, Long.MAX_VALUE)
+        println("Number $long doesn't fit in an Int.")
+    }
+}
diff --git a/libraries/stdlib/samples/test/samples/streams/streams.kt b/libraries/stdlib/samples/test/samples/streams/streams.kt
new file mode 100644
index 00000000000..ef3085bcfa0
--- /dev/null
+++ b/libraries/stdlib/samples/test/samples/streams/streams.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package samples.streams
+
+import samples.*
+import java.util.stream.*
+import kotlin.streams.*
+
+class Streams {
+
+    @Sample
+    fun streamAsSequence() {
+        val stringStream: Stream<String> = Stream.of("Never", "gonna", "give", "you", "up")
+        val stringSequence: Sequence<String> = stringStream.asSequence()
+        assertPrints(stringSequence.joinToString(" "), "Never gonna give you up")
+    }
+
+    @Sample
+    fun intStreamAsSequence() {
+        val intStream: IntStream = IntStream.of(5, 6, 7)
+        val intSequence: Sequence<Int> = intStream.asSequence()
+        assertPrints(intSequence.joinToString(", "), "5, 6, 7")
+    }
+
+    @Sample
+    fun longStreamAsSequence() {
+        val longStream: LongStream = LongStream.of(5_000_000_000, 6_000_000_000, 7_000_000_000)
+        val longSequence: Sequence<Long> = longStream.asSequence()
+        assertPrints(longSequence.joinToString(", "), "5000000000, 6000000000, 7000000000")
+    }
+
+    @Sample
+    fun doubleStreamAsSequence() {
+        val doubleStream: DoubleStream = DoubleStream.of(1e2, 1e3, 1e4)
+        val doubleSequence: Sequence<Double> = doubleStream.asSequence()
+        assertPrints(doubleSequence.joinToString(", "), "100.0, 1000.0, 10000.0")
+    }
+
+    @Sample
+    fun sequenceAsStream() {
+        val evenNumbersSequence: Sequence<Int> = generateSequence(2, { it + 2 }).take(5)
+        val evenNumberStream: Stream<Int> = evenNumbersSequence.asStream()
+        assertPrints(evenNumberStream.toList(), "[2, 4, 6, 8, 10]")
+    }
+
+    @Sample
+    fun streamToList() {
+        val stringStream: Stream<String> = Stream.of("Lion", "Leopard", "Jaguar", "Tiger")
+        val stringList: List<String> = stringStream.toList()
+        assertPrints(stringList, "[Lion, Leopard, Jaguar, Tiger]")
+    }
+
+    @Sample
+    fun intStreamToList() {
+        val intStream: IntStream = IntStream.of(10, 20, 30)
+        val intList: List<Int> = intStream.toList()
+        assertPrints(intList, "[10, 20, 30]")
+    }
+
+    @Sample
+    fun longStreamToList() {
+        val longStream: LongStream = LongStream.of(3_000_000_000, 4_000_000_000, 5_000_000_000)
+        val longList: List<Long> = longStream.toList()
+        assertPrints(longList, "[3000000000, 4000000000, 5000000000]")
+    }
+
+    @Sample
+    fun doubleStreamToList() {
+        val doubleStream: DoubleStream = DoubleStream.of(1e2, 1e3, 1e4)
+        val doubleList: List<Double> = doubleStream.toList()
+        assertPrints(doubleList, "[100.0, 1000.0, 10000.0]")
+    }
+}
\ No newline at end of file
diff --git a/libraries/stdlib/samples/test/samples/system/timing.kt b/libraries/stdlib/samples/test/samples/system/timing.kt
new file mode 100644
index 00000000000..62d51c8450b
--- /dev/null
+++ b/libraries/stdlib/samples/test/samples/system/timing.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package samples.system
+
+import samples.*
+import kotlin.system.*
+
+class Timing {
+
+    @Sample
+    fun measureBlockTimeMillis() {
+        val numbers: List<Int>
+        val timeInMillis = measureTimeMillis {
+            numbers = buildList {
+                addAll(0..100)
+                shuffle()
+                sortDescending()
+            }
+        }
+        // here numbers are initialized and sorted
+        assertPrints(numbers.first(), "100")
+
+        println("(The operation took $timeInMillis ms)")
+    }
+
+    @Sample
+    fun measureBlockNanoTime() {
+        var sqrt = 0
+        val number = 1000
+        val timeInNanos = measureNanoTime {
+            while (sqrt * sqrt < number) sqrt++
+        }
+        println("(The operation took $timeInNanos ns)")
+        println("The approximate square root of $number is between ${sqrt - 1} and $sqrt")
+    }
+}
diff --git a/libraries/stdlib/samples/test/samples/text/strings.kt b/libraries/stdlib/samples/test/samples/text/strings.kt
index 1c3e0ff6086..a30b571ce47 100644
--- a/libraries/stdlib/samples/test/samples/text/strings.kt
+++ b/libraries/stdlib/samples/test/samples/text/strings.kt
@@ -408,4 +408,17 @@ class Strings {
         assertPrints(matchDetails(inputString, toFind, 2), "Searching for 'ever' in 'Never ever give up' starting at position 2: Found at 6")
         assertPrints(matchDetails(inputString, toFind, 10), "Searching for 'ever' in 'Never ever give up' starting at position 10: Not found")
     }
+
+    @Sample
+    fun last() {
+        val string = "Kotlin 1.4.0"
+        assertPrints(string.last(), "0")
+        assertPrints(string.last { it.isLetter() }, "n")
+        assertPrints(string.lastOrNull { it > 'z' }, "null")
+        assertFails { string.last { it > 'z' } }
+
+        val emptyString = ""
+        assertPrints(emptyString.lastOrNull(), "null")
+        assertFails { emptyString.last() }
+    }
 }
diff --git a/libraries/stdlib/src/kotlin/coroutines/cancellation/CancellationExceptionH.kt b/libraries/stdlib/src/kotlin/coroutines/cancellation/CancellationExceptionH.kt
index 7ac0e7173a1..b64b1ffa9c9 100644
--- a/libraries/stdlib/src/kotlin/coroutines/cancellation/CancellationExceptionH.kt
+++ b/libraries/stdlib/src/kotlin/coroutines/cancellation/CancellationExceptionH.kt
@@ -9,7 +9,6 @@ package kotlin.coroutines.cancellation
  * Thrown by cancellable suspending functions if the coroutine is cancelled while it is suspended.
  * It indicates _normal_ cancellation of a coroutine.
  */
-@ExperimentalStdlibApi
 @SinceKotlin("1.4")
 public expect open class CancellationException : IllegalStateException {
     public constructor()
@@ -19,7 +18,6 @@ public expect open class CancellationException : IllegalStateException {
 /**
  * Creates an instance of [CancellationException] with the given [message] and [cause].
  */
-@ExperimentalStdlibApi
 @SinceKotlin("1.4")
 @Suppress("FunctionName", "NO_ACTUAL_FOR_EXPECT")
 public expect fun CancellationException(message: String?, cause: Throwable?): CancellationException
@@ -27,7 +25,6 @@ public expect fun CancellationException(message: String?, cause: Throwable?): Ca
 /**
  * Creates an instance of [CancellationException] with the given [cause].
  */
-@ExperimentalStdlibApi
 @SinceKotlin("1.4")
 @Suppress("FunctionName", "NO_ACTUAL_FOR_EXPECT")
 public expect fun CancellationException(cause: Throwable?): CancellationException
\ No newline at end of file
diff --git a/libraries/stdlib/src/kotlin/random/Random.kt b/libraries/stdlib/src/kotlin/random/Random.kt
index 823c69a8133..2532e2fd8f4 100644
--- a/libraries/stdlib/src/kotlin/random/Random.kt
+++ b/libraries/stdlib/src/kotlin/random/Random.kt
@@ -25,6 +25,8 @@ public abstract class Random {
      * Generates an `Int` whose lower [bitCount] bits are filled with random values and the remaining upper bits are zero.
      *
      * @param bitCount number of bits to generate, must be in range 0..32, otherwise the behavior is unspecified.
+     *
+     * @sample samples.random.Randoms.nextBits
      */
     public abstract fun nextBits(bitCount: Int): Int
 
@@ -32,6 +34,8 @@ public abstract class Random {
      * Gets the next random `Int` from the random number generator.
      *
      * Generates an `Int` random value uniformly distributed between `Int.MIN_VALUE` and `Int.MAX_VALUE` (inclusive).
+     *
+     * @sample samples.random.Randoms.nextInt
      */
     public open fun nextInt(): Int = nextBits(32)
 
@@ -43,6 +47,8 @@ public abstract class Random {
      * @param until must be positive.
      *
      * @throws IllegalArgumentException if [until] is negative or zero.
+     *
+     * @sample samples.random.Randoms.nextIntFromUntil
      */
     public open fun nextInt(until: Int): Int = nextInt(0, until)
 
@@ -52,6 +58,8 @@ public abstract class Random {
      * Generates an `Int` random value uniformly distributed between the specified [from] (inclusive) and [until] (exclusive) bounds.
      *
      * @throws IllegalArgumentException if [from] is greater than or equal to [until].
+     *
+     * @sample samples.random.Randoms.nextIntFromUntil
      */
     public open fun nextInt(from: Int, until: Int): Int {
         checkRangeBounds(from, until)
@@ -81,6 +89,8 @@ public abstract class Random {
      * Gets the next random `Long` from the random number generator.
      *
      * Generates a `Long` random value uniformly distributed between `Long.MIN_VALUE` and `Long.MAX_VALUE` (inclusive).
+     *
+     * @sample samples.random.Randoms.nextLong
      */
     public open fun nextLong(): Long = nextInt().toLong().shl(32) + nextInt()
 
@@ -92,6 +102,8 @@ public abstract class Random {
      * @param until must be positive.
      *
      * @throws IllegalArgumentException if [until] is negative or zero.
+     *
+     * @sample samples.random.Randoms.nextLongFromUntil
      */
     public open fun nextLong(until: Long): Long = nextLong(0, until)
 
@@ -101,6 +113,8 @@ public abstract class Random {
      * Generates a `Long` random value uniformly distributed between the specified [from] (inclusive) and [until] (exclusive) bounds.
      *
      * @throws IllegalArgumentException if [from] is greater than or equal to [until].
+     *
+     * @sample samples.random.Randoms.nextLongFromUntil
      */
     public open fun nextLong(from: Long, until: Long): Long {
         checkRangeBounds(from, until)
@@ -143,11 +157,15 @@ public abstract class Random {
 
     /**
      * Gets the next random [Boolean] value.
+     *
+     * @sample samples.random.Randoms.nextBoolean
      */
     public open fun nextBoolean(): Boolean = nextBits(1) != 0
 
     /**
      * Gets the next random [Double] value uniformly distributed between 0 (inclusive) and 1 (exclusive).
+     *
+     * @sample samples.random.Randoms.nextDouble
      */
     public open fun nextDouble(): Double = doubleFromParts(nextBits(26), nextBits(27))
 
@@ -157,6 +175,8 @@ public abstract class Random {
      * Generates a `Double` random value uniformly distributed between 0 (inclusive) and [until] (exclusive).
      *
      * @throws IllegalArgumentException if [until] is negative or zero.
+     *
+     * @sample samples.random.Randoms.nextDoubleFromUntil
      */
     public open fun nextDouble(until: Double): Double = nextDouble(0.0, until)
 
@@ -168,6 +188,8 @@ public abstract class Random {
      * [from] and [until] must be finite otherwise the behavior is unspecified.
      *
      * @throws IllegalArgumentException if [from] is greater than or equal to [until].
+     *
+     * @sample samples.random.Randoms.nextDoubleFromUntil
      */
     public open fun nextDouble(from: Double, until: Double): Double {
         checkRangeBounds(from, until)
@@ -183,6 +205,8 @@ public abstract class Random {
 
     /**
      * Gets the next random [Float] value uniformly distributed between 0 (inclusive) and 1 (exclusive).
+     *
+     * @sample samples.random.Randoms.nextFloat
      */
     public open fun nextFloat(): Float = nextBits(24) / (1 shl 24).toFloat()
 
@@ -191,6 +215,8 @@ public abstract class Random {
      * with random bytes.
      *
      * @return [array] with the subrange filled with random bytes.
+     *
+     * @sample samples.random.Randoms.nextBytes
      */
     public open fun nextBytes(array: ByteArray, fromIndex: Int = 0, toIndex: Int = array.size): ByteArray {
         require(fromIndex in 0..array.size && toIndex in 0..array.size) { "fromIndex ($fromIndex) or toIndex ($toIndex) are out of range: 0..${array.size}." }
@@ -221,11 +247,15 @@ public abstract class Random {
      * Fills the specified byte [array] with random bytes and returns it.
      *
      * @return [array] filled with random bytes.
+     *
+     * @sample samples.random.Randoms.nextBytes
      */
     public open fun nextBytes(array: ByteArray): ByteArray = nextBytes(array, 0, array.size)
 
     /**
      * Creates a byte array of the specified [size], filled with random bytes.
+     *
+     * @sample samples.random.Randoms.nextBytes
      */
     public open fun nextBytes(size: Int): ByteArray = nextBytes(ByteArray(size))
 
diff --git a/libraries/stdlib/src/kotlin/util/Preconditions.kt b/libraries/stdlib/src/kotlin/util/Preconditions.kt
index 7190100a645..84a4741e628 100644
--- a/libraries/stdlib/src/kotlin/util/Preconditions.kt
+++ b/libraries/stdlib/src/kotlin/util/Preconditions.kt
@@ -54,7 +54,7 @@ public inline fun <T : Any> requireNotNull(value: T?): T {
  * Throws an [IllegalArgumentException] with the result of calling [lazyMessage] if the [value] is null. Otherwise
  * returns the not null value.
  *
- * @sample samples.misc.Preconditions.failRequireWithLazyMessage
+ * @sample samples.misc.Preconditions.failRequireNotNullWithLazyMessage
  */
 @kotlin.internal.InlineOnly
 public inline fun <T : Any> requireNotNull(value: T?, lazyMessage: () -> Any): T {
diff --git a/libraries/stdlib/src/kotlin/util/Standard.kt b/libraries/stdlib/src/kotlin/util/Standard.kt
index 027cc85aeff..0aecfa3234f 100644
--- a/libraries/stdlib/src/kotlin/util/Standard.kt
+++ b/libraries/stdlib/src/kotlin/util/Standard.kt
@@ -114,6 +114,8 @@ public inline fun <T, R> T.let(block: (T) -> R): R {
 
 /**
  * Returns `this` value if it satisfies the given [predicate] or `null`, if it doesn't.
+ *
+ * For detailed usage information see the documentation for [scope functions](https://kotlinlang.org/docs/reference/scope-functions.html#takeif-and-takeunless).
  */
 @kotlin.internal.InlineOnly
 @SinceKotlin("1.1")
@@ -126,6 +128,8 @@ public inline fun <T> T.takeIf(predicate: (T) -> Boolean): T? {
 
 /**
  * Returns `this` value if it _does not_ satisfy the given [predicate] or `null`, if it does.
+ *
+ * For detailed usage information see the documentation for [scope functions](https://kotlinlang.org/docs/reference/scope-functions.html#takeif-and-takeunless).
  */
 @kotlin.internal.InlineOnly
 @SinceKotlin("1.1")
diff --git a/libraries/stdlib/wasm/build.gradle.kts b/libraries/stdlib/wasm/build.gradle.kts
index 3c05bd98dc4..e25ee1640b9 100644
--- a/libraries/stdlib/wasm/build.gradle.kts
+++ b/libraries/stdlib/wasm/build.gradle.kts
@@ -1,19 +1,66 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
-import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.IR
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 
 plugins {
+    `maven-publish`
     kotlin("multiplatform")
 }
 
+val unimplementedNativeBuiltIns =
+    (file("$rootDir/core/builtins/native/kotlin/").list().toSortedSet() - file("$rootDir/libraries/stdlib/wasm/builtins/kotlin/").list())
+        .map { "core/builtins/native/kotlin/$it" }
+
+
+
+val builtInsSources by task<Sync> {
+    val sources = listOf(
+        "core/builtins/src/kotlin/"
+    ) + unimplementedNativeBuiltIns
+
+    val excluded = listOf(
+        // JS-specific optimized version of emptyArray() already defined
+        "core/builtins/src/kotlin/ArrayIntrinsics.kt"
+    )
+
+    sources.forEach { path ->
+        from("$rootDir/$path") {
+            into(path.dropLastWhile { it != '/' })
+            excluded.filter { it.startsWith(path) }.forEach {
+                exclude(it.substring(path.length))
+            }
+        }
+    }
+
+    into("$buildDir/builtInsSources")
+}
+
+val commonMainSources by task<Sync> {
+    val sources = listOf(
+        "libraries/stdlib/common/src/",
+        "libraries/stdlib/src/kotlin/",
+        "libraries/stdlib/unsigned/"
+    )
+
+    sources.forEach { path ->
+        from("$rootDir/$path") {
+            into(path.dropLastWhile { it != '/' })
+        }
+    }
+
+    into("$buildDir/commonMainSources")
+}
+
 kotlin {
     js(IR) {
         nodejs()
     }
     sourceSets {
         val jsMain by getting {
-            kotlin.srcDirs("builtins", "internal", "runtime")
+            kotlin.srcDirs("builtins", "internal", "runtime", "src", "stubs")
+            kotlin.srcDirs(files(builtInsSources.map { it.destinationDir }))
+        }
+
+        val commonMain by getting {
+            kotlin.srcDirs(files(commonMainSources.map { it.destinationDir }))
         }
     }
 }
@@ -28,10 +75,13 @@ tasks.withType<KotlinCompile<*>>().configureEach {
         "-Xinline-classes",
         "-Xopt-in=kotlin.RequiresOptIn",
         "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
-        "-Xopt-in=kotlin.ExperimentalStdlibApi"
+        "-Xopt-in=kotlin.ExperimentalStdlibApi",
+        "-Xexplicit-api=warning"
     )
 }
 
 tasks.named("compileKotlinJs") {
     (this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin"
+    dependsOn(commonMainSources)
+    dependsOn(builtInsSources)
 }
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/builtins/README.md b/libraries/stdlib/wasm/builtins/README.md
deleted file mode 100644
index 5fdf80ad83d..00000000000
--- a/libraries/stdlib/wasm/builtins/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-This directory is a modified copy of `core/builtins` adapted for current
- needs of WASM backend.
- 
-This is a temporary solution for a development convenience. Most of files 
-from `core/builtins` will be reused once compiler implementation and
-stdlib become stable.
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Any.kt b/libraries/stdlib/wasm/builtins/kotlin/Any.kt
similarity index 81%
rename from libraries/stdlib/wasm/builtins/native/kotlin/Any.kt
rename to libraries/stdlib/wasm/builtins/kotlin/Any.kt
index 7e4e09f66bd..c95a877af4f 100644
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Any.kt
+++ b/libraries/stdlib/wasm/builtins/kotlin/Any.kt
@@ -3,20 +3,19 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress(
-    "NON_ABSTRACT_FUNCTION_WITH_NO_BODY",
-    "MUST_BE_INITIALIZED_OR_BE_ABSTRACT",
-    "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE",
-    "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED",
-    "WRONG_MODIFIER_TARGET"
-)
-
 package kotlin
 
+import kotlin.wasm.internal.*
+
 /**
  * The root of the Kotlin class hierarchy. Every Kotlin class has [Any] as a superclass.
  */
 public open class Any {
+    // Pointer to runtime type info
+    // Initialized by a compiler
+    @Suppress("MUST_BE_INITIALIZED_OR_BE_ABSTRACT")
+    internal var typeInfo: Int
+
     /**
      * Indicates whether some other object is "equal to" this one. Implementations must fulfil the following
      * requirements:
@@ -29,7 +28,8 @@ public open class Any {
      *
      * Read more about [equality](https://kotlinlang.org/docs/reference/equality.html) in Kotlin.
      */
-    public open operator fun equals(other: Any?): Boolean
+    public open operator fun equals(other: Any?): Boolean =
+        wasm_ref_eq(this, other)
 
     /**
      * Returns a hash code value for the object.  The general contract of `hashCode` is:
@@ -37,10 +37,12 @@ public open class Any {
      * * Whenever it is invoked on the same object more than once, the `hashCode` method must consistently return the same integer, provided no information used in `equals` comparisons on the object is modified.
      * * If two objects are equal according to the `equals()` method, then calling the `hashCode` method on each of the two objects must produce the same integer result.
      */
-    public open fun hashCode(): Int
+    // TODO: Implement
+    public open fun hashCode(): Int = 100
 
     /**
      * Returns a string representation of the object.
      */
-    public open fun toString(): String
+    // TODO: Implement
+    public open fun toString(): String = "[Object object]"
 }
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Array.kt b/libraries/stdlib/wasm/builtins/kotlin/Array.kt
similarity index 65%
rename from libraries/stdlib/wasm/builtins/native/kotlin/Array.kt
rename to libraries/stdlib/wasm/builtins/kotlin/Array.kt
index 933f00c8f9e..cdc115b427f 100644
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Array.kt
+++ b/libraries/stdlib/wasm/builtins/kotlin/Array.kt
@@ -3,16 +3,10 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress(
-    "NON_ABSTRACT_FUNCTION_WITH_NO_BODY",
-    "MUST_BE_INITIALIZED_OR_BE_ABSTRACT",
-    "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE",
-    "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED",
-    "WRONG_MODIFIER_TARGET"
-)
-
 package kotlin
 
+import kotlin.wasm.internal.*
+
 /**
  * Represents an array (specifically, a Java array when targeting the JVM platform).
  * Array instances can be created using the [arrayOf], [arrayOfNulls] and [emptyArray]
@@ -20,7 +14,9 @@ package kotlin
  * See [Kotlin language documentation](https://kotlinlang.org/docs/reference/basic-types.html#arrays)
  * for more information on arrays.
  */
-public class Array<T> {
+public class Array<T> constructor(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
     /**
      * Creates a new array with the specified [size], where each element is calculated by calling the specified
      * [init] function.
@@ -28,7 +24,10 @@ public class Array<T> {
      * The function [init] is called for each array element sequentially starting from the first one.
      * It should return the value for an array element given its index.
      */
-    public inline constructor(size: Int, init: (Int) -> T)
+    @Suppress("TYPE_PARAMETER_AS_REIFIED")
+    public constructor(size: Int, init: (Int) -> T) : this(size) {
+        JsArray_fill_T(jsArray, size, init)
+    }
 
     /**
      * Returns the array element at the specified [index]. This method can be called using the
@@ -40,7 +39,9 @@ public class Array<T> {
      * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
      * where the behavior is unspecified.
      */
-    public operator fun get(index: Int): T
+    @Suppress("UNCHECKED_CAST")
+    public operator fun get(index: Int): T =
+        WasmExternRefToAny(JsArray_get_WasmExternRef(jsArray, index)) as T
 
     /**
      * Sets the array element at the specified [index] to the specified [value]. This method can
@@ -52,15 +53,25 @@ public class Array<T> {
      * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
      * where the behavior is unspecified.
      */
-    public operator fun set(index: Int, value: T): Unit
+    public operator fun set(index: Int, value: T) {
+        JsArray_set_WasmExternRef(jsArray, index, value.toWasmExternRef())
+    }
 
     /**
      * Returns the number of elements in the array.
      */
     public val size: Int
+        get() = JsArray_getSize(jsArray)
 
     /**
      * Creates an iterator for iterating over the elements of the array.
      */
-    public operator fun iterator(): Iterator<T>
+    public operator fun iterator(): Iterator<T> = arrayIterator(this)
 }
+
+internal fun <T> arrayIterator(array: Array<T>) = object : Iterator<T> {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun next() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
+
diff --git a/libraries/stdlib/wasm/builtins/kotlin/Arrays.kt b/libraries/stdlib/wasm/builtins/kotlin/Arrays.kt
new file mode 100644
index 00000000000..3cc884ec1c9
--- /dev/null
+++ b/libraries/stdlib/wasm/builtins/kotlin/Arrays.kt
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+import kotlin.wasm.internal.*
+
+public class ByteArray(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
+    init {
+        JsArray_fill_Byte(jsArray, size) { 0 }
+    }
+
+    public constructor(size: Int, init: (Int) -> Byte) : this(size) {
+        jsArray = JsArray_new(size)
+        JsArray_fill_Byte(jsArray, size, init)
+    }
+
+    public operator fun get(index: Int): Byte =
+        JsArray_get_Byte(jsArray, index)
+
+    public operator fun set(index: Int, value: Byte) {
+        JsArray_set_Byte(jsArray, index, value)
+    }
+
+    public val size: Int
+        get() = JsArray_getSize(jsArray)
+
+
+    public operator fun iterator(): ByteIterator = byteArrayIterator(this)
+}
+
+internal fun byteArrayIterator(array: ByteArray) = object : ByteIterator() {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun nextByte() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
+
+
+public class CharArray(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
+    init {
+        JsArray_fill_Char(jsArray, size) { 0.toChar() }
+    }
+
+    public constructor(size: Int, init: (Int) -> Char) : this(size) {
+        jsArray = JsArray_new(size)
+        JsArray_fill_Char(jsArray, size, init)
+    }
+
+    public operator fun get(index: Int): Char =
+        JsArray_get_Char(jsArray, index)
+
+    public operator fun set(index: Int, value: Char) {
+        JsArray_set_Char(jsArray, index, value)
+    }
+
+    public val size: Int
+        get() = JsArray_getSize(jsArray)
+
+
+    public operator fun iterator(): CharIterator = charArrayIterator(this)
+}
+
+internal fun charArrayIterator(array: CharArray) = object : CharIterator() {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun nextChar() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
+
+
+public class ShortArray(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
+    init {
+        JsArray_fill_Short(jsArray, size) { 0 }
+    }
+
+    public constructor(size: Int, init: (Int) -> Short) : this(size) {
+        JsArray_fill_Short(jsArray, size, init)
+    }
+
+    public operator fun get(index: Int): Short =
+        JsArray_get_Short(jsArray, index)
+
+    public operator fun set(index: Int, value: Short) {
+        JsArray_set_Short(jsArray, index, value)
+    }
+
+    public val size: Int
+        get() = JsArray_getSize(jsArray)
+
+
+    public operator fun iterator(): ShortIterator = shortArrayIterator(this)
+}
+
+internal fun shortArrayIterator(array: ShortArray) = object : ShortIterator() {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun nextShort() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
+
+
+public class IntArray(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
+    init {
+        JsArray_fill_Int(jsArray, size) { 0 }
+    }
+
+    public constructor(size: Int, init: (Int) -> Int) : this(size) {
+        JsArray_fill_Int(jsArray, size, init)
+    }
+
+    public operator fun get(index: Int): Int =
+        JsArray_get_Int(jsArray, index)
+
+    public operator fun set(index: Int, value: Int) {
+        JsArray_set_Int(jsArray, index, value)
+    }
+
+    public val size: Int
+        get() = JsArray_getSize(jsArray)
+
+
+    public operator fun iterator(): IntIterator = intArrayIterator(this)
+}
+
+internal fun intArrayIterator(array: IntArray) = object : IntIterator() {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun nextInt() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
+
+
+public class LongArray(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
+    init {
+        JsArray_fill_Long(jsArray, size) { 0L }
+    }
+
+    public constructor(size: Int, init: (Int) -> Long) : this(size) {
+        JsArray_fill_Long(jsArray, size, init)
+    }
+
+    public operator fun get(index: Int): Long =
+        JsArray_get_Long(jsArray, index)
+
+    public operator fun set(index: Int, value: Long) {
+        JsArray_set_Long(jsArray, index, value)
+    }
+
+    public val size: Int
+        get() = JsArray_getSize(jsArray)
+
+
+    public operator fun iterator(): LongIterator = longArrayIterator(this)
+}
+
+internal fun longArrayIterator(array: LongArray) = object : LongIterator() {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun nextLong() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
+
+
+public class FloatArray(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
+    init {
+        JsArray_fill_Float(jsArray, size) { 0.0f }
+    }
+
+    public constructor(size: Int, init: (Int) -> Float) : this(size) {
+        JsArray_fill_Float(jsArray, size, init)
+    }
+
+    public operator fun get(index: Int): Float =
+        JsArray_get_Float(jsArray, index)
+
+    public operator fun set(index: Int, value: Float) {
+        JsArray_set_Float(jsArray, index, value)
+    }
+
+    public val size: Int
+        get() = JsArray_getSize(jsArray)
+
+
+    public operator fun iterator(): FloatIterator = floatArrayIterator(this)
+}
+
+internal fun floatArrayIterator(array: FloatArray) = object : FloatIterator() {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun nextFloat() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
+
+
+public class DoubleArray(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
+    init {
+        JsArray_fill_Double(jsArray, size) { 0.0 }
+    }
+
+    public constructor(size: Int, init: (Int) -> Double) : this(size) {
+        JsArray_fill_Double(jsArray, size, init)
+    }
+
+    public operator fun get(index: Int): Double =
+        JsArray_get_Double(jsArray, index)
+
+    public operator fun set(index: Int, value: Double) {
+        JsArray_set_Double(jsArray, index, value)
+    }
+
+    public val size: Int
+        get() = JsArray_getSize(jsArray)
+
+
+    public operator fun iterator(): DoubleIterator = doubleArrayIterator(this)
+}
+
+internal fun doubleArrayIterator(array: DoubleArray) = object : DoubleIterator() {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun nextDouble() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
+
+
+public class BooleanArray(size: Int) {
+    private var jsArray: WasmExternRef = JsArray_new(size)
+
+    init {
+        JsArray_fill_Boolean(jsArray, size) { false }
+    }
+
+    public constructor(size: Int, init: (Int) -> Boolean) : this(size) {
+        JsArray_fill_Boolean(jsArray, size, init)
+    }
+
+    public operator fun get(index: Int): Boolean =
+        JsArray_get_Boolean(jsArray, index)
+
+    public operator fun set(index: Int, value: Boolean) {
+        JsArray_set_Boolean(jsArray, index, value)
+    }
+
+    public val size: Int
+        get() = JsArray_getSize(jsArray)
+
+
+    public operator fun iterator(): BooleanIterator = booleanArrayIterator(this)
+}
+
+internal fun booleanArrayIterator(array: BooleanArray) = object : BooleanIterator() {
+    var index = 0
+    override fun hasNext() = index != array.size
+    override fun nextBoolean() = if (index != array.size) array[index++] else throw NoSuchElementException("$index")
+}
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Boolean.kt b/libraries/stdlib/wasm/builtins/kotlin/Boolean.kt
similarity index 51%
rename from libraries/stdlib/wasm/builtins/native/kotlin/Boolean.kt
rename to libraries/stdlib/wasm/builtins/kotlin/Boolean.kt
index adb106c4cc6..d40e68cf330 100644
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Boolean.kt
+++ b/libraries/stdlib/wasm/builtins/kotlin/Boolean.kt
@@ -3,56 +3,67 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress(
-    "NON_ABSTRACT_FUNCTION_WITH_NO_BODY",
-    "MUST_BE_INITIALIZED_OR_BE_ABSTRACT",
-    "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE",
-    "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED",
-    "WRONG_MODIFIER_TARGET"
-)
-
 package kotlin
 
-import kotlin.wasm.internal.WasmInstruction
-import kotlin.wasm.internal.wasm_i32_compareTo
+import kotlin.wasm.internal.*
 
 /**
  * Represents a value which is either `true` or `false`. On the JVM, non-nullable values of this type are
  * represented as values of the primitive type `boolean`.
  */
-public class Boolean private constructor() : Comparable<Boolean> {
+@WasmPrimitive
+public class Boolean private constructor(private val value: Boolean) : Comparable<Boolean> {
     /**
      * Returns the inverse of this boolean.
      */
-    @WasmInstruction(WasmInstruction.I32_EQZ)
-    public operator fun not(): Boolean
+    @WasmOp(WasmOp.I32_EQZ)
+    public operator fun not(): Boolean =
+        implementedAsIntrinsic
 
     /**
      * Performs a logical `and` operation between this Boolean and the [other] one. Unlike the `&&` operator,
      * this function does not perform short-circuit evaluation. Both `this` and [other] will always be evaluated.
      */
-    @WasmInstruction(WasmInstruction.I32_AND)
-    public infix fun and(other: Boolean): Boolean
+    @WasmOp(WasmOp.I32_AND)
+    public infix fun and(other: Boolean): Boolean =
+        implementedAsIntrinsic
 
     /**
      * Performs a logical `or` operation between this Boolean and the [other] one. Unlike the `||` operator,
      * this function does not perform short-circuit evaluation. Both `this` and [other] will always be evaluated.
      */
-    @WasmInstruction(WasmInstruction.I32_OR)
-    public infix fun or(other: Boolean): Boolean
+    @WasmOp(WasmOp.I32_OR)
+    public infix fun or(other: Boolean): Boolean =
+        implementedAsIntrinsic
 
     /**
      * Performs a logical `xor` operation between this Boolean and the [other] one.
      */
-    @WasmInstruction(WasmInstruction.I32_XOR)
-    public infix fun xor(other: Boolean): Boolean
+    @WasmOp(WasmOp.I32_XOR)
+    public infix fun xor(other: Boolean): Boolean =
+        implementedAsIntrinsic
 
     public override fun compareTo(other: Boolean): Int =
-        wasm_i32_compareTo(this.asInt(), other.asInt())
+        wasm_i32_compareTo(this.toInt(), other.toInt())
 
-    @WasmInstruction(WasmInstruction.NOP)
-    internal fun asInt(): Int
+    override fun toString(): String =
+        if (this) "true" else "false"
+
+    override fun hashCode(): Int =
+        toInt()
+
+    override fun equals(other: Any?): Boolean {
+        return if (other !is Boolean) {
+            false
+        } else {
+            this === (other as Boolean)
+        }
+    }
+
+    @WasmReinterpret
+    internal fun toInt(): Int =
+        implementedAsIntrinsic
 
     @SinceKotlin("1.3")
-    companion object {}
+    public companion object
 }
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Char.kt b/libraries/stdlib/wasm/builtins/kotlin/Char.kt
similarity index 82%
rename from libraries/stdlib/wasm/builtins/native/kotlin/Char.kt
rename to libraries/stdlib/wasm/builtins/kotlin/Char.kt
index 7f5dec7b135..49391beb5c9 100644
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Char.kt
+++ b/libraries/stdlib/wasm/builtins/kotlin/Char.kt
@@ -3,30 +3,34 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 
 package kotlin
 
-import kotlin.wasm.internal.ExcludedFromCodegen
-import kotlin.wasm.internal.WasmInstruction
-import kotlin.wasm.internal.implementedAsIntrinsic
-import kotlin.wasm.internal.wasm_i32_compareTo
+import kotlin.wasm.internal.*
 
 /**
  * Represents a 16-bit Unicode character.
  *
  * On the JVM, non-nullable values of this type are represented as values of the primitive type `char`.
  */
-public class Char private constructor() : Comparable<Char> {
+@WasmPrimitive
+@Suppress("NOTHING_TO_INLINE")
+public class Char private constructor(public val value: Char) : Comparable<Char> {
     /**
      * Compares this value with the specified value for order.
      *
      * Returns zero if this value is equal to the specified other value, a negative number if it's less than other,
      * or a positive number if it's greater than other.
      */
-    public override inline fun compareTo(other: Char): Int =
+    public override fun compareTo(other: Char): Int =
         wasm_i32_compareTo(this.toInt(), other.toInt())
 
+    public override fun equals(other: Any?): Boolean {
+        if (other is Char)
+            return this === (other as Char)
+        return false
+    }
+
     /** Adds the other Int value to this value resulting a Char. */
     public inline operator fun plus(other: Int): Char =
         (this.toInt() + other).toChar()
@@ -47,34 +51,46 @@ public class Char private constructor() : Comparable<Char> {
     public inline operator fun dec(): Char =
         (this.toInt() - 1).toChar()
 
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Char): CharRange
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Char): CharRange =
+        CharRange(this, other)
 
     /** Returns the value of this character as a `Byte`. */
     public inline fun toByte(): Byte =
         this.toInt().toByte()
+
     /** Returns the value of this character as a `Char`. */
     public inline fun toChar(): Char =
         this
+
     /** Returns the value of this character as a `Short`. */
     public inline fun toShort(): Short =
         this.toInt().toShort()
+
     /** Returns the value of this character as a `Int`. */
-    @WasmInstruction(WasmInstruction.NOP)
+    @WasmReinterpret
     public fun toInt(): Int =
         implementedAsIntrinsic
+
     /** Returns the value of this character as a `Long`. */
     public inline fun toLong(): Long =
         this.toInt().toLong()
+
     /** Returns the value of this character as a `Float`. */
     public inline fun toFloat(): Float =
         this.toInt().toFloat()
+
     /** Returns the value of this character as a `Double`. */
     public inline fun toDouble(): Double =
         this.toInt().toDouble()
 
-    @ExcludedFromCodegen
-    companion object {
+    override fun toString(): String =
+        charToString(this)
+
+    override fun hashCode(): Int =
+        this.toInt().hashCode()
+
+    public companion object {
         /**
          * The minimum value of a character code unit.
          */
@@ -129,6 +145,8 @@ public class Char private constructor() : Comparable<Char> {
         @SinceKotlin("1.3")
         public const val SIZE_BITS: Int = 16
     }
-
 }
 
+@WasmImport("runtime", "Char_toString")
+private fun charToString(c: Char): String = implementedAsIntrinsic
+
diff --git a/libraries/stdlib/wasm/builtins/kotlin/Enum.kt b/libraries/stdlib/wasm/builtins/kotlin/Enum.kt
new file mode 100644
index 00000000000..facf0e2758c
--- /dev/null
+++ b/libraries/stdlib/wasm/builtins/kotlin/Enum.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+public abstract class Enum<E : Enum<E>>(
+    public val name: String,
+    public val ordinal: Int
+) : Comparable<E> {
+
+    override fun compareTo(other: E): Int =
+        ordinal.compareTo(other.ordinal)
+
+    override fun toString(): String =
+        name
+
+    public companion object
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Library.kt b/libraries/stdlib/wasm/builtins/kotlin/Library.kt
similarity index 56%
rename from libraries/stdlib/wasm/builtins/native/kotlin/Library.kt
rename to libraries/stdlib/wasm/builtins/kotlin/Library.kt
index 19dce79c26a..2fc76fcb4c7 100644
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Library.kt
+++ b/libraries/stdlib/wasm/builtins/kotlin/Library.kt
@@ -2,86 +2,90 @@
  * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
-@file:Suppress(
-    "NON_MEMBER_FUNCTION_NO_BODY",
-    "REIFIED_TYPE_PARAMETER_NO_INLINE"
-)
-@file:kotlin.wasm.internal.ExcludedFromCodegen
+
+@file:Suppress("NOTHING_TO_INLINE")
 
 package kotlin
 
 import kotlin.internal.PureReifiable
 
+public inline fun <T> emptyArray(): Array<T> = arrayOf()
+
 /**
  * Returns a string representation of the object. Can be called with a null receiver, in which case
  * it returns the string "null".
  */
-public fun Any?.toString(): String
+public fun Any?.toString(): String = this?.toString() ?: "null"
 
 /**
  * Concatenates this string with the string representation of the given [other] object. If either the receiver
  * or the [other] object are null, they are represented as the string "null".
  */
-public operator fun String?.plus(other: Any?): String
+public operator fun String?.plus(other: Any?): String = (this ?: "null") + other.toString()
 
 /**
  * Returns an array of objects of the given type with the given [size], initialized with null values.
  */
-public fun <reified @PureReifiable T> arrayOfNulls(size: Int): Array<T?>
+// TODO: Should T be reified?
+@Suppress("REIFIED_TYPE_PARAMETER_NO_INLINE")
+public fun <@PureReifiable reified T> arrayOfNulls(size: Int): Array<T?> = Array(size) { null }
 
 /**
  * Returns an array containing the specified elements.
  */
-public inline fun <reified @PureReifiable T> arrayOf(vararg elements: T): Array<T>
+@Suppress("UNCHECKED_CAST")
+public inline fun <T> arrayOf(vararg elements: T): Array<T> = elements as Array<T>
 
 /**
  * Returns an array containing the specified [Double] numbers.
  */
-public fun doubleArrayOf(vararg elements: Double): DoubleArray
+public inline fun doubleArrayOf(vararg elements: Double): DoubleArray = elements
 
 /**
  * Returns an array containing the specified [Float] numbers.
  */
-public fun floatArrayOf(vararg elements: Float): FloatArray
+public inline fun floatArrayOf(vararg elements: Float): FloatArray = elements
 
 /**
  * Returns an array containing the specified [Long] numbers.
  */
-public fun longArrayOf(vararg elements: Long): LongArray
+public inline fun longArrayOf(vararg elements: Long): LongArray = elements
 
 /**
  * Returns an array containing the specified [Int] numbers.
  */
-public fun intArrayOf(vararg elements: Int): IntArray
+public inline fun intArrayOf(vararg elements: Int): IntArray = elements
 
 /**
  * Returns an array containing the specified characters.
  */
-public fun charArrayOf(vararg elements: Char): CharArray
+public inline fun charArrayOf(vararg elements: Char): CharArray = elements
 
 /**
  * Returns an array containing the specified [Short] numbers.
  */
-public fun shortArrayOf(vararg elements: Short): ShortArray
+public inline fun shortArrayOf(vararg elements: Short): ShortArray = elements
 
 /**
  * Returns an array containing the specified [Byte] numbers.
  */
-public fun byteArrayOf(vararg elements: Byte): ByteArray
+public inline fun byteArrayOf(vararg elements: Byte): ByteArray = elements
 
 /**
  * Returns an array containing the specified boolean values.
  */
-public fun booleanArrayOf(vararg elements: Boolean): BooleanArray
+public inline fun booleanArrayOf(vararg elements: Boolean): BooleanArray = elements
 
 /**
  * Returns an array containing enum T entries.
  */
 @SinceKotlin("1.1")
+@Suppress("NON_MEMBER_FUNCTION_NO_BODY")
 public inline fun <reified T : Enum<T>> enumValues(): Array<T>
 
 /**
  * Returns an enum entry with specified name.
  */
 @SinceKotlin("1.1")
+@Suppress("NON_MEMBER_FUNCTION_NO_BODY")
 public inline fun <reified T : Enum<T>> enumValueOf(name: String): T
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Nothing.kt b/libraries/stdlib/wasm/builtins/kotlin/Nothing.kt
similarity index 92%
rename from libraries/stdlib/wasm/builtins/native/kotlin/Nothing.kt
rename to libraries/stdlib/wasm/builtins/kotlin/Nothing.kt
index b2efbb75194..5fa13d4ff09 100644
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Nothing.kt
+++ b/libraries/stdlib/wasm/builtins/kotlin/Nothing.kt
@@ -16,8 +16,11 @@
 
 package kotlin
 
+import kotlin.wasm.internal.ExcludedFromCodegen
+
 /**
  * Nothing has no instances. You can use Nothing to represent "a value that never exists": for example,
  * if a function has the return type of Nothing, it means that it never returns (always throws an exception).
  */
+@ExcludedFromCodegen
 public class Nothing private constructor()
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Primitives.kt b/libraries/stdlib/wasm/builtins/kotlin/Primitives.kt
similarity index 86%
rename from libraries/stdlib/wasm/builtins/native/kotlin/Primitives.kt
rename to libraries/stdlib/wasm/builtins/kotlin/Primitives.kt
index b645e6a3e90..bc585e0b1d6 100644
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Primitives.kt
+++ b/libraries/stdlib/wasm/builtins/kotlin/Primitives.kt
@@ -2,7 +2,11 @@
  * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
-@file:Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@file:Suppress(
+    "OVERRIDE_BY_INLINE",
+    "NOTHING_TO_INLINE",
+    "unused"
+)
 
 package kotlin
 
@@ -11,9 +15,9 @@ import kotlin.wasm.internal.*
 /**
  * Represents a 8-bit signed integer.
  */
-public class Byte private constructor() : Number(), Comparable<Byte> {
-    @ExcludedFromCodegen
-    companion object {
+@WasmPrimitive
+public class Byte private constructor(public val value: Byte) : Number(), Comparable<Byte> {
+    public companion object {
         /**
          * A constant holding the minimum value an instance of Byte can have.
          */
@@ -233,8 +237,7 @@ public class Byte private constructor() : Number(), Comparable<Byte> {
      * The least significant 8 bits of the resulting `Char` code are the same as the bits of this `Byte` value,
      * whereas the most significant 8 bits are filled with the sign bit of this value.
      */
-    @WasmInstruction(WasmInstruction.NOP)
-    public override fun toChar(): Char = implementedAsIntrinsic
+    public override fun toChar(): Char = reinterpretAsInt().reinterpretAsChar()
 
     /**
      * Converts this [Byte] value to [Short].
@@ -244,8 +247,7 @@ public class Byte private constructor() : Number(), Comparable<Byte> {
      * The least significant 8 bits of the resulting `Short` value are the same as the bits of this `Byte` value,
      * whereas the most significant 8 bits are filled with the sign bit of this value.
      */
-    @WasmInstruction(WasmInstruction.NOP)
-    public override fun toShort(): Short = implementedAsIntrinsic
+    public override fun toShort(): Short = reinterpretAsInt().reinterpretAsShort()
 
     /**
      * Converts this [Byte] value to [Int].
@@ -255,8 +257,7 @@ public class Byte private constructor() : Number(), Comparable<Byte> {
      * The least significant 8 bits of the resulting `Int` value are the same as the bits of this `Byte` value,
      * whereas the most significant 24 bits are filled with the sign bit of this value.
      */
-    @WasmInstruction(WasmInstruction.NOP)
-    public override fun toInt(): Int = implementedAsIntrinsic
+    public override fun toInt(): Int = reinterpretAsInt()
 
     /**
      * Converts this [Byte] value to [Long].
@@ -266,62 +267,93 @@ public class Byte private constructor() : Number(), Comparable<Byte> {
      * The least significant 8 bits of the resulting `Long` value are the same as the bits of this `Byte` value,
      * whereas the most significant 56 bits are filled with the sign bit of this value.
      */
-    @WasmInstruction(WasmInstruction.I64_EXTEND_I32_S)
-    public override fun toLong(): Long = implementedAsIntrinsic
+    public override fun toLong(): Long = wasm_i64_extend_i32_s(this.toInt())
 
     /**
      * Converts this [Byte] value to [Float].
      *
      * The resulting `Float` value represents the same numerical value as this `Byte`.
      */
-    @WasmInstruction(WasmInstruction.F32_CONVERT_I32_S)
-    public override fun toFloat(): Float = implementedAsIntrinsic
+    public override fun toFloat(): Float = wasm_f32_convert_i32_s(this.toInt())
 
     /**
      * Converts this [Byte] value to [Double].
      *
      * The resulting `Double` value represents the same numerical value as this `Byte`.
      */
-    @WasmInstruction(WasmInstruction.F64_CONVERT_I32_S)
-    public override fun toDouble(): Double = implementedAsIntrinsic
+    public override fun toDouble(): Double = wasm_f64_convert_i32_s(this.toInt())
 
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Byte): IntRange {
-//        return IntRange(this.toInt(), other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Short): IntRange {
-//        return IntRange(this.toInt(), other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Int): IntRange {
-//        return IntRange(this.toInt(), other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Long): LongRange {
-//        return LongRange(this.toLong(), other.toLong())
-//    }
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Byte): IntRange {
+        return IntRange(this.toInt(), other.toInt())
+    }
 
-    // TODO: Support Any? and type operators
-//    public override fun equals(other: Any?): Boolean =
-//        other is Byte && wasm_i32_eq(this.toInt(), other.toInt()).reinterpretAsBoolean()
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Short): IntRange {
+        return IntRange(this.toInt(), other.toInt())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Int): IntRange {
+        return IntRange(this.toInt(), other.toInt())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Long): LongRange {
+        return LongRange(this.toLong(), other.toLong())
+    }
+
+    /** Performs a bitwise AND operation between the two values. */
+    @SinceKotlin("1.1")
+    @WasmOp(WasmOp.I32_AND)
+    public infix fun and(other: Byte): Byte =
+        implementedAsIntrinsic
+
+    /** Performs a bitwise OR operation between the two values. */
+    @SinceKotlin("1.1")
+    @WasmOp(WasmOp.I32_OR)
+    public infix fun or(other: Byte): Byte =
+        implementedAsIntrinsic
+
+    /** Performs a bitwise XOR operation between the two values. */
+    @SinceKotlin("1.1")
+    @WasmOp(WasmOp.I32_XOR)
+    public infix fun xor(other: Byte): Byte =
+        implementedAsIntrinsic
+
+    /** Inverts the bits in this value/ */
+    @SinceKotlin("1.1")
+    public inline fun inv(): Byte = this.xor(-1)
+
+
+    public override fun equals(other: Any?): Boolean =
+        other is Byte && wasm_i32_eq(this.toInt(), other.toInt())
 
     public inline fun equals(other: Byte): Boolean =
-        wasm_i32_eq(this.toInt(), other.toInt()).reinterpretAsBoolean()
+        wasm_i32_eq(this.toInt(), other.toInt())
 
-    // TODO: Implement Byte.toString()
-    // public override fun toString(): String
+    public override fun toString(): String =
+        byteToStringImpl(this)
 
     public override inline fun hashCode(): Int =
         this.toInt()
+
+    @WasmReinterpret
+    @PublishedApi
+    internal fun reinterpretAsInt(): Int =
+        implementedAsIntrinsic
 }
 
+@WasmImport("runtime", "coerceToString")
+private fun byteToStringImpl(byte: Byte): String =
+    implementedAsIntrinsic
+
 /**
  * Represents a 16-bit signed integer.
  */
-public class Short private constructor() : Number(), Comparable<Short> {
-    @ExcludedFromCodegen
-    companion object {
+@WasmPrimitive
+public class Short private constructor(public val value: Short) : Number(), Comparable<Short> {
+    public companion object {
         /**
          * A constant holding the minimum value an instance of Short can have.
          */
@@ -529,22 +561,48 @@ public class Short private constructor() : Number(), Comparable<Short> {
     public inline operator fun unaryMinus(): Int =
         -this.toInt()
 
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Byte): IntRange {
-//        return IntRange(this.toInt(), other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Short): IntRange {
-//        return IntRange(this.toInt(), other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Int): IntRange {
-//        return IntRange(this.toInt(), other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Long): LongRange  {
-//        return LongRange(this.toLong(), other.toLong())
-//    }
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Byte): IntRange {
+        return IntRange(this.toInt(), other.toInt())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Short): IntRange {
+        return IntRange(this.toInt(), other.toInt())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Int): IntRange {
+        return IntRange(this.toInt(), other)
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Long): LongRange {
+        return LongRange(this.toLong(), other)
+    }
+
+    /** Performs a bitwise AND operation between the two values. */
+    @SinceKotlin("1.1")
+    @WasmOp(WasmOp.I32_AND)
+    public infix fun and(other: Short): Short =
+        implementedAsIntrinsic
+
+    /** Performs a bitwise OR operation between the two values. */
+    @SinceKotlin("1.1")
+    @WasmOp(WasmOp.I32_OR)
+    public infix fun or(other: Short): Short =
+        implementedAsIntrinsic
+
+    /** Performs a bitwise XOR operation between the two values. */
+    @SinceKotlin("1.1")
+    @WasmOp(WasmOp.I32_XOR)
+    public infix fun xor(other: Short): Short =
+        implementedAsIntrinsic
+
+    /** Inverts the bits in this value */
+    @SinceKotlin("1.1")
+    public fun inv(): Short =
+        this.xor(-1)
 
     /**
      * Converts this [Short] value to [Byte].
@@ -563,9 +621,7 @@ public class Short private constructor() : Number(), Comparable<Short> {
      * The resulting `Char` code is equal to this value reinterpreted as an unsigned number,
      * i.e. it has the same binary representation as this `Short`.
      */
-    @WasmInstruction(WasmInstruction.NOP)
-    public override fun toChar(): Char =
-        implementedAsIntrinsic
+    public override fun toChar(): Char = reinterpretAsInt().reinterpretAsChar()
 
     /** Returns this value. */
     public override inline fun toShort(): Short =
@@ -579,9 +635,7 @@ public class Short private constructor() : Number(), Comparable<Short> {
      * The least significant 16 bits of the resulting `Int` value are the same as the bits of this `Short` value,
      * whereas the most significant 16 bits are filled with the sign bit of this value.
      */
-    @WasmInstruction(WasmInstruction.NOP)
-    public override fun toInt(): Int =
-        implementedAsIntrinsic
+    public override fun toInt(): Int = reinterpretAsInt()
 
     /**
      * Converts this [Short] value to [Long].
@@ -591,49 +645,50 @@ public class Short private constructor() : Number(), Comparable<Short> {
      * The least significant 16 bits of the resulting `Long` value are the same as the bits of this `Short` value,
      * whereas the most significant 48 bits are filled with the sign bit of this value.
      */
-    @WasmInstruction(WasmInstruction.I64_EXTEND_I32_S)
-    public override fun toLong(): Long =
-        implementedAsIntrinsic
+    public override fun toLong(): Long = wasm_i64_extend_i32_s(this.toInt())
 
     /**
      * Converts this [Short] value to [Float].
      *
      * The resulting `Float` value represents the same numerical value as this `Short`.
      */
-    @WasmInstruction(WasmInstruction.F32_CONVERT_I32_S)
-    public override fun toFloat(): Float =
-        implementedAsIntrinsic
+    public override fun toFloat(): Float = wasm_f32_convert_i32_s(this.toInt())
 
     /**
      * Converts this [Short] value to [Double].
      *
      * The resulting `Double` value represents the same numerical value as this `Short`.
      */
-    @WasmInstruction(WasmInstruction.F64_CONVERT_I32_S)
     public override fun toDouble(): Double =
-        implementedAsIntrinsic
+        wasm_f64_convert_i32_s(this.toInt())
 
     public inline fun equals(other: Short): Boolean =
-        wasm_i32_eq(this.toInt(), other.toInt()).reinterpretAsBoolean()
+        wasm_i32_eq(this.toInt(), other.toInt())
 
-    // TODO: Support Any? and type operators
-//    public override fun equals(other: Any?): Boolean =
-//        other is Short && wasm_i32_eq(this.toInt(), other.toInt()).reinterpretAsBoolean()
+    public override fun equals(other: Any?): Boolean =
+        other is Short && wasm_i32_eq(this.toInt(), other.toInt())
 
-    // TODO: Implement Short.toString()
-    // public override fun toString(): String
+    public override fun toString(): String = shortToStringImpl(this)
 
     public override inline fun hashCode(): Int =
         this.toInt()
+
+    @WasmReinterpret
+    @PublishedApi
+    internal fun reinterpretAsInt(): Int =
+        implementedAsIntrinsic
 }
 
+@WasmImport("runtime", "coerceToString")
+private fun shortToStringImpl(x: Short): String = implementedAsIntrinsic
+
 /**
  * Represents a 32-bit signed integer.
  */
-public class Int private constructor() : Number(), Comparable<Int> {
+@WasmPrimitive
+public class Int private constructor(val value: Int) : Number(), Comparable<Int> {
 
-    @ExcludedFromCodegen
-    companion object {
+    public companion object {
         /**
          * A constant holding the minimum value an instance of Int can have.
          */
@@ -714,7 +769,7 @@ public class Int private constructor() : Number(), Comparable<Int> {
         this + other.toInt()
 
     /** Adds the other value to this value. */
-    @WasmInstruction(WasmInstruction.I32_ADD)
+    @WasmOp(WasmOp.I32_ADD)
     public operator fun plus(other: Int): Int =
         implementedAsIntrinsic
 
@@ -739,7 +794,7 @@ public class Int private constructor() : Number(), Comparable<Int> {
         this - other.toInt()
 
     /** Subtracts the other value from this value. */
-    @WasmInstruction(WasmInstruction.I32_SUB)
+    @WasmOp(WasmOp.I32_SUB)
     public operator fun minus(other: Int): Int =
         implementedAsIntrinsic
 
@@ -764,7 +819,7 @@ public class Int private constructor() : Number(), Comparable<Int> {
         this * other.toInt()
 
     /** Multiplies this value by the other value. */
-    @WasmInstruction(WasmInstruction.I32_MUL)
+    @WasmOp(WasmOp.I32_MUL)
     public operator fun times(other: Int): Int =
         implementedAsIntrinsic
 
@@ -789,7 +844,7 @@ public class Int private constructor() : Number(), Comparable<Int> {
         this / other.toInt()
 
     /** Divides this value by the other value. */
-    @WasmInstruction(WasmInstruction.I32_DIV_S)
+    @WasmOp(WasmOp.I32_DIV_S)
     public operator fun div(other: Int): Int =
         implementedAsIntrinsic
 
@@ -814,7 +869,7 @@ public class Int private constructor() : Number(), Comparable<Int> {
         this % other.toInt()
 
     /** Calculates the remainder of dividing this value by the other value. */
-    @WasmInstruction(WasmInstruction.I32_REM_S)
+    @WasmOp(WasmOp.I32_REM_S)
     public operator fun rem(other: Int): Int =
         implementedAsIntrinsic
 
@@ -835,7 +890,8 @@ public class Int private constructor() : Number(), Comparable<Int> {
         this + 1
 
     /** Decrements this value. */
-    public inline operator fun dec(): Int =
+    // TODO: Fix test compiler/testData/codegen/box/functions/invoke/invoke.kt with inline dec
+    public operator fun dec(): Int =
         this - 1
 
     /** Returns this value. */
@@ -850,7 +906,7 @@ public class Int private constructor() : Number(), Comparable<Int> {
      * Note that only the five lowest-order bits of the [bitCount] are used as the shift distance.
      * The shift distance actually used is therefore always in the range `0..31`.
      */
-    @WasmInstruction(WasmInstruction.I32_SHL)
+    @WasmOp(WasmOp.I32_SHL)
     public infix fun shl(bitCount: Int): Int =
         implementedAsIntrinsic
 
@@ -860,7 +916,7 @@ public class Int private constructor() : Number(), Comparable<Int> {
      * Note that only the five lowest-order bits of the [bitCount] are used as the shift distance.
      * The shift distance actually used is therefore always in the range `0..31`.
      */
-    @WasmInstruction(WasmInstruction.I32_SHR_S)
+    @WasmOp(WasmOp.I32_SHR_S)
     public infix fun shr(bitCount: Int): Int =
         implementedAsIntrinsic
 
@@ -870,22 +926,22 @@ public class Int private constructor() : Number(), Comparable<Int> {
      * Note that only the five lowest-order bits of the [bitCount] are used as the shift distance.
      * The shift distance actually used is therefore always in the range `0..31`.
      */
-    @WasmInstruction(WasmInstruction.I32_SHR_U)
+    @WasmOp(WasmOp.I32_SHR_U)
     public infix fun ushr(bitCount: Int): Int =
         implementedAsIntrinsic
 
     /** Performs a bitwise AND operation between the two values. */
-    @WasmInstruction(WasmInstruction.I32_AND)
+    @WasmOp(WasmOp.I32_AND)
     public infix fun and(other: Int): Int =
         implementedAsIntrinsic
 
     /** Performs a bitwise OR operation between the two values. */
-    @WasmInstruction(WasmInstruction.I32_OR)
+    @WasmOp(WasmOp.I32_OR)
     public infix fun or(other: Int): Int =
         implementedAsIntrinsic
 
     /** Performs a bitwise XOR operation between the two values. */
-    @WasmInstruction(WasmInstruction.I32_XOR)
+    @WasmOp(WasmOp.I32_XOR)
     public infix fun xor(other: Int): Int =
         implementedAsIntrinsic
 
@@ -893,22 +949,25 @@ public class Int private constructor() : Number(), Comparable<Int> {
     public inline fun inv(): Int =
         this.xor(-1)
 
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Byte): IntRange {
-//        return IntRange(this, other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Short): IntRange {
-//        return IntRange(this, other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Int): IntRange  {
-//        return IntRange(this, other.toInt())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Long): LongRange {
-//        return LongRange(this.toLong(), other.toLong())
-//    }
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Byte): IntRange {
+        return IntRange(this, other.toInt())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Short): IntRange {
+        return IntRange(this, other.toInt())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Int): IntRange {
+        return IntRange(this, other.toInt())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Long): LongRange {
+        return LongRange(this.toLong(), other.toLong())
+    }
 
     /**
      * Converts this [Int] value to [Byte].
@@ -955,9 +1014,8 @@ public class Int private constructor() : Number(), Comparable<Int> {
      * The least significant 32 bits of the resulting `Long` value are the same as the bits of this `Int` value,
      * whereas the most significant 32 bits are filled with the sign bit of this value.
      */
-    @WasmInstruction(WasmInstruction.I64_EXTEND_I32_S)
     public override fun toLong(): Long =
-        implementedAsIntrinsic
+        wasm_i64_extend_i32_s(this)
 
     /**
      * Converts this [Int] value to [Float].
@@ -966,60 +1024,61 @@ public class Int private constructor() : Number(), Comparable<Int> {
      * In case when this `Int` value is exactly between two `Float`s,
      * the one with zero at least significant bit of mantissa is selected.
      */
-    @WasmInstruction(WasmInstruction.F32_CONVERT_I32_S)
     public override fun toFloat(): Float =
-        implementedAsIntrinsic
+        wasm_f32_convert_i32_s(this)
 
     /**
      * Converts this [Int] value to [Double].
      *
      * The resulting `Double` value represents the same numerical value as this `Int`.
      */
-    @WasmInstruction(WasmInstruction.F64_CONVERT_I32_S)
     public override fun toDouble(): Double =
-        implementedAsIntrinsic
+        wasm_f64_convert_i32_s(this)
 
     public inline fun equals(other: Int): Boolean =
-          wasm_i32_eq(this, other).reinterpretAsBoolean()
+        wasm_i32_eq(this, other)
 
-    // TODO: Support Any? and type operators
-//    public override fun equals(other: Any?): Boolean =
-//        other is Int && wasm_i32_eq(this, other).reinterpretAsBoolean()
+    public override fun equals(other: Any?): Boolean =
+        other is Int && wasm_i32_eq(this, other)
 
-    // TODO: Implement Int.toString()
-    // public override fun toString(): String
+    public override fun toString(): String =
+        intToStringImpl(this)
 
     public override inline fun hashCode(): Int =
         this
 
-    @WasmInstruction(WasmInstruction.NOP)
+    @WasmReinterpret
     @PublishedApi
     internal fun reinterpretAsBoolean(): Boolean =
         implementedAsIntrinsic
 
     @PublishedApi
-    @WasmInstruction(WasmInstruction.NOP)
+    @WasmReinterpret
     internal fun reinterpretAsByte(): Byte =
         implementedAsIntrinsic
 
     @PublishedApi
-    @WasmInstruction(WasmInstruction.NOP)
+    @WasmReinterpret
     internal fun reinterpretAsShort(): Short =
         implementedAsIntrinsic
 
     @PublishedApi
-    @WasmInstruction(WasmInstruction.NOP)
+    @WasmReinterpret
     internal fun reinterpretAsChar(): Char =
         implementedAsIntrinsic
 }
 
+@WasmImport("runtime", "coerceToString")
+private fun intToStringImpl(x: Int): String =
+    implementedAsIntrinsic
+
 /**
  * Represents a 64-bit signed integer.
  */
-public class Long private constructor() : Number(), Comparable<Long> {
+@WasmPrimitive
+public class Long private constructor(val value: Long) : Number(), Comparable<Long> {
 
-    @ExcludedFromCodegen
-    companion object {
+    public companion object {
         /**
          * A constant holding the minimum value an instance of Long can have.
          */
@@ -1104,7 +1163,7 @@ public class Long private constructor() : Number(), Comparable<Long> {
         this + other.toLong()
 
     /** Adds the other value to this value. */
-    @WasmInstruction(WasmInstruction.I64_ADD)
+    @WasmOp(WasmOp.I64_ADD)
     public operator fun plus(other: Long): Long =
         implementedAsIntrinsic
 
@@ -1129,7 +1188,7 @@ public class Long private constructor() : Number(), Comparable<Long> {
         this - other.toLong()
 
     /** Subtracts the other value from this value. */
-    @WasmInstruction(WasmInstruction.I64_SUB)
+    @WasmOp(WasmOp.I64_SUB)
     public operator fun minus(other: Long): Long =
         implementedAsIntrinsic
 
@@ -1154,7 +1213,7 @@ public class Long private constructor() : Number(), Comparable<Long> {
         this * other.toLong()
 
     /** Multiplies this value by the other value. */
-    @WasmInstruction(WasmInstruction.I64_MUL)
+    @WasmOp(WasmOp.I64_MUL)
     public operator fun times(other: Long): Long =
         implementedAsIntrinsic
 
@@ -1179,7 +1238,7 @@ public class Long private constructor() : Number(), Comparable<Long> {
         this / other.toLong()
 
     /** Divides this value by the other value. */
-    @WasmInstruction(WasmInstruction.I64_DIV_S)
+    @WasmOp(WasmOp.I64_DIV_S)
     public operator fun div(other: Long): Long =
         implementedAsIntrinsic
 
@@ -1204,7 +1263,7 @@ public class Long private constructor() : Number(), Comparable<Long> {
         this % other.toLong()
 
     /** Calculates the remainder of dividing this value by the other value. */
-    @WasmInstruction(WasmInstruction.I64_REM_S)
+    @WasmOp(WasmOp.I64_REM_S)
     public operator fun rem(other: Long): Long =
         implementedAsIntrinsic
 
@@ -1231,22 +1290,25 @@ public class Long private constructor() : Number(), Comparable<Long> {
     /** Returns the negative of this value. */
     public inline operator fun unaryMinus(): Long = 0L - this
 
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Byte): LongRange {
-//        return LongRange(this, other.toLong())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Short): LongRange  {
-//        return LongRange(this, other.toLong())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Int): LongRange {
-//        return LongRange(this, other.toLong())
-//    }
-//    /** Creates a range from this value to the specified [other] value. */
-//    public operator fun rangeTo(other: Long): LongRange  {
-//        return LongRange(this, other.toLong())
-//    }
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Byte): LongRange {
+        return LongRange(this, other.toLong())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Short): LongRange {
+        return LongRange(this, other.toLong())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Int): LongRange {
+        return LongRange(this, other.toLong())
+    }
+
+    /** Creates a range from this value to the specified [other] value. */
+    public operator fun rangeTo(other: Long): LongRange {
+        return LongRange(this, other.toLong())
+    }
 
     /**
      * Shifts this value left by the [bitCount] number of bits.
@@ -1276,17 +1338,17 @@ public class Long private constructor() : Number(), Comparable<Long> {
         wasm_i64_shr_u(this, bitCount.toLong())
 
     /** Performs a bitwise AND operation between the two values. */
-    @WasmInstruction(WasmInstruction.I64_AND)
+    @WasmOp(WasmOp.I64_AND)
     public infix fun and(other: Long): Long =
         implementedAsIntrinsic
 
     /** Performs a bitwise OR operation between the two values. */
-    @WasmInstruction(WasmInstruction.I64_OR)
+    @WasmOp(WasmOp.I64_OR)
     public infix fun or(other: Long): Long =
         implementedAsIntrinsic
 
     /** Performs a bitwise XOR operation between the two values. */
-    @WasmInstruction(WasmInstruction.I64_XOR)
+    @WasmOp(WasmOp.I64_XOR)
     public infix fun xor(other: Long): Long =
         implementedAsIntrinsic
 
@@ -1335,9 +1397,8 @@ public class Long private constructor() : Number(), Comparable<Long> {
      *
      * The resulting `Int` value is represented by the least significant 32 bits of this `Long` value.
      */
-    @WasmInstruction(WasmInstruction.I32_WRAP_I64)
     public override fun toInt(): Int =
-        implementedAsIntrinsic
+        wasm_i32_wrap_i64(this)
 
     /** Returns this value. */
     public override inline fun toLong(): Long =
@@ -1350,9 +1411,8 @@ public class Long private constructor() : Number(), Comparable<Long> {
      * In case when this `Long` value is exactly between two `Float`s,
      * the one with zero at least significant bit of mantissa is selected.
      */
-    @WasmInstruction(WasmInstruction.F32_CONVERT_I64_S)
     public override fun toFloat(): Float =
-        implementedAsIntrinsic
+        wasm_f32_convert_i64_s(this)
 
     /**
      * Converts this [Long] value to [Double].
@@ -1361,19 +1421,18 @@ public class Long private constructor() : Number(), Comparable<Long> {
      * In case when this `Long` value is exactly between two `Double`s,
      * the one with zero at least significant bit of mantissa is selected.
      */
-    @WasmInstruction(WasmInstruction.F64_CONVERT_I64_S)
     public override fun toDouble(): Double =
-        implementedAsIntrinsic
+        wasm_f64_convert_i64_s(this)
 
     public inline fun equals(other: Long): Boolean =
-        wasm_i64_eq(this, other).reinterpretAsBoolean()
+        wasm_i64_eq(this, other)
 
-    // TODO: Support Any? and type operators
-//    public override fun equals(other: Any?): Boolean =
-//        other is Long && wasm_i64_eq(this, other).reinterpretAsBoolean()
+    public override fun equals(other: Any?): Boolean =
+        other is Long && wasm_i64_eq(this, other)
 
-    // TODO: Implement Long.toString()
-    // public override fun toString(): String
+    // TODO: Implement proper Long.toString
+    public override fun toString(): String =
+        toDouble().toString()
 
     public override fun hashCode(): Int =
         ((this ushr 32) xor this).toInt()
@@ -1382,10 +1441,10 @@ public class Long private constructor() : Number(), Comparable<Long> {
 /**
  * Represents a single-precision 32-bit IEEE 754 floating point number.
  */
-public class Float private constructor() : Number(), Comparable<Float> {
+@WasmPrimitive
+public class Float private constructor(public val value: Float) : Number(), Comparable<Float> {
 
-    @ExcludedFromCodegen
-    companion object {
+    public companion object {
         /**
          * A constant holding the smallest *positive* nonzero value of Float.
          */
@@ -1411,7 +1470,9 @@ public class Float private constructor() : Number(), Comparable<Float> {
         /**
          * A constant holding the "not a number" value of Float.
          */
-        public val NaN: Float = wasm_f32_const_nan()
+        public val NaN: Float
+            get() =
+                wasm_float_nan()
     }
 
     /**
@@ -1483,7 +1544,7 @@ public class Float private constructor() : Number(), Comparable<Float> {
         this + other.toFloat()
 
     /** Adds the other value to this value. */
-    @WasmInstruction(WasmInstruction.F32_ADD)
+    @WasmOp(WasmOp.F32_ADD)
     public operator fun plus(other: Float): Float =
         implementedAsIntrinsic
 
@@ -1508,7 +1569,7 @@ public class Float private constructor() : Number(), Comparable<Float> {
         this - other.toFloat()
 
     /** Subtracts the other value from this value. */
-    @WasmInstruction(WasmInstruction.F32_SUB)
+    @WasmOp(WasmOp.F32_SUB)
     public operator fun minus(other: Float): Float =
         implementedAsIntrinsic
 
@@ -1533,7 +1594,7 @@ public class Float private constructor() : Number(), Comparable<Float> {
         this * other.toFloat()
 
     /** Multiplies this value by the other value. */
-    @WasmInstruction(WasmInstruction.F32_MUL)
+    @WasmOp(WasmOp.F32_MUL)
     public operator fun times(other: Float): Float =
         implementedAsIntrinsic
 
@@ -1558,7 +1619,7 @@ public class Float private constructor() : Number(), Comparable<Float> {
         this / other.toFloat()
 
     /** Divides this value by the other value. */
-    @WasmInstruction(WasmInstruction.F32_DIV)
+    @WasmOp(WasmOp.F32_DIV)
     public operator fun div(other: Float): Float =
         implementedAsIntrinsic
 
@@ -1602,7 +1663,7 @@ public class Float private constructor() : Number(), Comparable<Float> {
     public inline operator fun unaryPlus(): Float = this
 
     /** Returns the negative of this value. */
-    @WasmInstruction(WasmInstruction.F32_NEG)
+    @WasmOp(WasmOp.F32_NEG)
     public operator fun unaryMinus(): Float =
         implementedAsIntrinsic
 
@@ -1634,10 +1695,8 @@ public class Float private constructor() : Number(), Comparable<Float> {
      * Returns zero if this `Float` value is `NaN`, [Int.MIN_VALUE] if it's less than `Int.MIN_VALUE`,
      * [Int.MAX_VALUE] if it's bigger than `Int.MAX_VALUE`.
      */
-    // TODO: Implement Float.toInt()
     public override fun toInt(): Int {
-        wasm_unreachable()
-        return 0
+        return wasm_i32_trunc_sat_f32_s(this)
     }
 
     /**
@@ -1647,10 +1706,8 @@ public class Float private constructor() : Number(), Comparable<Float> {
      * Returns zero if this `Float` value is `NaN`, [Long.MIN_VALUE] if it's less than `Long.MIN_VALUE`,
      * [Long.MAX_VALUE] if it's bigger than `Long.MAX_VALUE`.
      */
-    // TODO: Implement Float.toLong()
     public override fun toLong(): Long {
-        wasm_unreachable()
-        return 0
+        return wasm_i64_trunc_sat_f32_s(this)
     }
 
     /** Returns this value. */
@@ -1662,35 +1719,37 @@ public class Float private constructor() : Number(), Comparable<Float> {
      *
      * The resulting `Double` value represents the same numerical value as this `Float`.
      */
-    @WasmInstruction(WasmInstruction.F64_PROMOTE_F32)
     public override fun toDouble(): Double =
-        implementedAsIntrinsic
+        wasm_f64_promote_f32(this)
 
     public inline fun equals(other: Float): Boolean =
         bits() == other.bits()
 
-    // TODO: Support Any? and type operators
-//    public override fun equals(other: Any?): Boolean =
-//        other is Float && this.equals(other)
+    public override fun equals(other: Any?): Boolean =
+        other is Float && this.equals(other)
 
-    // TODO: Implement Float.toString()
-    // public override fun toString(): String
+    public override fun toString(): String =
+        floatToStringImpl(this)
 
     public override inline fun hashCode(): Int =
         bits()
 
     @PublishedApi
-    @WasmInstruction(WasmInstruction.I32_REINTERPRET_F32)
+    @WasmOp(WasmOp.I32_REINTERPRET_F32)
     internal fun bits(): Int = implementedAsIntrinsic
 }
 
+@WasmImport("runtime", "coerceToString")
+private fun floatToStringImpl(x: Float): String =
+    implementedAsIntrinsic
+
 /**
  * Represents a double-precision 64-bit IEEE 754 floating point number.
  */
-public class Double private constructor() : Number(), Comparable<Double> {
+@WasmPrimitive
+public class Double private constructor(public val value: Double) : Number(), Comparable<Double> {
 
-    @ExcludedFromCodegen
-    companion object {
+    public companion object {
         /**
          * A constant holding the smallest *positive* nonzero value of Double.
          */
@@ -1716,7 +1775,10 @@ public class Double private constructor() : Number(), Comparable<Double> {
         /**
          * A constant holding the "not a number" value of Double.
          */
-        public val NaN: Double = wasm_f64_const_nan()
+        public val NaN: Double
+            get() =
+                wasm_double_nan()
+
     }
 
     /**
@@ -1792,7 +1854,7 @@ public class Double private constructor() : Number(), Comparable<Double> {
         this + other.toDouble()
 
     /** Adds the other value to this value. */
-    @WasmInstruction(WasmInstruction.F64_ADD)
+    @WasmOp(WasmOp.F64_ADD)
     public operator fun plus(other: Double): Double =
         implementedAsIntrinsic
 
@@ -1817,7 +1879,7 @@ public class Double private constructor() : Number(), Comparable<Double> {
         this - other.toDouble()
 
     /** Subtracts the other value from this value. */
-    @WasmInstruction(WasmInstruction.F64_SUB)
+    @WasmOp(WasmOp.F64_SUB)
     public operator fun minus(other: Double): Double =
         implementedAsIntrinsic
 
@@ -1842,7 +1904,7 @@ public class Double private constructor() : Number(), Comparable<Double> {
         this * other.toDouble()
 
     /** Multiplies this value by the other value. */
-    @WasmInstruction(WasmInstruction.F64_MUL)
+    @WasmOp(WasmOp.F64_MUL)
     public operator fun times(other: Double): Double =
         implementedAsIntrinsic
 
@@ -1867,7 +1929,7 @@ public class Double private constructor() : Number(), Comparable<Double> {
         this / other.toDouble()
 
     /** Divides this value by the other value. */
-    @WasmInstruction(WasmInstruction.F64_DIV)
+    @WasmOp(WasmOp.F64_DIV)
     public operator fun div(other: Double): Double =
         implementedAsIntrinsic
 
@@ -1908,7 +1970,7 @@ public class Double private constructor() : Number(), Comparable<Double> {
         this
 
     /** Returns the negative of this value. */
-    @WasmInstruction(WasmInstruction.F64_NEG)
+    @WasmOp(WasmOp.F64_NEG)
     public operator fun unaryMinus(): Double =
         implementedAsIntrinsic
 
@@ -1940,10 +2002,8 @@ public class Double private constructor() : Number(), Comparable<Double> {
      * Returns zero if this `Double` value is `NaN`, [Int.MIN_VALUE] if it's less than `Int.MIN_VALUE`,
      * [Int.MAX_VALUE] if it's bigger than `Int.MAX_VALUE`.
      */
-    // TODO: Implement Double.toInt()
     public override fun toInt(): Int {
-        wasm_unreachable()
-        return 0
+        return wasm_i32_trunc_sat_f64_s(this)
     }
 
     /**
@@ -1953,10 +2013,8 @@ public class Double private constructor() : Number(), Comparable<Double> {
      * Returns zero if this `Double` value is `NaN`, [Long.MIN_VALUE] if it's less than `Long.MIN_VALUE`,
      * [Long.MAX_VALUE] if it's bigger than `Long.MAX_VALUE`.
      */
-    // TODO: Implement Double.toLong()
     public override fun toLong(): Long {
-        wasm_unreachable()
-        return 0
+        return wasm_i64_trunc_sat_f64_s(this)
     }
 
     /**
@@ -1966,9 +2024,8 @@ public class Double private constructor() : Number(), Comparable<Double> {
      * In case when this `Double` value is exactly between two `Float`s,
      * the one with zero at least significant bit of mantissa is selected.
      */
-    @WasmInstruction(WasmInstruction.F32_DEMOTE_F64)
     public override fun toFloat(): Float =
-        implementedAsIntrinsic
+        wasm_f32_demote_f64(this)
 
     /** Returns this value. */
     public override inline fun toDouble(): Double =
@@ -1977,17 +2034,20 @@ public class Double private constructor() : Number(), Comparable<Double> {
     public inline fun equals(other: Double): Boolean =
         this.bits() == other.bits()
 
-    // TODO: Support Any? and type operators
-//    public override fun equals(other: Any?): Boolean =
-//        other is Double && this.bits() == other.bits()
+    public override fun equals(other: Any?): Boolean =
+        other is Double && this.bits() == other.bits()
 
-    // TODO: Implement Double.toString()
-    // public override fun toString(): String
+    public override fun toString(): String =
+        doubleToStringImpl(this)
 
     public override inline fun hashCode(): Int = bits().hashCode()
 
     @PublishedApi
-    @WasmInstruction(WasmInstruction.I64_REINTERPRET_F64)
+    @WasmOp(WasmOp.I64_REINTERPRET_F64)
     internal fun bits(): Long =
         implementedAsIntrinsic
 }
+
+@WasmImport("runtime", "coerceToString")
+private fun doubleToStringImpl(x: Double): String =
+    implementedAsIntrinsic
diff --git a/libraries/stdlib/wasm/builtins/kotlin/String.kt b/libraries/stdlib/wasm/builtins/kotlin/String.kt
new file mode 100644
index 00000000000..1ca1e42d318
--- /dev/null
+++ b/libraries/stdlib/wasm/builtins/kotlin/String.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+import kotlin.wasm.internal.*
+
+/**
+ * The `String` class represents character strings. All string literals in Kotlin programs, such as `"abc"`, are
+ * implemented as instances of this class.
+ */
+@WasmPrimitive
+public class String constructor(public val string: String) : Comparable<String>, CharSequence {
+    public companion object;
+
+    /**
+     * Returns a string obtained by concatenating this string with the string representation of the given [other] object.
+     */
+    public operator fun plus(other: Any?): String =
+        stringPlusImpl(this, other.toString())
+
+    public override val length: Int
+        get() = stringLengthImpl(this)
+
+    /**
+     * Returns the character of this string at the specified [index].
+     *
+     * If the [index] is out of bounds of this string, throws an [IndexOutOfBoundsException] except in Kotlin/JS
+     * where the behavior is unspecified.
+     */
+    public override fun get(index: Int): Char =
+        stringGetCharImpl(this, index)
+
+    public override fun subSequence(startIndex: Int, endIndex: Int): CharSequence =
+        stringSubSequenceImpl(this, startIndex, endIndex)
+
+    public override fun compareTo(other: String): Int =
+        stringCompareToImpl(this, other)
+
+    public override fun equals(other: Any?): Boolean {
+        if (other is String)
+            return this.compareTo(other) == 0
+        return false
+    }
+
+    public override fun toString(): String = this
+
+    // TODO: Implement
+    public override fun hashCode(): Int = 10
+}
+
+@JsFun("(it, other) => it + String(other)")
+private fun stringPlusImpl(it: String, other: String): String =
+    implementedAsIntrinsic
+
+@JsFun("(it) => it.length")
+private fun stringLengthImpl(it: String): Int =
+    implementedAsIntrinsic
+
+@WasmImport("runtime", "String_getChar")
+private fun stringGetCharImpl(it: String, index: Int): Char =
+    implementedAsIntrinsic
+
+@WasmImport("runtime", "String_compareTo")
+private fun stringCompareToImpl(it: String, other: String): Int =
+    implementedAsIntrinsic
+
+@WasmImport("runtime", "String_subsequence")
+private fun stringSubSequenceImpl(string: String, startIndex: Int, endIndex: Int): String =
+    implementedAsIntrinsic
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Annotation.kt b/libraries/stdlib/wasm/builtins/native/kotlin/Annotation.kt
deleted file mode 100644
index 8b640727b7e..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Annotation.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin
-
-/**
- * Base interface implicitly implemented by all annotation interfaces.
- * See [Kotlin language documentation](https://kotlinlang.org/docs/reference/annotations.html) for more information
- * on annotations.
- */
-public interface Annotation
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Arrays.kt b/libraries/stdlib/wasm/builtins/native/kotlin/Arrays.kt
deleted file mode 100644
index b8fd30c5892..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Arrays.kt
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-// Auto-generated file. DO NOT EDIT!
-
-@file:Suppress(
-    "NON_ABSTRACT_FUNCTION_WITH_NO_BODY",
-    "MUST_BE_INITIALIZED_OR_BE_ABSTRACT",
-    "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE",
-    "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED",
-    "WRONG_MODIFIER_TARGET"
-)
-
-package kotlin
-
-/**
- * An array of bytes. When targeting the JVM, instances of this class are represented as `byte[]`.
- * @constructor Creates a new array of the specified [size], with all elements initialized to zero.
- */
-public class ByteArray(size: Int) {
-    /**
-     * Creates a new array of the specified [size], where each element is calculated by calling the specified
-     * [init] function.
-     *
-     * The function [init] is called for each array element sequentially starting from the first one.
-     * It should return the value for an array element given its index.
-     */
-    public inline constructor(size: Int, init: (Int) -> Byte)
-
-    /**
-     * Returns the array element at the given [index].  This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun get(index: Int): Byte
-
-    /**
-     * Sets the element at the given [index] to the given [value]. This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun set(index: Int, value: Byte): Unit
-
-    /** Returns the number of elements in the array. */
-    public val size: Int
-
-    /** Creates an iterator over the elements of the array. */
-    public operator fun iterator(): ByteIterator
-}
-
-/**
- * An array of chars. When targeting the JVM, instances of this class are represented as `char[]`.
- * @constructor Creates a new array of the specified [size], with all elements initialized to null char (`\u0000').
- */
-public class CharArray(size: Int) {
-    /**
-     * Creates a new array of the specified [size], where each element is calculated by calling the specified
-     * [init] function.
-     *
-     * The function [init] is called for each array element sequentially starting from the first one.
-     * It should return the value for an array element given its index.
-     */
-    public inline constructor(size: Int, init: (Int) -> Char)
-
-    /**
-     * Returns the array element at the given [index].  This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun get(index: Int): Char
-
-    /**
-     * Sets the element at the given [index] to the given [value]. This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun set(index: Int, value: Char): Unit
-
-    /** Returns the number of elements in the array. */
-    public val size: Int
-
-    /** Creates an iterator over the elements of the array. */
-    public operator fun iterator(): CharIterator
-}
-
-/**
- * An array of shorts. When targeting the JVM, instances of this class are represented as `short[]`.
- * @constructor Creates a new array of the specified [size], with all elements initialized to zero.
- */
-public class ShortArray(size: Int) {
-    /**
-     * Creates a new array of the specified [size], where each element is calculated by calling the specified
-     * [init] function.
-     *
-     * The function [init] is called for each array element sequentially starting from the first one.
-     * It should return the value for an array element given its index.
-     */
-    public inline constructor(size: Int, init: (Int) -> Short)
-
-    /**
-     * Returns the array element at the given [index].  This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun get(index: Int): Short
-
-    /**
-     * Sets the element at the given [index] to the given [value]. This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun set(index: Int, value: Short): Unit
-
-    /** Returns the number of elements in the array. */
-    public val size: Int
-
-    /** Creates an iterator over the elements of the array. */
-    public operator fun iterator(): ShortIterator
-}
-
-/**
- * An array of ints. When targeting the JVM, instances of this class are represented as `int[]`.
- * @constructor Creates a new array of the specified [size], with all elements initialized to zero.
- */
-public class IntArray(size: Int) {
-    /**
-     * Creates a new array of the specified [size], where each element is calculated by calling the specified
-     * [init] function.
-     *
-     * The function [init] is called for each array element sequentially starting from the first one.
-     * It should return the value for an array element given its index.
-     */
-    public inline constructor(size: Int, init: (Int) -> Int)
-
-    /**
-     * Returns the array element at the given [index].  This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun get(index: Int): Int
-
-    /**
-     * Sets the element at the given [index] to the given [value]. This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun set(index: Int, value: Int): Unit
-
-    /** Returns the number of elements in the array. */
-    public val size: Int
-
-    /** Creates an iterator over the elements of the array. */
-    public operator fun iterator(): IntIterator
-}
-
-/**
- * An array of longs. When targeting the JVM, instances of this class are represented as `long[]`.
- * @constructor Creates a new array of the specified [size], with all elements initialized to zero.
- */
-public class LongArray(size: Int) {
-    /**
-     * Creates a new array of the specified [size], where each element is calculated by calling the specified
-     * [init] function.
-     *
-     * The function [init] is called for each array element sequentially starting from the first one.
-     * It should return the value for an array element given its index.
-     */
-    public inline constructor(size: Int, init: (Int) -> Long)
-
-    /**
-     * Returns the array element at the given [index].  This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun get(index: Int): Long
-
-    /**
-     * Sets the element at the given [index] to the given [value]. This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun set(index: Int, value: Long): Unit
-
-    /** Returns the number of elements in the array. */
-    public val size: Int
-
-    /** Creates an iterator over the elements of the array. */
-    public operator fun iterator(): LongIterator
-}
-
-/**
- * An array of floats. When targeting the JVM, instances of this class are represented as `float[]`.
- * @constructor Creates a new array of the specified [size], with all elements initialized to zero.
- */
-public class FloatArray(size: Int) {
-    /**
-     * Creates a new array of the specified [size], where each element is calculated by calling the specified
-     * [init] function.
-     *
-     * The function [init] is called for each array element sequentially starting from the first one.
-     * It should return the value for an array element given its index.
-     */
-    public inline constructor(size: Int, init: (Int) -> Float)
-
-    /**
-     * Returns the array element at the given [index].  This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun get(index: Int): Float
-
-    /**
-     * Sets the element at the given [index] to the given [value]. This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun set(index: Int, value: Float): Unit
-
-    /** Returns the number of elements in the array. */
-    public val size: Int
-
-    /** Creates an iterator over the elements of the array. */
-    public operator fun iterator(): FloatIterator
-}
-
-/**
- * An array of doubles. When targeting the JVM, instances of this class are represented as `double[]`.
- * @constructor Creates a new array of the specified [size], with all elements initialized to zero.
- */
-public class DoubleArray(size: Int) {
-    /**
-     * Creates a new array of the specified [size], where each element is calculated by calling the specified
-     * [init] function.
-     *
-     * The function [init] is called for each array element sequentially starting from the first one.
-     * It should return the value for an array element given its index.
-     */
-    public inline constructor(size: Int, init: (Int) -> Double)
-
-    /**
-     * Returns the array element at the given [index].  This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun get(index: Int): Double
-
-    /**
-     * Sets the element at the given [index] to the given [value]. This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun set(index: Int, value: Double): Unit
-
-    /** Returns the number of elements in the array. */
-    public val size: Int
-
-    /** Creates an iterator over the elements of the array. */
-    public operator fun iterator(): DoubleIterator
-}
-
-/**
- * An array of booleans. When targeting the JVM, instances of this class are represented as `boolean[]`.
- * @constructor Creates a new array of the specified [size], with all elements initialized to `false`.
- */
-public class BooleanArray(size: Int) {
-    /**
-     * Creates a new array of the specified [size], where each element is calculated by calling the specified
-     * [init] function.
-     *
-     * The function [init] is called for each array element sequentially starting from the first one.
-     * It should return the value for an array element given its index.
-     */
-    public inline constructor(size: Int, init: (Int) -> Boolean)
-
-    /**
-     * Returns the array element at the given [index].  This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun get(index: Int): Boolean
-
-    /**
-     * Sets the element at the given [index] to the given [value]. This method can be called using the index operator.
-     *
-     * If the [index] is out of bounds of this array, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    public operator fun set(index: Int, value: Boolean): Unit
-
-    /** Returns the number of elements in the array. */
-    public val size: Int
-
-    /** Creates an iterator over the elements of the array. */
-    public operator fun iterator(): BooleanIterator
-}
-
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/CharSequence.kt b/libraries/stdlib/wasm/builtins/native/kotlin/CharSequence.kt
deleted file mode 100644
index 335bc9bb63d..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/CharSequence.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin
-
-/**
- * Represents a readable sequence of [Char] values.
- */
-public interface CharSequence {
-    /**
-     * Returns the length of this character sequence.
-     */
-    public val length: Int
-
-    /**
-     * Returns the character at the specified [index] in this character sequence.
-     *
-     * @throws [IndexOutOfBoundsException] if the [index] is out of bounds of this character sequence.
-     *
-     * Note that the [String] implementation of this interface in Kotlin/JS has unspecified behavior
-     * if the [index] is out of its bounds.
-     */
-    public operator fun get(index: Int): Char
-
-    /**
-     * Returns a new character sequence that is a subsequence of this character sequence,
-     * starting at the specified [startIndex] and ending right before the specified [endIndex].
-     *
-     * @param startIndex the start index (inclusive).
-     * @param endIndex the end index (exclusive).
-     */
-    public fun subSequence(startIndex: Int, endIndex: Int): CharSequence
-}
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Collections.kt b/libraries/stdlib/wasm/builtins/native/kotlin/Collections.kt
deleted file mode 100644
index caf6ab6212c..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Collections.kt
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.collections
-
-import kotlin.internal.PlatformDependent
-
-/**
- * Classes that inherit from this interface can be represented as a sequence of elements that can
- * be iterated over.
- * @param T the type of element being iterated over. The iterator is covariant in its element type.
- */
-public interface Iterable<out T> {
-    /**
-     * Returns an iterator over the elements of this object.
-     */
-    public operator fun iterator(): Iterator<T>
-}
-
-/**
- * Classes that inherit from this interface can be represented as a sequence of elements that can
- * be iterated over and that supports removing elements during iteration.
- * @param T the type of element being iterated over. The mutable iterator is invariant in its element type.
- */
-public interface MutableIterable<out T> : Iterable<T> {
-    /**
-     * Returns an iterator over the elements of this sequence that supports removing elements during iteration.
-     */
-    override fun iterator(): MutableIterator<T>
-}
-
-/**
- * A generic collection of elements. Methods in this interface support only read-only access to the collection;
- * read/write access is supported through the [MutableCollection] interface.
- * @param E the type of elements contained in the collection. The collection is covariant in its element type.
- */
-public interface Collection<out E> : Iterable<E> {
-    // Query Operations
-    /**
-     * Returns the size of the collection.
-     */
-    public val size: Int
-
-    /**
-     * Returns `true` if the collection is empty (contains no elements), `false` otherwise.
-     */
-    public fun isEmpty(): Boolean
-
-    /**
-     * Checks if the specified element is contained in this collection.
-     */
-    public operator fun contains(element: @UnsafeVariance E): Boolean
-
-    override fun iterator(): Iterator<E>
-
-    // Bulk Operations
-    /**
-     * Checks if all elements in the specified collection are contained in this collection.
-     */
-    public fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
-}
-
-/**
- * A generic collection of elements that supports adding and removing elements.
- *
- * @param E the type of elements contained in the collection. The mutable collection is invariant in its element type.
- */
-public interface MutableCollection<E> : Collection<E>, MutableIterable<E> {
-    // Query Operations
-    override fun iterator(): MutableIterator<E>
-
-    // Modification Operations
-    /**
-     * Adds the specified element to the collection.
-     *
-     * @return `true` if the element has been added, `false` if the collection does not support duplicates
-     * and the element is already contained in the collection.
-     */
-    public fun add(element: E): Boolean
-
-    /**
-     * Removes a single instance of the specified element from this
-     * collection, if it is present.
-     *
-     * @return `true` if the element has been successfully removed; `false` if it was not present in the collection.
-     */
-    public fun remove(element: E): Boolean
-
-    // Bulk Modification Operations
-    /**
-     * Adds all of the elements of the specified collection to this collection.
-     *
-     * @return `true` if any of the specified elements was added to the collection, `false` if the collection was not modified.
-     */
-    public fun addAll(elements: Collection<E>): Boolean
-
-    /**
-     * Removes all of this collection's elements that are also contained in the specified collection.
-     *
-     * @return `true` if any of the specified elements was removed from the collection, `false` if the collection was not modified.
-     */
-    public fun removeAll(elements: Collection<E>): Boolean
-
-    /**
-     * Retains only the elements in this collection that are contained in the specified collection.
-     *
-     * @return `true` if any element was removed from the collection, `false` if the collection was not modified.
-     */
-    public fun retainAll(elements: Collection<E>): Boolean
-
-    /**
-     * Removes all elements from this collection.
-     */
-    public fun clear(): Unit
-}
-
-/**
- * A generic ordered collection of elements. Methods in this interface support only read-only access to the list;
- * read/write access is supported through the [MutableList] interface.
- * @param E the type of elements contained in the list. The list is covariant in its element type.
- */
-public interface List<out E> : Collection<E> {
-    // Query Operations
-
-    override val size: Int
-    override fun isEmpty(): Boolean
-    override fun contains(element: @UnsafeVariance E): Boolean
-    override fun iterator(): Iterator<E>
-
-    // Bulk Operations
-    override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
-
-    // Positional Access Operations
-    /**
-     * Returns the element at the specified index in the list.
-     */
-    public operator fun get(index: Int): E
-
-    // Search Operations
-    /**
-     * Returns the index of the first occurrence of the specified element in the list, or -1 if the specified
-     * element is not contained in the list.
-     */
-    public fun indexOf(element: @UnsafeVariance E): Int
-
-    /**
-     * Returns the index of the last occurrence of the specified element in the list, or -1 if the specified
-     * element is not contained in the list.
-     */
-    public fun lastIndexOf(element: @UnsafeVariance E): Int
-
-    // List Iterators
-    /**
-     * Returns a list iterator over the elements in this list (in proper sequence).
-     */
-    public fun listIterator(): ListIterator<E>
-
-    /**
-     * Returns a list iterator over the elements in this list (in proper sequence), starting at the specified [index].
-     */
-    public fun listIterator(index: Int): ListIterator<E>
-
-    // View
-    /**
-     * Returns a view of the portion of this list between the specified [fromIndex] (inclusive) and [toIndex] (exclusive).
-     * The returned list is backed by this list, so non-structural changes in the returned list are reflected in this list, and vice-versa.
-     *
-     * Structural changes in the base list make the behavior of the view undefined.
-     */
-    public fun subList(fromIndex: Int, toIndex: Int): List<E>
-}
-
-/**
- * A generic ordered collection of elements that supports adding and removing elements.
- * @param E the type of elements contained in the list. The mutable list is invariant in its element type.
- */
-public interface MutableList<E> : List<E>, MutableCollection<E> {
-    // Modification Operations
-    /**
-     * Adds the specified element to the end of this list.
-     *
-     * @return `true` because the list is always modified as the result of this operation.
-     */
-    override fun add(element: E): Boolean
-
-    override fun remove(element: E): Boolean
-
-    // Bulk Modification Operations
-    /**
-     * Adds all of the elements of the specified collection to the end of this list.
-     *
-     * The elements are appended in the order they appear in the [elements] collection.
-     *
-     * @return `true` if the list was changed as the result of the operation.
-     */
-    override fun addAll(elements: Collection<E>): Boolean
-
-    /**
-     * Inserts all of the elements of the specified collection [elements] into this list at the specified [index].
-     *
-     * @return `true` if the list was changed as the result of the operation.
-     */
-    public fun addAll(index: Int, elements: Collection<E>): Boolean
-
-    override fun removeAll(elements: Collection<E>): Boolean
-    override fun retainAll(elements: Collection<E>): Boolean
-    override fun clear(): Unit
-
-    // Positional Access Operations
-    /**
-     * Replaces the element at the specified position in this list with the specified element.
-     *
-     * @return the element previously at the specified position.
-     */
-    public operator fun set(index: Int, element: E): E
-
-    /**
-     * Inserts an element into the list at the specified [index].
-     */
-    public fun add(index: Int, element: E): Unit
-
-    /**
-     * Removes an element at the specified [index] from the list.
-     *
-     * @return the element that has been removed.
-     */
-    public fun removeAt(index: Int): E
-
-    // List Iterators
-    override fun listIterator(): MutableListIterator<E>
-
-    override fun listIterator(index: Int): MutableListIterator<E>
-
-    // View
-    override fun subList(fromIndex: Int, toIndex: Int): MutableList<E>
-}
-
-/**
- * A generic unordered collection of elements that does not support duplicate elements.
- * Methods in this interface support only read-only access to the set;
- * read/write access is supported through the [MutableSet] interface.
- * @param E the type of elements contained in the set. The set is covariant in its element type.
- */
-public interface Set<out E> : Collection<E> {
-    // Query Operations
-
-    override val size: Int
-    override fun isEmpty(): Boolean
-    override fun contains(element: @UnsafeVariance E): Boolean
-    override fun iterator(): Iterator<E>
-
-    // Bulk Operations
-    override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
-}
-
-/**
- * A generic unordered collection of elements that does not support duplicate elements, and supports
- * adding and removing elements.
- * @param E the type of elements contained in the set. The mutable set is invariant in its element type.
- */
-public interface MutableSet<E> : Set<E>, MutableCollection<E> {
-    // Query Operations
-    override fun iterator(): MutableIterator<E>
-
-    // Modification Operations
-
-    /**
-     * Adds the specified element to the set.
-     *
-     * @return `true` if the element has been added, `false` if the element is already contained in the set.
-     */
-    override fun add(element: E): Boolean
-
-    override fun remove(element: E): Boolean
-
-    // Bulk Modification Operations
-
-    override fun addAll(elements: Collection<E>): Boolean
-    override fun removeAll(elements: Collection<E>): Boolean
-    override fun retainAll(elements: Collection<E>): Boolean
-    override fun clear(): Unit
-}
-
-/**
- * A collection that holds pairs of objects (keys and values) and supports efficiently retrieving
- * the value corresponding to each key. Map keys are unique; the map holds only one value for each key.
- * Methods in this interface support only read-only access to the map; read-write access is supported through
- * the [MutableMap] interface.
- * @param K the type of map keys. The map is invariant in its key type, as it
- *          can accept key as a parameter (of [containsKey] for example) and return it in [keys] set.
- * @param V the type of map values. The map is covariant in its value type.
- */
-public interface Map<K, out V> {
-    // Query Operations
-    /**
-     * Returns the number of key/value pairs in the map.
-     */
-    public val size: Int
-
-    /**
-     * Returns `true` if the map is empty (contains no elements), `false` otherwise.
-     */
-    public fun isEmpty(): Boolean
-
-    /**
-     * Returns `true` if the map contains the specified [key].
-     */
-    public fun containsKey(key: K): Boolean
-
-    /**
-     * Returns `true` if the map maps one or more keys to the specified [value].
-     */
-    public fun containsValue(value: @UnsafeVariance V): Boolean
-
-    /**
-     * Returns the value corresponding to the given [key], or `null` if such a key is not present in the map.
-     */
-    public operator fun get(key: K): V?
-
-    /**
-     * Returns the value corresponding to the given [key], or [defaultValue] if such a key is not present in the map.
-     *
-     * @since JDK 1.8
-     */
-    @SinceKotlin("1.1")
-    @PlatformDependent
-    public fun getOrDefault(key: K, defaultValue: @UnsafeVariance V): V {
-        // See default implementation in JDK sources
-        return null as V
-    }
-
-    // Views
-    /**
-     * Returns a read-only [Set] of all keys in this map.
-     */
-    public val keys: Set<K>
-
-    /**
-     * Returns a read-only [Collection] of all values in this map. Note that this collection may contain duplicate values.
-     */
-    public val values: Collection<V>
-
-    /**
-     * Returns a read-only [Set] of all key/value pairs in this map.
-     */
-    public val entries: Set<Map.Entry<K, V>>
-
-    /**
-     * Represents a key/value pair held by a [Map].
-     */
-    public interface Entry<out K, out V> {
-        /**
-         * Returns the key of this key/value pair.
-         */
-        public val key: K
-
-        /**
-         * Returns the value of this key/value pair.
-         */
-        public val value: V
-    }
-}
-
-/**
- * A modifiable collection that holds pairs of objects (keys and values) and supports efficiently retrieving
- * the value corresponding to each key. Map keys are unique; the map holds only one value for each key.
- * @param K the type of map keys. The map is invariant in its key type.
- * @param V the type of map values. The mutable map is invariant in its value type.
- */
-public interface MutableMap<K, V> : Map<K, V> {
-    // Modification Operations
-    /**
-     * Associates the specified [value] with the specified [key] in the map.
-     *
-     * @return the previous value associated with the key, or `null` if the key was not present in the map.
-     */
-    public fun put(key: K, value: V): V?
-
-    /**
-     * Removes the specified key and its corresponding value from this map.
-     *
-     * @return the previous value associated with the key, or `null` if the key was not present in the map.
-     */
-    public fun remove(key: K): V?
-
-    /**
-     * Removes the entry for the specified key only if it is mapped to the specified value.
-     *
-     * @return true if entry was removed
-     */
-    @SinceKotlin("1.1")
-    @PlatformDependent
-    public fun remove(key: K, value: V): Boolean {
-        // See default implementation in JDK sources
-        return true
-    }
-
-    // Bulk Modification Operations
-    /**
-     * Updates this map with key/value pairs from the specified map [from].
-     */
-    public fun putAll(from: Map<out K, V>): Unit
-
-    /**
-     * Removes all elements from this map.
-     */
-    public fun clear(): Unit
-
-    // Views
-    /**
-     * Returns a [MutableSet] of all keys in this map.
-     */
-    override val keys: MutableSet<K>
-
-    /**
-     * Returns a [MutableCollection] of all values in this map. Note that this collection may contain duplicate values.
-     */
-    override val values: MutableCollection<V>
-
-    /**
-     * Returns a [MutableSet] of all key/value pairs in this map.
-     */
-    override val entries: MutableSet<MutableMap.MutableEntry<K, V>>
-
-    /**
-     * Represents a key/value pair held by a [MutableMap].
-     */
-    public interface MutableEntry<K, V> : Map.Entry<K, V> {
-        /**
-         * Changes the value associated with the key of this entry.
-         *
-         * @return the previous value corresponding to the key.
-         */
-        public fun setValue(newValue: V): V
-    }
-}
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Comparable.kt b/libraries/stdlib/wasm/builtins/native/kotlin/Comparable.kt
deleted file mode 100644
index bcc2bf337c9..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Comparable.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin
-
-/**
- * Classes which inherit from this interface have a defined total ordering between their instances.
- */
-public interface Comparable<in T> {
-    /**
-     * Compares this object with the specified object for order. Returns zero if this object is equal
-     * to the specified [other] object, a negative number if it's less than [other], or a positive number
-     * if it's greater than [other].
-     */
-    public operator fun compareTo(other: T): Int
-}
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Enum.kt b/libraries/stdlib/wasm/builtins/native/kotlin/Enum.kt
deleted file mode 100644
index 90a4931ea0a..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Enum.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress(
-    "NON_ABSTRACT_FUNCTION_WITH_NO_BODY",
-    "MUST_BE_INITIALIZED_OR_BE_ABSTRACT",
-    "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE",
-    "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED",
-    "WRONG_MODIFIER_TARGET"
-)
-
-package kotlin
-
-/**
- * The common base class of all enum classes.
- * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/enum-classes.html) for more
- * information on enum classes.
- */
-public abstract class Enum<E : Enum<E>>(name: String, ordinal: Int): Comparable<E> {
-    companion object {}
-
-    /**
-     * Returns the name of this enum constant, exactly as declared in its enum declaration.
-     */
-    public final val name: String
-
-    /**
-     * Returns the ordinal of this enumeration constant (its position in its enum declaration, where the initial constant
-     * is assigned an ordinal of zero).
-     */
-    public final val ordinal: Int
-
-    public override final fun compareTo(other: E): Int
-
-    /**
-     * Throws an exception since enum constants cannot be cloned.
-     * This method prevents enum classes from inheriting from `Cloneable`.
-     */
-    protected final fun clone(): Any
-
-    public override final fun equals(other: Any?): Boolean
-    public override final fun hashCode(): Int
-    public override fun toString(): String
-
-    /**
-     * Returns an array containing the constants of this enum type, in the order they're declared.
-     * This method may be used to iterate over the constants.
-     * @values
-     */
-
-    /**
-     * Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)
-     * @throws IllegalArgumentException if this enum type has no constant with the specified name
-     * @valueOf
-     */
-}
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Iterator.kt b/libraries/stdlib/wasm/builtins/native/kotlin/Iterator.kt
deleted file mode 100644
index d854a6a66f9..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Iterator.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin.collections
-
-/**
- * An iterator over a collection or another entity that can be represented as a sequence of elements.
- * Allows to sequentially access the elements.
- */
-public interface Iterator<out T> {
-    /**
-     * Returns the next element in the iteration.
-     */
-    public operator fun next(): T
-
-    /**
-     * Returns `true` if the iteration has more elements.
-     */
-    public operator fun hasNext(): Boolean
-}
-
-/**
- * An iterator over a mutable collection. Provides the ability to remove elements while iterating.
- * @see MutableCollection.iterator
- */
-public interface MutableIterator<out T> : Iterator<T> {
-    /**
-     * Removes from the underlying collection the last element returned by this iterator.
-     */
-    public fun remove(): Unit
-}
-
-/**
- * An iterator over a collection that supports indexed access.
- * @see List.listIterator
- */
-public interface ListIterator<out T> : Iterator<T> {
-    // Query Operations
-    override fun next(): T
-    override fun hasNext(): Boolean
-
-    /**
-     * Returns `true` if there are elements in the iteration before the current element.
-     */
-    public fun hasPrevious(): Boolean
-
-    /**
-     * Returns the previous element in the iteration and moves the cursor position backwards.
-     */
-    public fun previous(): T
-
-    /**
-     * Returns the index of the element that would be returned by a subsequent call to [next].
-     */
-    public fun nextIndex(): Int
-
-    /**
-     * Returns the index of the element that would be returned by a subsequent call to [previous].
-     */
-    public fun previousIndex(): Int
-}
-
-/**
- * An iterator over a mutable collection that supports indexed access. Provides the ability
- * to add, modify and remove elements while iterating.
- */
-public interface MutableListIterator<T> : ListIterator<T>, MutableIterator<T> {
-    // Query Operations
-    override fun next(): T
-    override fun hasNext(): Boolean
-
-    // Modification Operations
-    override fun remove(): Unit
-
-    /**
-     * Replaces the last element returned by [next] or [previous] with the specified element [element].
-     */
-    public fun set(element: T): Unit
-
-    /**
-     * Adds the specified element [element] into the underlying collection immediately before the element that would be
-     * returned by [next], if any, and after the element that would be returned by [previous], if any.
-     * (If the collection contains no elements, the new element becomes the sole element in the collection.)
-     * The new element is inserted before the implicit cursor: a subsequent call to [next] would be unaffected,
-     * and a subsequent call to [previous] would return the new element. (This call increases by one the value \
-     * that would be returned by a call to [nextIndex] or [previousIndex].)
-     */
-    public fun add(element: T): Unit
-}
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Number.kt b/libraries/stdlib/wasm/builtins/native/kotlin/Number.kt
deleted file mode 100644
index 49da583bf4b..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Number.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin
-
-/**
- * Superclass for all platform classes representing numeric values.
- */
-public abstract class Number {
-    /**
-     * Returns the value of this number as a [Double], which may involve rounding.
-     */
-    public abstract fun toDouble(): Double
-
-    /**
-     * Returns the value of this number as a [Float], which may involve rounding.
-     */
-    public abstract fun toFloat(): Float
-
-    /**
-     * Returns the value of this number as a [Long], which may involve rounding or truncation.
-     */
-    public abstract fun toLong(): Long
-
-    /**
-     * Returns the value of this number as an [Int], which may involve rounding or truncation.
-     */
-    public abstract fun toInt(): Int
-
-    /**
-     * Returns the [Char] with the numeric value equal to this number, truncated to 16 bits if appropriate.
-     */
-    public abstract fun toChar(): Char
-
-    /**
-     * Returns the value of this number as a [Short], which may involve rounding or truncation.
-     */
-    public abstract fun toShort(): Short
-
-    /**
-     * Returns the value of this number as a [Byte], which may involve rounding or truncation.
-     */
-    public abstract fun toByte(): Byte
-}
-
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/String.kt b/libraries/stdlib/wasm/builtins/native/kotlin/String.kt
deleted file mode 100644
index 198d09abae4..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/String.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress(
-    "NON_ABSTRACT_FUNCTION_WITH_NO_BODY",
-    "MUST_BE_INITIALIZED_OR_BE_ABSTRACT",
-    "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE",
-    "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED",
-    "WRONG_MODIFIER_TARGET"
-)
-
-package kotlin
-
-import kotlin.wasm.internal.ExcludedFromCodegen
-import kotlin.wasm.internal.WasmImport
-
-/**
- * The `String` class represents character strings. All string literals in Kotlin programs, such as `"abc"`, are
- * implemented as instances of this class.
- */
-public class String : Comparable<String>, CharSequence {
-    @ExcludedFromCodegen
-    companion object {}
-    
-    /**
-     * Returns a string obtained by concatenating this string with the string representation of the given [other] object.
-     */
-    @WasmImport("runtime", "String_plus")
-    public operator fun plus(other: Any?): String
-
-    public override val length: Int
-        @WasmImport("runtime", "String_getLength") get
-
-    /**
-     * Returns the character of this string at the specified [index].
-     *
-     * If the [index] is out of bounds of this string, throws an [IndexOutOfBoundsException] except in Kotlin/JS
-     * where the behavior is unspecified.
-     */
-    @WasmImport("runtime", "String_getChar")
-    public override fun get(index: Int): Char
-
-    @ExcludedFromCodegen
-    public override fun subSequence(startIndex: Int, endIndex: Int): CharSequence
-
-    @WasmImport("runtime", "String_compareTo")
-    public override fun compareTo(other: String): Int
-
-    @ExcludedFromCodegen
-    public override fun equals(other: Any?): Boolean
-
-    public override fun toString(): String = this
-
-    @ExcludedFromCodegen
-    public override fun hashCode(): Int
-}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/builtins/native/kotlin/Throwable.kt b/libraries/stdlib/wasm/builtins/native/kotlin/Throwable.kt
deleted file mode 100644
index b6328940998..00000000000
--- a/libraries/stdlib/wasm/builtins/native/kotlin/Throwable.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress(
-    "NON_ABSTRACT_FUNCTION_WITH_NO_BODY",
-    "MUST_BE_INITIALIZED_OR_BE_ABSTRACT",
-    "EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE",
-    "PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED",
-    "WRONG_MODIFIER_TARGET"
-)
-
-package kotlin
-
-/**
- * The base class for all errors and exceptions. Only instances of this class can be thrown or caught.
- *
- * @param message the detail message string.
- * @param cause the cause of this throwable.
- */
-public open class Throwable(open val message: String?, open val cause: Throwable?) {
-    constructor(message: String?) : this(message, null)
-
-    constructor(cause: Throwable?) : this(cause?.toString(), cause)
-
-    constructor() : this(null, null)
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/Annotations.kt b/libraries/stdlib/wasm/builtins/src/kotlin/Annotations.kt
deleted file mode 100644
index 0af5712da18..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/Annotations.kt
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin
-
-import kotlin.annotation.AnnotationRetention.BINARY
-import kotlin.annotation.AnnotationRetention.SOURCE
-import kotlin.annotation.AnnotationTarget.*
-
-/**
- * Marks the annotated declaration as deprecated.
- *
- * A deprecated API element is not recommended to use, typically because it's being phased out or a better alternative exists.
- *
- * To help removing deprecated API gradually, the property [level] could be used.
- * Usually a gradual phase-out goes through the "warning", then "error", then "hidden" or "removed" stages:
- * - First and by default, [DeprecationLevel.WARNING] is used to notify API consumers, but not to break their compilation or runtime usages.
- * - Then, some time later the deprecation level is raised to [DeprecationLevel.ERROR], so that no new Kotlin code can be compiled
- *   using the deprecated API.
- * - Finally, the API is either removed entirely, or hidden ([DeprecationLevel.HIDDEN]) from code,
- * so its usages look like unresolved references, while the API remains in the compiled code
- * preserving binary compatibility with previously compiled code.
- *
- * @property message The message explaining the deprecation and recommending an alternative API to use.
- * @property replaceWith If present, specifies a code fragment which should be used as a replacement for
- *  the deprecated API usage.
- * @property level Specifies how the deprecated element usages are reported in code.
- *  See the [DeprecationLevel] enum for the possible values.
- */
-@Target(CLASS, FUNCTION, PROPERTY, ANNOTATION_CLASS, CONSTRUCTOR, PROPERTY_SETTER, PROPERTY_GETTER, TYPEALIAS)
-@MustBeDocumented
-public annotation class Deprecated(
-    val message: String,
-    val replaceWith: ReplaceWith = ReplaceWith(""),
-    val level: DeprecationLevel = DeprecationLevel.WARNING
-)
-
-/**
- * Specifies a code fragment that can be used to replace a deprecated function, property or class. Tools such
- * as IDEs can automatically apply the replacements specified through this annotation.
- *
- * @property expression the replacement expression. The replacement expression is interpreted in the context
- *     of the symbol being used, and can reference members of enclosing classes etc.
- *     For function calls, the replacement expression may contain argument names of the deprecated function,
- *     which will be substituted with actual parameters used in the call being updated. The imports used in the file
- *     containing the deprecated function or property are NOT accessible; if the replacement expression refers
- *     on any of those imports, they need to be specified explicitly in the [imports] parameter.
- * @property imports the qualified names that need to be imported in order for the references in the
- *     replacement expression to be resolved correctly.
- */
-@Target()
-@Retention(BINARY)
-@MustBeDocumented
-public annotation class ReplaceWith(val expression: String, vararg val imports: String)
-
-/**
- * Possible levels of a deprecation. The level specifies how the deprecated element usages are reported in code.
- *
- * @see Deprecated
- */
-public enum class DeprecationLevel {
-    /** Usage of the deprecated element will be reported as a warning. */
-    WARNING,
-    /** Usage of the deprecated element will be reported as an error. */
-    ERROR,
-    /** Deprecated element will not be accessible from code. */
-    HIDDEN
-}
-
-/**
- * Signifies that the annotated functional type represents an extension function.
- */
-@Target(TYPE)
-@MustBeDocumented
-public annotation class ExtensionFunctionType
-
-/**
- * Annotates type arguments of functional type and holds corresponding parameter name specified by the user in type declaration (if any).
- */
-@Target(TYPE)
-@MustBeDocumented
-@SinceKotlin("1.1")
-public annotation class ParameterName(val name: String)
-
-/**
- * Suppresses the given compilation warnings in the annotated element.
- * @property names names of the compiler diagnostics to suppress.
- */
-@Target(CLASS, ANNOTATION_CLASS, PROPERTY, FIELD, LOCAL_VARIABLE, VALUE_PARAMETER,
-        CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, TYPE, EXPRESSION, FILE, TYPEALIAS)
-@Retention(SOURCE)
-public annotation class Suppress(vararg val names: String)
-
-/**
- * Suppresses errors about variance conflict
- */
-@Target(TYPE)
-@Retention(SOURCE)
-@MustBeDocumented
-public annotation class UnsafeVariance
-
-/**
- * Specifies the first version of Kotlin where a declaration has appeared.
- * Using the declaration and specifying an older API version (via the `-api-version` command line option) will result in an error.
- *
- * @property version the version in the following formats: `<major>.<minor>` or `<major>.<minor>.<patch>`, where major, minor and patch
- * are non-negative integer numbers without leading zeros.
- */
-@Target(CLASS, PROPERTY, FIELD, CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, TYPEALIAS)
-@Retention(AnnotationRetention.BINARY)
-@MustBeDocumented
-public annotation class SinceKotlin(val version: String)
-
-/**
- * When applied to annotation class X specifies that X defines a DSL language
- *
- * The general rule:
- * - an implicit receiver may *belong to a DSL @X* if marked with a corresponding DSL marker annotation
- * - two implicit receivers of the same DSL are not accessible in the same scope
- * - the closest one wins
- * - other available receivers are resolved as usual, but if the resulting resolved call binds to such a receiver, it's a compilation error
- *
- * Marking rules: an implicit receiver is considered marked with @Ann if
- * - its type is marked, or
- * - its type's classifier is marked
- * - or any of its superclasses/superinterfaces
- */
-@Target(ANNOTATION_CLASS)
-@Retention(BINARY)
-@MustBeDocumented
-@SinceKotlin("1.1")
-public annotation class DslMarker
-
-
-/**
- * When applied to a class or a member with internal visibility allows to use it from public inline functions and
- * makes it effectively public.
- *
- * Public inline functions cannot use non-public API, since if they are inlined, those non-public API references
- * would violate access restrictions at a call site (https://kotlinlang.org/docs/reference/inline-functions.html#public-inline-restrictions).
- *
- * To overcome this restriction an `internal` declaration can be annotated with the `@PublishedApi` annotation:
- * - this allows to call that declaration from public inline functions;
- * - the declaration becomes effectively public, and this should be considered with respect to binary compatibility maintaining.
- */
-@Target(AnnotationTarget.CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY)
-@Retention(AnnotationRetention.BINARY)
-@MustBeDocumented
-@SinceKotlin("1.1")
-public annotation class PublishedApi
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/Function.kt b/libraries/stdlib/wasm/builtins/src/kotlin/Function.kt
deleted file mode 100644
index 660d32a454d..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/Function.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin
-
-/**
- * Represents a value of a functional type, such as a lambda, an anonymous function or a function reference.
- *
- * @param R return type of the function.
- */
-public interface Function<out R>
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/Iterators.kt b/libraries/stdlib/wasm/builtins/src/kotlin/Iterators.kt
deleted file mode 100644
index 1ee3ad3c928..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/Iterators.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-// Auto-generated file. DO NOT EDIT!
-
-package kotlin.collections
-
-/** An iterator over a sequence of values of type `Byte`. */
-public abstract class ByteIterator : Iterator<Byte> {
-    override final fun next() = nextByte()
-
-    /** Returns the next value in the sequence without boxing. */
-    public abstract fun nextByte(): Byte
-}
-
-/** An iterator over a sequence of values of type `Char`. */
-public abstract class CharIterator : Iterator<Char> {
-    override final fun next() = nextChar()
-
-    /** Returns the next value in the sequence without boxing. */
-    public abstract fun nextChar(): Char
-}
-
-/** An iterator over a sequence of values of type `Short`. */
-public abstract class ShortIterator : Iterator<Short> {
-    override final fun next() = nextShort()
-
-    /** Returns the next value in the sequence without boxing. */
-    public abstract fun nextShort(): Short
-}
-
-/** An iterator over a sequence of values of type `Int`. */
-public abstract class IntIterator : Iterator<Int> {
-    override final fun next() = nextInt()
-
-    /** Returns the next value in the sequence without boxing. */
-    public abstract fun nextInt(): Int
-}
-
-/** An iterator over a sequence of values of type `Long`. */
-public abstract class LongIterator : Iterator<Long> {
-    override final fun next() = nextLong()
-
-    /** Returns the next value in the sequence without boxing. */
-    public abstract fun nextLong(): Long
-}
-
-/** An iterator over a sequence of values of type `Float`. */
-public abstract class FloatIterator : Iterator<Float> {
-    override final fun next() = nextFloat()
-
-    /** Returns the next value in the sequence without boxing. */
-    public abstract fun nextFloat(): Float
-}
-
-/** An iterator over a sequence of values of type `Double`. */
-public abstract class DoubleIterator : Iterator<Double> {
-    override final fun next() = nextDouble()
-
-    /** Returns the next value in the sequence without boxing. */
-    public abstract fun nextDouble(): Double
-}
-
-/** An iterator over a sequence of values of type `Boolean`. */
-public abstract class BooleanIterator : Iterator<Boolean> {
-    override final fun next() = nextBoolean()
-
-    /** Returns the next value in the sequence without boxing. */
-    public abstract fun nextBoolean(): Boolean
-}
-
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/Unit.kt b/libraries/stdlib/wasm/builtins/src/kotlin/Unit.kt
deleted file mode 100644
index 4835929d904..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/Unit.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin
-
-/**
- * The type with only one value: the `Unit` object. This type corresponds to the `void` type in Java.
- */
-public object Unit {
-    override fun toString() = "kotlin.Unit"
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/annotation/Annotations.kt b/libraries/stdlib/wasm/builtins/src/kotlin/annotation/Annotations.kt
deleted file mode 100644
index 119dbfa55d6..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/annotation/Annotations.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin.annotation
-
-import kotlin.annotation.AnnotationTarget.*
-
-/**
- * Contains the list of code elements which are the possible annotation targets
- */
-public enum class AnnotationTarget {
-    /** Class, interface or object, annotation class is also included */
-    CLASS,
-    /** Annotation class only */
-    ANNOTATION_CLASS,
-    /** Generic type parameter (unsupported yet) */
-    TYPE_PARAMETER,
-    /** Property */
-    PROPERTY,
-    /** Field, including property's backing field */
-    FIELD,
-    /** Local variable */
-    LOCAL_VARIABLE,
-    /** Value parameter of a function or a constructor */
-    VALUE_PARAMETER,
-    /** Constructor only (primary or secondary) */
-    CONSTRUCTOR,
-    /** Function (constructors are not included) */
-    FUNCTION,
-    /** Property getter only */
-    PROPERTY_GETTER,
-    /** Property setter only */
-    PROPERTY_SETTER,
-    /** Type usage */
-    TYPE,
-    /** Any expression */
-    EXPRESSION,
-    /** File */
-    FILE,
-    /** Type alias */
-    @SinceKotlin("1.1")
-    TYPEALIAS
-}
-
-/**
- * Contains the list of possible annotation's retentions.
- *
- * Determines how an annotation is stored in binary output.
- */
-public enum class AnnotationRetention {
-    /** Annotation isn't stored in binary output */
-    SOURCE,
-    /** Annotation is stored in binary output, but invisible for reflection */
-    BINARY,
-    /** Annotation is stored in binary output and visible for reflection (default retention) */
-    RUNTIME
-}
-
-/**
- * This meta-annotation indicates the kinds of code elements which are possible targets of an annotation.
- *
- * If the target meta-annotation is not present on an annotation declaration, the annotation is applicable to the following elements:
- * [CLASS], [PROPERTY], [FIELD], [LOCAL_VARIABLE], [VALUE_PARAMETER], [CONSTRUCTOR], [FUNCTION], [PROPERTY_GETTER], [PROPERTY_SETTER].
- *
- * @property allowedTargets list of allowed annotation targets
- */
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-@MustBeDocumented
-public annotation class Target(vararg val allowedTargets: AnnotationTarget)
-
-/**
- * This meta-annotation determines whether an annotation is stored in binary output and visible for reflection. By default, both are true.
- *
- * @property value necessary annotation retention (RUNTIME, BINARY or SOURCE)
- */
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-public annotation class Retention(val value: AnnotationRetention = AnnotationRetention.RUNTIME)
-
-/**
- * This meta-annotation determines that an annotation is applicable twice or more on a single code element
- */
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-public annotation class Repeatable
-
-/**
- * This meta-annotation determines that an annotation is a part of public API and therefore should be included in the generated
- * documentation for the element to which the annotation is applied.
- */
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-public annotation class MustBeDocumented
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/internal/InternalAnnotations.kt b/libraries/stdlib/wasm/builtins/src/kotlin/internal/InternalAnnotations.kt
deleted file mode 100644
index 09daa9dfda7..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/internal/InternalAnnotations.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin.internal
-
-/**
- * Specifies that the corresponding type parameter is not used for unsafe operations such as casts or 'is' checks
- * That means it's completely safe to use generic types as argument for such parameter.
- */
-@Target(AnnotationTarget.TYPE_PARAMETER)
-@Retention(AnnotationRetention.BINARY)
-internal annotation class PureReifiable
-
-/**
- * Specifies that the corresponding built-in method exists depending on platform.
- * Current implementation for JVM looks whether method with same JVM descriptor exists in the module JDK.
- * For example MutableMap.remove(K, V) available only if corresponding
- * method 'java/util/Map.remove(Ljava/lang/Object;Ljava/lang/Object;)Z' is defined in JDK (i.e. for major versions >= 8)
- */
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.BINARY)
-internal annotation class PlatformDependent
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KAnnotatedElement.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KAnnotatedElement.kt
deleted file mode 100644
index 4fa1a1e29eb..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KAnnotatedElement.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.reflect
-
-/**
- * Represents an annotated element and allows to obtain its annotations.
- * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/annotations.html)
- * for more information.
- */
-public interface KAnnotatedElement {
-    /**
-     * Annotations which are present on this element.
-     */
-    public val annotations: List<Annotation>
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KCallable.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KCallable.kt
deleted file mode 100644
index a95dbf4fed1..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KCallable.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.reflect
-
-/**
- * Represents a callable entity, such as a function or a property.
- *
- * @param R return type of the callable.
- */
-public  interface KCallable<out R> : KAnnotatedElement {
-    /**
-     * The name of this callable as it was declared in the source code.
-     * If the callable has no name, a special invented name is created.
-     * Nameless callables include:
-     * - constructors have the name "<init>",
-     * - property accessors: the getter for a property named "foo" will have the name "<get-foo>",
-     *   the setter, similarly, will have the name "<set-foo>".
-     */
-    public  val name: String
-
-    /**
-     * Parameters required to make a call to this callable.
-     * If this callable requires a `this` instance or an extension receiver parameter,
-     * they come first in the list in that order.
-     */
-    public val parameters: List<KParameter>
-
-    /**
-     * The type of values returned by this callable.
-     */
-    public val returnType: KType
-
-    /**
-     * The list of type parameters of this callable.
-     */
-    @SinceKotlin("1.1")
-    public val typeParameters: List<KTypeParameter>
-
-    /**
-     * Calls this callable with the specified list of arguments and returns the result.
-     * Throws an exception if the number of specified arguments is not equal to the size of [parameters],
-     * or if their types do not match the types of the parameters.
-     */
-    public fun call(vararg args: Any?): R
-
-    /**
-     * Calls this callable with the specified mapping of parameters to arguments and returns the result.
-     * If a parameter is not found in the mapping and is not optional (as per [KParameter.isOptional]),
-     * or its type does not match the type of the provided value, an exception is thrown.
-     */
-    public fun callBy(args: Map<KParameter, Any?>): R
-
-    /**
-     * Visibility of this callable, or `null` if its visibility cannot be represented in Kotlin.
-     */
-    @SinceKotlin("1.1")
-    public val visibility: KVisibility?
-
-    /**
-     * `true` if this callable is `final`.
-     */
-    @SinceKotlin("1.1")
-    public val isFinal: Boolean
-
-    /**
-     * `true` if this callable is `open`.
-     */
-    @SinceKotlin("1.1")
-    public val isOpen: Boolean
-
-    /**
-     * `true` if this callable is `abstract`.
-     */
-    @SinceKotlin("1.1")
-    public val isAbstract: Boolean
-
-    /**
-     * `true` if this is a suspending function.
-     */
-    @SinceKotlin("1.3")
-    public val isSuspend: Boolean
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KClass.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KClass.kt
deleted file mode 100644
index 29f99188475..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KClass.kt
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.reflect
-
-/**
- * Represents a class and provides introspection capabilities.
- * Instances of this class are obtainable by the `::class` syntax.
- * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/reflection.html#class-references)
- * for more information.
- *
- * @param T the type of the class.
- */
-public  interface KClass<T : Any> : KDeclarationContainer, KAnnotatedElement, KClassifier {
-    /**
-     * The simple name of the class as it was declared in the source code,
-     * or `null` if the class has no name (if, for example, it is an anonymous object literal).
-     */
-    public  val simpleName: String?
-
-    /**
-     * The fully qualified dot-separated name of the class,
-     * or `null` if the class is local or it is an anonymous object literal.
-     */
-    public val qualifiedName: String?
-
-    /**
-     * All functions and properties accessible in this class, including those declared in this class
-     * and all of its superclasses. Does not include constructors.
-     */
-    override val members: Collection<KCallable<*>>
-
-    /**
-     * All constructors declared in this class.
-     */
-    public val constructors: Collection<KFunction<T>>
-
-    /**
-     * All classes declared inside this class. This includes both inner and static nested classes.
-     */
-    public val nestedClasses: Collection<KClass<*>>
-
-    /**
-     * The instance of the object declaration, or `null` if this class is not an object declaration.
-     */
-    public val objectInstance: T?
-
-    /**
-     * Returns `true` if [value] is an instance of this class on a given platform.
-     */
-    @SinceKotlin("1.1")
-    public fun isInstance(value: Any?): Boolean
-
-    /**
-     * The list of type parameters of this class. This list does *not* include type parameters of outer classes.
-     */
-    @SinceKotlin("1.1")
-    public val typeParameters: List<KTypeParameter>
-
-    /**
-     * The list of immediate supertypes of this class, in the order they are listed in the source code.
-     */
-    @SinceKotlin("1.1")
-    public val supertypes: List<KType>
-
-    /**
-     * The list of the immediate subclasses if this class is a sealed class, or an empty list otherwise.
-     */
-    @SinceKotlin("1.3")
-    public val sealedSubclasses: List<KClass<out T>>
-
-    /**
-     * Visibility of this class, or `null` if its visibility cannot be represented in Kotlin.
-     */
-    @SinceKotlin("1.1")
-    public val visibility: KVisibility?
-
-    /**
-     * `true` if this class is `final`.
-     */
-    @SinceKotlin("1.1")
-    public val isFinal: Boolean
-
-    /**
-     * `true` if this class is `open`.
-     */
-    @SinceKotlin("1.1")
-    public val isOpen: Boolean
-
-    /**
-     * `true` if this class is `abstract`.
-     */
-    @SinceKotlin("1.1")
-    public val isAbstract: Boolean
-
-    /**
-     * `true` if this class is `sealed`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/sealed-classes.html)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isSealed: Boolean
-
-    /**
-     * `true` if this class is a data class.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/data-classes.html)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isData: Boolean
-
-    /**
-     * `true` if this class is an inner class.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/nested-classes.html#inner-classes)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isInner: Boolean
-
-    /**
-     * `true` if this class is a companion object.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/object-declarations.html#companion-objects)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isCompanion: Boolean
-
-    /**
-     * Returns `true` if this [KClass] instance represents the same Kotlin class as the class represented by [other].
-     * On JVM this means that all of the following conditions are satisfied:
-     *
-     * 1. [other] has the same (fully qualified) Kotlin class name as this instance.
-     * 2. [other]'s backing [Class] object is loaded with the same class loader as the [Class] object of this instance.
-     * 3. If the classes represent [Array], then [Class] objects of their element types are equal.
-     *
-     * For example, on JVM, [KClass] instances for a primitive type (`int`) and the corresponding wrapper type (`java.lang.Integer`)
-     * are considered equal, because they have the same fully qualified name "kotlin.Int".
-     */
-    override fun equals(other: Any?): Boolean
-
-    override fun hashCode(): Int
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KClassifier.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KClassifier.kt
deleted file mode 100644
index 3c804e9cfa6..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KClassifier.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin.reflect
-
-/**
- * A classifier is either a class or a type parameter.
- *
- * @see [KClass]
- * @see [KTypeParameter]
- */
-@SinceKotlin("1.1")
-public interface KClassifier
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KDeclarationContainer.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KDeclarationContainer.kt
deleted file mode 100644
index 447cfb33d49..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KDeclarationContainer.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin.reflect
-
-/**
- * Represents an entity which may contain declarations of any other entities,
- * such as a class or a package.
- */
-public interface KDeclarationContainer {
-    /**
-     * All functions and properties accessible in this container.
-     */
-    public val members: Collection<KCallable<*>>
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KFunction.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KFunction.kt
deleted file mode 100644
index 72b975b9313..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KFunction.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.reflect
-
-/**
- * Represents a function with introspection capabilities.
- */
-public interface KFunction<out R> : KCallable<R>, Function<R> {
-    /**
-     * `true` if this function is `inline`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/inline-functions.html)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isInline: Boolean
-
-    /**
-     * `true` if this function is `external`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/java-interop.html#using-jni-with-kotlin)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isExternal: Boolean
-
-    /**
-     * `true` if this function is `operator`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/operator-overloading.html)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isOperator: Boolean
-
-    /**
-     * `true` if this function is `infix`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/functions.html#infix-notation)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isInfix: Boolean
-
-    /**
-     * `true` if this is a suspending function.
-     */
-    @SinceKotlin("1.1")
-    public override val isSuspend: Boolean
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KParameter.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KParameter.kt
deleted file mode 100644
index 2267986d45f..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KParameter.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin.reflect
-
-/**
- * Represents a parameter passed to a function or a property getter/setter,
- * including `this` and extension receiver parameters.
- */
-public interface KParameter : KAnnotatedElement {
-    /**
-     * 0-based index of this parameter in the parameter list of its containing callable.
-     */
-    public val index: Int
-
-    /**
-     * Name of this parameter as it was declared in the source code,
-     * or `null` if the parameter has no name or its name is not available at runtime.
-     * Examples of nameless parameters include `this` instance for member functions,
-     * extension receiver for extension functions or properties, parameters of Java methods
-     * compiled without the debug information, and others.
-     */
-    public val name: String?
-
-    /**
-     * Type of this parameter. For a `vararg` parameter, this is the type of the corresponding array,
-     * not the individual element.
-     */
-    public val type: KType
-
-    /**
-     * Kind of this parameter.
-     */
-    public val kind: Kind
-
-    /**
-     * Kind represents a particular position of the parameter declaration in the source code,
-     * such as an instance, an extension receiver parameter or a value parameter.
-     */
-    public enum class Kind {
-        /** Instance required to make a call to the member, or an outer class instance for an inner class constructor. */
-        INSTANCE,
-
-        /** Extension receiver of an extension function or property. */
-        EXTENSION_RECEIVER,
-
-        /** Ordinary named value parameter. */
-        VALUE,
-    }
-
-    /**
-     * `true` if this parameter is optional and can be omitted when making a call via [KCallable.callBy], or `false` otherwise.
-     *
-     * A parameter is optional in any of the two cases:
-     * 1. The default value is provided at the declaration of this parameter.
-     * 2. The parameter is declared in a member function and one of the corresponding parameters in the super functions is optional.
-     */
-    public val isOptional: Boolean
-
-    /**
-     * `true` if this parameter is `vararg`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/functions.html#variable-number-of-arguments-varargs)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isVararg: Boolean
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KProperty.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KProperty.kt
deleted file mode 100644
index 70704209c81..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KProperty.kt
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("IMPLEMENTING_FUNCTION_INTERFACE")
-package kotlin.reflect
-
-/**
- * Represents a property, such as a named `val` or `var` declaration.
- * Instances of this class are obtainable by the `::` operator.
- * 
- * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/reflection.html)
- * for more information.
- *
- * @param R the type of the property.
- */
-public interface KProperty<out R> : KCallable<R> {
-    /**
-     * `true` if this property is `lateinit`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/properties.html#late-initialized-properties)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isLateinit: Boolean
-
-    /**
-     * `true` if this property is `const`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/properties.html#compile-time-constants)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public val isConst: Boolean
-
-    /** The getter of this property, used to obtain the value of the property. */
-    public val getter: Getter<R>
-
-    /**
-     * Represents a property accessor, which is a `get` or `set` method declared alongside the property.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/properties.html#getters-and-setters)
-     * for more information.
-     *
-     * @param R the type of the property, which it is an accessor of.
-     */
-    public interface Accessor<out R> {
-        /** The property which this accessor is originated from. */
-        public val property: KProperty<R>
-    }
-
-    /**
-     * Getter of the property is a `get` method declared alongside the property.
-     */
-    public interface Getter<out R> : Accessor<R>, KFunction<R>
-}
-
-/**
- * Represents a property declared as a `var`.
- */
-public interface KMutableProperty<R> : KProperty<R> {
-    /** The setter of this mutable property, used to change the value of the property. */
-    public val setter: Setter<R>
-
-    /**
-     * Setter of the property is a `set` method declared alongside the property.
-     */
-    public interface Setter<R> : KProperty.Accessor<R>, KFunction<Unit>
-}
-
-
-/**
- * Represents a property without any kind of receiver.
- * Such property is either originally declared in a receiverless context such as a package,
- * or has the receiver bound to it.
- */
-public interface KProperty0<out R> : KProperty<R>, () -> R {
-    /**
-     * Returns the current value of the property.
-     */
-    public  fun get(): R
-
-    /**
-     * Returns the value of the delegate if this is a delegated property, or `null` if this property is not delegated.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/delegated-properties.html)
-     * for more information.
-     */
-    @SinceKotlin("1.1")
-    public fun getDelegate(): Any?
-
-    override val getter: Getter<R>
-
-    /**
-     * Getter of the property is a `get` method declared alongside the property.
-     *
-     * Can be used as a function that takes 0 arguments and returns the value of the property type [R].
-     */
-    public interface Getter<out R> : KProperty.Getter<R>, () -> R
-}
-
-/**
- * Represents a `var`-property without any kind of receiver.
- */
-public  interface KMutableProperty0<R> : KProperty0<R>, KMutableProperty<R> {
-    /**
-     * Modifies the value of the property.
-     *
-     * @param value the new value to be assigned to this property.
-     */
-    public  fun set(value: R)
-
-    override val setter: Setter<R>
-
-    /**
-     * Setter of the property is a `set` method declared alongside the property.
-     *
-     * Can be used as a function that takes new property value as an argument and returns [Unit].
-     */
-    public interface Setter<R> : KMutableProperty.Setter<R>, (R) -> Unit
-}
-
-
-/**
- * Represents a property, operations on which take one receiver as a parameter.
- *
- * @param T the type of the receiver which should be used to obtain the value of the property.
- * @param R the type of the property.
- */
-public  interface KProperty1<T, out R> : KProperty<R>, (T) -> R {
-    /**
-     * Returns the current value of the property.
-     *
-     * @param receiver the receiver which is used to obtain the value of the property.
-     *                 For example, it should be a class instance if this is a member property of that class,
-     *                 or an extension receiver if this is a top level extension property.
-     */
-    public  fun get(receiver: T): R
-
-    /**
-     * Returns the value of the delegate if this is a delegated property, or `null` if this property is not delegated.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/delegated-properties.html)
-     * for more information.
-     *
-     * Note that for a top level **extension** property, the delegate is the same for all extension receivers,
-     * so the  [receiver] instance passed in is not going to make any difference, it must only be a value of [T].
-     *
-     * @param receiver the receiver which is used to obtain the value of the property delegate.
-     *                 For example, it should be a class instance if this is a member property of that class,
-     *                 or an extension receiver if this is a top level extension property.
-     *
-     * @see [kotlin.reflect.full.getExtensionDelegate] // [KProperty1.getExtensionDelegate]
-     */
-    @SinceKotlin("1.1")
-    public fun getDelegate(receiver: T): Any?
-
-    override val getter: Getter<T, R>
-
-    /**
-     * Getter of the property is a `get` method declared alongside the property.
-     *
-     * Can be used as a function that takes an argument of type [T] (the receiver) and returns the value of the property type [R].
-     */
-    public interface Getter<T, out R> : KProperty.Getter<R>, (T) -> R
-}
-
-/**
- * Represents a `var`-property, operations on which take one receiver as a parameter.
- */
-public  interface KMutableProperty1<T, R> : KProperty1<T, R>, KMutableProperty<R> {
-    /**
-     * Modifies the value of the property.
-     *
-     * @param receiver the receiver which is used to modify the value of the property.
-     *                 For example, it should be a class instance if this is a member property of that class,
-     *                 or an extension receiver if this is a top level extension property.
-     * @param value the new value to be assigned to this property.
-     */
-    public  fun set(receiver: T, value: R)
-
-    override val setter: Setter<T, R>
-
-    /**
-     * Setter of the property is a `set` method declared alongside the property.
-     *
-     * Can be used as a function that takes the receiver and the new property value as arguments and returns [Unit].
-     */
-    public interface Setter<T, R> : KMutableProperty.Setter<R>, (T, R) -> Unit
-}
-
-
-/**
- * Represents a property, operations on which take two receivers as parameters,
- * such as an extension property declared in a class.
- *
- * @param D the type of the first receiver. In case of the extension property in a class this is
- *        the type of the declaring class of the property, or any subclass of that class.
- * @param E the type of the second receiver. In case of the extension property in a class this is
- *        the type of the extension receiver.
- * @param R the type of the property.
- */
-public  interface KProperty2<D, E, out R> : KProperty<R>, (D, E) -> R {
-    /**
-     * Returns the current value of the property. In case of the extension property in a class,
-     * the instance of the class should be passed first and the instance of the extension receiver second.
-     *
-     * @param receiver1 the instance of the first receiver.
-     * @param receiver2 the instance of the second receiver.
-     */
-    public  fun get(receiver1: D, receiver2: E): R
-
-    /**
-     * Returns the value of the delegate if this is a delegated property, or `null` if this property is not delegated.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/delegated-properties.html)
-     * for more information.
-     *
-     * In case of the extension property in a class, the instance of the class should be passed first
-     * and the instance of the extension receiver second.
-     *
-     * @param receiver1 the instance of the first receiver.
-     * @param receiver2 the instance of the second receiver.
-     *
-     * @see [kotlin.reflect.full.getExtensionDelegate] // [KProperty2.getExtensionDelegate]
-     */
-    @SinceKotlin("1.1")
-    public fun getDelegate(receiver1: D, receiver2: E): Any?
-
-    override val getter: Getter<D, E, R>
-
-    /**
-     * Getter of the property is a `get` method declared alongside the property.
-     *
-     * Can be used as a function that takes an argument of type [D] (the first receiver), an argument of type [E] (the second receiver)
-     * and returns the value of the property type [R].
-     */
-    public interface Getter<D, E, out R> : KProperty.Getter<R>, (D, E) -> R
-}
-
-/**
- * Represents a `var`-property, operations on which take two receivers as parameters.
- */
-public  interface KMutableProperty2<D, E, R> : KProperty2<D, E, R>, KMutableProperty<R> {
-    /**
-     * Modifies the value of the property.
-     *
-     * @param receiver1 the instance of the first receiver.
-     * @param receiver2 the instance of the second receiver.
-     * @param value the new value to be assigned to this property.
-     */
-    public  fun set(receiver1: D, receiver2: E, value: R)
-
-    override val setter: Setter<D, E, R>
-
-    /**
-     * Setter of the property is a `set` method declared alongside the property.
-     *
-     * Can be used as a function that takes an argument of type [D] (the first receiver), an argument of type [E] (the second receiver),
-     * and the new property value and returns [Unit].
-     */
-    public interface Setter<D, E, R> : KMutableProperty.Setter<R>, (D, E, R) -> Unit
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KType.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KType.kt
deleted file mode 100644
index dc3263244f3..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KType.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.reflect
-
-/**
- * Represents a type. Type is usually either a class with optional type arguments,
- * or a type parameter of some declaration, plus nullability.
- */
-public interface KType : KAnnotatedElement {
-    /**
-     * The declaration of the classifier used in this type.
-     * For example, in the type `List<String>` the classifier would be the [KClass] instance for [List].
-     *
-     * Returns `null` if this type is not denotable in Kotlin, for example if it is an intersection type.
-     */
-    @SinceKotlin("1.1")
-    public val classifier: KClassifier?
-
-    /**
-     * Type arguments passed for the parameters of the classifier in this type.
-     * For example, in the type `Array<out Number>` the only type argument is `out Number`.
-     *
-     * In case this type is based on an inner class, the returned list contains the type arguments provided for the innermost class first,
-     * then its outer class, and so on.
-     * For example, in the type `Outer<A, B>.Inner<C, D>` the returned list is `[C, D, A, B]`.
-     */
-    @SinceKotlin("1.1")
-    public val arguments: List<KTypeProjection>
-
-    /**
-     * `true` if this type was marked nullable in the source code.
-     *
-     * For Kotlin types, it means that `null` value is allowed to be represented by this type.
-     * In practice it means that the type was declared with a question mark at the end.
-     * For non-Kotlin types, it means the type or the symbol which was declared with this type
-     * is annotated with a runtime-retained nullability annotation such as [javax.annotation.Nullable].
-     *
-     * Note that even if [isMarkedNullable] is false, values of the type can still be `null`.
-     * This may happen if it is a type of the type parameter with a nullable upper bound:
-     *
-     * ```
-     * fun <T> foo(t: T) {
-     *     // isMarkedNullable == false for t's type, but t can be null here when T = "Any?"
-     * }
-     * ```
-     */
-    public val isMarkedNullable: Boolean
-}
-
-/**
- * Represents a type projection. Type projection is usually the argument to another type in a type usage.
- * For example, in the type `Array<out Number>`, `out Number` is the covariant projection of the type represented by the class `Number`.
- *
- * Type projection is either the star projection, or an entity consisting of a specific type plus optional variance.
- *
- * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/generics.html#type-projections)
- * for more information.
- */
-@SinceKotlin("1.1")
-public data class KTypeProjection constructor(
-        /**
-         * The use-site variance specified in the projection, or `null` if this is a star projection.
-         */
-        public val variance: KVariance?,
-        /**
-         * The type specified in the projection, or `null` if this is a star projection.
-         */
-        public val type: KType?
-) {
-    public companion object {
-        /**
-         * Star projection, denoted by the `*` character.
-         * For example, in the type `KClass<*>`, `*` is the star projection.
-         * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/generics.html#star-projections)
-         * for more information.
-         */
-        public val STAR: KTypeProjection = KTypeProjection(null, null)
-
-        /**
-         * Creates an invariant projection of a given type. Invariant projection is just the type itself,
-         * without any use-site variance modifiers applied to it.
-         * For example, in the type `Set<String>`, `String` is an invariant projection of the type represented by the class `String`.
-         */
-        public fun invariant(type: KType): KTypeProjection =
-                KTypeProjection(KVariance.INVARIANT, type)
-
-        /**
-         * Creates a contravariant projection of a given type, denoted by the `in` modifier applied to a type.
-         * For example, in the type `MutableList<in Number>`, `in Number` is a contravariant projection of the type of class `Number`.
-         */
-        public fun contravariant(type: KType): KTypeProjection =
-                KTypeProjection(KVariance.IN, type)
-
-        /**
-         * Creates a covariant projection of a given type, denoted by the `out` modifier applied to a type.
-         * For example, in the type `Array<out Number>`, `out Number` is a covariant projection of the type of class `Number`.
-         */
-        public fun covariant(type: KType): KTypeProjection =
-                KTypeProjection(KVariance.OUT, type)
-    }
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KTypeParameter.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KTypeParameter.kt
deleted file mode 100644
index 5351ffc7100..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KTypeParameter.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.reflect
-
-/**
- * Represents a declaration of a type parameter of a class or a callable.
- * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/generics.html#generics)
- * for more information.
- */
-@SinceKotlin("1.1")
-public interface KTypeParameter : KClassifier {
-    /**
-     * The name of this type parameter as it was declared in the source code.
-     */
-    public val name: String
-
-    /**
-     * Upper bounds, or generic constraints imposed on this type parameter.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/generics.html#upper-bounds)
-     * for more information.
-     */
-    public val upperBounds: List<KType>
-
-    /**
-     * Declaration-site variance of this type parameter.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/generics.html#declaration-site-variance)
-     * for more information.
-     */
-    public val variance: KVariance
-
-    /**
-     * `true` if this type parameter is `reified`.
-     * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/inline-functions.html#reified-type-parameters)
-     * for more information.
-     */
-    public val isReified: Boolean
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KVariance.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KVariance.kt
deleted file mode 100644
index 9a237cbbb9b..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KVariance.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin.reflect
-
-/**
- * Represents variance applied to a type parameter on the declaration site (*declaration-site variance*),
- * or to a type in a projection (*use-site variance*).
- *
- * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/generics.html#variance)
- * for more information.
- *
- * @see [KTypeParameter.variance]
- * @see [KTypeProjection]
- */
-@SinceKotlin("1.1")
-enum class KVariance {
-    /**
-     * The affected type parameter or type is *invariant*, which means it has no variance applied to it.
-     */
-    INVARIANT,
-
-    /**
-     * The affected type parameter or type is *contravariant*. Denoted by the `in` modifier in the source code.
-     */
-    IN,
-
-    /**
-     * The affected type parameter or type is *covariant*. Denoted by the `out` modifier in the source code.
-     */
-    OUT,
-}
diff --git a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KVisibility.kt b/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KVisibility.kt
deleted file mode 100644
index 6ddd7e1769b..00000000000
--- a/libraries/stdlib/wasm/builtins/src/kotlin/reflect/KVisibility.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin.reflect
-
-/**
- * Visibility is an aspect of a Kotlin declaration regulating where that declaration is accessible in the source code.
- * Visibility can be changed with one of the following modifiers: `public`, `protected`, `internal`, `private`.
- *
- * Note that some Java visibilities such as package-private and protected (which also gives access to items from the same package)
- * cannot be represented in Kotlin, so there's no [KVisibility] value corresponding to them.
- *
- * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/visibility-modifiers.html)
- * for more information.
- */
-@SinceKotlin("1.1")
-enum class KVisibility {
-    /**
-     * Visibility of declarations marked with the `public` modifier, or with no modifier at all.
-     */
-    PUBLIC,
-
-    /**
-     * Visibility of declarations marked with the `protected` modifier.
-     */
-    PROTECTED,
-
-    /**
-     * Visibility of declarations marked with the `internal` modifier.
-     */
-    INTERNAL,
-
-    /**
-     * Visibility of declarations marked with the `private` modifier.
-     */
-    PRIVATE,
-}
diff --git a/libraries/stdlib/wasm/internal/WasmInstructions.kt b/libraries/stdlib/wasm/internal/WasmInstructions.kt
deleted file mode 100644
index a4369aed7ea..00000000000
--- a/libraries/stdlib/wasm/internal/WasmInstructions.kt
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:ExcludedFromCodegen
-@file:Suppress("NON_ABSTRACT_FUNCTION_WITH_NO_BODY", "unused")
-
-package kotlin.wasm.internal
-
-@WasmInstruction(WasmInstruction.UNREACHABLE)
-external fun wasm_unreachable(): Nothing
-
-@WasmInstruction(WasmInstruction.I32_EQZ)
-external fun wasm_i32_eqz(a: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_EQ)
-external fun wasm_i32_eq(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_NE)
-external fun wasm_i32_ne(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_LT_S)
-external fun wasm_i32_lt_s(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_LT_U)
-external fun wasm_i32_lt_u(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_GT_S)
-external fun wasm_i32_gt_s(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_GT_U)
-external fun wasm_i32_gt_u(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_LE_S)
-external fun wasm_i32_le_s(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_LE_U)
-external fun wasm_i32_le_u(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_GE_S)
-external fun wasm_i32_ge_s(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_GE_U)
-external fun wasm_i32_ge_u(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I64_EQZ)
-external fun wasm_i64_eqz(a: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_EQ)
-external fun wasm_i64_eq(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_NE)
-external fun wasm_i64_ne(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_LT_S)
-external fun wasm_i64_lt_s(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_LT_U)
-external fun wasm_i64_lt_u(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_GT_S)
-external fun wasm_i64_gt_s(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_GT_U)
-external fun wasm_i64_gt_u(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_LE_S)
-external fun wasm_i64_le_s(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_LE_U)
-external fun wasm_i64_le_u(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_GE_S)
-external fun wasm_i64_ge_s(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.I64_GE_U)
-external fun wasm_i64_ge_u(a: Long, b: Long): Int
-
-@WasmInstruction(WasmInstruction.F32_EQ)
-external fun wasm_f32_eq(a: Float, b: Float): Int
-
-@WasmInstruction(WasmInstruction.F32_NE)
-external fun wasm_f32_ne(a: Float, b: Float): Int
-
-@WasmInstruction(WasmInstruction.F32_LT)
-external fun wasm_f32_lt(a: Float, b: Float): Int
-
-@WasmInstruction(WasmInstruction.F32_GT)
-external fun wasm_f32_gt(a: Float, b: Float): Int
-
-@WasmInstruction(WasmInstruction.F32_LE)
-external fun wasm_f32_le(a: Float, b: Float): Int
-
-@WasmInstruction(WasmInstruction.F32_GE)
-external fun wasm_f32_ge(a: Float, b: Float): Int
-
-@WasmInstruction(WasmInstruction.F64_EQ)
-external fun wasm_f64_eq(a: Double, b: Double): Int
-
-@WasmInstruction(WasmInstruction.F64_NE)
-external fun wasm_f64_ne(a: Double, b: Double): Int
-
-@WasmInstruction(WasmInstruction.F64_LT)
-external fun wasm_f64_lt(a: Double, b: Double): Int
-
-@WasmInstruction(WasmInstruction.F64_GT)
-external fun wasm_f64_gt(a: Double, b: Double): Int
-
-@WasmInstruction(WasmInstruction.F64_LE)
-external fun wasm_f64_le(a: Double, b: Double): Int
-
-@WasmInstruction(WasmInstruction.F64_GE)
-external fun wasm_f64_ge(a: Double, b: Double): Int
-
-@WasmInstruction(WasmInstruction.I32_CLZ)
-external fun wasm_i32_clz(a: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_CTZ)
-external fun wasm_i32_ctz(a: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_POPCNT)
-external fun wasm_i32_popcnt(a: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_ADD)
-external fun wasm_i32_add(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_SUB)
-external fun wasm_i32_sub(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_MUL)
-external fun wasm_i32_mul(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_DIV_S)
-external fun wasm_i32_div_s(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_DIV_U)
-external fun wasm_i32_div_u(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_REM_S)
-external fun wasm_i32_rem_s(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_REM_U)
-external fun wasm_i32_rem_u(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_AND)
-external fun wasm_i32_and(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_OR)
-external fun wasm_i32_or(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_XOR)
-external fun wasm_i32_xor(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_SHL)
-external fun wasm_i32_shl(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_SHR_S)
-external fun wasm_i32_shr_s(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_SHR_U)
-external fun wasm_i32_shr_u(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_ROTL)
-external fun wasm_i32_rotl(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I32_ROTR)
-external fun wasm_i32_rotr(a: Int, b: Int): Int
-
-@WasmInstruction(WasmInstruction.I64_CLZ)
-external fun wasm_i64_clz(a: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_CTZ)
-external fun wasm_i64_ctz(a: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_POPCNT)
-external fun wasm_i64_popcnt(a: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_ADD)
-external fun wasm_i64_add(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_SUB)
-external fun wasm_i64_sub(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_MUL)
-external fun wasm_i64_mul(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_DIV_S)
-external fun wasm_i64_div_s(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_DIV_U)
-external fun wasm_i64_div_u(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_REM_S)
-external fun wasm_i64_rem_s(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_REM_U)
-external fun wasm_i64_rem_u(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_AND)
-external fun wasm_i64_and(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_OR)
-external fun wasm_i64_or(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_XOR)
-external fun wasm_i64_xor(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_SHL)
-external fun wasm_i64_shl(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_SHR_S)
-external fun wasm_i64_shr_s(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_SHR_U)
-external fun wasm_i64_shr_u(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_ROTL)
-external fun wasm_i64_rotl(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.I64_ROTR)
-external fun wasm_i64_rotr(a: Long, b: Long): Long
-
-@WasmInstruction(WasmInstruction.F32_ABS)
-external fun wasm_f32_abs(a: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_NEG)
-external fun wasm_f32_neg(a: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_CEIL)
-external fun wasm_f32_ceil(a: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_FLOOR)
-external fun wasm_f32_floor(a: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_TRUNC)
-external fun wasm_f32_trunc(a: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_NEAREST)
-external fun wasm_f32_nearest(a: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_SQRT)
-external fun wasm_f32_sqrt(a: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_ADD)
-external fun wasm_f32_add(a: Float, b: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_SUB)
-external fun wasm_f32_sub(a: Float, b: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_MUL)
-external fun wasm_f32_mul(a: Float, b: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_DIV)
-external fun wasm_f32_div(a: Float, b: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_FMIN)
-external fun wasm_f32_fmin(a: Float, b: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_FMAX)
-external fun wasm_f32_fmax(a: Float, b: Float): Float
-
-@WasmInstruction(WasmInstruction.F32_COPYSIGN)
-external fun wasm_f32_copysign(a: Float, b: Float): Float
-
-@WasmInstruction(WasmInstruction.F64_ABS)
-external fun wasm_f64_abs(a: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_NEG)
-external fun wasm_f64_neg(a: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_CEIL)
-external fun wasm_f64_ceil(a: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_FLOOR)
-external fun wasm_f64_floor(a: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_TRUNC)
-external fun wasm_f64_trunc(a: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_NEAREST)
-external fun wasm_f64_nearest(a: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_SQRT)
-external fun wasm_f64_sqrt(a: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_ADD)
-external fun wasm_f64_add(a: Double, b: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_SUB)
-external fun wasm_f64_sub(a: Double, b: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_MUL)
-external fun wasm_f64_mul(a: Double, b: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_DIV)
-external fun wasm_f64_div(a: Double, b: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_FMIN)
-external fun wasm_f64_fmin(a: Double, b: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_FMAX)
-external fun wasm_f64_fmax(a: Double, b: Double): Double
-
-@WasmInstruction(WasmInstruction.F64_COPYSIGN)
-external fun wasm_f64_copysign(a: Double, b: Double): Double
-
-@WasmInstruction(WasmInstruction.I32_WRAP_I64)
-external fun wasm_i32_wrap_i64(a: Long): Int
-
-@WasmInstruction(WasmInstruction.I32_TRUNC_F32_S)
-external fun wasm_i32_trunc_f32_s(a: Float): Int
-
-@WasmInstruction(WasmInstruction.I32_TRUNC_F32_U)
-external fun wasm_i32_trunc_f32_u(a: Float): Int
-
-@WasmInstruction(WasmInstruction.I32_TRUNC_F64_S)
-external fun wasm_i32_trunc_f64_s(a: Double): Int
-
-@WasmInstruction(WasmInstruction.I32_TRUNC_F64_U)
-external fun wasm_i32_trunc_f64_u(a: Double): Int
-
-@WasmInstruction(WasmInstruction.I64_EXTEND_I32_S)
-external fun wasm_i64_extend_i32_s(a: Int): Long
-
-@WasmInstruction(WasmInstruction.I64_EXTEND_I32_U)
-external fun wasm_i64_extend_i32_u(a: Int): Long
-
-@WasmInstruction(WasmInstruction.I64_TRUNC_F32_S)
-external fun wasm_i64_trunc_f32_s(a: Float): Long
-
-@WasmInstruction(WasmInstruction.I64_TRUNC_F32_U)
-external fun wasm_i64_trunc_f32_u(a: Float): Long
-
-@WasmInstruction(WasmInstruction.I64_TRUNC_F64_S)
-external fun wasm_i64_trunc_f64_s(a: Double): Long
-
-@WasmInstruction(WasmInstruction.I64_TRUNC_F64_U)
-external fun wasm_i64_trunc_f64_u(a: Double): Long
-
-@WasmInstruction(WasmInstruction.F32_CONVERT_I32_S)
-external fun wasm_f32_convert_i32_s(a: Int): Float
-
-@WasmInstruction(WasmInstruction.F32_CONVERT_I32_U)
-external fun wasm_f32_convert_i32_u(a: Int): Float
-
-@WasmInstruction(WasmInstruction.F32_CONVERT_I64_S)
-external fun wasm_f32_convert_i64_s(a: Long): Float
-
-@WasmInstruction(WasmInstruction.F32_CONVERT_I64_U)
-external fun wasm_f32_convert_i64_u(a: Long): Float
-
-@WasmInstruction(WasmInstruction.F32_DEMOTE_F64)
-external fun wasm_f32_demote_f64(a: Double): Float
-
-@WasmInstruction(WasmInstruction.F64_CONVERT_I32_S)
-external fun wasm_f64_convert_i32_s(a: Int): Double
-
-@WasmInstruction(WasmInstruction.F64_CONVERT_I32_U)
-external fun wasm_f64_convert_i32_u(a: Int): Double
-
-@WasmInstruction(WasmInstruction.F64_CONVERT_I64_S)
-external fun wasm_f64_convert_i64_s(a: Long): Double
-
-@WasmInstruction(WasmInstruction.F64_CONVERT_I64_U)
-external fun wasm_f64_convert_i64_u(a: Long): Double
-
-@WasmInstruction(WasmInstruction.F64_PROMOTE_F32)
-external fun wasm_f64_promote_f32(a: Float): Double
-
-@WasmInstruction(WasmInstruction.I32_REINTERPRET_F32)
-external fun wasm_i32_reinterpret_f32(a: Float): Int
-
-@WasmInstruction(WasmInstruction.I64_REINTERPRET_F64)
-external fun wasm_i64_reinterpret_f64(a: Double): Long
-
-@WasmInstruction(WasmInstruction.F32_REINTERPRET_I32)
-external fun wasm_f32_reinterpret_i32(a: Int): Float
-
-@WasmInstruction(WasmInstruction.F32_CONST_NAN)
-external fun wasm_f32_const_nan(): Float
-
-@WasmInstruction(WasmInstruction.F32_CONST_PLUS_INF)
-external fun wasm_f32_const_plus_inf(): Float
-
-@WasmInstruction(WasmInstruction.F32_CONST_MINUS_INF)
-external fun wasm_f32_const_minus_inf(): Float
-
-@WasmInstruction(WasmInstruction.F64_CONST_NAN)
-external fun wasm_f64_const_nan(): Double
-
-@WasmInstruction(WasmInstruction.F64_CONST_PLUS_INF)
-external fun wasm_f64_const_plus_inf(): Float
-
-@WasmInstruction(WasmInstruction.F64_CONST_MINUS_INF)
-external fun wasm_f64_const_minus_inf(): Float
-
diff --git a/libraries/stdlib/wasm/internal/WasmMath.kt b/libraries/stdlib/wasm/internal/WasmMath.kt
deleted file mode 100644
index bfe5e1681e4..00000000000
--- a/libraries/stdlib/wasm/internal/WasmMath.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.wasm.internal
-
-// `compareTo(x, y)` implemented as `(x >= y) - (x <= y)`
-
-fun wasm_i32_compareTo(x: Int, y: Int): Int =
-    wasm_i32_ge_s(x, y) - wasm_i32_le_s(x, y)
-
-fun wasm_i64_compareTo(x: Long, y: Long): Int =
-    wasm_i64_ge_s(x, y) - wasm_i64_le_s(x, y)
-
-fun wasm_f32_compareTo(x: Float, y: Float): Int =
-    wasm_f32_ge(x, y) - wasm_f32_le(x, y)
-
-fun wasm_f64_compareTo(x: Double, y: Double): Int =
-    wasm_f64_ge(x, y) - wasm_f64_le(x, y)
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/DefaultConstructorMarker.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/DefaultConstructorMarker.kt
new file mode 100644
index 00000000000..cc6a5de4771
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/DefaultConstructorMarker.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.wasm.internal
+
+internal object DefaultConstructorMarker
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/Function0.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/Function0.kt
new file mode 100644
index 00000000000..e542e4ee725
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/Function0.kt
@@ -0,0 +1,341 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("unused")
+
+package kotlin.wasm.internal
+
+/** A function that takes 0 arguments. */
+public interface Function0<out R> : Function<R> {
+    /** Invokes the function. */
+    public operator fun invoke(): R
+}
+
+/** A function that takes 1 argument. */
+public interface Function1<in P1, out R> : Function<R> {
+    /** Invokes the function with the specified argument. */
+    public operator fun invoke(p1: P1): R
+}
+
+/** A function that takes 2 arguments. */
+public interface Function2<in P1, in P2, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2): R
+}
+
+/** A function that takes 3 arguments. */
+public interface Function3<in P1, in P2, in P3, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3): R
+}
+
+/** A function that takes 4 arguments. */
+public interface Function4<in P1, in P2, in P3, in P4, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4): R
+}
+
+/** A function that takes 5 arguments. */
+public interface Function5<in P1, in P2, in P3, in P4, in P5, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5): R
+}
+
+/** A function that takes 6 arguments. */
+public interface Function6<in P1, in P2, in P3, in P4, in P5, in P6, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6): R
+}
+
+/** A function that takes 7 arguments. */
+public interface Function7<in P1, in P2, in P3, in P4, in P5, in P6, in P7, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7): R
+}
+
+/** A function that takes 8 arguments. */
+public interface Function8<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8): R
+}
+
+/** A function that takes 9 arguments. */
+public interface Function9<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9): R
+}
+
+/** A function that takes 10 arguments. */
+public interface Function10<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10): R
+}
+
+/** A function that takes 11 arguments. */
+public interface Function11<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11): R
+}
+
+/** A function that takes 12 arguments. */
+public interface Function12<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, out R> : Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12): R
+}
+
+/** A function that takes 13 arguments. */
+public interface Function13<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13
+    ): R
+}
+
+/** A function that takes 14 arguments. */
+public interface Function14<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14
+    ): R
+}
+
+/** A function that takes 15 arguments. */
+public interface Function15<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14,
+        p15: P15
+    ): R
+}
+
+/** A function that takes 16 arguments. */
+public interface Function16<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14,
+        p15: P15,
+        p16: P16
+    ): R
+}
+
+/** A function that takes 17 arguments. */
+public interface Function17<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14,
+        p15: P15,
+        p16: P16,
+        p17: P17
+    ): R
+}
+
+/** A function that takes 18 arguments. */
+public interface Function18<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14,
+        p15: P15,
+        p16: P16,
+        p17: P17,
+        p18: P18
+    ): R
+}
+
+/** A function that takes 19 arguments. */
+public interface Function19<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14,
+        p15: P15,
+        p16: P16,
+        p17: P17,
+        p18: P18,
+        p19: P19
+    ): R
+}
+
+/** A function that takes 20 arguments. */
+public interface Function20<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14,
+        p15: P15,
+        p16: P16,
+        p17: P17,
+        p18: P18,
+        p19: P19,
+        p20: P20
+    ): R
+}
+
+/** A function that takes 21 arguments. */
+public interface Function21<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, in P21, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14,
+        p15: P15,
+        p16: P16,
+        p17: P17,
+        p18: P18,
+        p19: P19,
+        p20: P20,
+        p21: P21
+    ): R
+}
+
+/** A function that takes 22 arguments. */
+public interface Function22<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, in P21, in P22, out R> :
+    Function<R> {
+    /** Invokes the function with the specified arguments. */
+    public operator fun invoke(
+        p1: P1,
+        p2: P2,
+        p3: P3,
+        p4: P4,
+        p5: P5,
+        p6: P6,
+        p7: P7,
+        p8: P8,
+        p9: P9,
+        p10: P10,
+        p11: P11,
+        p12: P12,
+        p13: P13,
+        p14: P14,
+        p15: P15,
+        p16: P16,
+        p17: P17,
+        p18: P18,
+        p19: P19,
+        p20: P20,
+        p21: P21,
+        p22: P22
+    ): R
+}
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/JsArray.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/JsArray.kt
new file mode 100644
index 00000000000..2d74af9b300
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/JsArray.kt
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+
+package kotlin.wasm.internal
+
+@ExcludedFromCodegen
+@WasmForeign
+internal class WasmExternRef
+
+@WasmImport("runtime", "JsArray_new")
+internal fun JsArray_new(size: Int): WasmExternRef =
+    implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_Byte(array: WasmExternRef, index: Int): Byte = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_Byte(array: WasmExternRef, index: Int, value: Byte): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_Char(array: WasmExternRef, index: Int): Char = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_Char(array: WasmExternRef, index: Int, value: Char): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_Short(array: WasmExternRef, index: Int): Short = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_Short(array: WasmExternRef, index: Int, value: Short): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_Int(array: WasmExternRef, index: Int): Int = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_Int(array: WasmExternRef, index: Int, value: Int): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_Long(array: WasmExternRef, index: Int): Long = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_Long(array: WasmExternRef, index: Int, value: Long): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_Float(array: WasmExternRef, index: Int): Float = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_Float(array: WasmExternRef, index: Int, value: Float): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_Double(array: WasmExternRef, index: Int): Double = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_Double(array: WasmExternRef, index: Int, value: Double): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_Boolean(array: WasmExternRef, index: Int): Boolean = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_Boolean(array: WasmExternRef, index: Int, value: Boolean): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_get")
+internal fun JsArray_get_WasmExternRef(array: WasmExternRef, index: Int): WasmExternRef = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_set")
+internal fun JsArray_set_WasmExternRef(array: WasmExternRef, index: Int, value: WasmExternRef): Unit = implementedAsIntrinsic
+
+@WasmImport("runtime", "JsArray_getSize")
+internal fun JsArray_getSize(array: WasmExternRef): Int =
+    implementedAsIntrinsic
+
+@JsFun("(x) => x")
+internal fun Any?.toWasmExternRef(): WasmExternRef =
+    implementedAsIntrinsic
+
+@JsFun("(x) => x")
+internal fun WasmExternRefToAny(ref: WasmExternRef): Any? =
+    implementedAsIntrinsic
+
+internal inline fun JsArray_fill_Byte(array: WasmExternRef, size: Int, init: (Int) -> Byte) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_Byte(array, i, init(i))
+        i++
+    }
+}
+
+internal inline fun JsArray_fill_Char(array: WasmExternRef, size: Int, init: (Int) -> Char) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_Char(array, i, init(i))
+        i++
+    }
+}
+
+internal inline fun JsArray_fill_Short(array: WasmExternRef, size: Int, init: (Int) -> Short) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_Short(array, i, init(i))
+        i++
+    }
+}
+
+internal inline fun JsArray_fill_Int(array: WasmExternRef, size: Int, init: (Int) -> Int) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_Int(array, i, init(i))
+        i++
+    }
+}
+
+internal inline fun JsArray_fill_Long(array: WasmExternRef, size: Int, init: (Int) -> Long) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_Long(array, i, init(i))
+        i++
+    }
+}
+
+internal inline fun JsArray_fill_Float(array: WasmExternRef, size: Int, init: (Int) -> Float) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_Float(array, i, init(i))
+        i++
+    }
+}
+
+internal inline fun JsArray_fill_Double(array: WasmExternRef, size: Int, init: (Int) -> Double) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_Double(array, i, init(i))
+        i++
+    }
+}
+
+internal inline fun JsArray_fill_Boolean(array: WasmExternRef, size: Int, init: (Int) -> Boolean) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_Boolean(array, i, init(i))
+        i++
+    }
+}
+
+internal inline fun <T> JsArray_fill_T(array: WasmExternRef, size: Int, init: (Int) -> T) {
+    var i = 0
+    while (i < size) {
+        JsArray_set_WasmExternRef(array, i, init(i).toWasmExternRef())
+        i++
+    }
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/Runtime.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/Runtime.kt
new file mode 100644
index 00000000000..9046afa96f7
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/Runtime.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.wasm.internal
+
+@WasmImport("runtime", "String_getLiteral")
+internal fun stringLiteral(index: Int): String =
+    implementedAsIntrinsic
+
+@WasmReinterpret
+internal fun unsafeNotNull(x: Any?): Any =
+    implementedAsIntrinsic
+
+internal fun nullableEquals(lhs: Any?, rhs: Any?): Boolean {
+    if (wasm_ref_is_null(lhs))
+        return wasm_ref_is_null(rhs)
+    return unsafeNotNull(lhs).equals(rhs)
+}
+
+internal fun anyNtoString(x: Any?): String = x.toString()
+
+internal fun nullableFloatIeee754Equals(lhs: Float?, rhs: Float?): Boolean {
+    if (lhs == null) return rhs == null
+    if (rhs == null) return false
+    return wasm_f32_eq(lhs, rhs)
+}
+
+internal fun nullableDoubleIeee754Equals(lhs: Double?, rhs: Double?): Boolean {
+    if (lhs == null) return rhs == null
+    if (rhs == null) return false
+    return wasm_f64_eq(lhs, rhs)
+}
+
+
+internal fun <T : Any> ensureNotNull(v: T?): T = if (v == null) THROW_NPE() else v
+
+@ExcludedFromCodegen
+internal fun <T, R> boxIntrinsic(x: T): R =
+    implementedAsIntrinsic
+
+@ExcludedFromCodegen
+internal fun <T, R> unboxIntrinsic(x: T): R =
+    implementedAsIntrinsic
+
+internal fun wasmThrow(e: Throwable): Nothing {
+    println("Kotlin/Wasm exception wasm thrown: ${e.message}")
+    wasm_unreachable()
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/ThrowHelpers.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/ThrowHelpers.kt
new file mode 100644
index 00000000000..afc6ae3d74c
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/ThrowHelpers.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.wasm.internal
+
+internal fun THROW_CCE(): Nothing {
+    throw ClassCastException()
+}
+
+internal fun THROW_NPE(): Nothing {
+    throw NullPointerException()
+}
+
+internal fun THROW_ISE(): Nothing {
+    throw IllegalStateException()
+}
+
+internal fun THROW_IAE(): Nothing {
+    throw IllegalArgumentException()
+}
+
+@PublishedApi
+internal fun throwUninitializedPropertyAccessException(name: String): Nothing {
+    throw UninitializedPropertyAccessException("lateinit property $name has not been initialized")
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/TypeInfo.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/TypeInfo.kt
new file mode 100644
index 00000000000..86f80ef7607
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/TypeInfo.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("unused")  // Used by compiler
+
+package kotlin.wasm.internal
+
+internal const val TYPE_INFO_ELEMENT_SIZE = 4
+
+internal const val TYPE_INFO_VTABLE_OFFSET = 2 * TYPE_INFO_ELEMENT_SIZE
+internal const val TYPE_INFO_VTABLE_LENGTH_OFFSET = TYPE_INFO_ELEMENT_SIZE
+internal const val SUPER_CLASS_ID_OFFSET = 0
+
+internal fun getVtablePtr(obj: Any): Int =
+    obj.typeInfo + TYPE_INFO_VTABLE_OFFSET
+
+internal fun getVtableLength(obj: Any): Int =
+    wasm_i32_load(obj.typeInfo + TYPE_INFO_VTABLE_LENGTH_OFFSET)
+
+internal fun getInterfaceListLength(obj: Any): Int =
+    wasm_i32_load(obj.typeInfo + TYPE_INFO_VTABLE_LENGTH_OFFSET)
+
+internal fun getSuperClassId(obj: Any): Int =
+    wasm_i32_load(obj.typeInfo + SUPER_CLASS_ID_OFFSET)
+
+internal fun getVirtualMethodId(obj: Any, virtualFunctionSlot: Int): Int {
+    val vtablePtr = getVtablePtr(obj)
+    val methodIdPtr = vtablePtr + virtualFunctionSlot * TYPE_INFO_ELEMENT_SIZE
+    return wasm_i32_load(methodIdPtr)
+}
+
+internal fun getInterfaceMethodId(obj: Any, methodSignatureId: Int): Int {
+    val vtableLength = getVtableLength(obj)
+    val vtableSignatures = getVtablePtr(obj) + vtableLength * TYPE_INFO_ELEMENT_SIZE
+    var virtualFunctionSlot = 0
+    while (virtualFunctionSlot < vtableLength) {
+        if (wasm_i32_load(vtableSignatures + virtualFunctionSlot * TYPE_INFO_ELEMENT_SIZE) == methodSignatureId) {
+            return getVirtualMethodId(obj, virtualFunctionSlot)
+        }
+        virtualFunctionSlot++
+    }
+    wasm_unreachable()
+}
+
+
+internal fun isSubClassOfImpl(currentClassId: Int, otherClassId: Int): Boolean {
+    if (currentClassId == otherClassId) return true
+    val anyClassId = wasmClassId<Any>()
+    if (currentClassId == anyClassId && otherClassId != anyClassId) return false
+    return isSubClassOfImpl(wasm_i32_load(currentClassId + SUPER_CLASS_ID_OFFSET), otherClassId)
+}
+
+internal fun isSubClass(obj: Any, classId: Int): Boolean {
+    return isSubClassOfImpl(obj.typeInfo, classId)
+}
+
+internal fun isInterface(obj: Any, interfaceId: Int): Boolean {
+    val vtableLength = getVtableLength(obj)
+    val interfaceListSizePtr = getVtablePtr(obj) + 2 * vtableLength * TYPE_INFO_ELEMENT_SIZE
+    val interfaceListPtr = interfaceListSizePtr + TYPE_INFO_ELEMENT_SIZE
+    val interfaceListSize = wasm_i32_load(interfaceListSizePtr)
+
+    var interfaceSlot = 0
+    while (interfaceSlot < interfaceListSize) {
+        val supportedInterface = wasm_i32_load(interfaceListPtr + interfaceSlot * TYPE_INFO_ELEMENT_SIZE)
+        if (supportedInterface == interfaceId) {
+            return true
+        }
+        interfaceSlot++
+    }
+
+    return false
+}
+
+@ExcludedFromCodegen
+internal fun <T> wasmClassId(): Int =
+    implementedAsIntrinsic
+
+@ExcludedFromCodegen
+internal fun <T> wasmInterfaceId(): Int =
+    implementedAsIntrinsic
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmAnnotations.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmAnnotations.kt
new file mode 100644
index 00000000000..24f44c8057e
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmAnnotations.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.wasm.internal
+
+import kotlin.annotation.AnnotationTarget.*
+
+// Exclude declaration or file from lowering and code generation
+@Target(FILE, CLASS, FUNCTION, CONSTRUCTOR, PROPERTY)
+@Retention(AnnotationRetention.BINARY)
+internal annotation class ExcludedFromCodegen
+
+@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER)
+@Retention(AnnotationRetention.BINARY)
+internal annotation class WasmImport(val module: String, val name: String)
+
+@Target(CLASS)
+@Retention(AnnotationRetention.BINARY)
+internal annotation class WasmForeign
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.BINARY)
+internal annotation class WasmReinterpret
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.BINARY)
+internal annotation class WasmPrimitive
+
+/**
+ *  Replace calls to this functions with specified Wasm instruction.
+ *
+ *  Operands are passed in the following order:
+ *    1. Dispatch receiver (if present)
+ *    2. Extension receiver (if present)
+ *    3. Value arguments
+ *
+ *  @mnemonic parameter is an instruction WAT name: "i32.add", "f64.trunc", etc.
+ *
+ *  Immediate arguments (label, index, offest, align, etc.) are not supported yet.
+ */
+
+@ExcludedFromCodegen
+internal val implementedAsIntrinsic: Nothing
+    get() = null!!
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmInstructions.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmInstructions.kt
new file mode 100644
index 00000000000..ff5569aa198
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmInstructions.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:ExcludedFromCodegen
+@file:Suppress("unused")
+
+package kotlin.wasm.internal
+
+@WasmOp(WasmOp.UNREACHABLE)
+internal fun wasm_unreachable(): Nothing =
+    implementedAsIntrinsic
+
+internal fun wasm_float_nan(): Float =
+    implementedAsIntrinsic
+
+internal fun wasm_double_nan(): Double =
+    implementedAsIntrinsic
+
+internal fun <From, To> wasm_ref_cast(a: From): To =
+    implementedAsIntrinsic
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmMath.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmMath.kt
new file mode 100644
index 00000000000..2a1c273fd23
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmMath.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.wasm.internal
+
+// `compareTo(x, y)` implemented as `(x >= y) - (x <= y)`
+
+fun wasm_i32_compareTo(x: Int, y: Int): Int =
+    wasm_i32_ge_s(x, y).toInt() - wasm_i32_le_s(x, y).toInt()
+
+fun wasm_i64_compareTo(x: Long, y: Long): Int =
+    wasm_i64_ge_s(x, y).toInt() - wasm_i64_le_s(x, y).toInt()
+
+@WasmImport("runtime", "String_equals")
+fun wasm_string_eq(x: String, y: String): Boolean =
+    implementedAsIntrinsic
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmOp.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmOp.kt
new file mode 100644
index 00000000000..b69794a9f4f
--- /dev/null
+++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmOp.kt
@@ -0,0 +1,514 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:ExcludedFromCodegen
+@file:Suppress(
+    "INLINE_CLASS_IN_EXTERNAL_DECLARATION",
+    "NON_ABSTRACT_FUNCTION_WITH_NO_BODY",
+    "unused"
+)
+
+package kotlin.wasm.internal
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.BINARY)
+internal annotation class WasmOp(val name: String) {
+    companion object {
+        const val I32_EQZ = "I32_EQZ"
+        const val I64_EQZ = "I64_EQZ"
+        const val I32_CLZ = "I32_CLZ"
+        const val I32_CTZ = "I32_CTZ"
+        const val I32_POPCNT = "I32_POPCNT"
+        const val I64_CLZ = "I64_CLZ"
+        const val I64_CTZ = "I64_CTZ"
+        const val I64_POPCNT = "I64_POPCNT"
+        const val F32_ABS = "F32_ABS"
+        const val F32_NEG = "F32_NEG"
+        const val F32_CEIL = "F32_CEIL"
+        const val F32_FLOOR = "F32_FLOOR"
+        const val F32_TRUNC = "F32_TRUNC"
+        const val F32_NEAREST = "F32_NEAREST"
+        const val F32_SQRT = "F32_SQRT"
+        const val F64_ABS = "F64_ABS"
+        const val F64_NEG = "F64_NEG"
+        const val F64_CEIL = "F64_CEIL"
+        const val F64_FLOOR = "F64_FLOOR"
+        const val F64_TRUNC = "F64_TRUNC"
+        const val F64_NEAREST = "F64_NEAREST"
+        const val F64_SQRT = "F64_SQRT"
+        const val I32_WRAP_I64 = "I32_WRAP_I64"
+        const val I32_TRUNC_F32_S = "I32_TRUNC_F32_S"
+        const val I32_TRUNC_F32_U = "I32_TRUNC_F32_U"
+        const val I32_TRUNC_F64_S = "I32_TRUNC_F64_S"
+        const val I32_TRUNC_F64_U = "I32_TRUNC_F64_U"
+        const val I64_EXTEND_I32_S = "I64_EXTEND_I32_S"
+        const val I64_EXTEND_I32_U = "I64_EXTEND_I32_U"
+        const val I64_TRUNC_F32_S = "I64_TRUNC_F32_S"
+        const val I64_TRUNC_F32_U = "I64_TRUNC_F32_U"
+        const val I64_TRUNC_F64_S = "I64_TRUNC_F64_S"
+        const val I64_TRUNC_F64_U = "I64_TRUNC_F64_U"
+        const val F32_CONVERT_I32_S = "F32_CONVERT_I32_S"
+        const val F32_CONVERT_I32_U = "F32_CONVERT_I32_U"
+        const val F32_CONVERT_I64_S = "F32_CONVERT_I64_S"
+        const val F32_CONVERT_I64_U = "F32_CONVERT_I64_U"
+        const val F32_DEMOTE_F64 = "F32_DEMOTE_F64"
+        const val F64_CONVERT_I32_S = "F64_CONVERT_I32_S"
+        const val F64_CONVERT_I32_U = "F64_CONVERT_I32_U"
+        const val F64_CONVERT_I64_S = "F64_CONVERT_I64_S"
+        const val F64_CONVERT_I64_U = "F64_CONVERT_I64_U"
+        const val F64_PROMOTE_F32 = "F64_PROMOTE_F32"
+        const val I32_REINTERPRET_F32 = "I32_REINTERPRET_F32"
+        const val I64_REINTERPRET_F64 = "I64_REINTERPRET_F64"
+        const val F32_REINTERPRET_I32 = "F32_REINTERPRET_I32"
+        const val F64_REINTERPRET_I64 = "F64_REINTERPRET_I64"
+        const val I32_EXTEND8_S = "I32_EXTEND8_S"
+        const val I32_EXTEND16_S = "I32_EXTEND16_S"
+        const val I64_EXTEND8_S = "I64_EXTEND8_S"
+        const val I64_EXTEND16_S = "I64_EXTEND16_S"
+        const val I64_EXTEND32_S = "I64_EXTEND32_S"
+        const val I32_TRUNC_SAT_F32_S = "I32_TRUNC_SAT_F32_S"
+        const val I32_TRUNC_SAT_F32_U = "I32_TRUNC_SAT_F32_U"
+        const val I32_TRUNC_SAT_F64_S = "I32_TRUNC_SAT_F64_S"
+        const val I32_TRUNC_SAT_F64_U = "I32_TRUNC_SAT_F64_U"
+        const val I64_TRUNC_SAT_F32_S = "I64_TRUNC_SAT_F32_S"
+        const val I64_TRUNC_SAT_F32_U = "I64_TRUNC_SAT_F32_U"
+        const val I64_TRUNC_SAT_F64_S = "I64_TRUNC_SAT_F64_S"
+        const val I64_TRUNC_SAT_F64_U = "I64_TRUNC_SAT_F64_U"
+        const val I32_EQ = "I32_EQ"
+        const val I32_NE = "I32_NE"
+        const val I32_LT_S = "I32_LT_S"
+        const val I32_LT_U = "I32_LT_U"
+        const val I32_GT_S = "I32_GT_S"
+        const val I32_GT_U = "I32_GT_U"
+        const val I32_LE_S = "I32_LE_S"
+        const val I32_LE_U = "I32_LE_U"
+        const val I32_GE_S = "I32_GE_S"
+        const val I32_GE_U = "I32_GE_U"
+        const val I64_EQ = "I64_EQ"
+        const val I64_NE = "I64_NE"
+        const val I64_LT_S = "I64_LT_S"
+        const val I64_LT_U = "I64_LT_U"
+        const val I64_GT_S = "I64_GT_S"
+        const val I64_GT_U = "I64_GT_U"
+        const val I64_LE_S = "I64_LE_S"
+        const val I64_LE_U = "I64_LE_U"
+        const val I64_GE_S = "I64_GE_S"
+        const val I64_GE_U = "I64_GE_U"
+        const val F32_EQ = "F32_EQ"
+        const val F32_NE = "F32_NE"
+        const val F32_LT = "F32_LT"
+        const val F32_GT = "F32_GT"
+        const val F32_LE = "F32_LE"
+        const val F32_GE = "F32_GE"
+        const val F64_EQ = "F64_EQ"
+        const val F64_NE = "F64_NE"
+        const val F64_LT = "F64_LT"
+        const val F64_GT = "F64_GT"
+        const val F64_LE = "F64_LE"
+        const val F64_GE = "F64_GE"
+        const val I32_ADD = "I32_ADD"
+        const val I32_SUB = "I32_SUB"
+        const val I32_MUL = "I32_MUL"
+        const val I32_DIV_S = "I32_DIV_S"
+        const val I32_DIV_U = "I32_DIV_U"
+        const val I32_REM_S = "I32_REM_S"
+        const val I32_REM_U = "I32_REM_U"
+        const val I32_AND = "I32_AND"
+        const val I32_OR = "I32_OR"
+        const val I32_XOR = "I32_XOR"
+        const val I32_SHL = "I32_SHL"
+        const val I32_SHR_S = "I32_SHR_S"
+        const val I32_SHR_U = "I32_SHR_U"
+        const val I32_ROTL = "I32_ROTL"
+        const val I32_ROTR = "I32_ROTR"
+        const val I64_ADD = "I64_ADD"
+        const val I64_SUB = "I64_SUB"
+        const val I64_MUL = "I64_MUL"
+        const val I64_DIV_S = "I64_DIV_S"
+        const val I64_DIV_U = "I64_DIV_U"
+        const val I64_REM_S = "I64_REM_S"
+        const val I64_REM_U = "I64_REM_U"
+        const val I64_AND = "I64_AND"
+        const val I64_OR = "I64_OR"
+        const val I64_XOR = "I64_XOR"
+        const val I64_SHL = "I64_SHL"
+        const val I64_SHR_S = "I64_SHR_S"
+        const val I64_SHR_U = "I64_SHR_U"
+        const val I64_ROTL = "I64_ROTL"
+        const val I64_ROTR = "I64_ROTR"
+        const val F32_ADD = "F32_ADD"
+        const val F32_SUB = "F32_SUB"
+        const val F32_MUL = "F32_MUL"
+        const val F32_DIV = "F32_DIV"
+        const val F32_MIN = "F32_MIN"
+        const val F32_MAX = "F32_MAX"
+        const val F32_COPYSIGN = "F32_COPYSIGN"
+        const val F64_ADD = "F64_ADD"
+        const val F64_SUB = "F64_SUB"
+        const val F64_MUL = "F64_MUL"
+        const val F64_DIV = "F64_DIV"
+        const val F64_MIN = "F64_MIN"
+        const val F64_MAX = "F64_MAX"
+        const val F64_COPYSIGN = "F64_COPYSIGN"
+        const val I32_CONST = "I32_CONST"
+        const val I64_CONST = "I64_CONST"
+        const val F32_CONST = "F32_CONST"
+        const val F64_CONST = "F64_CONST"
+        const val I32_LOAD = "I32_LOAD"
+        const val I64_LOAD = "I64_LOAD"
+        const val F32_LOAD = "F32_LOAD"
+        const val F64_LOAD = "F64_LOAD"
+        const val I32_LOAD8_S = "I32_LOAD8_S"
+        const val I32_LOAD8_U = "I32_LOAD8_U"
+        const val I32_LOAD16_S = "I32_LOAD16_S"
+        const val I32_LOAD16_U = "I32_LOAD16_U"
+        const val I64_LOAD8_S = "I64_LOAD8_S"
+        const val I64_LOAD8_U = "I64_LOAD8_U"
+        const val I64_LOAD16_S = "I64_LOAD16_S"
+        const val I64_LOAD16_U = "I64_LOAD16_U"
+        const val I64_LOAD32_S = "I64_LOAD32_S"
+        const val I64_LOAD32_U = "I64_LOAD32_U"
+        const val I32_STORE = "I32_STORE"
+        const val I64_STORE = "I64_STORE"
+        const val F32_STORE = "F32_STORE"
+        const val F64_STORE = "F64_STORE"
+        const val I32_STORE8 = "I32_STORE8"
+        const val I32_STORE16 = "I32_STORE16"
+        const val I64_STORE8 = "I64_STORE8"
+        const val I64_STORE16 = "I64_STORE16"
+        const val I64_STORE32 = "I64_STORE32"
+        const val MEMORY_SIZE = "MEMORY_SIZE"
+        const val MEMORY_GROW = "MEMORY_GROW"
+        const val MEMORY_INIT = "MEMORY_INIT"
+        const val DATA_DROP = "DATA_DROP"
+        const val MEMORY_COPY = "MEMORY_COPY"
+        const val MEMORY_FILL = "MEMORY_FILL"
+        const val TABLE_GET = "TABLE_GET"
+        const val TABLE_SET = "TABLE_SET"
+        const val TABLE_GROW = "TABLE_GROW"
+        const val TABLE_SIZE = "TABLE_SIZE"
+        const val TABLE_FILL = "TABLE_FILL"
+        const val TABLE_INIT = "TABLE_INIT"
+        const val ELEM_DROP = "ELEM_DROP"
+        const val TABLE_COPY = "TABLE_COPY"
+        const val UNREACHABLE = "UNREACHABLE"
+        const val NOP = "NOP"
+        const val BLOCK = "BLOCK"
+        const val LOOP = "LOOP"
+        const val IF = "IF"
+        const val ELSE = "ELSE"
+        const val END = "END"
+        const val BR = "BR"
+        const val BR_IF = "BR_IF"
+        const val BR_TABLE = "BR_TABLE"
+        const val RETURN = "RETURN"
+        const val CALL = "CALL"
+        const val CALL_INDIRECT = "CALL_INDIRECT"
+        const val DROP = "DROP"
+        const val SELECT = "SELECT"
+        const val SELECT_TYPED = "SELECT_TYPED"
+        const val LOCAL_GET = "LOCAL_GET"
+        const val LOCAL_SET = "LOCAL_SET"
+        const val LOCAL_TEE = "LOCAL_TEE"
+        const val GLOBAL_GET = "GLOBAL_GET"
+        const val GLOBAL_SET = "GLOBAL_SET"
+        const val REF_NULL = "REF_NULL"
+        const val REF_IS_NULL = "REF_IS_NULL"
+        const val REF_EQ = "REF_EQ"
+        const val REF_FUNC = "REF_FUNC"
+        const val STRUCT_NEW_WITH_RTT = "STRUCT_NEW_WITH_RTT"
+        const val STRUCT_GET = "STRUCT_GET"
+        const val STRUCT_SET = "STRUCT_SET"
+        const val REF_CAST = "REF_CAST"
+        const val RTT_CANON = "RTT_CANON"
+        const val RTT_SUB = "RTT_SUB"
+    }
+}
+
+@WasmOp(WasmOp.I32_EQ)
+public external fun wasm_i32_eq(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_NE)
+public external fun wasm_i32_ne(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_LT_S)
+public external fun wasm_i32_lt_s(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_LT_U)
+public external fun wasm_i32_lt_u(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_GT_S)
+public external fun wasm_i32_gt_s(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_GT_U)
+public external fun wasm_i32_gt_u(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_LE_S)
+public external fun wasm_i32_le_s(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_LE_U)
+public external fun wasm_i32_le_u(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_GE_S)
+public external fun wasm_i32_ge_s(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I32_GE_U)
+public external fun wasm_i32_ge_u(a: Int, b: Int): Boolean
+
+@WasmOp(WasmOp.I64_EQ)
+public external fun wasm_i64_eq(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_NE)
+public external fun wasm_i64_ne(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_LT_S)
+public external fun wasm_i64_lt_s(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_LT_U)
+public external fun wasm_i64_lt_u(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_GT_S)
+public external fun wasm_i64_gt_s(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_GT_U)
+public external fun wasm_i64_gt_u(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_LE_S)
+public external fun wasm_i64_le_s(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_LE_U)
+public external fun wasm_i64_le_u(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_GE_S)
+public external fun wasm_i64_ge_s(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.I64_GE_U)
+public external fun wasm_i64_ge_u(a: Long, b: Long): Boolean
+
+@WasmOp(WasmOp.F32_EQ)
+public external fun wasm_f32_eq(a: Float, b: Float): Boolean
+
+@WasmOp(WasmOp.F32_NE)
+public external fun wasm_f32_ne(a: Float, b: Float): Boolean
+
+@WasmOp(WasmOp.F32_LT)
+public external fun wasm_f32_lt(a: Float, b: Float): Boolean
+
+@WasmOp(WasmOp.F32_GT)
+public external fun wasm_f32_gt(a: Float, b: Float): Boolean
+
+@WasmOp(WasmOp.F32_LE)
+public external fun wasm_f32_le(a: Float, b: Float): Boolean
+
+@WasmOp(WasmOp.F32_GE)
+public external fun wasm_f32_ge(a: Float, b: Float): Boolean
+
+@WasmOp(WasmOp.F64_EQ)
+public external fun wasm_f64_eq(a: Double, b: Double): Boolean
+
+@WasmOp(WasmOp.F64_NE)
+public external fun wasm_f64_ne(a: Double, b: Double): Boolean
+
+@WasmOp(WasmOp.F64_LT)
+public external fun wasm_f64_lt(a: Double, b: Double): Boolean
+
+@WasmOp(WasmOp.F64_GT)
+public external fun wasm_f64_gt(a: Double, b: Double): Boolean
+
+@WasmOp(WasmOp.F64_LE)
+public external fun wasm_f64_le(a: Double, b: Double): Boolean
+
+@WasmOp(WasmOp.F64_GE)
+public external fun wasm_f64_ge(a: Double, b: Double): Boolean
+
+@WasmOp(WasmOp.I32_ADD)
+public external fun wasm_i32_add(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_SUB)
+public external fun wasm_i32_sub(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_MUL)
+public external fun wasm_i32_mul(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_DIV_S)
+public external fun wasm_i32_div_s(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_DIV_U)
+public external fun wasm_i32_div_u(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_REM_S)
+public external fun wasm_i32_rem_s(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_REM_U)
+public external fun wasm_i32_rem_u(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_AND)
+public external fun wasm_i32_and(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_OR)
+public external fun wasm_i32_or(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_XOR)
+public external fun wasm_i32_xor(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_SHL)
+public external fun wasm_i32_shl(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_SHR_S)
+public external fun wasm_i32_shr_s(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_SHR_U)
+public external fun wasm_i32_shr_u(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_ROTL)
+public external fun wasm_i32_rotl(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I32_ROTR)
+public external fun wasm_i32_rotr(a: Int, b: Int): Int
+
+@WasmOp(WasmOp.I64_ADD)
+public external fun wasm_i64_add(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_SUB)
+public external fun wasm_i64_sub(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_MUL)
+public external fun wasm_i64_mul(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_DIV_S)
+public external fun wasm_i64_div_s(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_DIV_U)
+public external fun wasm_i64_div_u(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_REM_S)
+public external fun wasm_i64_rem_s(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_REM_U)
+public external fun wasm_i64_rem_u(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_AND)
+public external fun wasm_i64_and(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_OR)
+public external fun wasm_i64_or(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_XOR)
+public external fun wasm_i64_xor(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_SHL)
+public external fun wasm_i64_shl(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_SHR_S)
+public external fun wasm_i64_shr_s(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_SHR_U)
+public external fun wasm_i64_shr_u(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_ROTL)
+public external fun wasm_i64_rotl(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.I64_ROTR)
+public external fun wasm_i64_rotr(a: Long, b: Long): Long
+
+@WasmOp(WasmOp.F32_ADD)
+public external fun wasm_f32_add(a: Float, b: Float): Float
+
+@WasmOp(WasmOp.F32_SUB)
+public external fun wasm_f32_sub(a: Float, b: Float): Float
+
+@WasmOp(WasmOp.F32_MUL)
+public external fun wasm_f32_mul(a: Float, b: Float): Float
+
+@WasmOp(WasmOp.F32_DIV)
+public external fun wasm_f32_div(a: Float, b: Float): Float
+
+@WasmOp(WasmOp.F32_MIN)
+public external fun wasm_f32_min(a: Float, b: Float): Float
+
+@WasmOp(WasmOp.F32_MAX)
+public external fun wasm_f32_max(a: Float, b: Float): Float
+
+@WasmOp(WasmOp.F32_COPYSIGN)
+public external fun wasm_f32_copysign(a: Float, b: Float): Float
+
+@WasmOp(WasmOp.F64_ADD)
+public external fun wasm_f64_add(a: Double, b: Double): Double
+
+@WasmOp(WasmOp.F64_SUB)
+public external fun wasm_f64_sub(a: Double, b: Double): Double
+
+@WasmOp(WasmOp.F64_MUL)
+public external fun wasm_f64_mul(a: Double, b: Double): Double
+
+@WasmOp(WasmOp.F64_DIV)
+public external fun wasm_f64_div(a: Double, b: Double): Double
+
+@WasmOp(WasmOp.F64_MIN)
+public external fun wasm_f64_min(a: Double, b: Double): Double
+
+@WasmOp(WasmOp.F64_MAX)
+public external fun wasm_f64_max(a: Double, b: Double): Double
+
+
+@WasmOp(WasmOp.REF_IS_NULL)
+public external fun wasm_ref_is_null(a: Any?): Boolean
+
+@WasmOp(WasmOp.REF_EQ)
+public external fun wasm_ref_eq(a: Any?, b: Any?): Boolean
+
+
+// ---
+
+@WasmOp(WasmOp.F32_NEAREST)
+public external fun wasm_f32_nearest(a: Float): Float
+
+@WasmOp(WasmOp.F64_NEAREST)
+public external fun wasm_f64_nearest(a: Double): Double
+
+@WasmOp(WasmOp.I32_WRAP_I64)
+public external fun wasm_i32_wrap_i64(a: Long): Int
+
+@WasmOp(WasmOp.I64_EXTEND_I32_S)
+public external fun wasm_i64_extend_i32_s(a: Int): Long
+
+@WasmOp(WasmOp.F32_CONVERT_I32_S)
+public external fun wasm_f32_convert_i32_s(a: Int): Float
+
+@WasmOp(WasmOp.F32_CONVERT_I64_S)
+public external fun wasm_f32_convert_i64_s(a: Long): Float
+
+@WasmOp(WasmOp.F32_DEMOTE_F64)
+public external fun wasm_f32_demote_f64(a: Double): Float
+
+@WasmOp(WasmOp.F64_CONVERT_I32_S)
+public external fun wasm_f64_convert_i32_s(a: Int): Double
+
+@WasmOp(WasmOp.F64_CONVERT_I64_S)
+public external fun wasm_f64_convert_i64_s(a: Long): Double
+
+@WasmOp(WasmOp.F64_PROMOTE_F32)
+public external fun wasm_f64_promote_f32(a: Float): Double
+
+@WasmOp(WasmOp.I32_REINTERPRET_F32)
+public external fun wasm_i32_reinterpret_f32(a: Float): Int
+
+@WasmOp(WasmOp.F32_REINTERPRET_I32)
+public external fun wasm_f32_reinterpret_i32(a: Int): Float
+
+@WasmOp(WasmOp.I32_TRUNC_SAT_F32_S)
+public external fun wasm_i32_trunc_sat_f32_s(a: Float): Int
+
+@WasmOp(WasmOp.I32_TRUNC_SAT_F64_S)
+public external fun wasm_i32_trunc_sat_f64_s(a: Double): Int
+
+@WasmOp(WasmOp.I64_TRUNC_SAT_F32_S)
+public external fun wasm_i64_trunc_sat_f32_s(a: Float): Long
+
+@WasmOp(WasmOp.I64_TRUNC_SAT_F64_S)
+public external fun wasm_i64_trunc_sat_f64_s(a: Double): Long
+
+@WasmOp(WasmOp.I32_LOAD)
+public external fun wasm_i32_load(x: Int): Int
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/runtime/runtime.js b/libraries/stdlib/wasm/runtime/runtime.js
deleted file mode 100644
index 453739330c5..00000000000
--- a/libraries/stdlib/wasm/runtime/runtime.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-const runtime = {
-    /**
-     * kotlin.String#plus(other: Any?): String
-     * @return {string}
-     */
-    String_plus(str1, str2) {
-        if (typeof str1 != "string") throw `Illegal argument str1: ${str1}`;
-        return str1 + String(str2);
-    },
-
-    /**
-     * @return {number}
-     */
-    String_getLength(str) {
-        if (typeof str != "string") throw `Illegal argument x: ${str}`;
-        return str.length;
-    },
-
-    /**
-     * @return {number}
-     */
-    String_getChar(str, index) {
-        if (typeof str != "string") throw `Illegal argument str: ${str}`;
-        if (typeof index != "number") throw `Illegal argument index: ${index}`;
-        return str.charCodeAt(index);
-    },
-
-    /**
-     * @return {number}
-     */
-    String_compareTo(str1, str2) {
-        if (str1 > str2) return 1;
-        if (str1 < str2) return -1;
-        return 0;
-    },
-
-    String_getLiteral(index) {
-        return runtime.stringLiterals[index];
-    }
-};
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/runtime/runtime.kt b/libraries/stdlib/wasm/runtime/runtime.kt
deleted file mode 100644
index a77b3ef53d2..00000000000
--- a/libraries/stdlib/wasm/runtime/runtime.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.wasm.internal
-
-@WasmImport("runtime", "String_getLiteral")
-public fun stringLiteral(index: Int): String =
-    implementedAsIntrinsic
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/runtime/stubsKotlinRanges.kt b/libraries/stdlib/wasm/runtime/stubsKotlinRanges.kt
deleted file mode 100644
index e952b6893eb..00000000000
--- a/libraries/stdlib/wasm/runtime/stubsKotlinRanges.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:kotlin.wasm.internal.ExcludedFromCodegen
-
-package kotlin.ranges
-
-// Stubs for unimplemented classes used by CommonBackendContext
-
-class CharProgression
-class IntProgression
-class LongProgression
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/runtime/testHelpers.kt b/libraries/stdlib/wasm/runtime/testHelpers.kt
deleted file mode 100644
index fa2d30a86d8..00000000000
--- a/libraries/stdlib/wasm/runtime/testHelpers.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin
-
-import kotlin.wasm.internal.wasm_unreachable
-
-fun assertEquals(x: Boolean, y: Boolean) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Byte, y: Byte) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Short, y: Short) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Char, y: Char) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Int, y: Int) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Long, y: Long) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Float, y: Float) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Double, y: Double) {
-    if (x != y) wasm_unreachable()
-}
-
-
-fun assertEquals(x: Boolean, y: Boolean, s: String) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Byte, y: Byte, s: String) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Short, y: Short, s: String) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Char, y: Char, s: String) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Int, y: Int, s: String) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Long, y: Long, s: String) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Float, y: Float, s: String) {
-    if (x != y) wasm_unreachable()
-}
-fun assertEquals(x: Double, y: Double, s: String) {
-    if (x != y) wasm_unreachable()
-}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/runtime/wasmAnnotations.kt b/libraries/stdlib/wasm/runtime/wasmAnnotations.kt
deleted file mode 100644
index 6ec72a60151..00000000000
--- a/libraries/stdlib/wasm/runtime/wasmAnnotations.kt
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package kotlin.wasm.internal
-
-import kotlin.annotation.AnnotationTarget.*
-
-// Exclude declaration or file from lowerings and code generation
-@Target(FILE, CLASS, FUNCTION, PROPERTY)
-@Retention(AnnotationRetention.BINARY)
-internal annotation class ExcludedFromCodegen
-
-@ExcludedFromCodegen
-@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER)
-@Retention(AnnotationRetention.BINARY)
-internal annotation class WasmImport(val module: String, val name: String)
-
-/**
- *  Replace calls to this functions with specified Wasm instruction.
- *
- *  Operands are passed in the following order:
- *    1. Dispatch receiver (if present)
- *    2. Extension receiver (if present)
- *    3. Value arguments
- *
- *  @mnemonic parameter is an instruction WAT name: "i32.add", "f64.trunc", etc.
- *
- *  Immediate arguments (label, index, offest, align, etc.) are not supported yet.
- */
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.BINARY)
-@ExcludedFromCodegen
-internal annotation class WasmInstruction(val mnemonic: String) {
-    companion object {
-        const val NOP = "nop"
-        const val UNREACHABLE = "unreachable"
-        const val I32_EQZ = "i32.eqz"
-        const val I32_EQ = "i32.eq"
-        const val I32_NE = "i32.ne"
-        const val I32_LT_S = "i32.lt_s"
-        const val I32_LT_U = "i32.lt_u"
-        const val I32_GT_S = "i32.gt_s"
-        const val I32_GT_U = "i32.gt_u"
-        const val I32_LE_S = "i32.le_s"
-        const val I32_LE_U = "i32.le_u"
-        const val I32_GE_S = "i32.ge_s"
-        const val I32_GE_U = "i32.ge_u"
-        const val I64_EQZ = "i64.eqz"
-        const val I64_EQ = "i64.eq"
-        const val I64_NE = "i64.ne"
-        const val I64_LT_S = "i64.lt_s"
-        const val I64_LT_U = "i64.lt_u"
-        const val I64_GT_S = "i64.gt_s"
-        const val I64_GT_U = "i64.gt_u"
-        const val I64_LE_S = "i64.le_s"
-        const val I64_LE_U = "i64.le_u"
-        const val I64_GE_S = "i64.ge_s"
-        const val I64_GE_U = "i64.ge_u"
-        const val F32_EQ = "f32.eq"
-        const val F32_NE = "f32.ne"
-        const val F32_LT = "f32.lt"
-        const val F32_GT = "f32.gt"
-        const val F32_LE = "f32.le"
-        const val F32_GE = "f32.ge"
-        const val F64_EQ = "f64.eq"
-        const val F64_NE = "f64.ne"
-        const val F64_LT = "f64.lt"
-        const val F64_GT = "f64.gt"
-        const val F64_LE = "f64.le"
-        const val F64_GE = "f64.ge"
-        const val I32_CLZ = "i32.clz"
-        const val I32_CTZ = "i32.ctz"
-        const val I32_POPCNT = "i32.popcnt"
-        const val I32_ADD = "i32.add"
-        const val I32_SUB = "i32.sub"
-        const val I32_MUL = "i32.mul"
-        const val I32_DIV_S = "i32.div_s"
-        const val I32_DIV_U = "i32.div_u"
-        const val I32_REM_S = "i32.rem_s"
-        const val I32_REM_U = "i32.rem_u"
-        const val I32_AND = "i32.and"
-        const val I32_OR = "i32.or"
-        const val I32_XOR = "i32.xor"
-        const val I32_SHL = "i32.shl"
-        const val I32_SHR_S = "i32.shr_s"
-        const val I32_SHR_U = "i32.shr_u"
-        const val I32_ROTL = "i32.rotl"
-        const val I32_ROTR = "i32.rotr"
-        const val I64_CLZ = "i64.clz"
-        const val I64_CTZ = "i64.ctz"
-        const val I64_POPCNT = "i64.popcnt"
-        const val I64_ADD = "i64.add"
-        const val I64_SUB = "i64.sub"
-        const val I64_MUL = "i64.mul"
-        const val I64_DIV_S = "i64.div_s"
-        const val I64_DIV_U = "i64.div_u"
-        const val I64_REM_S = "i64.rem_s"
-        const val I64_REM_U = "i64.rem_u"
-        const val I64_AND = "i64.and"
-        const val I64_OR = "i64.or"
-        const val I64_XOR = "i64.xor"
-        const val I64_SHL = "i64.shl"
-        const val I64_SHR_S = "i64.shr_s"
-        const val I64_SHR_U = "i64.shr_u"
-        const val I64_ROTL = "i64.rotl"
-        const val I64_ROTR = "i64.rotr"
-        const val F32_ABS = "f32.abs"
-        const val F32_NEG = "f32.neg"
-        const val F32_CEIL = "f32.ceil"
-        const val F32_FLOOR = "f32.floor"
-        const val F32_TRUNC = "f32.trunc"
-        const val F32_NEAREST = "f32.nearest"
-        const val F32_SQRT = "f32.sqrt"
-        const val F32_ADD = "f32.add"
-        const val F32_SUB = "f32.sub"
-        const val F32_MUL = "f32.mul"
-        const val F32_DIV = "f32.div"
-        const val F32_FMIN = "f32.fmin"
-        const val F32_FMAX = "f32.fmax"
-        const val F32_COPYSIGN = "f32.copysign"
-        const val F64_ABS = "f64.abs"
-        const val F64_NEG = "f64.neg"
-        const val F64_CEIL = "f64.ceil"
-        const val F64_FLOOR = "f64.floor"
-        const val F64_TRUNC = "f64.trunc"
-        const val F64_NEAREST = "f64.nearest"
-        const val F64_SQRT = "f64.sqrt"
-        const val F64_ADD = "f64.add"
-        const val F64_SUB = "f64.sub"
-        const val F64_MUL = "f64.mul"
-        const val F64_DIV = "f64.div"
-        const val F64_FMIN = "f64.fmin"
-        const val F64_FMAX = "f64.fmax"
-        const val F64_COPYSIGN = "f64.copysign"
-        const val I32_WRAP_I64 = "i32.wrap/i64"
-        const val I32_TRUNC_F32_S = "i32.trunc_s/f32"
-        const val I32_TRUNC_F32_U = "i32.trunc_u/f32"
-        const val I32_TRUNC_F64_S = "i32.trunc_s/f64"
-        const val I32_TRUNC_F64_U = "i32.trunc_u/f64"
-        const val I64_EXTEND_I32_S = "i64.extend_s/i32"
-        const val I64_EXTEND_I32_U = "i64.extend_u/i32"
-        const val I64_TRUNC_F32_S = "i64.trunc_s/f32"
-        const val I64_TRUNC_F32_U = "i64.trunc_u/f32"
-        const val I64_TRUNC_F64_S = "i64.trunc_s/f64"
-        const val I64_TRUNC_F64_U = "i64.trunc_u/f64"
-        const val F32_CONVERT_I32_S = "f32.convert_s/i32"
-        const val F32_CONVERT_I32_U = "f32.convert_u/i32"
-        const val F32_CONVERT_I64_S = "f32.convert_s/i64"
-        const val F32_CONVERT_I64_U = "f32.convert_u/i64"
-        const val F64_CONVERT_I32_S = "f64.convert_s/i32"
-        const val F64_CONVERT_I32_U = "f64.convert_u/i32"
-        const val F64_CONVERT_I64_S = "f64.convert_s/i64"
-        const val F64_CONVERT_I64_U = "f64.convert_u/i64"
-        const val F32_DEMOTE_F64 = "f32.demote/f64"
-        const val F64_PROMOTE_F32 = "f64.promote/f32"
-        const val I32_REINTERPRET_F32 = "i32.reinterpret/f32"
-        const val I64_REINTERPRET_F64 = "i64.reinterpret/f64"
-        const val F32_REINTERPRET_I32 = "f32.reinterpret/i32"
-
-        const val F32_CONST_NAN = "f32.const nan"
-        const val F64_CONST_NAN = "f64.const nan"
-        const val F32_CONST_PLUS_INF = "f32.const +inf"
-        const val F32_CONST_MINUS_INF = "f32.const -inf"
-        const val F64_CONST_PLUS_INF = "f64.const +inf"
-        const val F64_CONST_MINUS_INF = "f64.const -inf"
-    }
-}
-
-@ExcludedFromCodegen
-internal val implementedAsIntrinsic: Nothing
-    get() = null!!
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/generated/_ArraysWasm.kt b/libraries/stdlib/wasm/src/generated/_ArraysWasm.kt
new file mode 100644
index 00000000000..df7fd477c9a
--- /dev/null
+++ b/libraries/stdlib/wasm/src/generated/_ArraysWasm.kt
@@ -0,0 +1,2408 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+//
+// NOTE: THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
+// See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
+//
+
+import kotlin.ranges.contains
+import kotlin.ranges.reversed
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun <T> Array<out T>.elementAt(index: Int): T {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun ByteArray.elementAt(index: Int): Byte {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun ShortArray.elementAt(index: Int): Short {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun IntArray.elementAt(index: Int): Int {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun LongArray.elementAt(index: Int): Long {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun FloatArray.elementAt(index: Int): Float {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun DoubleArray.elementAt(index: Int): Double {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun BooleanArray.elementAt(index: Int): Boolean {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun CharArray.elementAt(index: Int): Char {
+    return get(index)
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun <T> Array<out T>.asList(): List<T> {
+    return object : AbstractList<T>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: T): Boolean = this@asList.contains(element)
+        override fun get(index: Int): T = this@asList[index]
+        override fun indexOf(element: T): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: T): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun ByteArray.asList(): List<Byte> {
+    return object : AbstractList<Byte>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: Byte): Boolean = this@asList.contains(element)
+        override fun get(index: Int): Byte = this@asList[index]
+        override fun indexOf(element: Byte): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: Byte): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun ShortArray.asList(): List<Short> {
+    return object : AbstractList<Short>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: Short): Boolean = this@asList.contains(element)
+        override fun get(index: Int): Short = this@asList[index]
+        override fun indexOf(element: Short): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: Short): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun IntArray.asList(): List<Int> {
+    return object : AbstractList<Int>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: Int): Boolean = this@asList.contains(element)
+        override fun get(index: Int): Int = this@asList[index]
+        override fun indexOf(element: Int): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: Int): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun LongArray.asList(): List<Long> {
+    return object : AbstractList<Long>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: Long): Boolean = this@asList.contains(element)
+        override fun get(index: Int): Long = this@asList[index]
+        override fun indexOf(element: Long): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: Long): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun FloatArray.asList(): List<Float> {
+    return object : AbstractList<Float>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: Float): Boolean = this@asList.any { it.toBits() == element.toBits() }
+        override fun get(index: Int): Float = this@asList[index]
+        override fun indexOf(element: Float): Int = this@asList.indexOfFirst { it.toBits() == element.toBits() }
+        override fun lastIndexOf(element: Float): Int = this@asList.indexOfLast { it.toBits() == element.toBits() }
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun DoubleArray.asList(): List<Double> {
+    return object : AbstractList<Double>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: Double): Boolean = this@asList.any { it.toBits() == element.toBits() }
+        override fun get(index: Int): Double = this@asList[index]
+        override fun indexOf(element: Double): Int = this@asList.indexOfFirst { it.toBits() == element.toBits() }
+        override fun lastIndexOf(element: Double): Int = this@asList.indexOfLast { it.toBits() == element.toBits() }
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun BooleanArray.asList(): List<Boolean> {
+    return object : AbstractList<Boolean>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: Boolean): Boolean = this@asList.contains(element)
+        override fun get(index: Int): Boolean = this@asList[index]
+        override fun indexOf(element: Boolean): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: Boolean): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+public actual fun CharArray.asList(): List<Char> {
+    return object : AbstractList<Char>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: Char): Boolean = this@asList.contains(element)
+        override fun get(index: Int): Char = this@asList[index]
+        override fun indexOf(element: Char): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: Char): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns `true` if the two specified arrays are *deeply* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * If two corresponding elements are nested arrays, they are also compared deeply.
+ * If any of arrays contains itself on any nesting level the behavior is undefined.
+ * 
+ * The elements of other types are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.LowPriorityInOverloadResolution
+public actual infix fun <T> Array<out T>.contentDeepEquals(other: Array<out T>): Boolean {
+    return this.contentDeepEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *deeply* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The specified arrays are also considered deeply equal if both are `null`.
+ * 
+ * If two corresponding elements are nested arrays, they are also compared deeply.
+ * If any of arrays contains itself on any nesting level the behavior is undefined.
+ * 
+ * The elements of other types are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun <T> Array<out T>?.contentDeepEquals(other: Array<out T>?): Boolean {
+    return contentDeepEqualsImpl(other)
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ * Nested arrays are treated as lists too.
+ * 
+ * If any of arrays contains itself on any nesting level the behavior is undefined.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.LowPriorityInOverloadResolution
+public actual fun <T> Array<out T>.contentDeepHashCode(): Int {
+    return this.contentDeepHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ * Nested arrays are treated as lists too.
+ * 
+ * If any of arrays contains itself on any nesting level the behavior is undefined.
+ */
+@SinceKotlin("1.4")
+public actual fun <T> Array<out T>?.contentDeepHashCode(): Int {
+    return contentDeepHashCodeImpl()
+}
+
+/**
+ * Returns a string representation of the contents of this array as if it is a [List].
+ * Nested arrays are treated as lists too.
+ * 
+ * If any of arrays contains itself on any nesting level that reference
+ * is rendered as `"[...]"` to prevent recursion.
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentDeepToString
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.LowPriorityInOverloadResolution
+public actual fun <T> Array<out T>.contentDeepToString(): String {
+    return this.contentDeepToString()
+}
+
+/**
+ * Returns a string representation of the contents of this array as if it is a [List].
+ * Nested arrays are treated as lists too.
+ * 
+ * If any of arrays contains itself on any nesting level that reference
+ * is rendered as `"[...]"` to prevent recursion.
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentDeepToString
+ */
+@SinceKotlin("1.4")
+public actual fun <T> Array<out T>?.contentDeepToString(): String {
+    return contentDeepToStringImpl()
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun <T> Array<out T>.contentEquals(other: Array<out T>): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun ByteArray.contentEquals(other: ByteArray): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun ShortArray.contentEquals(other: ShortArray): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun IntArray.contentEquals(other: IntArray): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun LongArray.contentEquals(other: LongArray): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun FloatArray.contentEquals(other: FloatArray): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun DoubleArray.contentEquals(other: DoubleArray): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun BooleanArray.contentEquals(other: BooleanArray): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual infix fun CharArray.contentEquals(other: CharArray): Boolean {
+    return this.contentEquals(other)
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun <T> Array<out T>?.contentEquals(other: Array<out T>?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (this[i] != other[i]) return false
+    }
+    return true
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun ByteArray?.contentEquals(other: ByteArray?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (this[i] != other[i]) return false
+    }
+    return true
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun ShortArray?.contentEquals(other: ShortArray?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (this[i] != other[i]) return false
+    }
+    return true
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun IntArray?.contentEquals(other: IntArray?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (this[i] != other[i]) return false
+    }
+    return true
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun LongArray?.contentEquals(other: LongArray?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (this[i] != other[i]) return false
+    }
+    return true
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun FloatArray?.contentEquals(other: FloatArray?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (!this[i].equals(other[i])) return false
+    }
+    return true
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun DoubleArray?.contentEquals(other: DoubleArray?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (!this[i].equals(other[i])) return false
+    }
+    return true
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun BooleanArray?.contentEquals(other: BooleanArray?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (this[i] != other[i]) return false
+    }
+    return true
+}
+
+/**
+ * Returns `true` if the two specified arrays are *structurally* equal to one another,
+ * i.e. contain the same number of the same elements in the same order.
+ * 
+ * The elements are compared for equality with the [equals][Any.equals] function.
+ * For floating point numbers it means that `NaN` is equal to itself and `-0.0` is not equal to `0.0`.
+ */
+@SinceKotlin("1.4")
+public actual infix fun CharArray?.contentEquals(other: CharArray?): Boolean {
+    if (this === other) return true
+    if (this === null || other === null) return false
+    if (size != other.size) return false
+    for (i in indices) {
+        if (this[i] != other[i]) return false
+    }
+    return true
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun <T> Array<out T>.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun ByteArray.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun ShortArray.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun IntArray.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun LongArray.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun FloatArray.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun DoubleArray.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun BooleanArray.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun CharArray.contentHashCode(): Int {
+    return this.contentHashCode()
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun <T> Array<out T>?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun ByteArray?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun ShortArray?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun IntArray?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun LongArray?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun FloatArray?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun DoubleArray?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun BooleanArray?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ */
+@SinceKotlin("1.4")
+public actual fun CharArray?.contentHashCode(): Int {
+    if (this === null) return 0
+    var result = 1
+    for (element in this)
+        result = 31 * result + element.hashCode()
+    return result
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun <T> Array<out T>.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun ByteArray.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun ShortArray.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun IntArray.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun LongArray.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun FloatArray.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun DoubleArray.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun BooleanArray.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@Deprecated("Use Kotlin compiler 1.4 to avoid deprecation warning.")
+@SinceKotlin("1.1")
+@DeprecatedSinceKotlin(hiddenSince = "1.4")
+public actual fun CharArray.contentToString(): String {
+    return this.contentToString()
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun <T> Array<out T>?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun ByteArray?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun ShortArray?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun IntArray?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun LongArray?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun FloatArray?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun DoubleArray?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun BooleanArray?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Returns a string representation of the contents of the specified array as if it is [List].
+ * 
+ * @sample samples.collections.Arrays.ContentOperations.contentToString
+ */
+@SinceKotlin("1.4")
+public actual fun CharArray?.contentToString(): String {
+    return this?.joinToString(", ", "[", "]") ?: "null"
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun <T> Array<out T>.copyInto(destination: Array<T>, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): Array<T> {
+    TODO("Wasm stdlib: copyInto(destination: Array<T>, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun ByteArray.copyInto(destination: ByteArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): ByteArray {
+    TODO("Wasm stdlib: copyInto(destination: ByteArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun ShortArray.copyInto(destination: ShortArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): ShortArray {
+    TODO("Wasm stdlib: copyInto(destination: ShortArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun IntArray.copyInto(destination: IntArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): IntArray {
+    TODO("Wasm stdlib: copyInto(destination: IntArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun LongArray.copyInto(destination: LongArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): LongArray {
+    TODO("Wasm stdlib: copyInto(destination: LongArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun FloatArray.copyInto(destination: FloatArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): FloatArray {
+    TODO("Wasm stdlib: copyInto(destination: FloatArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun DoubleArray.copyInto(destination: DoubleArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): DoubleArray {
+    TODO("Wasm stdlib: copyInto(destination: DoubleArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun BooleanArray.copyInto(destination: BooleanArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): BooleanArray {
+    TODO("Wasm stdlib: copyInto(destination: BooleanArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Copies this array or its subrange into the [destination] array and returns that array.
+ * 
+ * It's allowed to pass the same array in the [destination] and even specify the subrange so that it overlaps with the destination range.
+ * 
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the [destination] array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the subrange to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to copy, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ * or when that index is out of the [destination] array indices range.
+ * 
+ * @return the [destination] array.
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun CharArray.copyInto(destination: CharArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size): CharArray {
+    TODO("Wasm stdlib: copyInto(destination: CharArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)")
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun <T> Array<T>.copyOf(): Array<T> {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun ByteArray.copyOf(): ByteArray {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun ShortArray.copyOf(): ShortArray {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun IntArray.copyOf(): IntArray {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun LongArray.copyOf(): LongArray {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun FloatArray.copyOf(): FloatArray {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun DoubleArray.copyOf(): DoubleArray {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun BooleanArray.copyOf(): BooleanArray {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.copyOf
+ */
+public actual fun CharArray.copyOf(): CharArray {
+    return this.copyOfUninitializedElements(size)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with zero values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with zero values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizedPrimitiveCopyOf
+ */
+public actual fun ByteArray.copyOf(newSize: Int): ByteArray {
+    return this.copyOfUninitializedElements(newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with zero values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with zero values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizedPrimitiveCopyOf
+ */
+public actual fun ShortArray.copyOf(newSize: Int): ShortArray {
+    return this.copyOfUninitializedElements(newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with zero values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with zero values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizedPrimitiveCopyOf
+ */
+public actual fun IntArray.copyOf(newSize: Int): IntArray {
+    return this.copyOfUninitializedElements(newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with zero values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with zero values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizedPrimitiveCopyOf
+ */
+public actual fun LongArray.copyOf(newSize: Int): LongArray {
+    return this.copyOfUninitializedElements(newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with zero values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with zero values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizedPrimitiveCopyOf
+ */
+public actual fun FloatArray.copyOf(newSize: Int): FloatArray {
+    return this.copyOfUninitializedElements(newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with zero values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with zero values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizedPrimitiveCopyOf
+ */
+public actual fun DoubleArray.copyOf(newSize: Int): DoubleArray {
+    return this.copyOfUninitializedElements(newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with `false` values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with `false` values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizedPrimitiveCopyOf
+ */
+public actual fun BooleanArray.copyOf(newSize: Int): BooleanArray {
+    return this.copyOfUninitializedElements(newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with null char (`\u0000`) values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with null char (`\u0000`) values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizedPrimitiveCopyOf
+ */
+public actual fun CharArray.copyOf(newSize: Int): CharArray {
+    return this.copyOfUninitializedElements(newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array, resized to the given [newSize].
+ * The copy is either truncated or padded at the end with `null` values if necessary.
+ * 
+ * - If [newSize] is less than the size of the original array, the copy array is truncated to the [newSize].
+ * - If [newSize] is greater than the size of the original array, the extra elements in the copy array are filled with `null` values.
+ * 
+ * @sample samples.collections.Arrays.CopyOfOperations.resizingCopyOf
+ */
+public actual fun <T> Array<T>.copyOf(newSize: Int): Array<T?> {
+    TODO("Wasm stdlib: copyOf(newSize: Int)")
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun <T> Array<T>.copyOfRange(fromIndex: Int, toIndex: Int): Array<T> {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun ByteArray.copyOfRange(fromIndex: Int, toIndex: Int): ByteArray {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun ShortArray.copyOfRange(fromIndex: Int, toIndex: Int): ShortArray {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun IntArray.copyOfRange(fromIndex: Int, toIndex: Int): IntArray {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun LongArray.copyOfRange(fromIndex: Int, toIndex: Int): LongArray {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun FloatArray.copyOfRange(fromIndex: Int, toIndex: Int): FloatArray {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun DoubleArray.copyOfRange(fromIndex: Int, toIndex: Int): DoubleArray {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun BooleanArray.copyOfRange(fromIndex: Int, toIndex: Int): BooleanArray {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns a new array which is a copy of the specified range of the original array.
+ * 
+ * @param fromIndex the start of the range (inclusive) to copy.
+ * @param toIndex the end of the range (exclusive) to copy.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+public actual fun CharArray.copyOfRange(fromIndex: Int, toIndex: Int): CharArray {
+    checkCopyOfRangeArguments(fromIndex, toIndex, size)
+    return copyOfUninitializedElements(fromIndex, toIndex)
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun <T> Array<T>.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): Array<T> {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun ByteArray.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): ByteArray {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun ShortArray.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): ShortArray {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun IntArray.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): IntArray {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun LongArray.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): LongArray {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun FloatArray.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): FloatArray {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun DoubleArray.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): DoubleArray {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun BooleanArray.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): BooleanArray {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array's range between [fromIndex] (inclusive)
+ * and [toIndex] (exclusive) with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun CharArray.copyOfUninitializedElements(fromIndex: Int, toIndex: Int): CharArray {
+    TODO("Wasm stdlib: copyOfUninitializedElements(fromIndex: Int, toIndex: Int)")
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun <T> Array<T>.copyOfUninitializedElements(newSize: Int): Array<T> {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun ByteArray.copyOfUninitializedElements(newSize: Int): ByteArray {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun ShortArray.copyOfUninitializedElements(newSize: Int): ShortArray {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun IntArray.copyOfUninitializedElements(newSize: Int): IntArray {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun LongArray.copyOfUninitializedElements(newSize: Int): LongArray {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun FloatArray.copyOfUninitializedElements(newSize: Int): FloatArray {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun DoubleArray.copyOfUninitializedElements(newSize: Int): DoubleArray {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun BooleanArray.copyOfUninitializedElements(newSize: Int): BooleanArray {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Returns new array which is a copy of the original array with new elements filled with **lateinit** _uninitialized_ values.
+ * Attempts to read _uninitialized_ values from this array work in implementation-dependent manner,
+ * either throwing exception or returning some kind of implementation-specific default value.
+ */
+internal fun CharArray.copyOfUninitializedElements(newSize: Int): CharArray {
+    return copyOfUninitializedElements(0, newSize)
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun <T> Array<T>.fill(element: T, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: T, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun ByteArray.fill(element: Byte, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: Byte, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun ShortArray.fill(element: Short, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: Short, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun IntArray.fill(element: Int, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: Int, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun LongArray.fill(element: Long, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: Long, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun FloatArray.fill(element: Float, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: Float, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun DoubleArray.fill(element: Double, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: Double, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun BooleanArray.fill(element: Boolean, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: Boolean, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Fills this array or its subrange with the specified [element] value.
+ * 
+ * @param fromIndex the start of the range (inclusive) to fill, 0 by default.
+ * @param toIndex the end of the range (exclusive) to fill, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@SinceKotlin("1.3")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun CharArray.fill(element: Char, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: fill(element: Char, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun <T> Array<T>.plus(element: T): Array<T> {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun ByteArray.plus(element: Byte): ByteArray {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun ShortArray.plus(element: Short): ShortArray {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun IntArray.plus(element: Int): IntArray {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun LongArray.plus(element: Long): LongArray {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun FloatArray.plus(element: Float): FloatArray {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun DoubleArray.plus(element: Double): DoubleArray {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun BooleanArray.plus(element: Boolean): BooleanArray {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+public actual operator fun CharArray.plus(element: Char): CharArray {
+    val index = size
+    val result = copyOfUninitializedElements(index + 1)
+    result[index] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun <T> Array<T>.plus(elements: Collection<T>): Array<T> {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun ByteArray.plus(elements: Collection<Byte>): ByteArray {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun ShortArray.plus(elements: Collection<Short>): ShortArray {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun IntArray.plus(elements: Collection<Int>): IntArray {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun LongArray.plus(elements: Collection<Long>): LongArray {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun FloatArray.plus(elements: Collection<Float>): FloatArray {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun DoubleArray.plus(elements: Collection<Double>): DoubleArray {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun BooleanArray.plus(elements: Collection<Boolean>): BooleanArray {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+public actual operator fun CharArray.plus(elements: Collection<Char>): CharArray {
+    var index = size
+    val result = copyOfUninitializedElements(index + elements.size)
+    for (element in elements) result[index++] = element
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun <T> Array<T>.plus(elements: Array<out T>): Array<T> {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun ByteArray.plus(elements: ByteArray): ByteArray {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun ShortArray.plus(elements: ShortArray): ShortArray {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun IntArray.plus(elements: IntArray): IntArray {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun LongArray.plus(elements: LongArray): LongArray {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun FloatArray.plus(elements: FloatArray): FloatArray {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun DoubleArray.plus(elements: DoubleArray): DoubleArray {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun BooleanArray.plus(elements: BooleanArray): BooleanArray {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+public actual operator fun CharArray.plus(elements: CharArray): CharArray {
+    val thisSize = size
+    val arraySize = elements.size
+    val result = copyOfUninitializedElements(thisSize + arraySize)
+    elements.copyInto(result, thisSize)
+    return result
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun <T> Array<T>.plusElement(element: T): Array<T> {
+    return plus(element)
+}
+
+/**
+ * Sorts the array in-place.
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortArray
+ */
+public actual fun IntArray.sort(): Unit {
+    TODO("Wasm stdlib: sort()")
+}
+
+/**
+ * Sorts the array in-place.
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortArray
+ */
+public actual fun LongArray.sort(): Unit {
+    TODO("Wasm stdlib: sort()")
+}
+
+/**
+ * Sorts the array in-place.
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortArray
+ */
+public actual fun ByteArray.sort(): Unit {
+    TODO("Wasm stdlib: sort()")
+}
+
+/**
+ * Sorts the array in-place.
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortArray
+ */
+public actual fun ShortArray.sort(): Unit {
+    TODO("Wasm stdlib: sort()")
+}
+
+/**
+ * Sorts the array in-place.
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortArray
+ */
+public actual fun DoubleArray.sort(): Unit {
+    TODO("Wasm stdlib: sort()")
+}
+
+/**
+ * Sorts the array in-place.
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortArray
+ */
+public actual fun FloatArray.sort(): Unit {
+    TODO("Wasm stdlib: sort()")
+}
+
+/**
+ * Sorts the array in-place.
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortArray
+ */
+public actual fun CharArray.sort(): Unit {
+    TODO("Wasm stdlib: sort()")
+}
+
+/**
+ * Sorts the array in-place according to the natural order of its elements.
+ * 
+ * The sort is _stable_. It means that equal elements preserve their order relative to each other after sorting.
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortArrayOfComparable
+ */
+public actual fun <T : Comparable<T>> Array<out T>.sort(): Unit {
+    TODO("Wasm stdlib: sort()")
+}
+
+/**
+ * Sorts a range in the array in-place.
+ * 
+ * The sort is _stable_. It means that equal elements preserve their order relative to each other after sorting.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortRangeOfArrayOfComparable
+ */
+@SinceKotlin("1.4")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun <T : Comparable<T>> Array<out T>.sort(fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sort(fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Sorts a range in the array in-place.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortRangeOfArray
+ */
+@SinceKotlin("1.4")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun ByteArray.sort(fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sort(fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Sorts a range in the array in-place.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortRangeOfArray
+ */
+@SinceKotlin("1.4")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun ShortArray.sort(fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sort(fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Sorts a range in the array in-place.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortRangeOfArray
+ */
+@SinceKotlin("1.4")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun IntArray.sort(fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sort(fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Sorts a range in the array in-place.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortRangeOfArray
+ */
+@SinceKotlin("1.4")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun LongArray.sort(fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sort(fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Sorts a range in the array in-place.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortRangeOfArray
+ */
+@SinceKotlin("1.4")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun FloatArray.sort(fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sort(fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Sorts a range in the array in-place.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortRangeOfArray
+ */
+@SinceKotlin("1.4")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun DoubleArray.sort(fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sort(fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Sorts a range in the array in-place.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ * 
+ * @sample samples.collections.Arrays.Sorting.sortRangeOfArray
+ */
+@SinceKotlin("1.4")
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun CharArray.sort(fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sort(fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Sorts the array in-place according to the order specified by the given [comparator].
+ * 
+ * The sort is _stable_. It means that equal elements preserve their order relative to each other after sorting.
+ */
+public actual fun <T> Array<out T>.sortWith(comparator: Comparator<in T>): Unit {
+    TODO("Wasm stdlib: sortWith(comparator: Comparator<in T>)")
+}
+
+/**
+ * Sorts a range in the array in-place with the given [comparator].
+ * 
+ * The sort is _stable_. It means that equal elements preserve their order relative to each other after sorting.
+ * 
+ * @param fromIndex the start of the range (inclusive) to sort, 0 by default.
+ * @param toIndex the end of the range (exclusive) to sort, size of this array by default.
+ * 
+ * @throws IndexOutOfBoundsException if [fromIndex] is less than zero or [toIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [fromIndex] is greater than [toIndex].
+ */
+@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
+public actual fun <T> Array<out T>.sortWith(comparator: Comparator<in T>, fromIndex: Int = 0, toIndex: Int = size): Unit {
+    TODO("Wasm stdlib: sortWith(comparator: Comparator<in T>, fromIndex: Int = 0, toIndex: Int = size)")
+}
+
+/**
+ * Returns a *typed* object array containing all of the elements of this primitive array.
+ */
+public actual fun ByteArray.toTypedArray(): Array<Byte> {
+    return Array(size) { index -> this[index] }
+}
+
+/**
+ * Returns a *typed* object array containing all of the elements of this primitive array.
+ */
+public actual fun ShortArray.toTypedArray(): Array<Short> {
+    return Array(size) { index -> this[index] }
+}
+
+/**
+ * Returns a *typed* object array containing all of the elements of this primitive array.
+ */
+public actual fun IntArray.toTypedArray(): Array<Int> {
+    return Array(size) { index -> this[index] }
+}
+
+/**
+ * Returns a *typed* object array containing all of the elements of this primitive array.
+ */
+public actual fun LongArray.toTypedArray(): Array<Long> {
+    return Array(size) { index -> this[index] }
+}
+
+/**
+ * Returns a *typed* object array containing all of the elements of this primitive array.
+ */
+public actual fun FloatArray.toTypedArray(): Array<Float> {
+    return Array(size) { index -> this[index] }
+}
+
+/**
+ * Returns a *typed* object array containing all of the elements of this primitive array.
+ */
+public actual fun DoubleArray.toTypedArray(): Array<Double> {
+    return Array(size) { index -> this[index] }
+}
+
+/**
+ * Returns a *typed* object array containing all of the elements of this primitive array.
+ */
+public actual fun BooleanArray.toTypedArray(): Array<Boolean> {
+    return Array(size) { index -> this[index] }
+}
+
+/**
+ * Returns a *typed* object array containing all of the elements of this primitive array.
+ */
+public actual fun CharArray.toTypedArray(): Array<Char> {
+    return Array(size) { index -> this[index] }
+}
+
diff --git a/libraries/stdlib/wasm/src/generated/_CollectionsWasm.kt b/libraries/stdlib/wasm/src/generated/_CollectionsWasm.kt
new file mode 100644
index 00000000000..776281e0520
--- /dev/null
+++ b/libraries/stdlib/wasm/src/generated/_CollectionsWasm.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+//
+// NOTE: THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
+// See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
+//
+
+import kotlin.ranges.contains
+import kotlin.ranges.reversed
+
+/**
+ * Reverses elements in the list in-place.
+ */
+public actual fun <T> MutableList<T>.reverse(): Unit {
+    val midPoint = (size / 2) - 1
+    if (midPoint < 0) return
+    var reverseIndex = lastIndex
+    for (index in 0..midPoint) {
+        val tmp = this[index]
+        this[index] = this[reverseIndex]
+        this[reverseIndex] = tmp
+        reverseIndex--
+    }
+}
+
diff --git a/libraries/stdlib/wasm/src/generated/_ComparisonsWasm.kt b/libraries/stdlib/wasm/src/generated/_ComparisonsWasm.kt
new file mode 100644
index 00000000000..d19edc4f00b
--- /dev/null
+++ b/libraries/stdlib/wasm/src/generated/_ComparisonsWasm.kt
@@ -0,0 +1,445 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.comparisons
+
+//
+// NOTE: THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
+// See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
+//
+
+
+/**
+ * Returns the greater of two values.
+ * 
+ * If values are equal, returns the first one.
+ */
+@SinceKotlin("1.1")
+public actual fun <T : Comparable<T>> maxOf(a: T, b: T): T {
+    return if (a >= b) a else b
+}
+
+/**
+ * Returns the greater of two values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Byte, b: Byte): Byte {
+    return maxOf(a.toInt(), b.toInt()).toByte()
+}
+
+/**
+ * Returns the greater of two values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Short, b: Short): Short {
+    return maxOf(a.toInt(), b.toInt()).toShort()
+}
+
+/**
+ * Returns the greater of two values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Int, b: Int): Int {
+    return if (a >= b) a else b
+}
+
+/**
+ * Returns the greater of two values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Long, b: Long): Long {
+    return if (a >= b) a else b
+}
+
+/**
+ * Returns the greater of two values.
+ * 
+ * If either value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Float, b: Float): Float {
+    return if (a.compareTo(b) >= 0) a else b
+}
+
+/**
+ * Returns the greater of two values.
+ * 
+ * If either value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Double, b: Double): Double {
+    return if (a.compareTo(b) >= 0) a else b
+}
+
+/**
+ * Returns the greater of three values.
+ * 
+ * If there are multiple equal maximal values, returns the first of them.
+ */
+@SinceKotlin("1.1")
+public actual fun <T : Comparable<T>> maxOf(a: T, b: T, c: T): T {
+    return maxOf(a, maxOf(b, c))
+}
+
+/**
+ * Returns the greater of three values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Byte, b: Byte, c: Byte): Byte {
+    return maxOf(a.toInt(), maxOf(b.toInt(), c.toInt())).toByte()
+}
+
+/**
+ * Returns the greater of three values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Short, b: Short, c: Short): Short {
+    return maxOf(a.toInt(), maxOf(b.toInt(), c.toInt())).toShort()
+}
+
+/**
+ * Returns the greater of three values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Int, b: Int, c: Int): Int {
+    return maxOf(a, maxOf(b, c))
+}
+
+/**
+ * Returns the greater of three values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Long, b: Long, c: Long): Long {
+    return maxOf(a, maxOf(b, c))
+}
+
+/**
+ * Returns the greater of three values.
+ * 
+ * If any value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Float, b: Float, c: Float): Float {
+    return maxOf(a, maxOf(b, c))
+}
+
+/**
+ * Returns the greater of three values.
+ * 
+ * If any value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun maxOf(a: Double, b: Double, c: Double): Double {
+    return maxOf(a, maxOf(b, c))
+}
+
+/**
+ * Returns the greater of the given values.
+ * 
+ * If there are multiple equal maximal values, returns the first of them.
+ */
+@SinceKotlin("1.4")
+public actual fun <T : Comparable<T>> maxOf(a: T, vararg other: T): T {
+    var max = a
+    for (e in other) max = maxOf(max, e)
+    return max
+}
+
+/**
+ * Returns the greater of the given values.
+ */
+@SinceKotlin("1.4")
+public actual fun maxOf(a: Byte, vararg other: Byte): Byte {
+    var max = a
+    for (e in other) max = maxOf(max, e)
+    return max
+}
+
+/**
+ * Returns the greater of the given values.
+ */
+@SinceKotlin("1.4")
+public actual fun maxOf(a: Short, vararg other: Short): Short {
+    var max = a
+    for (e in other) max = maxOf(max, e)
+    return max
+}
+
+/**
+ * Returns the greater of the given values.
+ */
+@SinceKotlin("1.4")
+public actual fun maxOf(a: Int, vararg other: Int): Int {
+    var max = a
+    for (e in other) max = maxOf(max, e)
+    return max
+}
+
+/**
+ * Returns the greater of the given values.
+ */
+@SinceKotlin("1.4")
+public actual fun maxOf(a: Long, vararg other: Long): Long {
+    var max = a
+    for (e in other) max = maxOf(max, e)
+    return max
+}
+
+/**
+ * Returns the greater of the given values.
+ * 
+ * If any value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.4")
+public actual fun maxOf(a: Float, vararg other: Float): Float {
+    var max = a
+    for (e in other) max = maxOf(max, e)
+    return max
+}
+
+/**
+ * Returns the greater of the given values.
+ * 
+ * If any value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.4")
+public actual fun maxOf(a: Double, vararg other: Double): Double {
+    var max = a
+    for (e in other) max = maxOf(max, e)
+    return max
+}
+
+/**
+ * Returns the smaller of two values.
+ * 
+ * If values are equal, returns the first one.
+ */
+@SinceKotlin("1.1")
+public actual fun <T : Comparable<T>> minOf(a: T, b: T): T {
+    return if (a <= b) a else b
+}
+
+/**
+ * Returns the smaller of two values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Byte, b: Byte): Byte {
+    return minOf(a.toInt(), b.toInt()).toByte()
+}
+
+/**
+ * Returns the smaller of two values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Short, b: Short): Short {
+    return minOf(a.toInt(), b.toInt()).toShort()
+}
+
+/**
+ * Returns the smaller of two values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Int, b: Int): Int {
+    return if (a <= b) a else b
+}
+
+/**
+ * Returns the smaller of two values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Long, b: Long): Long {
+    return if (a <= b) a else b
+}
+
+/**
+ * Returns the smaller of two values.
+ * 
+ * If either value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Float, b: Float): Float {
+    return when {
+        a.isNaN() -> a
+        b.isNaN() -> b
+        else -> if (a.compareTo(b) <= 0) a else b
+    }
+}
+
+/**
+ * Returns the smaller of two values.
+ * 
+ * If either value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Double, b: Double): Double {
+    return when {
+        a.isNaN() -> a
+        b.isNaN() -> b
+        else -> if (a.compareTo(b) <= 0) a else b
+    }
+}
+
+/**
+ * Returns the smaller of three values.
+ * 
+ * If there are multiple equal minimal values, returns the first of them.
+ */
+@SinceKotlin("1.1")
+public actual fun <T : Comparable<T>> minOf(a: T, b: T, c: T): T {
+    return minOf(a, minOf(b, c))
+}
+
+/**
+ * Returns the smaller of three values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Byte, b: Byte, c: Byte): Byte {
+    return minOf(a.toInt(), minOf(b.toInt(), c.toInt())).toByte()
+}
+
+/**
+ * Returns the smaller of three values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Short, b: Short, c: Short): Short {
+    return minOf(a.toInt(), minOf(b.toInt(), c.toInt())).toShort()
+}
+
+/**
+ * Returns the smaller of three values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Int, b: Int, c: Int): Int {
+    return minOf(a, minOf(b, c))
+}
+
+/**
+ * Returns the smaller of three values.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Long, b: Long, c: Long): Long {
+    return minOf(a, minOf(b, c))
+}
+
+/**
+ * Returns the smaller of three values.
+ * 
+ * If any value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Float, b: Float, c: Float): Float {
+    return minOf(a, minOf(b, c))
+}
+
+/**
+ * Returns the smaller of three values.
+ * 
+ * If any value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public actual inline fun minOf(a: Double, b: Double, c: Double): Double {
+    return minOf(a, minOf(b, c))
+}
+
+/**
+ * Returns the smaller of the given values.
+ * 
+ * If there are multiple equal minimal values, returns the first of them.
+ */
+@SinceKotlin("1.4")
+public actual fun <T : Comparable<T>> minOf(a: T, vararg other: T): T {
+    var min = a
+    for (e in other) min = minOf(min, e)
+    return min
+}
+
+/**
+ * Returns the smaller of the given values.
+ */
+@SinceKotlin("1.4")
+public actual fun minOf(a: Byte, vararg other: Byte): Byte {
+    var min = a
+    for (e in other) min = minOf(min, e)
+    return min
+}
+
+/**
+ * Returns the smaller of the given values.
+ */
+@SinceKotlin("1.4")
+public actual fun minOf(a: Short, vararg other: Short): Short {
+    var min = a
+    for (e in other) min = minOf(min, e)
+    return min
+}
+
+/**
+ * Returns the smaller of the given values.
+ */
+@SinceKotlin("1.4")
+public actual fun minOf(a: Int, vararg other: Int): Int {
+    var min = a
+    for (e in other) min = minOf(min, e)
+    return min
+}
+
+/**
+ * Returns the smaller of the given values.
+ */
+@SinceKotlin("1.4")
+public actual fun minOf(a: Long, vararg other: Long): Long {
+    var min = a
+    for (e in other) min = minOf(min, e)
+    return min
+}
+
+/**
+ * Returns the smaller of the given values.
+ * 
+ * If any value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.4")
+public actual fun minOf(a: Float, vararg other: Float): Float {
+    var min = a
+    for (e in other) min = minOf(min, e)
+    return min
+}
+
+/**
+ * Returns the smaller of the given values.
+ * 
+ * If any value is `NaN`, returns `NaN`.
+ */
+@SinceKotlin("1.4")
+public actual fun minOf(a: Double, vararg other: Double): Double {
+    var min = a
+    for (e in other) min = minOf(min, e)
+    return min
+}
+
diff --git a/libraries/stdlib/wasm/src/generated/_StringsWasm.kt b/libraries/stdlib/wasm/src/generated/_StringsWasm.kt
new file mode 100644
index 00000000000..9ed5b20ff09
--- /dev/null
+++ b/libraries/stdlib/wasm/src/generated/_StringsWasm.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.text
+
+//
+// NOTE: THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
+// See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
+//
+
+
+/**
+ * Returns a character at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this char sequence.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@kotlin.internal.InlineOnly
+public actual inline fun CharSequence.elementAt(index: Int): Char {
+    return get(index)
+}
+
diff --git a/libraries/stdlib/wasm/src/generated/_UArraysWasm.kt b/libraries/stdlib/wasm/src/generated/_UArraysWasm.kt
new file mode 100644
index 00000000000..a42075114c8
--- /dev/null
+++ b/libraries/stdlib/wasm/src/generated/_UArraysWasm.kt
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+//
+// NOTE: THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
+// See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
+//
+
+import kotlin.ranges.contains
+import kotlin.ranges.reversed
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public actual inline fun UIntArray.elementAt(index: Int): UInt {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public actual inline fun ULongArray.elementAt(index: Int): ULong {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public actual inline fun UByteArray.elementAt(index: Int): UByte {
+    return get(index)
+}
+
+/**
+ * Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this array.
+ * 
+ * @sample samples.collections.Collections.Elements.elementAt
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public actual inline fun UShortArray.elementAt(index: Int): UShort {
+    return get(index)
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+public actual fun UIntArray.asList(): List<UInt> {
+    return object : AbstractList<UInt>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: UInt): Boolean = this@asList.contains(element)
+        override fun get(index: Int): UInt = this@asList[index]
+        override fun indexOf(element: UInt): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: UInt): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+public actual fun ULongArray.asList(): List<ULong> {
+    return object : AbstractList<ULong>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: ULong): Boolean = this@asList.contains(element)
+        override fun get(index: Int): ULong = this@asList[index]
+        override fun indexOf(element: ULong): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: ULong): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+public actual fun UByteArray.asList(): List<UByte> {
+    return object : AbstractList<UByte>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: UByte): Boolean = this@asList.contains(element)
+        override fun get(index: Int): UByte = this@asList[index]
+        override fun indexOf(element: UByte): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: UByte): Int = this@asList.lastIndexOf(element)
+    }
+}
+
+/**
+ * Returns a [List] that wraps the original array.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+public actual fun UShortArray.asList(): List<UShort> {
+    return object : AbstractList<UShort>(), RandomAccess {
+        override val size: Int get() = this@asList.size
+        override fun isEmpty(): Boolean = this@asList.isEmpty()
+        override fun contains(element: UShort): Boolean = this@asList.contains(element)
+        override fun get(index: Int): UShort = this@asList[index]
+        override fun indexOf(element: UShort): Int = this@asList.indexOf(element)
+        override fun lastIndexOf(element: UShort): Int = this@asList.lastIndexOf(element)
+    }
+}
+
diff --git a/libraries/stdlib/wasm/src/kotlin/Exceptions.kt b/libraries/stdlib/wasm/src/kotlin/Exceptions.kt
new file mode 100644
index 00000000000..82e33cbb565
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/Exceptions.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+
+public actual open class Exception actual constructor(message: String?, cause: Throwable?) : Throwable(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
+public actual open class Error actual constructor(message: String?, cause: Throwable?) : Throwable(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
+public actual open class RuntimeException actual constructor(message: String?, cause: Throwable?) : Exception(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
+public actual open class IllegalArgumentException actual constructor(message: String?, cause: Throwable?) : RuntimeException(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
+public actual open class IllegalStateException actual constructor(message: String?, cause: Throwable?) : RuntimeException(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
+public actual open class IndexOutOfBoundsException actual constructor(message: String?) : RuntimeException(message) {
+    actual constructor() : this(null)
+}
+
+public actual open class ConcurrentModificationException actual constructor(message: String?, cause: Throwable?) : RuntimeException(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
+public actual open class UnsupportedOperationException actual constructor(message: String?, cause: Throwable?) : RuntimeException(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
+
+public actual open class NumberFormatException actual constructor(message: String?) : IllegalArgumentException(message) {
+    actual constructor() : this(null)
+}
+
+
+public actual open class NullPointerException actual constructor(message: String?) : RuntimeException(message) {
+    actual constructor() : this(null)
+}
+
+public actual open class ClassCastException actual constructor(message: String?) : RuntimeException(message) {
+    actual constructor() : this(null)
+}
+
+public actual open class AssertionError private constructor(message: String?, cause: Throwable?) : Error(message, cause) {
+    actual constructor() : this(null)
+    constructor(message: String?) : this(message, null)
+    actual constructor(message: Any?) : this(message.toString(), message as? Throwable)
+}
+
+public actual open class NoSuchElementException actual constructor(message: String?) : RuntimeException(message) {
+    actual constructor() : this(null)
+}
+
+@SinceKotlin("1.3")
+public actual open class ArithmeticException actual constructor(message: String?) : RuntimeException(message) {
+    actual constructor() : this(null)
+}
+
+public actual open class NoWhenBranchMatchedException actual constructor(message: String?, cause: Throwable?) : RuntimeException(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
+public actual open class UninitializedPropertyAccessException actual constructor(message: String?, cause: Throwable?) : RuntimeException(message, cause) {
+    actual constructor() : this(null, null)
+    actual constructor(message: String?) : this(message, null)
+    actual constructor(cause: Throwable?) : this(null, cause)
+}
+
diff --git a/libraries/stdlib/wasm/src/kotlin/JsInterop.kt b/libraries/stdlib/wasm/src/kotlin/JsInterop.kt
new file mode 100644
index 00000000000..c2660e20681
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/JsInterop.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+/**
+ * Implements annotated function in JavaScript and automatically imports is to Wasm.
+ * [code] string must contain JS expression that evaluates to JS function with signature that matches annotated kotlin function
+ *
+ * For example, a function that adds two Doubles via JS:
+ *
+ *      @JsFun("(x, y) => x + y")
+ *      fun jsAdd(x: Double, y: Double): Double =
+ *          error("...")
+ *
+ * This is a temporary annotation because K/Wasm <-> JS interop is not designed yet.
+ */
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
+@Retention(AnnotationRetention.BINARY)
+public annotation class JsFun(val code: String)
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/Kotlin.kt b/libraries/stdlib/wasm/src/kotlin/Kotlin.kt
new file mode 100644
index 00000000000..d45631a5835
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/Kotlin.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+import kotlin.annotation.AnnotationTarget.FIELD
+import kotlin.annotation.AnnotationTarget.PROPERTY
+
+
+/**
+ * Provides a comparison function for imposing a total ordering between instances of the type [T].
+ */
+public actual fun interface Comparator<T> {
+    /**
+     * Compares its two arguments for order. Returns zero if the arguments are equal,
+     * a negative number if the first argument is less than the second, or a positive number
+     * if the first argument is greater than the second.
+     */
+    public actual fun compare(a: T, b: T): Int
+}
+
+// From kotlin.kt
+
+
+
+// From numbers.kt
+
+actual fun Double.isNaN(): Boolean = TODO("Wasm stdlib: Kotlin")
+actual fun Float.isNaN(): Boolean = TODO("Wasm stdlib: Kotlin")
+actual fun Double.isInfinite(): Boolean = TODO("Wasm stdlib: Kotlin")
+actual fun Float.isInfinite(): Boolean = TODO("Wasm stdlib: Kotlin")
+actual fun Double.isFinite(): Boolean = TODO("Wasm stdlib: Kotlin")
+actual fun Float.isFinite(): Boolean = TODO("Wasm stdlib: Kotlin")
+
+/**
+ * Returns a bit representation of the specified floating-point value as [Long]
+ * according to the IEEE 754 floating-point "double format" bit layout.
+ */
+@SinceKotlin("1.2")
+public actual fun Double.toBits(): Long = TODO("Wasm stdlib: Kotlin")
+
+/**
+ * Returns a bit representation of the specified floating-point value as [Long]
+ * according to the IEEE 754 floating-point "double format" bit layout,
+ * preserving `NaN` values exact layout.
+ */
+@SinceKotlin("1.2")
+public actual fun Double.toRawBits(): Long = TODO("Wasm stdlib: Kotlin")
+
+/**
+ * Returns the [Double] value corresponding to a given bit representation.
+ */
+@SinceKotlin("1.2")
+public actual fun Double.Companion.fromBits(bits: Long): Double = TODO("Wasm stdlib: Kotlin")
+
+/**
+ * Returns a bit representation of the specified floating-point value as [Int]
+ * according to the IEEE 754 floating-point "single format" bit layout.
+ */
+@SinceKotlin("1.2")
+public actual fun Float.toBits(): Int = TODO("Wasm stdlib: Kotlin")
+
+/**
+ * Returns a bit representation of the specified floating-point value as [Int]
+ * according to the IEEE 754 floating-point "single format" bit layout,
+ * preserving `NaN` values exact layout.
+ */
+@SinceKotlin("1.2")
+public actual fun Float.toRawBits(): Int = TODO("Wasm stdlib: Kotlin")
+
+/**
+ * Returns the [Float] value corresponding to a given bit representation.
+ */
+@SinceKotlin("1.2")
+public actual fun Float.Companion.fromBits(bits: Int): Float = TODO("Wasm stdlib: Kotlin")
+
+
+// From concurrent.kt
+
+// TODO: promote to error? Otherwise it gets to JVM part
+//@Deprecated("Use Volatile annotation from kotlin.jvm package", ReplaceWith("kotlin.jvm.Volatile"), level = DeprecationLevel.WARNING)
+//public typealias Volatile = kotlin.jvm.Volatile
+
+@Deprecated("Synchronization on any object is not supported on every platform and will be removed from the common standard library soon.")
+public actual inline fun <R> synchronized(lock: Any, block: () -> R): R = TODO("Wasm stdlib: Kotlin")
+
+
+
+
+// from lazy.kt
+
+public actual fun <T> lazy(initializer: () -> T): Lazy<T> = TODO("Wasm stdlib: Kotlin")
+
+/**
+ * Creates a new instance of the [Lazy] that uses the specified initialization function [initializer].
+ *
+ * The [mode] parameter is ignored. */
+public actual fun <T> lazy(mode: LazyThreadSafetyMode, initializer: () -> T): Lazy<T> = TODO("Wasm stdlib: Kotlin")
+
+/**
+ * Creates a new instance of the [Lazy] that uses the specified initialization function [initializer].
+ *
+ * The [lock] parameter is ignored.
+ */
+public actual fun <T> lazy(lock: Any?, initializer: () -> T): Lazy<T> = TODO("Wasm stdlib: Kotlin")
diff --git a/libraries/stdlib/wasm/src/kotlin/Math.kt b/libraries/stdlib/wasm/src/kotlin/Math.kt
new file mode 100644
index 00000000000..61843481e38
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/Math.kt
@@ -0,0 +1,990 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.math
+
+
+// region ================ Double Math ========================================
+
+/** Computes the sine of the angle [x] given in radians.
+ *
+ *  Special cases:
+ *   - `sin(NaN|+Inf|-Inf)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun sin(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/** Computes the cosine of the angle [x] given in radians.
+ *
+ *  Special cases:
+ *   - `cos(NaN|+Inf|-Inf)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun cos(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/** Computes the tangent of the angle [x] given in radians.
+ *
+ *  Special cases:
+ *   - `tan(NaN|+Inf|-Inf)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun tan(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the arc sine of the value [x];
+ * the returned value is an angle in the range from `-PI/2` to `PI/2` radians.
+ *
+ * Special cases:
+ *    - `asin(x)` is `NaN`, when `abs(x) > 1` or x is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun asin(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the arc cosine of the value [x];
+ * the returned value is an angle in the range from `0.0` to `PI` radians.
+ *
+ * Special cases:
+ *    - `acos(x)` is `NaN`, when `abs(x) > 1` or x is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun acos(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the arc tangent of the value [x];
+ * the returned value is an angle in the range from `-PI/2` to `PI/2` radians.
+ *
+ * Special cases:
+ *   - `atan(NaN)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun atan(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the angle `theta` of the polar coordinates `(r, theta)` that correspond
+ * to the rectangular coordinates `(x, y)` by computing the arc tangent of the value [y] / [x];
+ * the returned value is an angle in the range from `-PI` to `PI` radians.
+ *
+ * Special cases:
+ *   - `atan2(0.0, 0.0)` is `0.0`
+ *   - `atan2(0.0, x)` is  `0.0` for `x > 0` and `PI` for `x < 0`
+ *   - `atan2(-0.0, x)` is `-0.0` for 'x > 0` and `-PI` for `x < 0`
+ *   - `atan2(y, +Inf)` is `0.0` for `0 < y < +Inf` and `-0.0` for '-Inf < y < 0`
+ *   - `atan2(y, -Inf)` is `PI` for `0 < y < +Inf` and `-PI` for `-Inf < y < 0`
+ *   - `atan2(y, 0.0)` is `PI/2` for `y > 0` and `-PI/2` for `y < 0`
+ *   - `atan2(+Inf, x)` is `PI/2` for finite `x`y
+ *   - `atan2(-Inf, x)` is `-PI/2` for finite `x`
+ *   - `atan2(NaN, x)` and `atan2(y, NaN)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun atan2(y: Double, x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the hyperbolic sine of the value [x].
+ *
+ * Special cases:
+ *   - `sinh(NaN)` is `NaN`
+ *   - `sinh(+Inf)` is `+Inf`
+ *   - `sinh(-Inf)` is `-Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun sinh(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the hyperbolic cosine of the value [x].
+ *
+ * Special cases:
+ *   - `cosh(NaN)` is `NaN`
+ *   - `cosh(+Inf|-Inf)` is `+Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun cosh(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the hyperbolic tangent of the value [x].
+ *
+ * Special cases:
+ *   - `tanh(NaN)` is `NaN`
+ *   - `tanh(+Inf)` is `1.0`
+ *   - `tanh(-Inf)` is `-1.0`
+ */
+@SinceKotlin("1.2")
+public actual fun tanh(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the inverse hyperbolic sine of the value [x].
+ *
+ * The returned value is `y` such that `sinh(y) == x`.
+ *
+ * Special cases:
+ *   - `asinh(NaN)` is `NaN`
+ *   - `asinh(+Inf)` is `+Inf`
+ *   - `asinh(-Inf)` is `-Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun asinh(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the inverse hyperbolic cosine of the value [x].
+ *
+ * The returned value is positive `y` such that `cosh(y) == x`.
+ *
+ * Special cases:
+ *   - `acosh(NaN)` is `NaN`
+ *   - `acosh(x)` is `NaN` when `x < 1`
+ *   - `acosh(+Inf)` is `+Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun acosh(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the inverse hyperbolic tangent of the value [x].
+ *
+ * The returned value is `y` such that `tanh(y) == x`.
+ *
+ * Special cases:
+ *   - `tanh(NaN)` is `NaN`
+ *   - `tanh(x)` is `NaN` when `x > 1` or `x < -1`
+ *   - `tanh(1.0)` is `+Inf`
+ *   - `tanh(-1.0)` is `-Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun atanh(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes `sqrt(x^2 + y^2)` without intermediate overflow or underflow.
+ *
+ * Special cases:
+ *   - returns `+Inf` if any of arguments is infinite
+ *   - returns `NaN` if any of arguments is `NaN` and the other is not infinite
+ */
+@SinceKotlin("1.2")
+public actual fun hypot(x: Double, y: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the positive square root of the value [x].
+ *
+ * Special cases:
+ *   - `sqrt(x)` is `NaN` when `x < 0` or `x` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun sqrt(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes Euler's number `e` raised to the power of the value [x].
+ *
+ * Special cases:
+ *   - `exp(NaN)` is `NaN`
+ *   - `exp(+Inf)` is `+Inf`
+ *   - `exp(-Inf)` is `0.0`
+ */
+@SinceKotlin("1.2")
+public actual fun exp(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes `exp(x) - 1`.
+ *
+ * This function can be implemented to produce more precise result for [x] near zero.
+ *
+ * Special cases:
+ *   - `expm1(NaN)` is `NaN`
+ *   - `expm1(+Inf)` is `+Inf`
+ *   - `expm1(-Inf)` is `-1.0`
+ *
+ * @see [exp] function.
+ */
+@SinceKotlin("1.2")
+public actual fun expm1(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the logarithm of the value [x] to the given [base].
+ *
+ * Special cases:
+ *   - `log(x, b)` is `NaN` if either `x` or `b` are `NaN`
+ *   - `log(x, b)` is `NaN` when `x < 0` or `b <= 0` or `b == 1.0`
+ *   - `log(+Inf, +Inf)` is `NaN`
+ *   - `log(+Inf, b)` is `+Inf` for `b > 1` and `-Inf` for `b < 1`
+ *   - `log(0.0, b)` is `-Inf` for `b > 1` and `+Inf` for `b > 1`
+ *
+ * See also logarithm functions for common fixed bases: [ln], [log10] and [log2].
+ */
+@SinceKotlin("1.2")
+public actual fun log(x: Double, base: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the natural logarithm (base `E`) of the value [x].
+ *
+ * Special cases:
+ *   - `ln(NaN)` is `NaN`
+ *   - `ln(x)` is `NaN` when `x < 0.0`
+ *   - `ln(+Inf)` is `+Inf`
+ *   - `ln(0.0)` is `-Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun ln(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the common logarithm (base 10) of the value [x].
+ *
+ * @see [ln] function for special cases.
+ */
+@SinceKotlin("1.2")
+public actual fun log10(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the binary logarithm (base 2) of the value [x].
+ *
+ * @see [ln] function for special cases.
+ */
+@SinceKotlin("1.2")
+public actual fun log2(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes `ln(x + 1)`.
+ *
+ * This function can be implemented to produce more precise result for [x] near zero.
+ *
+ * Special cases:
+ *   - `ln1p(NaN)` is `NaN`
+ *   - `ln1p(x)` is `NaN` where `x < -1.0`
+ *   - `ln1p(-1.0)` is `-Inf`
+ *   - `ln1p(+Inf)` is `+Inf`
+ *
+ * @see [ln] function
+ * @see [expm1] function
+ */
+@SinceKotlin("1.2")
+public actual fun ln1p(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds the given value [x] to an integer towards positive infinity.
+
+ * @return the smallest double value that is greater than or equal to the given value [x] and is a mathematical integer.
+ *
+ * Special cases:
+ *   - `ceil(x)` is `x` where `x` is `NaN` or `+Inf` or `-Inf` or already a mathematical integer.
+ */
+@SinceKotlin("1.2")
+public actual fun ceil(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds the given value [x] to an integer towards negative infinity.
+
+ * @return the largest double value that is smaller than or equal to the given value [x] and is a mathematical integer.
+ *
+ * Special cases:
+ *   - `floor(x)` is `x` where `x` is `NaN` or `+Inf` or `-Inf` or already a mathematical integer.
+ */
+@SinceKotlin("1.2")
+public actual fun floor(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds the given value [x] to an integer towards zero.
+ *
+ * @return the value [x] having its fractional part truncated.
+ *
+ * Special cases:
+ *   - `truncate(x)` is `x` where `x` is `NaN` or `+Inf` or `-Inf` or already a mathematical integer.
+ */
+@SinceKotlin("1.2")
+public actual fun truncate(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds the given value [x] towards the closest integer with ties rounded towards even integer.
+ *
+ * Special cases:
+ *   - `round(x)` is `x` where `x` is `NaN` or `+Inf` or `-Inf` or already a mathematical integer.
+ */
+@SinceKotlin("1.2")
+public actual fun round(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the absolute value of the given value [x].
+ *
+ * Special cases:
+ *   - `abs(NaN)` is `NaN`
+ *
+ * @see absoluteValue extension property for [Double]
+ */
+@SinceKotlin("1.2")
+public actual fun abs(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the sign of the given value [x]:
+ *   - `-1.0` if the value is negative,
+ *   - zero if the value is zero,
+ *   - `1.0` if the value is positive
+ *
+ * Special case:
+ *   - `sign(NaN)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun sign(x: Double): Double = TODO("Wasm stdlib: Math")
+
+
+/**
+ * Returns the smaller of two values.
+ *
+ * If either value is `NaN`, then the result is `NaN`.
+ */
+@SinceKotlin("1.2")
+public actual fun min(a: Double, b: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the greater of two values.
+ *
+ * If either value is `NaN`, then the result is `NaN`.
+ */
+@SinceKotlin("1.2")
+public actual fun max(a: Double, b: Double): Double = TODO("Wasm stdlib: Math")
+
+// extensions
+
+/**
+ * Raises this value to the power [x].
+ *
+ * Special cases:
+ *   - `b.pow(0.0)` is `1.0`
+ *   - `b.pow(1.0) == b`
+ *   - `b.pow(NaN)` is `NaN`
+ *   - `NaN.pow(x)` is `NaN` for `x != 0.0`
+ *   - `b.pow(Inf)` is `NaN` for `abs(b) == 1.0`
+ *   - `b.pow(x)` is `NaN` for `b < 0` and `x` is finite and not an integer
+ */
+@SinceKotlin("1.2")
+public actual fun Double.pow(x: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Raises this value to the integer power [n].
+ *
+ * See the other overload of [pow] for details.
+ */
+@SinceKotlin("1.2")
+public actual fun Double.pow(n: Int): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the absolute value of this value.
+ *
+ * Special cases:
+ *   - `NaN.absoluteValue` is `NaN`
+ *
+ * @see abs function
+ */
+@SinceKotlin("1.2")
+public actual val Double.absoluteValue: Double get() = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the sign of this value:
+ *   - `-1.0` if the value is negative,
+ *   - zero if the value is zero,
+ *   - `1.0` if the value is positive
+ *
+ * Special case:
+ *   - `NaN.sign` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual val Double.sign: Double get() = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns this value with the sign bit same as of the [sign] value.
+ *
+ * If [sign] is `NaN` the sign of the result is undefined.
+ */
+@SinceKotlin("1.2")
+public actual fun Double.withSign(sign: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns this value with the sign bit same as of the [sign] value.
+ */
+@SinceKotlin("1.2")
+public actual fun Double.withSign(sign: Int): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the ulp (unit in the last place) of this value.
+ *
+ * An ulp is a positive distance between this value and the next nearest [Double] value larger in magnitude.
+ *
+ * Special Cases:
+ *   - `NaN.ulp` is `NaN`
+ *   - `x.ulp` is `+Inf` when `x` is `+Inf` or `-Inf`
+ *   - `0.0.ulp` is `Double.MIN_VALUE`
+ */
+@SinceKotlin("1.2")
+public actual val Double.ulp: Double get() = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the [Double] value nearest to this value in direction of positive infinity.
+ */
+@SinceKotlin("1.2")
+public actual fun Double.nextUp(): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the [Double] value nearest to this value in direction of negative infinity.
+ */
+@SinceKotlin("1.2")
+public actual fun Double.nextDown(): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the [Double] value nearest to this value in direction from this value towards the value [to].
+ *
+ * Special cases:
+ *   - `x.nextTowards(y)` is `NaN` if either `x` or `y` are `NaN`
+ *   - `x.nextTowards(x) == x`
+ *
+ */
+@SinceKotlin("1.2")
+public actual fun Double.nextTowards(to: Double): Double = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds this [Double] value to the nearest integer and converts the result to [Int].
+ * Ties are rounded towards positive infinity.
+ *
+ * Special cases:
+ *   - `x.roundToInt() == Int.MAX_VALUE` when `x > Int.MAX_VALUE`
+ *   - `x.roundToInt() == Int.MIN_VALUE` when `x < Int.MIN_VALUE`
+ *
+ * @throws IllegalArgumentException when this value is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun Double.roundToInt(): Int = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds this [Double] value to the nearest integer and converts the result to [Long].
+ * Ties are rounded towards positive infinity.
+ *
+ * Special cases:
+ *   - `x.roundToLong() == Long.MAX_VALUE` when `x > Long.MAX_VALUE`
+ *   - `x.roundToLong() == Long.MIN_VALUE` when `x < Long.MIN_VALUE`
+ *
+ * @throws IllegalArgumentException when this value is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun Double.roundToLong(): Long = TODO("Wasm stdlib: Math")
+
+// endregion
+
+
+
+// region ================ Float Math ========================================
+
+/** Computes the sine of the angle [x] given in radians.
+ *
+ *  Special cases:
+ *   - `sin(NaN|+Inf|-Inf)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun sin(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/** Computes the cosine of the angle [x] given in radians.
+ *
+ *  Special cases:
+ *   - `cos(NaN|+Inf|-Inf)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun cos(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/** Computes the tangent of the angle [x] given in radians.
+ *
+ *  Special cases:
+ *   - `tan(NaN|+Inf|-Inf)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun tan(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the arc sine of the value [x];
+ * the returned value is an angle in the range from `-PI/2` to `PI/2` radians.
+ *
+ * Special cases:
+ *    - `asin(x)` is `NaN`, when `abs(x) > 1` or x is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun asin(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the arc cosine of the value [x];
+ * the returned value is an angle in the range from `0.0` to `PI` radians.
+ *
+ * Special cases:
+ *    - `acos(x)` is `NaN`, when `abs(x) > 1` or x is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun acos(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the arc tangent of the value [x];
+ * the returned value is an angle in the range from `-PI/2` to `PI/2` radians.
+ *
+ * Special cases:
+ *   - `atan(NaN)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun atan(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the angle `theta` of the polar coordinates `(r, theta)` that correspond
+ * to the rectangular coordinates `(x, y)` by computing the arc tangent of the value [y] / [x];
+ * the returned value is an angle in the range from `-PI` to `PI` radians.
+ *
+ * Special cases:
+ *   - `atan2(0.0, 0.0)` is `0.0`
+ *   - `atan2(0.0, x)` is  `0.0` for `x > 0` and `PI` for `x < 0`
+ *   - `atan2(-0.0, x)` is `-0.0` for 'x > 0` and `-PI` for `x < 0`
+ *   - `atan2(y, +Inf)` is `0.0` for `0 < y < +Inf` and `-0.0` for '-Inf < y < 0`
+ *   - `atan2(y, -Inf)` is `PI` for `0 < y < +Inf` and `-PI` for `-Inf < y < 0`
+ *   - `atan2(y, 0.0)` is `PI/2` for `y > 0` and `-PI/2` for `y < 0`
+ *   - `atan2(+Inf, x)` is `PI/2` for finite `x`y
+ *   - `atan2(-Inf, x)` is `-PI/2` for finite `x`
+ *   - `atan2(NaN, x)` and `atan2(y, NaN)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun atan2(y: Float, x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the hyperbolic sine of the value [x].
+ *
+ * Special cases:
+ *   - `sinh(NaN)` is `NaN`
+ *   - `sinh(+Inf)` is `+Inf`
+ *   - `sinh(-Inf)` is `-Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun sinh(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the hyperbolic cosine of the value [x].
+ *
+ * Special cases:
+ *   - `cosh(NaN)` is `NaN`
+ *   - `cosh(+Inf|-Inf)` is `+Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun cosh(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the hyperbolic tangent of the value [x].
+ *
+ * Special cases:
+ *   - `tanh(NaN)` is `NaN`
+ *   - `tanh(+Inf)` is `1.0`
+ *   - `tanh(-Inf)` is `-1.0`
+ */
+@SinceKotlin("1.2")
+public actual fun tanh(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the inverse hyperbolic sine of the value [x].
+ *
+ * The returned value is `y` such that `sinh(y) == x`.
+ *
+ * Special cases:
+ *   - `asinh(NaN)` is `NaN`
+ *   - `asinh(+Inf)` is `+Inf`
+ *   - `asinh(-Inf)` is `-Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun asinh(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the inverse hyperbolic cosine of the value [x].
+ *
+ * The returned value is positive `y` such that `cosh(y) == x`.
+ *
+ * Special cases:
+ *   - `acosh(NaN)` is `NaN`
+ *   - `acosh(x)` is `NaN` when `x < 1`
+ *   - `acosh(+Inf)` is `+Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun acosh(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the inverse hyperbolic tangent of the value [x].
+ *
+ * The returned value is `y` such that `tanh(y) == x`.
+ *
+ * Special cases:
+ *   - `tanh(NaN)` is `NaN`
+ *   - `tanh(x)` is `NaN` when `x > 1` or `x < -1`
+ *   - `tanh(1.0)` is `+Inf`
+ *   - `tanh(-1.0)` is `-Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun atanh(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes `sqrt(x^2 + y^2)` without intermediate overflow or underflow.
+ *
+ * Special cases:
+ *   - returns `+Inf` if any of arguments is infinite
+ *   - returns `NaN` if any of arguments is `NaN` and the other is not infinite
+ */
+@SinceKotlin("1.2")
+public actual fun hypot(x: Float, y: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the positive square root of the value [x].
+ *
+ * Special cases:
+ *   - `sqrt(x)` is `NaN` when `x < 0` or `x` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun sqrt(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes Euler's number `e` raised to the power of the value [x].
+ *
+ * Special cases:
+ *   - `exp(NaN)` is `NaN`
+ *   - `exp(+Inf)` is `+Inf`
+ *   - `exp(-Inf)` is `0.0`
+ */
+@SinceKotlin("1.2")
+public actual fun exp(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes `exp(x) - 1`.
+ *
+ * This function can be implemented to produce more precise result for [x] near zero.
+ *
+ * Special cases:
+ *   - `expm1(NaN)` is `NaN`
+ *   - `expm1(+Inf)` is `+Inf`
+ *   - `expm1(-Inf)` is `-1.0`
+ *
+ * @see [exp] function.
+ */
+@SinceKotlin("1.2")
+public actual fun expm1(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the logarithm of the value [x] to the given [base].
+ *
+ * Special cases:
+ *   - `log(x, b)` is `NaN` if either `x` or `b` are `NaN`
+ *   - `log(x, b)` is `NaN` when `x < 0` or `b <= 0` or `b == 1.0`
+ *   - `log(+Inf, +Inf)` is `NaN`
+ *   - `log(+Inf, b)` is `+Inf` for `b > 1` and `-Inf` for `b < 1`
+ *   - `log(0.0, b)` is `-Inf` for `b > 1` and `+Inf` for `b > 1`
+ *
+ * See also logarithm functions for common fixed bases: [ln], [log10] and [log2].
+ */
+@SinceKotlin("1.2")
+public actual fun log(x: Float, base: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the natural logarithm (base `E`) of the value [x].
+ *
+ * Special cases:
+ *   - `ln(NaN)` is `NaN`
+ *   - `ln(x)` is `NaN` when `x < 0.0`
+ *   - `ln(+Inf)` is `+Inf`
+ *   - `ln(0.0)` is `-Inf`
+ */
+@SinceKotlin("1.2")
+public actual fun ln(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the common logarithm (base 10) of the value [x].
+ *
+ * @see [ln] function for special cases.
+ */
+@SinceKotlin("1.2")
+public actual fun log10(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes the binary logarithm (base 2) of the value [x].
+ *
+ * @see [ln] function for special cases.
+ */
+@SinceKotlin("1.2")
+public actual fun log2(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Computes `ln(a + 1)`.
+ *
+ * This function can be implemented to produce more precise result for [x] near zero.
+ *
+ * Special cases:
+ *   - `ln1p(NaN)` is `NaN`
+ *   - `ln1p(x)` is `NaN` where `x < -1.0`
+ *   - `ln1p(-1.0)` is `-Inf`
+ *   - `ln1p(+Inf)` is `+Inf`
+ *
+ * @see [ln] function
+ * @see [expm1] function
+ */
+@SinceKotlin("1.2")
+public actual fun ln1p(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds the given value [x] to an integer towards positive infinity.
+
+ * @return the smallest Float value that is greater than or equal to the given value [x] and is a mathematical integer.
+ *
+ * Special cases:
+ *   - `ceil(x)` is `x` where `x` is `NaN` or `+Inf` or `-Inf` or already a mathematical integer.
+ */
+@SinceKotlin("1.2")
+public actual fun ceil(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds the given value [x] to an integer towards negative infinity.
+
+ * @return the largest Float value that is smaller than or equal to the given value [x] and is a mathematical integer.
+ *
+ * Special cases:
+ *   - `floor(x)` is `x` where `x` is `NaN` or `+Inf` or `-Inf` or already a mathematical integer.
+ */
+@SinceKotlin("1.2")
+public actual fun floor(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds the given value [x] to an integer towards zero.
+ *
+ * @return the value [x] having its fractional part truncated.
+ *
+ * Special cases:
+ *   - `truncate(x)` is `x` where `x` is `NaN` or `+Inf` or `-Inf` or already a mathematical integer.
+ */
+@SinceKotlin("1.2")
+public actual fun truncate(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds the given value [x] towards the closest integer with ties rounded towards even integer.
+ *
+ * Special cases:
+ *   - `round(x)` is `x` where `x` is `NaN` or `+Inf` or `-Inf` or already a mathematical integer.
+ */
+@SinceKotlin("1.2")
+public actual fun round(x: Float): Float = TODO("Wasm stdlib: Math")
+
+
+/**
+ * Returns the absolute value of the given value [x].
+ *
+ * Special cases:
+ *   - `abs(NaN)` is `NaN`
+ *
+ * @see absoluteValue extension property for [Float]
+ */
+@SinceKotlin("1.2")
+public actual fun abs(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the sign of the given value [x]:
+ *   - `-1.0` if the value is negative,
+ *   - zero if the value is zero,
+ *   - `1.0` if the value is positive
+ *
+ * Special case:
+ *   - `sign(NaN)` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun sign(x: Float): Float = TODO("Wasm stdlib: Math")
+
+
+
+/**
+ * Returns the smaller of two values.
+ *
+ * If either value is `NaN`, then the result is `NaN`.
+ */
+@SinceKotlin("1.2")
+public actual fun min(a: Float, b: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the greater of two values.
+ *
+ * If either value is `NaN`, then the result is `NaN`.
+ */
+@SinceKotlin("1.2")
+public actual fun max(a: Float, b: Float): Float = TODO("Wasm stdlib: Math")
+
+// extensions
+
+
+/**
+ * Raises this value to the power [x].
+ *
+ * Special cases:
+ *   - `b.pow(0.0)` is `1.0`
+ *   - `b.pow(1.0) == b`
+ *   - `b.pow(NaN)` is `NaN`
+ *   - `NaN.pow(x)` is `NaN` for `x != 0.0`
+ *   - `b.pow(Inf)` is `NaN` for `abs(b) == 1.0`
+ *   - `b.pow(x)` is `NaN` for `b < 0` and `x` is finite and not an integer
+ */
+@SinceKotlin("1.2")
+public actual fun Float.pow(x: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Raises this value to the integer power [n].
+ *
+ * See the other overload of [pow] for details.
+ */
+@SinceKotlin("1.2")
+public actual fun Float.pow(n: Int): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the absolute value of this value.
+ *
+ * Special cases:
+ *   - `NaN.absoluteValue` is `NaN`
+ *
+ * @see abs function
+ */
+@SinceKotlin("1.2")
+public actual val Float.absoluteValue: Float get() = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the sign of this value:
+ *   - `-1.0` if the value is negative,
+ *   - zero if the value is zero,
+ *   - `1.0` if the value is positive
+ *
+ * Special case:
+ *   - `NaN.sign` is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual val Float.sign: Float get() = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns this value with the sign bit same as of the [sign] value.
+ *
+ * If [sign] is `NaN` the sign of the result is undefined.
+ */
+@SinceKotlin("1.2")
+public actual fun Float.withSign(sign: Float): Float = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns this value with the sign bit same as of the [sign] value.
+ */
+@SinceKotlin("1.2")
+public actual fun Float.withSign(sign: Int): Float = TODO("Wasm stdlib: Math")
+
+
+/**
+ * Rounds this [Float] value to the nearest integer and converts the result to [Int].
+ * Ties are rounded towards positive infinity.
+ *
+ * Special cases:
+ *   - `x.roundToInt() == Int.MAX_VALUE` when `x > Int.MAX_VALUE`
+ *   - `x.roundToInt() == Int.MIN_VALUE` when `x < Int.MIN_VALUE`
+ *
+ * @throws IllegalArgumentException when this value is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun Float.roundToInt(): Int = TODO("Wasm stdlib: Math")
+
+/**
+ * Rounds this [Float] value to the nearest integer and converts the result to [Long].
+ * Ties are rounded towards positive infinity.
+ *
+ * Special cases:
+ *   - `x.roundToLong() == Long.MAX_VALUE` when `x > Long.MAX_VALUE`
+ *   - `x.roundToLong() == Long.MIN_VALUE` when `x < Long.MIN_VALUE`
+ *
+ * @throws IllegalArgumentException when this value is `NaN`
+ */
+@SinceKotlin("1.2")
+public actual fun Float.roundToLong(): Long = TODO("Wasm stdlib: Math")
+
+
+// endregion
+
+// region ================ Integer Math ========================================
+
+
+/**
+ * Returns the absolute value of the given value [n].
+ *
+ * Special cases:
+ *   - `abs(Int.MIN_VALUE)` is `Int.MIN_VALUE` due to an overflow
+ *
+ * @see absoluteValue extension property for [Int]
+ */
+@SinceKotlin("1.2")
+public actual fun abs(n: Int): Int = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the smaller of two values.
+ */
+@SinceKotlin("1.2")
+public actual fun min(a: Int, b: Int): Int = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the greater of two values.
+ */
+@SinceKotlin("1.2")
+public actual fun max(a: Int, b: Int): Int = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the absolute value of this value.
+ *
+ * Special cases:
+ *   - `Int.MIN_VALUE.absoluteValue` is `Int.MIN_VALUE` due to an overflow
+ *
+ * @see abs function
+ */
+@SinceKotlin("1.2")
+public actual val Int.absoluteValue: Int get() = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the sign of this value:
+ *   - `-1` if the value is negative,
+ *   - `0` if the value is zero,
+ *   - `1` if the value is positive
+ */
+@SinceKotlin("1.2")
+public actual val Int.sign: Int get() = TODO("Wasm stdlib: Math")
+
+
+
+/**
+ * Returns the absolute value of the given value [n].
+ *
+ * Special cases:
+ *   - `abs(Long.MIN_VALUE)` is `Long.MIN_VALUE` due to an overflow
+ *
+ * @see absoluteValue extension property for [Long]
+ */
+@SinceKotlin("1.2")
+public actual fun abs(n: Long): Long = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the smaller of two values.
+ */
+@SinceKotlin("1.2")
+public actual fun min(a: Long, b: Long): Long = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the greater of two values.
+ */
+@SinceKotlin("1.2")
+public actual fun max(a: Long, b: Long): Long = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the absolute value of this value.
+ *
+ * Special cases:
+ *   - `Long.MIN_VALUE.absoluteValue` is `Long.MIN_VALUE` due to an overflow
+ *
+ * @see abs function
+ */
+@SinceKotlin("1.2")
+public actual val Long.absoluteValue: Long get() = TODO("Wasm stdlib: Math")
+
+/**
+ * Returns the sign of this value:
+ *   - `-1` if the value is negative,
+ *   - `0` if the value is zero,
+ *   - `1` if the value is positive
+ */
+@SinceKotlin("1.2")
+public actual val Long.sign: Int get() = TODO("Wasm stdlib: Math")
+
+
+// endregion
diff --git a/libraries/stdlib/wasm/src/kotlin/Sequences.kt b/libraries/stdlib/wasm/src/kotlin/Sequences.kt
new file mode 100644
index 00000000000..01e51c5d714
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/Sequences.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.sequences
+
+internal actual class ConstrainedOnceSequence<T> : Sequence<T> {
+    actual constructor(sequence: Sequence<T>) { TODO("Wasm stdlib: ConstrainedOnceSequence") }
+
+    actual override fun iterator(): Iterator<T> = TODO("Wasm stdlib: ConstrainedOnceSequence")
+}
diff --git a/libraries/stdlib/wasm/src/kotlin/Text.kt b/libraries/stdlib/wasm/src/kotlin/Text.kt
new file mode 100644
index 00000000000..9e2efe0528e
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/Text.kt
@@ -0,0 +1,402 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.text
+
+actual class Regex {
+    actual constructor(pattern: String) { TODO("Wasm stdlib: Text") }
+    actual constructor(pattern: String, option: RegexOption) { TODO("Wasm stdlib: Text") }
+    actual constructor(pattern: String, options: Set<RegexOption>) { TODO("Wasm stdlib: Text") }
+
+    actual val pattern: String = TODO("Wasm stdlib: Text")
+    actual val options: Set<RegexOption> = TODO("Wasm stdlib: Text")
+
+    actual fun matchEntire(input: CharSequence): MatchResult? = TODO("Wasm stdlib: Text")
+    actual infix fun matches(input: CharSequence): Boolean = TODO("Wasm stdlib: Text")
+    actual fun containsMatchIn(input: CharSequence): Boolean = TODO("Wasm stdlib: Text")
+    actual fun replace(input: CharSequence, replacement: String): String = TODO("Wasm stdlib: Text")
+    actual fun replace(input: CharSequence, transform: (MatchResult) -> CharSequence): String = TODO("Wasm stdlib: Text")
+    actual fun replaceFirst(input: CharSequence, replacement: String): String = TODO("Wasm stdlib: Text")
+
+    /**
+     * Returns the first match of a regular expression in the [input], beginning at the specified [startIndex].
+     *
+     * @param startIndex An index to start search with, by default 0. Must be not less than zero and not greater than `input.length()`
+     * @return An instance of [MatchResult] if match was found or `null` otherwise.
+     * @sample samples.text.Regexps.find
+     */
+    actual fun find(input: CharSequence, startIndex: Int): MatchResult? = TODO("Wasm stdlib: Text")
+
+    /**
+     * Returns a sequence of all occurrences of a regular expression within the [input] string, beginning at the specified [startIndex].
+     *
+     * @sample samples.text.Regexps.findAll
+     */
+    actual fun findAll(input: CharSequence, startIndex: Int): Sequence<MatchResult> = TODO("Wasm stdlib: Text")
+
+    /**
+     * Splits the [input] CharSequence around matches of this regular expression.
+     *
+     * @param limit Non-negative value specifying the maximum number of substrings the string can be split to.
+     * Zero by default means no limit is set.
+     */
+    actual fun split(input: CharSequence, limit: Int): List<String> = TODO("Wasm stdlib: Text")
+
+    actual companion object {
+        actual fun fromLiteral(literal: String): Regex = TODO("Wasm stdlib: Text")
+        actual fun escape(literal: String): String = TODO("Wasm stdlib: Text")
+        actual fun escapeReplacement(literal: String): String = TODO("Wasm stdlib: Text")
+    }
+}
+
+actual class MatchGroup {
+    actual val value: String = TODO("Wasm stdlib: Text")
+}
+
+actual enum class RegexOption {
+    IGNORE_CASE,
+    MULTILINE
+}
+
+
+// From char.kt
+
+actual fun Char.isWhitespace(): Boolean = TODO("Wasm stdlib: Text")
+actual fun Char.toLowerCase(): Char = TODO("Wasm stdlib: Text")
+actual fun Char.toUpperCase(): Char = TODO("Wasm stdlib: Text")
+actual fun Char.isHighSurrogate(): Boolean = TODO("Wasm stdlib: Text")
+actual fun Char.isLowSurrogate(): Boolean = TODO("Wasm stdlib: Text")
+
+// From string.kt
+
+
+/**
+ * Converts the characters in the specified array to a string.
+ */
+@SinceKotlin("1.2")
+public actual fun String(chars: CharArray): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Converts the characters from a portion of the specified array to a string.
+ *
+ * @throws IndexOutOfBoundsException if either [offset] or [length] are less than zero
+ * or `offset + length` is out of [chars] array bounds.
+ */
+@SinceKotlin("1.2")
+public actual fun String(chars: CharArray, offset: Int, length: Int): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Concatenates characters in this [CharArray] into a String.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun CharArray.concatToString(): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Concatenates characters in this [CharArray] or its subrange into a String.
+ *
+ * @param startIndex the beginning (inclusive) of the subrange of characters, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange of characters, size of this array by default.
+ *
+ * @throws IndexOutOfBoundsException if [startIndex] is less than zero or [endIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [startIndex] is greater than [endIndex].
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun CharArray.concatToString(startIndex: Int, endIndex: Int): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a [CharArray] containing characters of this string.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun String.toCharArray(): CharArray = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a [CharArray] containing characters of this string or its substring.
+ *
+ * @param startIndex the beginning (inclusive) of the substring, 0 by default.
+ * @param endIndex the end (exclusive) of the substring, length of this string by default.
+ *
+ * @throws IndexOutOfBoundsException if [startIndex] is less than zero or [endIndex] is greater than the length of this string.
+ * @throws IllegalArgumentException if [startIndex] is greater than [endIndex].
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun String.toCharArray(startIndex: Int, endIndex: Int): CharArray = TODO("Wasm stdlib: Text")
+
+/**
+ * Decodes a string from the bytes in UTF-8 encoding in this array.
+ *
+ * Malformed byte sequences are replaced by the replacement char `\uFFFD`.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun ByteArray.decodeToString(): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Decodes a string from the bytes in UTF-8 encoding in this array or its subrange.
+ *
+ * @param startIndex the beginning (inclusive) of the subrange to decode, 0 by default.
+ * @param endIndex the end (exclusive) of the subrange to decode, size of this array by default.
+ * @param throwOnInvalidSequence specifies whether to throw an exception on malformed byte sequence or replace it by the replacement char `\uFFFD`.
+ *
+ * @throws IndexOutOfBoundsException if [startIndex] is less than zero or [endIndex] is greater than the size of this array.
+ * @throws IllegalArgumentException if [startIndex] is greater than [endIndex].
+ * @throws CharacterCodingException if the byte array contains malformed UTF-8 byte sequence and [throwOnInvalidSequence] is true.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun ByteArray.decodeToString(
+    startIndex: Int,
+    endIndex: Int,
+    throwOnInvalidSequence: Boolean
+): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Encodes this string to an array of bytes in UTF-8 encoding.
+ *
+ * Any malformed char sequence is replaced by the replacement byte sequence.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun String.encodeToByteArray(): ByteArray = TODO("Wasm stdlib: Text")
+
+/**
+ * Encodes this string or its substring to an array of bytes in UTF-8 encoding.
+ *
+ * @param startIndex the beginning (inclusive) of the substring to encode, 0 by default.
+ * @param endIndex the end (exclusive) of the substring to encode, length of this string by default.
+ * @param throwOnInvalidSequence specifies whether to throw an exception on malformed char sequence or replace.
+ *
+ * @throws IndexOutOfBoundsException if [startIndex] is less than zero or [endIndex] is greater than the length of this string.
+ * @throws IllegalArgumentException if [startIndex] is greater than [endIndex].
+ * @throws CharacterCodingException if this string contains malformed char sequence and [throwOnInvalidSequence] is true.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun String.encodeToByteArray(
+    startIndex: Int,
+    endIndex: Int,
+    throwOnInvalidSequence: Boolean
+): ByteArray = TODO("Wasm stdlib: Text")
+
+
+internal actual fun String.nativeIndexOf(str: String, fromIndex: Int): Int = TODO("Wasm stdlib: Text")
+internal actual fun String.nativeLastIndexOf(str: String, fromIndex: Int): Int = TODO("Wasm stdlib: Text")
+
+
+public actual fun String.substring(startIndex: Int): String = TODO("Wasm stdlib: Text")
+public actual fun String.substring(startIndex: Int, endIndex: Int): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a copy of this string converted to upper case using the rules of the default locale.
+ *
+ * @sample samples.text.Strings.toUpperCase
+ */
+public actual fun String.toUpperCase(): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a copy of this string converted to lower case using the rules of the default locale.
+ *
+ * @sample samples.text.Strings.toLowerCase
+ */
+public actual fun String.toLowerCase(): String = TODO("Wasm stdlib: Text")
+public actual fun String.capitalize(): String = TODO("Wasm stdlib: Text")
+public actual fun String.decapitalize(): String = TODO("Wasm stdlib: Text")
+public actual fun CharSequence.repeat(n: Int): String = TODO("Wasm stdlib: Text")
+
+
+/**
+ * Returns a new string with all occurrences of [oldChar] replaced with [newChar].
+ */
+actual fun String.replace(oldChar: Char, newChar: Char, ignoreCase: Boolean): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a new string obtained by replacing all occurrences of the [oldValue] substring in this string
+ * with the specified [newValue] string.
+ */
+actual fun String.replace(oldValue: String, newValue: String, ignoreCase: Boolean): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a new string with the first occurrence of [oldChar] replaced with [newChar].
+ */
+actual fun String.replaceFirst(oldChar: Char, newChar: Char, ignoreCase: Boolean): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a new string obtained by replacing the first occurrence of the [oldValue] substring in this string
+ * with the specified [newValue] string.
+ */
+actual fun String.replaceFirst(oldValue: String, newValue: String, ignoreCase: Boolean): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns `true` if this string is equal to [other], optionally ignoring character case.
+ *
+ * @param ignoreCase `true` to ignore character case when comparing strings. By default `false`.
+ */
+actual fun String?.equals(other: String?, ignoreCase: Boolean): Boolean = TODO("Wasm stdlib: Text")
+
+/**
+ * Compares two strings lexicographically, optionally ignoring case differences.
+ */
+@SinceKotlin("1.2")
+actual fun String.compareTo(other: String, ignoreCase: Boolean): Int = TODO("Wasm stdlib: Text")
+
+
+public actual fun String.startsWith(prefix: String, ignoreCase: Boolean): Boolean = TODO("Wasm stdlib: Text")
+public actual fun String.startsWith(prefix: String, startIndex: Int, ignoreCase: Boolean): Boolean = TODO("Wasm stdlib: Text")
+public actual fun String.endsWith(suffix: String, ignoreCase: Boolean): Boolean = TODO("Wasm stdlib: Text")
+
+// From stringsCode.kt
+
+internal actual fun String.nativeIndexOf(ch: Char, fromIndex: Int): Int = TODO("Wasm stdlib: Text")
+internal actual fun String.nativeLastIndexOf(ch: Char, fromIndex: Int): Int = TODO("Wasm stdlib: Text")
+
+actual fun CharSequence.isBlank(): Boolean = TODO("Wasm stdlib: Text")
+/**
+ * Returns `true` if the specified range in this char sequence is equal to the specified range in another char sequence.
+ * @param thisOffset the start offset in this char sequence of the substring to compare.
+ * @param other the string against a substring of which the comparison is performed.
+ * @param otherOffset the start offset in the other char sequence of the substring to compare.
+ * @param length the length of the substring to compare.
+ */
+actual fun CharSequence.regionMatches(
+    thisOffset: Int,
+    other: CharSequence,
+    otherOffset: Int,
+    length: Int,
+    ignoreCase: Boolean
+): Boolean = TODO("Wasm stdlib: Text")
+
+
+/**
+ * A Comparator that orders strings ignoring character case.
+ *
+ * Note that this Comparator does not take locale into account,
+ * and will result in an unsatisfactory ordering for certain locales.
+ */
+@SinceKotlin("1.2")
+public actual val String.Companion.CASE_INSENSITIVE_ORDER: Comparator<String> get() = TODO("Wasm stdlib: Text")
+
+actual fun String.toBoolean(): Boolean = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns `true` if the contents of this string is equal to the word "true", ignoring case, and `false` otherwise.
+ */
+actual fun String?.toBoolean(): Boolean = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a signed [Byte] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ */
+actual fun String.toByte(): Byte = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a signed [Byte] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
+ */
+actual fun String.toByte(radix: Int): Byte = TODO("Wasm stdlib: Text")
+
+
+/**
+ * Parses the string as a [Short] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ */
+actual fun String.toShort(): Short = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a [Short] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
+ */
+actual fun String.toShort(radix: Int): Short = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as an [Int] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ */
+actual fun String.toInt(): Int = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as an [Int] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
+ */
+actual fun String.toInt(radix: Int): Int = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a [Long] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ */
+actual fun String.toLong(): Long = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a [Long] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
+ */
+actual fun String.toLong(radix: Int): Long = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a [Double] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ */
+actual fun String.toDouble(): Double = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a [Float] number and returns the result.
+ * @throws NumberFormatException if the string is not a valid representation of a number.
+ */
+actual fun String.toFloat(): Float = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a [Double] number and returns the result
+ * or `null` if the string is not a valid representation of a number.
+ */
+actual fun String.toDoubleOrNull(): Double? = TODO("Wasm stdlib: Text")
+
+/**
+ * Parses the string as a [Float] number and returns the result
+ * or `null` if the string is not a valid representation of a number.
+ */
+actual fun String.toFloatOrNull(): Float? = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a string representation of this [Byte] value in the specified [radix].
+ *
+ * @throws IllegalArgumentException when [radix] is not a valid radix for number to string conversion.
+ */
+@SinceKotlin("1.2")
+actual fun Byte.toString(radix: Int): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a string representation of this [Short] value in the specified [radix].
+ *
+ * @throws IllegalArgumentException when [radix] is not a valid radix for number to string conversion.
+ */
+@SinceKotlin("1.2")
+actual fun Short.toString(radix: Int): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a string representation of this [Int] value in the specified [radix].
+ *
+ * @throws IllegalArgumentException when [radix] is not a valid radix for number to string conversion.
+ */
+@SinceKotlin("1.2")
+actual fun Int.toString(radix: Int): String = TODO("Wasm stdlib: Text")
+
+/**
+ * Returns a string representation of this [Long] value in the specified [radix].
+ *
+ * @throws IllegalArgumentException when [radix] is not a valid radix for number to string conversion.
+ */
+@SinceKotlin("1.2")
+actual fun Long.toString(radix: Int): String = TODO("Wasm stdlib: Text")
+
+@PublishedApi
+internal actual fun checkRadix(radix: Int): Int = TODO("Wasm stdlib: Text")
+
+internal actual fun digitOf(char: Char, radix: Int): Int = TODO("Wasm stdlib: Text")
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableCollection.kt b/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableCollection.kt
new file mode 100644
index 00000000000..4114e8b5193
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableCollection.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+/**
+ * Provides a skeletal implementation of the [MutableCollection] interface.
+ *
+ * @param E the type of elements contained in the collection. The collection is invariant on its element type.
+ */
+@SinceKotlin("1.3")
+public actual abstract class AbstractMutableCollection<E> : MutableCollection<E> {
+    actual protected constructor()
+
+    actual abstract override val size: Int
+    actual abstract override fun iterator(): MutableIterator<E>
+    actual abstract override fun add(element: E): Boolean
+
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: AbstractMutableCollection")
+    actual override fun contains(element: @UnsafeVariance E): Boolean = TODO("Wasm stdlib: AbstractMutableCollection")
+    actual override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean = TODO("Wasm stdlib: AbstractMutableCollection")
+
+
+    actual override fun addAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableCollection")
+    actual override fun remove(element: E): Boolean = TODO("Wasm stdlib: AbstractMutableCollection")
+    actual override fun removeAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableCollection")
+    actual override fun retainAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableCollection")
+    actual override fun clear(): Unit = TODO("Wasm stdlib: AbstractMutableCollection")
+}
+
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableList.kt b/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableList.kt
new file mode 100644
index 00000000000..f2ba41d66c5
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableList.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+/**
+ * Provides a skeletal implementation of the [MutableList] interface.
+ *
+ * @param E the type of elements contained in the list. The list is invariant on its element type.
+ */
+public actual abstract class AbstractMutableList<E> : MutableList<E> {
+    actual protected constructor()
+
+    // From List
+
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun contains(element: @UnsafeVariance E): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun indexOf(element: @UnsafeVariance E): Int = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun lastIndexOf(element: @UnsafeVariance E): Int = TODO("Wasm stdlib: AbstractMutableList")
+
+    // From MutableCollection
+
+    actual override fun iterator(): MutableIterator<E> = TODO("Wasm stdlib: AbstractMutableList")
+
+    // From MutableList
+
+    /**
+     * Adds the specified element to the end of this list.
+     *
+     * @return `true` because the list is always modified as the result of this operation.
+     */
+    actual override fun add(element: E): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun remove(element: E): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun addAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun addAll(index: Int, elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun removeAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun retainAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun clear() { TODO("Wasm stdlib: AbstractMutableList") }
+    actual override fun listIterator(): MutableListIterator<E> = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun listIterator(index: Int): MutableListIterator<E> = TODO("Wasm stdlib: AbstractMutableList")
+    actual override fun subList(fromIndex: Int, toIndex: Int): MutableList<E> = TODO("Wasm stdlib: AbstractMutableList")
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableMap.kt b/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableMap.kt
new file mode 100644
index 00000000000..31fb824b2a8
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableMap.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+/**
+ * Provides a skeletal implementation of the [MutableMap] interface.
+ *
+ * The implementor is required to implement [entries] property, which should return mutable set of map entries, and [put] function.
+ *
+ * @param K the type of map keys. The map is invariant on its key type.
+ * @param V the type of map values. The map is invariant on its value type.
+ */
+@SinceKotlin("1.3")
+public actual abstract class AbstractMutableMap<K, V> : MutableMap<K, V> {
+    actual protected constructor()
+
+    /**
+     * Associates the specified [value] with the specified [key] in the map.
+     *
+     * This method is redeclared as abstract, because it's not implemented in the base class,
+     * so it must be always overridden in the concrete mutable collection implementation.
+     *
+     * @return the previous value associated with the key, or `null` if the key was not present in the map.
+     */
+    abstract actual override fun put(key: K, value: V): V?
+
+    abstract actual override val entries: MutableSet<MutableMap.MutableEntry<K, V>>
+
+    actual override val keys: MutableSet<K> = TODO("Wasm stdlib: AbstractMutableMap")
+    actual override val size: Int = TODO("Wasm stdlib: AbstractMutableMap")
+    actual override val values: MutableCollection<V> = TODO("Wasm stdlib: AbstractMutableMap")
+    actual override fun clear() { TODO("Wasm stdlib: AbstractMutableMap") }
+    actual override fun containsKey(key: K): Boolean = TODO("Wasm stdlib: AbstractMutableMap")
+    actual override fun containsValue(value: V): Boolean = TODO("Wasm stdlib: AbstractMutableMap")
+    actual override fun get(key: K): V? = TODO("Wasm stdlib: AbstractMutableMap")
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: AbstractMutableMap")
+    actual override fun putAll(from: Map<out K, V>) { TODO("Wasm stdlib: AbstractMutableMap") }
+    actual override fun remove(key: K): V? = TODO("Wasm stdlib: AbstractMutableMap")
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableSet.kt b/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableSet.kt
new file mode 100644
index 00000000000..1db74638914
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/AbstractMutableSet.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+/**
+ * Provides a skeletal implementation of the [MutableSet] interface.
+ *
+ * @param E the type of elements contained in the set. The set is invariant on its element type.
+ */
+@SinceKotlin("1.3")
+public actual abstract class AbstractMutableSet<E> : MutableSet<E> {
+    actual protected constructor()
+
+    actual abstract override val size: Int
+    actual abstract override fun iterator(): MutableIterator<E>
+    actual abstract override fun add(element: E): Boolean
+
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: AbstractMutableSet")
+    actual override fun contains(element: @UnsafeVariance E): Boolean = TODO("Wasm stdlib: AbstractMutableSet")
+    actual override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean = TODO("Wasm stdlib: AbstractMutableSet")
+
+
+    actual override fun addAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableSet")
+    actual override fun remove(element: E): Boolean = TODO("Wasm stdlib: AbstractMutableSet")
+    actual override fun removeAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableSet")
+    actual override fun retainAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: AbstractMutableSet")
+    actual override fun clear() { TODO("Wasm stdlib: AbstractMutableSet") }
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/ArrayList.kt b/libraries/stdlib/wasm/src/kotlin/collections/ArrayList.kt
new file mode 100644
index 00000000000..df2a7816202
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/ArrayList.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+actual open class ArrayList<E> : MutableList<E>, RandomAccess {
+    actual constructor() { TODO("Wasm stdlib: ArrayList") }
+    actual constructor(initialCapacity: Int) { TODO("Wasm stdlib: ArrayList") }
+    actual constructor(elements: Collection<E>) { TODO("Wasm stdlib: ArrayList") }
+
+    actual fun trimToSize() { TODO("Wasm stdlib: ArrayList") }
+    actual fun ensureCapacity(minCapacity: Int) { TODO("Wasm stdlib: ArrayList") }
+
+    // From List
+
+    actual override val size: Int = TODO("Wasm stdlib: ArrayList")
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override fun contains(element: @UnsafeVariance E): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override operator fun get(index: Int): E = TODO("Wasm stdlib: ArrayList")
+    actual override fun indexOf(element: @UnsafeVariance E): Int = TODO("Wasm stdlib: ArrayList")
+    actual override fun lastIndexOf(element: @UnsafeVariance E): Int = TODO("Wasm stdlib: ArrayList")
+
+    // From MutableCollection
+
+    actual override fun iterator(): MutableIterator<E> = TODO("Wasm stdlib: ArrayList")
+
+    // From MutableList
+
+    actual override fun add(element: E): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override fun remove(element: E): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override fun addAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override fun addAll(index: Int, elements: Collection<E>): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override fun removeAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override fun retainAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: ArrayList")
+    actual override fun clear() { TODO("Wasm stdlib: ArrayList") }
+    actual override operator fun set(index: Int, element: E): E = TODO("Wasm stdlib: ArrayList")
+    actual override fun add(index: Int, element: E) { TODO("Wasm stdlib: ArrayList") }
+    actual override fun removeAt(index: Int): E = TODO("Wasm stdlib: ArrayList")
+    actual override fun listIterator(): MutableListIterator<E> = TODO("Wasm stdlib: ArrayList")
+    actual override fun listIterator(index: Int): MutableListIterator<E> = TODO("Wasm stdlib: ArrayList")
+    actual override fun subList(fromIndex: Int, toIndex: Int): MutableList<E> = TODO("Wasm stdlib: ArrayList")
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/Arrays.kt b/libraries/stdlib/wasm/src/kotlin/collections/Arrays.kt
new file mode 100644
index 00000000000..f9c4e90b0e6
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/Arrays.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+import kotlin.internal.PureReifiable
+
+// Array Utils copied from K/N
+
+internal fun checkCopyOfRangeArguments(fromIndex: Int, toIndex: Int, size: Int) {
+    if (toIndex > size)
+        throw IndexOutOfBoundsException("toIndex ($toIndex) is greater than size ($size).")
+    if (fromIndex > toIndex)
+        throw IllegalArgumentException("fromIndex ($fromIndex) is greater than toIndex ($toIndex).")
+}
+
+
+// TODO: internal
+/**
+ * Returns a string representation of the contents of the subarray of the specified array as if it is [List].
+ */
+@SinceKotlin("1.1")
+@kotlin.internal.InlineOnly
+public inline fun <T> Array<out T>.subarrayContentToString(offset: Int, length: Int): String {
+    val sb = StringBuilder(2 + length * 3)
+    sb.append("[")
+    var i = 0
+    while (i < length) {
+        if (i > 0) sb.append(", ")
+        sb.append(this[offset + i])
+        i++
+    }
+    sb.append("]")
+    return sb.toString()
+}
+
+
+/**
+ * Returns a hash code based on the contents of this array as if it is [List].
+ * Nested arrays are treated as lists too.
+ *
+ * If any of arrays contains itself on any nesting level the behavior is undefined.
+ */
+@SinceKotlin("1.1")
+@UseExperimental(ExperimentalUnsignedTypes::class)
+internal fun <T> Array<out T>?.contentDeepHashCodeImpl(): Int {
+    if (this == null) return 0
+    var result = 1
+    for (element in this) {
+        val elementHash = when (element) {
+            null            -> 0
+
+            is Array<*>     -> element.contentDeepHashCode()
+
+            is ByteArray    -> element.contentHashCode()
+            is ShortArray   -> element.contentHashCode()
+            is IntArray     -> element.contentHashCode()
+            is LongArray    -> element.contentHashCode()
+            is FloatArray   -> element.contentHashCode()
+            is DoubleArray  -> element.contentHashCode()
+            is CharArray    -> element.contentHashCode()
+            is BooleanArray -> element.contentHashCode()
+
+            is UByteArray   -> element.contentHashCode()
+            is UShortArray  -> element.contentHashCode()
+            is UIntArray    -> element.contentHashCode()
+            is ULongArray   -> element.contentHashCode()
+
+            else            -> element.hashCode()
+        }
+
+        result = 31 * result + elementHash
+    }
+    return result
+}
+
+@Suppress("UNCHECKED_CAST")
+internal actual fun <T> arrayOfNulls(reference: Array<T>, size: Int): Array<T> = arrayOfNulls<Any>(size) as Array<T>
+
+internal actual fun copyToArrayImpl(collection: Collection<*>): Array<Any?> {
+    val array = Array<Any?>(collection.size)
+    val iterator = collection.iterator()
+    var index = 0
+    while (iterator.hasNext())
+        array[index++] = iterator.next()
+    return array
+}
+
+@Suppress("UNCHECKED_CAST")
+internal actual fun <T> copyToArrayImpl(collection: Collection<*>, array: Array<T>): Array<T> {
+    if (array.size < collection.size)
+        return copyToArrayImpl(collection) as Array<T>
+
+    val iterator = collection.iterator()
+    var index = 0
+    while (iterator.hasNext()) {
+        array[index++] = iterator.next() as T
+    }
+    if (index < array.size) {
+        return array.copyOf(index) as Array<T>
+    }
+    return array
+}
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/Collections.kt b/libraries/stdlib/wasm/src/kotlin/collections/Collections.kt
new file mode 100644
index 00000000000..87abd933c9f
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/Collections.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+actual interface RandomAccess
+
+/** Returns the array if it's not `null`, or an empty array otherwise. */
+actual inline fun <reified T> Array<out T>?.orEmpty(): Array<out T> = this ?: emptyArray<T>()
+
+
+public actual inline fun <reified T> Collection<T>.toTypedArray(): Array<T> {
+    val result = arrayOfNulls<T>(size)
+    var index = 0
+    for (element in this) result[index++] = element
+    @Suppress("UNCHECKED_CAST")
+    return result as Array<T>
+}
+
+@SinceKotlin("1.2")
+actual fun <T> MutableList<T>.fill(value: T): Unit = TODO("Wasm stdlib: Collections")
+
+@SinceKotlin("1.2")
+actual fun <T> MutableList<T>.shuffle(): Unit = TODO("Wasm stdlib: Collections")
+
+@SinceKotlin("1.2")
+actual fun <T> Iterable<T>.shuffled(): List<T> = TODO("Wasm stdlib: Collections")
+
+actual fun <T : Comparable<T>> MutableList<T>.sort(): Unit = TODO("Wasm stdlib: Collections")
+actual fun <T> MutableList<T>.sortWith(comparator: Comparator<in T>): Unit = TODO("Wasm stdlib: Collections")
+
+
+// from Grouping.kt
+public actual fun <T, K> Grouping<T, K>.eachCount(): Map<K, Int> = TODO("Wasm stdlib: Collections")
+// public actual inline fun <T, K> Grouping<T, K>.eachSumOf(valueSelector: (T) -> Int): Map<K, Int>
+
+internal actual fun <K, V> Map<K, V>.toSingletonMapOrSelf(): Map<K, V> = TODO("Wasm stdlib: Collections")
+internal actual fun <K, V> Map<out K, V>.toSingletonMap(): Map<K, V> = TODO("Wasm stdlib: Collections")
+internal actual fun <T> Array<out T>.copyToArrayOfAny(isVarargs: Boolean): Array<out Any?> = TODO("Wasm stdlib: Collections")
+
+@PublishedApi
+@SinceKotlin("1.3")
+internal actual fun checkIndexOverflow(index: Int): Int = TODO("Wasm stdlib: Collections")
+
+@PublishedApi
+@SinceKotlin("1.3")
+internal actual fun checkCountOverflow(count: Int): Int = TODO("Wasm stdlib: Collections")
+
+@PublishedApi
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+@kotlin.internal.InlineOnly
+internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.() -> Unit): List<E> {
+    return TODO("Wasm stdlib: Collections")
+}
+
+@PublishedApi
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+@kotlin.internal.InlineOnly
+internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: MutableList<E>.() -> Unit): List<E> {
+    checkBuilderCapacity(capacity)
+    return TODO("Wasm stdlib: Collections")
+}
+
+
+/**
+ * Returns an immutable set containing only the specified object [element].
+ */
+public fun <T> setOf(element: T): Set<T> = hashSetOf(element)
+
+@PublishedApi
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+@kotlin.internal.InlineOnly
+internal actual inline fun <E> buildSetInternal(builderAction: MutableSet<E>.() -> Unit): Set<E> {
+    return TODO("Wasm stdlib: Collections")
+}
+
+@PublishedApi
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+@kotlin.internal.InlineOnly
+internal actual inline fun <E> buildSetInternal(capacity: Int, builderAction: MutableSet<E>.() -> Unit): Set<E> {
+    return TODO("Wasm stdlib: Collections")
+}
+
+
+/**
+ * Returns an immutable map, mapping only the specified key to the
+ * specified value.
+ */
+public fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = hashMapOf(pair)
+
+@PublishedApi
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+@kotlin.internal.InlineOnly
+internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> {
+    return TODO("Wasm stdlib: Collections")
+}
+
+@PublishedApi
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+@kotlin.internal.InlineOnly
+internal actual inline fun <K, V> buildMapInternal(capacity: Int, builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> {
+    return TODO("Wasm stdlib: Collections")
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/HashMap.kt b/libraries/stdlib/wasm/src/kotlin/collections/HashMap.kt
new file mode 100644
index 00000000000..10add08b1fe
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/HashMap.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+actual open class HashMap<K, V> : MutableMap<K, V> {
+    actual constructor() { TODO("Wasm stdlib: HashMap") }
+    actual constructor(initialCapacity: Int) { TODO("Wasm stdlib: HashMap") }
+    actual constructor(initialCapacity: Int, loadFactor: Float) { TODO("Wasm stdlib: HashMap") }
+    actual constructor(original: Map<out K, V>) { TODO("Wasm stdlib: HashMap") }
+
+    // From Map
+
+    actual override val size: Int = TODO("Wasm stdlib: HashMap")
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: HashMap")
+    actual override fun containsKey(key: K): Boolean = TODO("Wasm stdlib: HashMap")
+    actual override fun containsValue(value: @UnsafeVariance V): Boolean = TODO("Wasm stdlib: HashMap")
+    actual override operator fun get(key: K): V? = TODO("Wasm stdlib: HashMap")
+
+    // From MutableMap
+
+    actual override fun put(key: K, value: V): V? = TODO("Wasm stdlib: HashMap")
+    actual override fun remove(key: K): V? = TODO("Wasm stdlib: HashMap")
+    actual override fun putAll(from: Map<out K, V>) { TODO("Wasm stdlib: HashMap") }
+    actual override fun clear() { TODO("Wasm stdlib: HashMap") }
+    actual override val keys: MutableSet<K> = TODO("Wasm stdlib: HashMap")
+    actual override val values: MutableCollection<V> = TODO("Wasm stdlib: HashMap")
+    actual override val entries: MutableSet<MutableMap.MutableEntry<K, V>> = TODO("Wasm stdlib: HashMap")
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/HashSet.kt b/libraries/stdlib/wasm/src/kotlin/collections/HashSet.kt
new file mode 100644
index 00000000000..9c8863b5fcb
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/HashSet.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+actual open class HashSet<E> : MutableSet<E> {
+    actual constructor()  { TODO("Wasm stdlib: HashSet") }
+    actual constructor(initialCapacity: Int) { TODO("Wasm stdlib: HashSet") }
+    actual constructor(initialCapacity: Int, loadFactor: Float) { TODO("Wasm stdlib: HashSet") }
+    actual constructor(elements: Collection<E>) { TODO("Wasm stdlib: HashSet") }
+
+    // From Set
+
+    actual override val size: Int = TODO("Wasm stdlib: HashSet")
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: HashSet")
+    actual override fun contains(element: @UnsafeVariance E): Boolean = TODO("Wasm stdlib: HashSet")
+    actual override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean  = TODO("Wasm stdlib: HashSet")
+
+    // From MutableSet
+
+    actual override fun iterator(): MutableIterator<E> = TODO("Wasm stdlib: HashSet")
+    actual override fun add(element: E): Boolean = TODO("Wasm stdlib: HashSet")
+    actual override fun remove(element: E): Boolean = TODO("Wasm stdlib: HashSet")
+    actual override fun addAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: HashSet")
+    actual override fun removeAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: HashSet")
+    actual override fun retainAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: HashSet")
+    actual override fun clear() { TODO("Wasm stdlib: HashSet") }
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/LinkedHashMap.kt b/libraries/stdlib/wasm/src/kotlin/collections/LinkedHashMap.kt
new file mode 100644
index 00000000000..a7be8b0918b
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/LinkedHashMap.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+actual open class LinkedHashMap<K, V> : MutableMap<K, V> {
+    actual constructor() { TODO("Wasm stdlib: LinkedHashMap") }
+    actual constructor(initialCapacity: Int) { TODO("Wasm stdlib: LinkedHashMap") }
+    actual constructor(initialCapacity: Int, loadFactor: Float) { TODO("Wasm stdlib: LinkedHashMap") }
+    actual constructor(original: Map<out K, V>) { TODO("Wasm stdlib: LinkedHashMap") }
+
+    // From Map
+
+    actual override val size: Int = TODO("Wasm stdlib: LinkedHashMap")
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: LinkedHashMap")
+    actual override fun containsKey(key: K): Boolean = TODO("Wasm stdlib: LinkedHashMap")
+    actual override fun containsValue(value: V): Boolean = TODO("Wasm stdlib: LinkedHashMap")
+    actual override fun get(key: K): V? = TODO("Wasm stdlib: LinkedHashMap")
+
+    // From MutableMap
+
+    actual override fun put(key: K, value: V): V? = TODO("Wasm stdlib: LinkedHashMap")
+    actual override fun remove(key: K): V? = TODO("Wasm stdlib: LinkedHashMap")
+    actual override fun putAll(from: Map<out K, V>) { TODO("Wasm stdlib: LinkedHashMap") }
+    actual override fun clear() { TODO("Wasm stdlib: LinkedHashMap") }
+    actual override val keys: MutableSet<K> = TODO("Wasm stdlib: LinkedHashMap")
+    actual override val values: MutableCollection<V> = TODO("Wasm stdlib: LinkedHashMap")
+    actual override val entries: MutableSet<MutableMap.MutableEntry<K, V>> = TODO("Wasm stdlib: LinkedHashMap")
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/LinkedHashSet.kt b/libraries/stdlib/wasm/src/kotlin/collections/LinkedHashSet.kt
new file mode 100644
index 00000000000..6a9dda88390
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/LinkedHashSet.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+actual open class LinkedHashSet<E> : MutableSet<E> {
+    actual constructor() { TODO("Wasm stdlib: LinkedHashSet") }
+    actual constructor(initialCapacity: Int) { TODO("Wasm stdlib: LinkedHashSet") }
+    actual constructor(initialCapacity: Int, loadFactor: Float) { TODO("Wasm stdlib: LinkedHashSet") }
+    actual constructor(elements: Collection<E>) { TODO("Wasm stdlib: LinkedHashSet") }
+
+    // From Set
+
+    actual override val size: Int = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun isEmpty(): Boolean = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun contains(element: @UnsafeVariance E): Boolean = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean = TODO("Wasm stdlib: LinkedHashSet")
+
+    // From MutableSet
+
+    actual override fun iterator(): MutableIterator<E> = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun add(element: E): Boolean = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun remove(element: E): Boolean = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun addAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun removeAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun retainAll(elements: Collection<E>): Boolean = TODO("Wasm stdlib: LinkedHashSet")
+    actual override fun clear() { TODO("Wasm stdlib: LinkedHashSet") }
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/Maps.kt b/libraries/stdlib/wasm/src/kotlin/collections/Maps.kt
new file mode 100644
index 00000000000..42038dd6088
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/collections/Maps.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.collections
+
+/**
+ * Calculate the initial capacity of a map.
+ */
+@PublishedApi
+internal actual fun mapCapacity(expectedSize: Int): Int = TODO("Wasm stdlib: Maps")
+
+/**
+ * Checks a collection builder function capacity argument.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+@PublishedApi
+internal fun checkBuilderCapacity(capacity: Int) { TODO("Wasm stdlib: Maps") }
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/coroutines/Coroutines.kt b/libraries/stdlib/wasm/src/kotlin/coroutines/Coroutines.kt
new file mode 100644
index 00000000000..0961934ca18
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/coroutines/Coroutines.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.coroutines
+
+@PublishedApi
+@SinceKotlin("1.3")
+internal actual class SafeContinuation<in T> : Continuation<T> {
+    actual internal constructor(delegate: Continuation<T>, initialResult: Any?) { TODO("Wasm stdlib: Coroutines") }
+
+    @PublishedApi
+    actual internal constructor(delegate: Continuation<T>) { TODO("Wasm stdlib: Coroutines") }
+
+    @PublishedApi
+    actual internal fun getOrThrow(): Any? = TODO("Wasm stdlib: Coroutines")
+
+    actual override val context: CoroutineContext = TODO("Wasm stdlib: Coroutines")
+    actual override fun resumeWith(result: Result<T>): Unit { TODO("Wasm stdlib: Coroutines") }
+}
diff --git a/libraries/stdlib/wasm/src/kotlin/coroutines/CoroutinesIntrinsics.kt b/libraries/stdlib/wasm/src/kotlin/coroutines/CoroutinesIntrinsics.kt
new file mode 100644
index 00000000000..d8959b4a719
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/coroutines/CoroutinesIntrinsics.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.coroutines.intrinsics
+
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.ContinuationInterceptor
+import kotlin.coroutines.CoroutineContext
+import kotlin.internal.InlineOnly
+
+/**
+ * Starts an unintercepted coroutine without a receiver and with result type [T] and executes it until its first suspension.
+ * Returns the result of the coroutine or throws its exception if it does not suspend or [COROUTINE_SUSPENDED] if it suspends.
+ * In the latter case, the [completion] continuation is invoked when the coroutine completes with a result or an exception.
+ *
+ * The coroutine is started directly in the invoker's thread without going through the [ContinuationInterceptor] that might
+ * be present in the completion's [CoroutineContext]. It is the invoker's responsibility to ensure that a proper invocation
+ * context is established.
+ *
+ * This function is designed to be used from inside of [suspendCoroutineUninterceptedOrReturn] to resume the execution of the suspended
+ * coroutine using a reference to the suspending function.
+ */
+@SinceKotlin("1.3")
+public actual inline fun <T> (suspend () -> T).startCoroutineUninterceptedOrReturn(
+    completion: Continuation<T>
+): Any? = TODO("Wasm stdlib: Coroutines intrinsics")
+
+/**
+ * Starts an unintercepted coroutine with receiver type [R] and result type [T] and executes it until its first suspension.
+ * Returns the result of the coroutine or throws its exception if it does not suspend or [COROUTINE_SUSPENDED] if it suspends.
+ * In the latter case, the [completion] continuation is invoked when the coroutine completes with a result or an exception.
+ *
+ * The coroutine is started directly in the invoker's thread without going through the [ContinuationInterceptor] that might
+ * be present in the completion's [CoroutineContext]. It is the invoker's responsibility to ensure that a proper invocation
+ * context is established.
+ *
+ * This function is designed to be used from inside of [suspendCoroutineUninterceptedOrReturn] to resume the execution of the suspended
+ * coroutine using a reference to the suspending function.
+ */
+@SinceKotlin("1.3")
+public actual inline fun <R, T> (suspend R.() -> T).startCoroutineUninterceptedOrReturn(
+    receiver: R,
+    completion: Continuation<T>
+): Any? = TODO("Wasm stdlib: Coroutines intrinsics")
+
+@InlineOnly
+internal actual inline fun <R, P, T> (suspend R.(P) -> T).startCoroutineUninterceptedOrReturn(
+    receiver: R,
+    param: P,
+    completion: Continuation<T>
+): Any? = TODO("Wasm stdlib: Coroutines intrinsics")
+
+@SinceKotlin("1.3")
+public actual fun <T> (suspend () -> T).createCoroutineUnintercepted(
+    completion: Continuation<T>
+): Continuation<Unit> = TODO("Wasm stdlib: Coroutines intrinsics")
+
+@SinceKotlin("1.3")
+public actual fun <R, T> (suspend R.() -> T).createCoroutineUnintercepted(
+    receiver: R,
+    completion: Continuation<T>
+): Continuation<Unit> = TODO("Wasm stdlib: Coroutines intrinsics")
+
+/**
+ * Intercepts this continuation with [ContinuationInterceptor].
+ *
+ * This function shall be used on the immediate result of [createCoroutineUnintercepted] or [suspendCoroutineUninterceptedOrReturn],
+ * in which case it checks for [ContinuationInterceptor] in the continuation's [context][Continuation.context],
+ * invokes [ContinuationInterceptor.interceptContinuation], caches and returns the result.
+ *
+ * If this function is invoked on other [Continuation] instances it returns `this` continuation unchanged.
+ */
+@SinceKotlin("1.3")
+public actual fun <T> Continuation<T>.intercepted(): Continuation<T> = TODO("Wasm stdlib: Coroutines intrinsics")
diff --git a/libraries/stdlib/wasm/src/kotlin/coroutines/cancellation/CancellationException.kt b/libraries/stdlib/wasm/src/kotlin/coroutines/cancellation/CancellationException.kt
new file mode 100644
index 00000000000..0438d8b0b19
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/coroutines/cancellation/CancellationException.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.coroutines.cancellation
+
+@ExperimentalStdlibApi
+@SinceKotlin("1.4")
+public actual open class CancellationException : IllegalStateException {
+    actual constructor() : super()
+    actual constructor(message: String?) : super(message)
+    constructor(message: String?, cause: Throwable?) : super(message, cause)
+    constructor(cause: Throwable?) : super(cause)
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/io.kt b/libraries/stdlib/wasm/src/kotlin/io.kt
new file mode 100644
index 00000000000..0d27e864646
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/io.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.io
+
+import kotlin.wasm.internal.*
+
+/** Prints the line separator to the standard output stream. */
+public actual fun println() {
+    println("")
+}
+
+/** Prints the given [message] and the line separator to the standard output stream. */
+public actual fun println(message: Any?) {
+    printlnImpl(message.toString())
+}
+
+/** Prints the given [message] to the standard output stream. */
+public actual fun print(message: Any?) {
+    // TODO: Support print without newline
+    println(message)
+}
+
+
+internal actual interface Serializable
+
+@WasmImport("runtime", "println")
+private fun printlnImpl(message: String): Unit =
+    implementedAsIntrinsic
diff --git a/libraries/stdlib/wasm/src/kotlin/random/Random.kt b/libraries/stdlib/wasm/src/kotlin/random/Random.kt
new file mode 100644
index 00000000000..4270affaaec
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/random/Random.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.random
+
+internal actual fun defaultPlatformRandom(): Random = TODO("Wasm stdlib: Random")
+internal actual fun doubleFromParts(hi26: Int, low27: Int): Double = TODO("Wasm stdlib: Random")
diff --git a/libraries/stdlib/wasm/src/kotlin/reflect/KCallable.kt b/libraries/stdlib/wasm/src/kotlin/reflect/KCallable.kt
new file mode 100644
index 00000000000..15a8c0ec4f2
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/reflect/KCallable.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.reflect
+
+/**
+ * Represents a callable entity, such as a function or a property.
+ *
+ * @param R return type of the callable.
+ */
+public actual interface KCallable<out R> {
+    /**
+     * The name of this callable as it was declared in the source code.
+     * If the callable has no name, a special invented name is created.
+     * Nameless callables include:
+     * - constructors have the name "<init>",
+     * - property accessors: the getter for a property named "foo" will have the name "<get-foo>",
+     *   the setter, similarly, will have the name "<set-foo>".
+     */
+    actual public val name: String
+}
diff --git a/libraries/stdlib/wasm/src/kotlin/reflect/KClass.kt b/libraries/stdlib/wasm/src/kotlin/reflect/KClass.kt
new file mode 100644
index 00000000000..2251a80db6f
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/reflect/KClass.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.reflect
+
+/**
+ * Represents a class and provides introspection capabilities.
+ * Instances of this class are obtainable by the `::class` syntax.
+ * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/reflection.html#class-references)
+ * for more information.
+ *
+ * @param T the type of the class.
+ */
+public actual interface KClass<T : Any> : KClassifier {
+    /**
+     * The simple name of the class as it was declared in the source code,
+     * or `null` if the class has no name (if, for example, it is a class of an anonymous object).
+     */
+    public actual val simpleName: String?
+
+    /**
+     * The fully qualified dot-separated name of the class,
+     * or `null` if the class is local or a class of an anonymous object.
+     */
+    public actual val qualifiedName: String?
+
+    /**
+     * Returns `true` if [value] is an instance of this class on a given platform.
+     */
+    @SinceKotlin("1.1")
+    public actual fun isInstance(value: Any?): Boolean
+
+}
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/reflect/KClasses.kt b/libraries/stdlib/wasm/src/kotlin/reflect/KClasses.kt
new file mode 100644
index 00000000000..fa239b1368d
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/reflect/KClasses.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.reflect
+
+internal actual val KClass<*>.qualifiedOrSimpleName: String? get() = TODO("Wasm stdlib: KClass<*>.qualifiedOrSimpleName")
diff --git a/libraries/stdlib/wasm/src/kotlin/reflect/KFunction.kt b/libraries/stdlib/wasm/src/kotlin/reflect/KFunction.kt
new file mode 100644
index 00000000000..9810f3d5653
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/reflect/KFunction.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.reflect
+
+/**
+ * Represents a function with introspection capabilities.
+ */
+public actual interface KFunction<out R> : KCallable<R>, Function<R>
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/reflect/KProperty.kt b/libraries/stdlib/wasm/src/kotlin/reflect/KProperty.kt
new file mode 100644
index 00000000000..0e80aa9178a
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/reflect/KProperty.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("IMPLEMENTING_FUNCTION_INTERFACE")
+package kotlin.reflect
+
+/**
+ * Represents a property, such as a named `val` or `var` declaration.
+ * Instances of this class are obtainable by the `::` operator.
+ * 
+ * See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/reflection.html)
+ * for more information.
+ *
+ * @param R the type of the property.
+ */
+public actual interface KProperty<out R> : KCallable<R> {
+}
+
+/**
+ * Represents a property declared as a `var`.
+ */
+public actual interface KMutableProperty<R> : KProperty<R> {
+}
+
+
+/**
+ * Represents a property without any kind of receiver.
+ * Such property is either originally declared in a receiverless context such as a package,
+ * or has the receiver bound to it.
+ */
+public actual interface KProperty0<out R> : KProperty<R>, () -> R {
+    /**
+     * Returns the current value of the property.
+     */
+    public actual fun get(): R
+}
+
+/**
+ * Represents a `var`-property without any kind of receiver.
+ */
+public actual interface KMutableProperty0<R> : KProperty0<R>, KMutableProperty<R> {
+    /**
+     * Modifies the value of the property.
+     *
+     * @param value the new value to be assigned to this property.
+     */
+    public actual fun set(value: R)
+}
+
+
+/**
+ * Represents a property, operations on which take one receiver as a parameter.
+ *
+ * @param T the type of the receiver which should be used to obtain the value of the property.
+ * @param R the type of the property.
+ */
+public actual interface KProperty1<T, out R> : KProperty<R>, (T) -> R {
+    /**
+     * Returns the current value of the property.
+     *
+     * @param receiver the receiver which is used to obtain the value of the property.
+     *                 For example, it should be a class instance if this is a member property of that class,
+     *                 or an extension receiver if this is a top level extension property.
+     */
+    public actual fun get(receiver: T): R
+}
+
+/**
+ * Represents a `var`-property, operations on which take one receiver as a parameter.
+ */
+public actual interface KMutableProperty1<T, R> : KProperty1<T, R>, KMutableProperty<R> {
+    /**
+     * Modifies the value of the property.
+     *
+     * @param receiver the receiver which is used to modify the value of the property.
+     *                 For example, it should be a class instance if this is a member property of that class,
+     *                 or an extension receiver if this is a top level extension property.
+     * @param value the new value to be assigned to this property.
+     */
+    public actual fun set(receiver: T, value: R)
+}
+
+
+/**
+ * Represents a property, operations on which take two receivers as parameters,
+ * such as an extension property declared in a class.
+ *
+ * @param D the type of the first receiver. In case of the extension property in a class this is
+ *        the type of the declaring class of the property, or any subclass of that class.
+ * @param E the type of the second receiver. In case of the extension property in a class this is
+ *        the type of the extension receiver.
+ * @param R the type of the property.
+ */
+public actual interface KProperty2<D, E, out R> : KProperty<R>, (D, E) -> R {
+    /**
+     * Returns the current value of the property. In case of the extension property in a class,
+     * the instance of the class should be passed first and the instance of the extension receiver second.
+     *
+     * @param receiver1 the instance of the first receiver.
+     * @param receiver2 the instance of the second receiver.
+     */
+    public actual fun get(receiver1: D, receiver2: E): R
+}
+
+/**
+ * Represents a `var`-property, operations on which take two receivers as parameters.
+ */
+public actual interface KMutableProperty2<D, E, R> : KProperty2<D, E, R>, KMutableProperty<R> {
+    /**
+     * Modifies the value of the property.
+     *
+     * @param receiver1 the instance of the first receiver.
+     * @param receiver2 the instance of the second receiver.
+     * @param value the new value to be assigned to this property.
+     */
+    public actual fun set(receiver1: D, receiver2: E, value: R)
+}
diff --git a/libraries/stdlib/wasm/src/kotlin/reflect/KType.kt b/libraries/stdlib/wasm/src/kotlin/reflect/KType.kt
new file mode 100644
index 00000000000..b3a1926acc9
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/reflect/KType.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.reflect
+
+/**
+ * Represents a type. Type is usually either a class with optional type arguments,
+ * or a type parameter of some declaration, plus nullability.
+ */
+public actual interface KType {
+    /**
+     * The declaration of the classifier used in this type.
+     * For example, in the type `List<String>` the classifier would be the [KClass] instance for [List].
+     *
+     * Returns `null` if this type is not denotable in Kotlin, for example if it is an intersection type.
+     */
+    @SinceKotlin("1.1")
+    public actual val classifier: KClassifier?
+
+    /**
+     * Type arguments passed for the parameters of the classifier in this type.
+     * For example, in the type `Array<out Number>` the only type argument is `out Number`.
+     *
+     * In case this type is based on an inner class, the returned list contains the type arguments provided for the innermost class first,
+     * then its outer class, and so on.
+     * For example, in the type `Outer<A, B>.Inner<C, D>` the returned list is `[C, D, A, B]`.
+     */
+    @SinceKotlin("1.1")
+    public actual val arguments: List<KTypeProjection>
+
+    /**
+     * `true` if this type was marked nullable in the source code.
+     *
+     * For Kotlin types, it means that `null` value is allowed to be represented by this type.
+     * In practice it means that the type was declared with a question mark at the end.
+     * For non-Kotlin types, it means the type or the symbol which was declared with this type
+     * is annotated with a runtime-retained nullability annotation such as [javax.annotation.Nullable].
+     *
+     * Note that even if [isMarkedNullable] is false, values of the type can still be `null`.
+     * This may happen if it is a type of the type parameter with a nullable upper bound:
+     *
+     * ```
+     * fun <T> foo(t: T) {
+     *     // isMarkedNullable == false for t's type, but t can be null here when T = "Any?"
+     * }
+     * ```
+     */
+    public actual val isMarkedNullable: Boolean
+}
diff --git a/libraries/stdlib/wasm/src/kotlin/text/Appendable.kt b/libraries/stdlib/wasm/src/kotlin/text/Appendable.kt
new file mode 100644
index 00000000000..3e251ef6edc
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/text/Appendable.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.text
+
+/**
+ * An object to which char sequences and values can be appended.
+ */
+actual interface Appendable {
+    /**
+     * Appends the specified character [value] to this Appendable and returns this instance.
+     *
+     * @param value the character to append.
+     */
+    actual fun append(value: Char): Appendable
+
+    /**
+     * Appends the specified character sequence [value] to this Appendable and returns this instance.
+     *
+     * @param value the character sequence to append. If [value] is `null`, then the four characters `"null"` are appended to this Appendable.
+     */
+    actual fun append(value: CharSequence?): Appendable
+
+    /**
+     * Appends a subsequence of the specified character sequence [value] to this Appendable and returns this instance.
+     *
+     * @param value the character sequence from which a subsequence is appended. If [value] is `null`,
+     *  then characters are appended as if [value] contained the four characters `"null"`.
+     * @param startIndex the beginning (inclusive) of the subsequence to append.
+     * @param endIndex the end (exclusive) of the subsequence to append.
+     *
+     * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of the [value] character sequence indices or when `startIndex > endIndex`.
+     */
+    actual fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable
+}
diff --git a/libraries/stdlib/wasm/src/kotlin/text/CharacterCodingException.kt b/libraries/stdlib/wasm/src/kotlin/text/CharacterCodingException.kt
new file mode 100644
index 00000000000..9e3a8aae00c
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/text/CharacterCodingException.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.text
+
+/**
+ *  The exception thrown when a character encoding or decoding error occurs.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual open class CharacterCodingException actual constructor() : Exception()
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/text/StringBuilder.kt b/libraries/stdlib/wasm/src/kotlin/text/StringBuilder.kt
new file mode 100644
index 00000000000..4b7037f5605
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/text/StringBuilder.kt
@@ -0,0 +1,387 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.text
+
+/**
+ * A mutable sequence of characters.
+ *
+ * String builder can be used to efficiently perform multiple string manipulation operations.
+ */
+actual class StringBuilder : Appendable, CharSequence {
+    /** Constructs an empty string builder. */
+    actual constructor() { TODO("Wasm stdlib: StringBuilder") }
+
+    /** Constructs an empty string builder with the specified initial [capacity]. */
+    actual constructor(capacity: Int) { TODO("Wasm stdlib: StringBuilder") }
+
+    /** Constructs a string builder that contains the same characters as the specified [content] char sequence. */
+    actual constructor(content: CharSequence) { TODO("Wasm stdlib: StringBuilder") }
+
+    /** Constructs a string builder that contains the same characters as the specified [content] string. */
+    @SinceKotlin("1.3")
+//    @ExperimentalStdlibApi
+    actual constructor(content: String) { TODO("Wasm stdlib: StringBuilder") }
+
+    actual override val length: Int = TODO("Wasm stdlib: StringBuilder")
+
+    actual override operator fun get(index: Int): Char = TODO("Wasm stdlib: StringBuilder")
+
+    actual override fun subSequence(startIndex: Int, endIndex: Int): CharSequence = TODO("Wasm stdlib: StringBuilder")
+
+    actual override fun append(value: Char): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+    actual override fun append(value: CharSequence?): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+    actual override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Reverses the contents of this string builder and returns this instance.
+     *
+     * Surrogate pairs included in this string builder are treated as single characters.
+     * Therefore, the order of the high-low surrogates is never reversed.
+     *
+     * Note that the reverse operation may produce new surrogate pairs that were unpaired low-surrogates and high-surrogates before the operation.
+     * For example, reversing `"\uDC00\uD800"` produces `"\uD800\uDC00"` which is a valid surrogate pair.
+     */
+    actual fun reverse(): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Appends the string representation of the specified object [value] to this string builder and returns this instance.
+     *
+     * The overall effect is exactly as if the [value] were converted to a string by the `value.toString()` method,
+     * and then that string was appended to this string builder.
+     */
+    actual fun append(value: Any?): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Appends the string representation of the specified boolean [value] to this string builder and returns this instance.
+     *
+     * The overall effect is exactly as if the [value] were converted to a string by the `value.toString()` method,
+     * and then that string was appended to this string builder.
+     */
+    @SinceKotlin("1.3")
+//    @ExperimentalStdlibApi
+    actual fun append(value: Boolean): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Appends characters in the specified character array [value] to this string builder and returns this instance.
+     *
+     * Characters are appended in order, starting at the index 0.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun append(value: CharArray): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Appends the specified string [value] to this string builder and returns this instance.
+     */
+    @SinceKotlin("1.3")
+//    @ExperimentalStdlibApi
+    actual fun append(value: String?): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Returns the current capacity of this string builder.
+     *
+     * The capacity is the maximum length this string builder can have before an allocation occurs.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun capacity(): Int = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Ensures that the capacity of this string builder is at least equal to the specified [minimumCapacity].
+     *
+     * If the current capacity is less than the [minimumCapacity], a new backing storage is allocated with greater capacity.
+     * Otherwise, this method takes no action and simply returns.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun ensureCapacity(minimumCapacity: Int) { TODO("Wasm stdlib: StringBuilder") }
+
+    /**
+     * Returns the index within this string builder of the first occurrence of the specified [string].
+     *
+     * Returns `-1` if the specified [string] does not occur in this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun indexOf(string: String): Int = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Returns the index within this string builder of the first occurrence of the specified [string],
+     * starting at the specified [startIndex].
+     *
+     * Returns `-1` if the specified [string] does not occur in this string builder starting at the specified [startIndex].
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun indexOf(string: String, startIndex: Int): Int = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Returns the index within this string builder of the last occurrence of the specified [string].
+     * The last occurrence of empty string `""` is considered to be at the index equal to `this.length`.
+     *
+     * Returns `-1` if the specified [string] does not occur in this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun lastIndexOf(string: String): Int = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Returns the index within this string builder of the last occurrence of the specified [string],
+     * starting from the specified [startIndex] toward the beginning.
+     *
+     * Returns `-1` if the specified [string] does not occur in this string builder starting at the specified [startIndex].
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun lastIndexOf(string: String, startIndex: Int): Int = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Inserts the string representation of the specified boolean [value] into this string builder at the specified [index] and returns this instance.
+     *
+     * The overall effect is exactly as if the [value] were converted to a string by the `value.toString()` method,
+     * and then that string was inserted into this string builder at the specified [index].
+     *
+     * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun insert(index: Int, value: Boolean): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Inserts the specified character [value] into this string builder at the specified [index] and returns this instance.
+     *
+     * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun insert(index: Int, value: Char): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Inserts characters in the specified character array [value] into this string builder at the specified [index] and returns this instance.
+     *
+     * The inserted characters go in same order as in the [value] character array, starting at [index].
+     *
+     * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun insert(index: Int, value: CharArray): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Inserts characters in the specified character sequence [value] into this string builder at the specified [index] and returns this instance.
+     *
+     * The inserted characters go in the same order as in the [value] character sequence, starting at [index].
+     *
+     * @param index the position in this string builder to insert at.
+     * @param value the character sequence from which characters are inserted. If [value] is `null`, then the four characters `"null"` are inserted.
+     *
+     * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun insert(index: Int, value: CharSequence?): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Inserts the string representation of the specified object [value] into this string builder at the specified [index] and returns this instance.
+     *
+     * The overall effect is exactly as if the [value] were converted to a string by the `value.toString()` method,
+     * and then that string was inserted into this string builder at the specified [index].
+     *
+     * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun insert(index: Int, value: Any?): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Inserts the string [value] into this string builder at the specified [index] and returns this instance.
+     *
+     * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun insert(index: Int, value: String?): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     *  Sets the length of this string builder to the specified [newLength].
+     *
+     *  If the [newLength] is less than the current length, it is changed to the specified [newLength].
+     *  Otherwise, null characters '\u0000' are appended to this string builder until its length is less than the [newLength].
+     *
+     *  Note that in Kotlin/JS [set] operator function has non-constant execution time complexity.
+     *  Therefore, increasing length of this string builder and then updating each character by index may slow down your program.
+     *
+     *  @throws IndexOutOfBoundsException or [IllegalArgumentException] if [newLength] is less than zero.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun setLength(newLength: Int) { TODO("Wasm stdlib: StringBuilder") }
+
+    /**
+     * Returns a new [String] that contains characters in this string builder at [startIndex] (inclusive) and up to the [length] (exclusive).
+     *
+     * @throws IndexOutOfBoundsException if [startIndex] is less than zero or greater than the length of this string builder.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun substring(startIndex: Int): String = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Returns a new [String] that contains characters in this string builder at [startIndex] (inclusive) and up to the [endIndex] (exclusive).
+     *
+     * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this string builder indices or when `startIndex > endIndex`.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun substring(startIndex: Int, endIndex: Int): String = TODO("Wasm stdlib: StringBuilder")
+
+    /**
+     * Attempts to reduce storage used for this string builder.
+     *
+     * If the backing storage of this string builder is larger than necessary to hold its current contents,
+     * then it may be resized to become more space efficient.
+     * Calling this method may, but is not required to, affect the value of the [capacity] property.
+     */
+    @SinceKotlin("1.3")
+    @ExperimentalStdlibApi
+    actual fun trimToSize() { TODO("Wasm stdlib: StringBuilder") }
+}
+
+
+/**
+ * Clears the content of this string builder making it empty and returns this instance.
+ *
+ * @sample samples.text.Strings.clearStringBuilder
+ */
+@SinceKotlin("1.3")
+public actual fun StringBuilder.clear(): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+/**
+ * Sets the character at the specified [index] to the specified [value].
+ *
+ * @throws IndexOutOfBoundsException if [index] is out of bounds of this string builder.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual operator fun StringBuilder.set(index: Int, value: Char) { TODO("Wasm stdlib: StringBuilder") }
+
+/**
+ * Replaces characters in the specified range of this string builder with characters in the specified string [value] and returns this instance.
+ *
+ * @param startIndex the beginning (inclusive) of the range to replace.
+ * @param endIndex the end (exclusive) of the range to replace.
+ * @param value the string to replace with.
+ *
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] if [startIndex] is less than zero, greater than the length of this string builder, or `startIndex > endIndex`.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun StringBuilder.setRange(startIndex: Int, endIndex: Int, value: String): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+/**
+ * Removes the character at the specified [index] from this string builder and returns this instance.
+ *
+ * If the `Char` at the specified [index] is part of a supplementary code point, this method does not remove the entire supplementary character.
+ *
+ * @param index the index of `Char` to remove.
+ *
+ * @throws IndexOutOfBoundsException if [index] is out of bounds of this string builder.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun StringBuilder.deleteAt(index: Int): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+/**
+ * Removes characters in the specified range from this string builder and returns this instance.
+ *
+ * @param startIndex the beginning (inclusive) of the range to remove.
+ * @param endIndex the end (exclusive) of the range to remove.
+ *
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] is out of range of this string builder indices or when `startIndex > endIndex`.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun StringBuilder.deleteRange(startIndex: Int, endIndex: Int): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+/**
+ * Copies characters from this string builder into the [destination] character array.
+ *
+ * @param destination the array to copy to.
+ * @param destinationOffset the position in the array to copy to, 0 by default.
+ * @param startIndex the beginning (inclusive) of the range to copy, 0 by default.
+ * @param endIndex the end (exclusive) of the range to copy, length of this string builder by default.
+ *
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of this string builder indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException when the subrange doesn't fit into the [destination] array starting at the specified [destinationOffset],
+ *  or when that index is out of the [destination] array indices range.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun StringBuilder.toCharArray(destination: CharArray, destinationOffset: Int, startIndex: Int, endIndex: Int) { TODO("Wasm stdlib: StringBuilder") }
+
+/**
+ * Appends characters in a subarray of the specified character array [value] to this string builder and returns this instance.
+ *
+ * Characters are appended in order, starting at specified [startIndex].
+ *
+ * @param value the array from which characters are appended.
+ * @param startIndex the beginning (inclusive) of the subarray to append.
+ * @param endIndex the end (exclusive) of the subarray to append.
+ *
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of the [value] array indices or when `startIndex > endIndex`.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun StringBuilder.appendRange(value: CharArray, startIndex: Int, endIndex: Int): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+/**
+ * Appends a subsequence of the specified character sequence [value] to this string builder and returns this instance.
+ *
+ * @param value the character sequence from which a subsequence is appended. If [value] is `null`,
+ *  then characters are appended as if [value] contained the four characters `"null"`.
+ * @param startIndex the beginning (inclusive) of the subsequence to append.
+ * @param endIndex the end (exclusive) of the subsequence to append.
+ *
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of the [value] character sequence indices or when `startIndex > endIndex`.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun StringBuilder.appendRange(value: CharSequence, startIndex: Int, endIndex: Int): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+/**
+ * Inserts characters in a subarray of the specified character array [value] into this string builder at the specified [index] and returns this instance.
+ *
+ * The inserted characters go in same order as in the [value] array, starting at [index].
+ *
+ * @param index the position in this string builder to insert at.
+ * @param value the array from which characters are inserted.
+ * @param startIndex the beginning (inclusive) of the subarray to insert.
+ * @param endIndex the end (exclusive) of the subarray to insert.
+ *
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of the [value] array indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of this string builder.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun StringBuilder.insertRange(index: Int, value: CharArray, startIndex: Int, endIndex: Int): StringBuilder = TODO("Wasm stdlib: StringBuilder")
+
+/**
+ * Inserts characters in a subsequence of the specified character sequence [value] into this string builder at the specified [index] and returns this instance.
+ *
+ * The inserted characters go in the same order as in the [value] character sequence, starting at [index].
+ *
+ * @param index the position in this string builder to insert at.
+ * @param value the character sequence from which a subsequence is inserted. If [value] is `null`,
+ *  then characters will be inserted as if [value] contained the four characters `"null"`.
+ * @param startIndex the beginning (inclusive) of the subsequence to insert.
+ * @param endIndex the end (exclusive) of the subsequence to insert.
+ *
+ * @throws IndexOutOfBoundsException or [IllegalArgumentException] when [startIndex] or [endIndex] is out of range of the [value] character sequence indices or when `startIndex > endIndex`.
+ * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of this string builder.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun StringBuilder.insertRange(index: Int, value: CharSequence, startIndex: Int, endIndex: Int): StringBuilder = TODO("Wasm stdlib: StringBuilder")
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/throwableExtensions.kt b/libraries/stdlib/wasm/src/kotlin/throwableExtensions.kt
new file mode 100644
index 00000000000..fc2ef231f66
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/throwableExtensions.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+/**
+ * Returns the detailed description of this throwable with its stack trace.
+ *
+ * The detailed description includes:
+ * - the short description (see [Throwable.toString]) of this throwable;
+ * - the complete stack trace;
+ * - detailed descriptions of the exceptions that were [suppressed][suppressedExceptions] in order to deliver this exception;
+ * - the detailed description of each throwable in the [Throwable.cause] chain.
+ */
+@SinceKotlin("1.4")
+public actual fun Throwable.stackTraceToString(): String =
+    TODO("Implement stackTraceToString")
+
+/**
+ * Prints the [detailed description][Throwable.stackTraceToString] of this throwable to console error output.
+ */
+@SinceKotlin("1.4")
+public actual fun Throwable.printStackTrace() {
+    TODO("Implement printStackTrace")
+}
+
+/**
+ * Adds the specified exception to the list of exceptions that were
+ * suppressed in order to deliver this exception.
+ */
+@SinceKotlin("1.4")
+public actual fun Throwable.addSuppressed(exception: Throwable) {
+    TODO("Implement Throwable.addSuppressed")
+}
+
+/**
+ * Returns a list of all exceptions that were suppressed in order to deliver this exception.
+ */
+@SinceKotlin("1.4")
+public actual val Throwable.suppressedExceptions: List<Throwable>
+    get() {
+        TODO("Implement Throwable.suppressedExceptions")
+    }
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/time/Duration.kt b/libraries/stdlib/wasm/src/kotlin/time/Duration.kt
new file mode 100644
index 00000000000..f36abccdbca
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/time/Duration.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package kotlin.time
+
+internal actual fun formatToExactDecimals(value: Double, decimals: Int): String = TODO("Wasm stdlib: Duration")
+internal actual fun formatUpToDecimals(value: Double, decimals: Int): String = TODO("Wasm stdlib: Duration")
+internal actual fun formatScientific(value: Double): String = TODO("Wasm stdlib: Duration")
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/src/kotlin/time/DurationUnit.kt b/libraries/stdlib/wasm/src/kotlin/time/DurationUnit.kt
new file mode 100644
index 00000000000..515e8385967
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/time/DurationUnit.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.time
+
+
+/**
+ * The list of possible time measurement units, in which a duration can be expressed.
+ *
+ * The smallest time unit is [NANOSECONDS] and the largest is [DAYS], which corresponds to exactly 24 [HOURS].
+ */
+@SinceKotlin("1.3")
+@ExperimentalTime
+public actual enum class DurationUnit {
+    /**
+     * Time unit representing one nanosecond, which is 1/1000 of a microsecond.
+     */
+    NANOSECONDS,
+    /**
+     * Time unit representing one microsecond, which is 1/1000 of a millisecond.
+     */
+    MICROSECONDS,
+    /**
+     * Time unit representing one millisecond, which is 1/1000 of a second.
+     */
+    MILLISECONDS,
+    /**
+     * Time unit representing one second.
+     */
+    SECONDS,
+    /**
+     * Time unit representing one minute.
+     */
+    MINUTES,
+    /**
+     * Time unit representing one hour.
+     */
+    HOURS,
+    /**
+     * Time unit representing one day, which is always equal to 24 hours.
+     */
+    DAYS;
+}
+
+/** Converts the given time duration [value] expressed in the specified [sourceUnit] into the specified [targetUnit]. */
+@SinceKotlin("1.3")
+@ExperimentalTime
+internal actual fun convertDurationUnit(value: Double, sourceUnit: DurationUnit, targetUnit: DurationUnit): Double  = TODO("Wasm stdlib: convertDurationUnit")
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt.193 b/libraries/stdlib/wasm/src/kotlin/time/TimeSources.kt
similarity index 50%
rename from idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt.193
rename to libraries/stdlib/wasm/src/kotlin/time/TimeSources.kt
index ed8af9ec992..2438fe3cebd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt.193
+++ b/libraries/stdlib/wasm/src/kotlin/time/TimeSources.kt
@@ -2,10 +2,10 @@
  * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
+package kotlin.time
 
-package org.jetbrains.kotlin.idea.codeInsight
-
-import com.intellij.xml.breadcrumbs.BreadcrumbsInfoProvider
-
-// FIX ME WHEN BUNCH 201 REMOVED
-typealias BreadcrumbsProviderCompatBase = BreadcrumbsInfoProvider
\ No newline at end of file
+@SinceKotlin("1.3")
+@ExperimentalTime
+internal actual object MonotonicTimeSource : TimeSource {
+    override fun markNow(): TimeMark = TODO("Wasm stdlib: MonotonicTimeSource::markNow")
+}
diff --git a/libraries/stdlib/wasm/src/kotlin/util/Numbers.kt b/libraries/stdlib/wasm/src/kotlin/util/Numbers.kt
new file mode 100644
index 00000000000..e84353a1fa4
--- /dev/null
+++ b/libraries/stdlib/wasm/src/kotlin/util/Numbers.kt
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+/**
+ * Counts the number of set bits in the binary representation of this [Int] number.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Int.countOneBits(): Int = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Counts the number of consecutive most significant bits that are zero in the binary representation of this [Int] number.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Int.countLeadingZeroBits(): Int = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Counts the number of consecutive least significant bits that are zero in the binary representation of this [Int] number.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Int.countTrailingZeroBits(): Int = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Returns a number having a single bit set in the position of the most significant set bit of this [Int] number,
+ * or zero, if this number is zero.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Int.takeHighestOneBit(): Int = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Returns a number having a single bit set in the position of the least significant set bit of this [Int] number,
+ * or zero, if this number is zero.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Int.takeLowestOneBit(): Int = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Rotates the binary representation of this [Int] number left by the specified [bitCount] number of bits.
+ * The most significant bits pushed out from the left side reenter the number as the least significant bits on the right side.
+ *
+ * Rotating the number left by a negative bit count is the same as rotating it right by the negated bit count:
+ * `number.rotateLeft(-n) == number.rotateRight(n)`
+ *
+ * Rotating by a multiple of [Int.SIZE_BITS] (32) returns the same number, or more generally
+ * `number.rotateLeft(n) == number.rotateLeft(n % 32)`
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Int.rotateLeft(bitCount: Int): Int = TODO("Wasm stdlib: Numbers")
+
+
+/**
+ * Rotates the binary representation of this [Int] number right by the specified [bitCount] number of bits.
+ * The least significant bits pushed out from the right side reenter the number as the most significant bits on the left side.
+ *
+ * Rotating the number right by a negative bit count is the same as rotating it left by the negated bit count:
+ * `number.rotateRight(-n) == number.rotateLeft(n)`
+ *
+ * Rotating by a multiple of [Int.SIZE_BITS] (32) returns the same number, or more generally
+ * `number.rotateRight(n) == number.rotateRight(n % 32)`
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Int.rotateRight(bitCount: Int): Int = TODO("Wasm stdlib: Numbers")
+
+
+/**
+ * Counts the number of set bits in the binary representation of this [Long] number.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Long.countOneBits(): Int = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Counts the number of consecutive most significant bits that are zero in the binary representation of this [Long] number.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Long.countLeadingZeroBits(): Int = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Counts the number of consecutive least significant bits that are zero in the binary representation of this [Long] number.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Long.countTrailingZeroBits(): Int = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Returns a number having a single bit set in the position of the most significant set bit of this [Long] number,
+ * or zero, if this number is zero.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Long.takeHighestOneBit(): Long = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Returns a number having a single bit set in the position of the least significant set bit of this [Long] number,
+ * or zero, if this number is zero.
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Long.takeLowestOneBit(): Long = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Rotates the binary representation of this [Long] number left by the specified [bitCount] number of bits.
+ * The most significant bits pushed out from the left side reenter the number as the least significant bits on the right side.
+ *
+ * Rotating the number left by a negative bit count is the same as rotating it right by the negated bit count:
+ * `number.rotateLeft(-n) == number.rotateRight(n)`
+ *
+ * Rotating by a multiple of [Long.SIZE_BITS] (64) returns the same number, or more generally
+ * `number.rotateLeft(n) == number.rotateLeft(n % 64)`
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Long.rotateLeft(bitCount: Int): Long = TODO("Wasm stdlib: Numbers")
+
+/**
+ * Rotates the binary representation of this [Long] number right by the specified [bitCount] number of bits.
+ * The least significant bits pushed out from the right side reenter the number as the most significant bits on the left side.
+ *
+ * Rotating the number right by a negative bit count is the same as rotating it left by the negated bit count:
+ * `number.rotateRight(-n) == number.rotateLeft(n)`
+ *
+ * Rotating by a multiple of [Long.SIZE_BITS] (64) returns the same number, or more generally
+ * `number.rotateRight(n) == number.rotateRight(n % 64)`
+ */
+@SinceKotlin("1.3")
+@ExperimentalStdlibApi
+public actual fun Long.rotateRight(bitCount: Int): Long = TODO("Wasm stdlib: Numbers")
diff --git a/libraries/stdlib/wasm/stubs/experimentalPackageStub.kt b/libraries/stdlib/wasm/stubs/experimentalPackageStub.kt
new file mode 100644
index 00000000000..9d00c812f07
--- /dev/null
+++ b/libraries/stdlib/wasm/stubs/experimentalPackageStub.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.experimental
+
+// In some tests `import kotlin.experimental*` is used without actually importing anything
\ No newline at end of file
diff --git a/libraries/stdlib/wasm/stubs/testHelpers.kt b/libraries/stdlib/wasm/stubs/testHelpers.kt
new file mode 100644
index 00000000000..4b51e714be5
--- /dev/null
+++ b/libraries/stdlib/wasm/stubs/testHelpers.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.test
+
+import kotlin.internal.OnlyInputTypes
+
+public fun assert(x: Boolean) {
+    if (!x) throw AssertionError("Assertion failed")
+}
+
+/** Asserts that the [expected] value is equal to the [actual] value, with an optional [message]. */
+public fun <@OnlyInputTypes T> assertEquals(expected: T, actual: T, message: String? = null) {
+    if (expected != actual) throw AssertionError("assertEquals failed: expected:$expected, actual:$actual, message=$message")
+}
+
+/** Asserts that the [actual] value is not equal to the illegal value, with an optional [message]. */
+public fun <@OnlyInputTypes T> assertNotEquals(illegal: T, actual: T, message: String? = null) {
+    if (illegal == actual) throw AssertionError("assertNotEquals failed: illegal:$illegal, actual:$actual, message=$message")
+}
diff --git a/libraries/stdlib/wasm/stubs/testHelpers2.kt b/libraries/stdlib/wasm/stubs/testHelpers2.kt
new file mode 100644
index 00000000000..bae3a0dbeb9
--- /dev/null
+++ b/libraries/stdlib/wasm/stubs/testHelpers2.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin
+
+import kotlin.internal.OnlyInputTypes
+
+public fun assert(x: Boolean) {
+    if (!x) throw AssertionError("Assertion failed")
+}
+
+/** Asserts that the [expected] value is equal to the [actual] value, with an optional [message]. */
+public fun <@OnlyInputTypes T> assertEquals(expected: T, actual: T, message: String? = null) {
+    if (expected != actual) throw AssertionError("assertEquals failed: expected:$expected, actual:$actual, message=$message")
+}
\ No newline at end of file
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk7.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk7.txt
index c77b8fc031c..1ce2284c03b 100644
--- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk7.txt
+++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk7.txt
@@ -1,3 +1,25 @@
+public abstract interface annotation class kotlin/io/path/ExperimentalPathApi : java/lang/annotation/Annotation {
+}
+
+public final class kotlin/io/path/PathsKt {
+	public static final fun appendText (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/charset/Charset;)V
+	public static synthetic fun appendText$default (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/charset/Charset;ILjava/lang/Object;)V
+	public static final fun fileAttributeViewNotAvailable (Ljava/nio/file/Path;Ljava/lang/Class;)Ljava/lang/Void;
+	public static final fun getExtension (Ljava/nio/file/Path;)Ljava/lang/String;
+	public static final fun getInvariantSeparatorsPath (Ljava/nio/file/Path;)Ljava/lang/String;
+	public static final fun getName (Ljava/nio/file/Path;)Ljava/lang/String;
+	public static final fun getNameWithoutExtension (Ljava/nio/file/Path;)Ljava/lang/String;
+	public static final fun listDirectoryEntries (Ljava/nio/file/Path;Ljava/lang/String;)Ljava/util/List;
+	public static synthetic fun listDirectoryEntries$default (Ljava/nio/file/Path;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/List;
+	public static final fun readText (Ljava/nio/file/Path;Ljava/nio/charset/Charset;)Ljava/lang/String;
+	public static synthetic fun readText$default (Ljava/nio/file/Path;Ljava/nio/charset/Charset;ILjava/lang/Object;)Ljava/lang/String;
+	public static final fun relativeTo (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
+	public static final fun relativeToOrNull (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
+	public static final fun relativeToOrSelf (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path;
+	public static final fun writeText (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/charset/Charset;[Ljava/nio/file/OpenOption;)V
+	public static synthetic fun writeText$default (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/charset/Charset;[Ljava/nio/file/OpenOption;ILjava/lang/Object;)V
+}
+
 public final class kotlin/jdk7/AutoCloseableKt {
 	public static final fun closeFinally (Ljava/lang/AutoCloseable;Ljava/lang/Throwable;)V
 }
diff --git a/libraries/tools/kotlin-annotations-android/build.gradle.kts b/libraries/tools/kotlin-annotations-android/build.gradle.kts
index a506bc64543..297e3f9c1fb 100644
--- a/libraries/tools/kotlin-annotations-android/build.gradle.kts
+++ b/libraries/tools/kotlin-annotations-android/build.gradle.kts
@@ -16,10 +16,8 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += listOf(
-            "-Xallow-kotlin-package",
-            "-module-name", project.name
-    )
+    kotlinOptions.freeCompilerArgs += listOf("-Xallow-kotlin-package")
+    kotlinOptions.moduleName = project.name
 }
 
 sourceSets {
diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle
index f05b9fd44f3..42e2c3bdfed 100644
--- a/libraries/tools/kotlin-annotations-jvm/build.gradle
+++ b/libraries/tools/kotlin-annotations-jvm/build.gradle
@@ -29,8 +29,8 @@ compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xnormalize-constructor-calls=enable",
-            "-module-name", project.name
     ]
+    kotlinOptions.moduleName = project.name
 }
 
 configureJvmIrBackend(project)
diff --git a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts
new file mode 100644
index 00000000000..23ab92f255c
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts
@@ -0,0 +1,27 @@
+description = "kotlin-gradle-statistics"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(kotlinStdlib())
+
+    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation("junit:junit:4.12")
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { projectDefault() }
+}
+
+projectTest {
+    workingDir = rootDir
+}
+
+publish()
+
+sourcesJar()
+javadocJar()
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-build-metrics/src/org/jetbrains/kotlin/gradle/internal/build/metrics/GradleBuildMetricsData.kt b/libraries/tools/kotlin-gradle-build-metrics/src/org/jetbrains/kotlin/gradle/internal/build/metrics/GradleBuildMetricsData.kt
new file mode 100644
index 00000000000..b7596751395
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-build-metrics/src/org/jetbrains/kotlin/gradle/internal/build/metrics/GradleBuildMetricsData.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.internal.build.metrics
+
+import java.io.Serializable
+
+class GradleBuildMetricsData : Serializable {
+    val parentMetric: MutableMap<String, String?> = LinkedHashMap()
+    val buildAttributeKind: MutableMap<String, String> = LinkedHashMap()
+    val taskData: MutableMap<String, TaskData> = LinkedHashMap()
+
+    companion object {
+        const val serialVersionUID = 0L
+    }
+}
+
+data class TaskData(
+    val path: String,
+    val typeFqName: String,
+    val timeMetrics: Map<String, Long>,
+    val buildAttributes: Map<String, Int>,
+    val didWork: Boolean
+) : Serializable {
+
+    companion object {
+        const val serialVersionUID = 0L
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
index 3566ad7ba73..afd41ffa90c 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
@@ -681,7 +681,7 @@ fun getSomething() = 10
 
         project.build("assembleDebug", options = options) {
             assertSuccessful()
-            assertContains("'kotlin-android-extensions' plugin is deprecated")
+            assertContains("The 'kotlin-android-extensions' Gradle plugin is deprecated")
         }
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
index a014cf0b93e..e0364c9b69c 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.gradle
 
 import com.intellij.testFramework.TestDataFile
 import org.gradle.api.logging.LogLevel
+import org.gradle.api.logging.configuration.WarningMode
 import org.gradle.tooling.GradleConnector
 import org.gradle.util.GradleVersion
 import org.intellij.lang.annotations.Language
@@ -213,7 +214,8 @@ abstract class BaseGradleIT {
         val parallelTasksInProject: Boolean? = null,
         val jsCompilerType: KotlinJsCompilerType? = null,
         val configurationCache: Boolean = false,
-        val configurationCacheProblems: ConfigurationCacheProblems = ConfigurationCacheProblems.FAIL
+        val configurationCacheProblems: ConfigurationCacheProblems = ConfigurationCacheProblems.FAIL,
+        val warningMode: WarningMode = WarningMode.Summary
     )
 
     enum class ConfigurationCacheProblems {
@@ -828,6 +830,16 @@ Finished executing task ':$taskName'|
 
             // Workaround: override a console type set in the user machine gradle.properties (since Gradle 4.3):
             add("--console=plain")
+            //The feature of failing the build on deprecation warnings is introduced in gradle 5.6
+            val supportFailingBuildOnWarning =
+                GradleVersion.version(chooseWrapperVersionOrFinishTest()) >= GradleVersion.version("5.6")
+            // Agp uses Gradle internal API constructor DefaultDomainObjectSet(Class<T>) until Agp 3.6.0 which is deprecated by Gradle,
+            // so we don't run with --warning-mode=fail when Agp 3.6 or less is used.
+            val notUsingAgpWithWarnings =
+                options.androidGradlePluginVersion == null || options.androidGradlePluginVersion > AGPVersion.v3_6_0
+            if (supportFailingBuildOnWarning && notUsingAgpWithWarnings && options.warningMode == WarningMode.Fail) {
+                add("--warning-mode=${WarningMode.Fail.name.toLowerCase()}")
+            }
             addAll(options.freeCommandLineArgs)
         }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt
index a1ce40158d3..4e263436db6 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt
@@ -23,6 +23,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import java.io.File
+import org.jetbrains.kotlin.gradle.util.createTempDir
 import kotlin.test.assertEquals
 
 private val DEFAULT_GRADLE_VERSION = GradleVersionRequired.AtLeast("5.6.4")
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt
index 3bd389a836a..4036018fc20 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.gradle
 
+import org.jetbrains.kotlin.gradle.util.AGPVersion
 import org.junit.Test
 
 class ConfigurationAvoidanceIT : BaseGradleIT() {
@@ -28,4 +29,46 @@ class ConfigurationAvoidanceIT : BaseGradleIT() {
         }
     }
 
+    @Test
+    fun testAndroidUnrelatedTaskNotConfigured() = with(
+        Project(
+            "AndroidProject",
+            gradleVersionRequirement = GradleVersionRequired.AtLeast("6.6.1")
+        )
+    ) {
+        setupWorkingDir()
+
+        listOf("Android", "Test").forEach { subproject ->
+            gradleBuildScript(subproject).appendText("\n" + """
+                android {
+                    applicationVariants.all {
+                        it.getAidlCompileProvider().configure {
+                            throw new RuntimeException("Task should not be configured.")
+                        }
+                    }
+                }
+                """.trimIndent()
+            )
+        }
+
+        gradleBuildScript("Lib").appendText(
+            "\n" + """
+            android {
+                libraryVariants.all {
+                    it.getAidlCompileProvider().configure {
+                        throw new RuntimeException("Task should not be configured.")
+                    }
+                }
+            }
+        """.trimIndent()
+        )
+
+        build(
+            "help", options = defaultBuildOptions().copy(
+                androidGradlePluginVersion = AGPVersion.v4_2_0
+            )
+        ) {
+            assertSuccessful()
+        }
+    }
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
index 67c99007564..3bb76c5ec5a 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.gradle
 
 import org.jetbrains.kotlin.gradle.util.findFileByName
+import org.jetbrains.kotlin.gradle.util.createTempDir
 import org.junit.Test
 import java.io.File
 import java.net.URI
@@ -18,6 +19,27 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
         testConfigurationCacheOf(":compileKotlin")
     }
 
+    @Test
+    fun testJvmWithMavenPublish() = with(Project("kotlinProject")) {
+        setupWorkingDir()
+        gradleBuildScript().appendText("""
+            apply plugin: "maven-publish"
+            group = "com.example"
+            version = "1.0"
+            publishing.repositories {
+                maven { 
+                    url = "${'$'}buildDir/repo"
+                }
+            }
+            publishing.publications {
+                maven(MavenPublication) {
+                    from(components["java"])
+                }
+            }
+        """.trimIndent())
+        testConfigurationCacheOf(":publishMavenPublicationToMavenRepository", checkUpToDateOnRebuild = false)
+    }
+
     @Test
     fun testIncrementalKaptProject() = with(Project("kaptIncrementalCompilationProject")) {
         setupIncrementalAptProject("AGGREGATING")
@@ -57,6 +79,7 @@ abstract class AbstractConfigurationCacheIT : BaseGradleIT() {
     protected fun Project.testConfigurationCacheOf(
         vararg taskNames: String,
         executedTaskNames: List<String>? = null,
+        checkUpToDateOnRebuild: Boolean = true,
         buildOptions: BuildOptions = defaultBuildOptions()
     ) {
         // First, run a build that serializes the tasks state for instant execution in further builds
@@ -81,9 +104,11 @@ abstract class AbstractConfigurationCacheIT : BaseGradleIT() {
             assertContains("Reusing configuration cache.")
         }
 
-        build(*taskNames, options = buildOptions) {
-            assertSuccessful()
-            assertTasksUpToDate(executedTask)
+        if (checkUpToDateOnRebuild) {
+            build(*taskNames, options = buildOptions) {
+                assertSuccessful()
+                assertTasksUpToDate(executedTask)
+            }
         }
     }
 
@@ -99,7 +124,7 @@ abstract class AbstractConfigurationCacheIT : BaseGradleIT() {
      * directory.
      */
     private fun copyReportToTempDir(htmlReportFile: File): File =
-        createTempDir().let { tempDir ->
+        createTempDir("report").let { tempDir ->
             htmlReportFile.parentFile.copyRecursively(tempDir)
             tempDir.resolve(htmlReportFile.name)
         }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt
index d6ee511fc42..c9027e84cfb 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt
@@ -103,6 +103,14 @@ class HierarchicalMppIT : BaseGradleIT() {
                         assertTrue("$it") { it.newVisibleSourceSets == emptySet<String>() }
                     }
                 }
+
+                // ALso check that the files produced by dependency transformations survive a clean build:
+                val existingFilesFromReports = reports.flatMap { it.useFiles }.filter { it.isFile }
+                assertTrue { existingFilesFromReports.isNotEmpty() }
+                build("clean") {
+                    assertSuccessful()
+                    existingFilesFromReports.forEach { assertTrue("Expected that $it exists after clean build.") { it.isFile } }
+                }
             }
 
             // --- Move the dependency from jvmAndJsMain to commonMain, expect that it is now propagated to commonTest:
@@ -582,7 +590,8 @@ class HierarchicalMppIT : BaseGradleIT() {
                                                 scope,
                                                 it.groupId + ":" + it.moduleName,
                                                 it.allVisibleSourceSets.joinToString(","),
-                                                it.useFilesForSourceSets.keys.joinToString(",")
+                                                it.useFilesForSourceSets.keys.joinToString(","),
+                                                it.useFilesForSourceSets.values.flatten().joinToString(",")
                                         )
                     
                                         println("        " + line.joinToString(" :: "))
@@ -613,7 +622,8 @@ class HierarchicalMppIT : BaseGradleIT() {
         val scope: String,
         val groupAndModule: String,
         val allVisibleSourceSets: Set<String>,
-        val newVisibleSourceSets: Set<String> // those which the dependsOn parents don't see
+        val newVisibleSourceSets: Set<String>, // those which the dependsOn parents don't see
+        val useFiles: List<File>
     ) {
         val isExcluded: Boolean get() = allVisibleSourceSets.isEmpty()
 
@@ -622,14 +632,17 @@ class HierarchicalMppIT : BaseGradleIT() {
             const val TEST_OUTPUT_COMPONENT_SEPARATOR = " :: "
             const val TEST_OUTPUT_ITEMS_SEPARATOR = ","
 
+            private operator fun <T> List<T>.component6() = this[5]
+
             fun parseTestOutputLine(line: String): DependencyTransformationReport {
                 val tail = line.substringAfter(TEST_OUTPUT_MARKER + TEST_OUTPUT_COMPONENT_SEPARATOR)
-                val (sourceSetName, scope, groupAndModule, allVisibleSourceSets, newVisibleSourceSets) =
+                val (sourceSetName, scope, groupAndModule, allVisibleSourceSets, newVisibleSourceSets, useFiles) =
                     tail.split(TEST_OUTPUT_COMPONENT_SEPARATOR)
                 return DependencyTransformationReport(
                     sourceSetName, scope, groupAndModule,
                     allVisibleSourceSets.split(TEST_OUTPUT_ITEMS_SEPARATOR).filter { it.isNotEmpty() }.toSet(),
-                    newVisibleSourceSets.split(TEST_OUTPUT_ITEMS_SEPARATOR).filter { it.isNotEmpty() }.toSet()
+                    newVisibleSourceSets.split(TEST_OUTPUT_ITEMS_SEPARATOR).filter { it.isNotEmpty() }.toSet(),
+                    useFiles.split(TEST_OUTPUT_ITEMS_SEPARATOR).map { File(it) }
                 )
             }
         }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt
index 2c5e189f006..bd4b2728148 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt
@@ -293,7 +293,7 @@ open class A {
 
         val appBuildGradle = project.projectDir.resolve("app/build.gradle")
         val appBuildGradleContent = appBuildGradle.readText()
-        appBuildGradle.modify { it.checkedReplace("compile project(':lib')", "") }
+        appBuildGradle.modify { it.checkedReplace("implementation project(':lib')", "") }
         val aaKt = project.projectDir.getFileByName("AA.kt")
         aaKt.addNewLine()
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
index d43ddc360f3..c520e6bee6e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.kotlin.gradle
 
+import org.gradle.api.logging.configuration.WarningMode
 import org.jetbrains.kotlin.gradle.util.*
 import org.junit.Test
 import kotlin.test.assertEquals
@@ -18,8 +19,9 @@ open class KaptIncrementalIT : BaseGradleIT() {
     private val annotatedElements =
         arrayOf("A", "funA", "valA", "funUtil", "valUtil", "B", "funB", "valB", "useB")
 
-    override fun defaultBuildOptions(): BuildOptions =
-        super.defaultBuildOptions().copy(incremental = true)
+    override fun defaultBuildOptions(): BuildOptions {
+        return super.defaultBuildOptions().copy(incremental = true, warningMode = WarningMode.Fail)
+    }
 
     @Test
     fun testAddNewLine() {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt
index 52dfb6a5c9e..ca60e4001ca 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt
@@ -190,7 +190,7 @@ class KaptIncrementalWithAggregatingApt : KaptIncrementalIT() {
         project.gradleBuildScript().appendText("""
             
             dependencies {
-                compile 'com.google.guava:guava:12.0'
+                implementation 'com.google.guava:guava:12.0'
             }
         """.trimIndent())
         project.build("build") {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
index c7ca33d8a89..a310d8aee48 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.gradle.util.*
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Test
 import java.io.File
+import java.nio.file.FileSystemException
 import java.nio.file.Files
 import java.util.zip.ZipFile
 import kotlin.test.assertEquals
@@ -692,7 +693,12 @@ class KotlinGradleIT : BaseGradleIT() {
         val buildDir = projectDir.resolve("build")
         buildDir.deleteRecursively()
         val externalBuildDir = Files.createTempDirectory(workingDir.toPath(), "externalBuild")
-        Files.createSymbolicLink(buildDir.toPath(), externalBuildDir)
+        try {
+            Files.createSymbolicLink(buildDir.toPath(), externalBuildDir)
+        } catch (_: FileSystemException) {
+            //Windows requires SeSymbolicLink privilege and we can't grant it
+            null
+        } ?: return@with
 
         build("build") {
             assertSuccessful()
@@ -1053,4 +1059,31 @@ class KotlinGradleIT : BaseGradleIT() {
             assertTasksExecuted(":lib1:compileDebugKotlin")
         }
     }
+
+    /** Regression test for KT-38692. */
+    @Test
+    fun testIncrementalWhenNoKotlinSources() = with(
+        Project("kotlinProject")
+    ) {
+        setupWorkingDir()
+        assertTrue(this.allKotlinFiles.toList().isNotEmpty())
+        build(":compileKotlin") {
+            assertSuccessful()
+            assertTasksExecuted(":compileKotlin")
+        }
+
+        // Remove all Kotlin sources and force non-incremental run
+        allKotlinFiles.forEach { assertTrue(it.delete()) }
+        projectDir.resolve("src/main/java/Sample.java").also {
+            it.parentFile.mkdirs()
+            it.writeText("public class Sample {}")
+        }
+        build("compileKotlin", "--rerun-tasks") {
+            assertSuccessful()
+            assertTasksExecuted(":compileKotlin")
+            val compiledKotlinClasses = fileInWorkingDir(classesDir()).allFilesWithExtension("class").toList()
+
+            assertTrue(compiledKotlinClasses.isEmpty())
+        }
+    }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
index 8a91bff35b8..0be7879e3fc 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
@@ -4,6 +4,8 @@
  */
 package org.jetbrains.kotlin.gradle
 
+import org.jetbrains.kotlin.gradle.native.GeneralNativeIT.Companion.checkNativeCommandLineArguments
+import org.jetbrains.kotlin.gradle.native.GeneralNativeIT.Companion.containsSequentially
 import org.jetbrains.kotlin.gradle.native.MPPNativeTargets
 import org.jetbrains.kotlin.gradle.native.configureMemoryInGradleProperties
 import org.jetbrains.kotlin.gradle.native.transformNativeTestProject
@@ -123,14 +125,6 @@ class NewMultiplatformIT : BaseGradleIT() {
             // we use `maven { setUrl(...) }` because this syntax actually works both for Groovy and Kotlin DSLs in Gradle
             gradleBuildScript().appendText("\nrepositories { maven { setUrl(\"$libLocalRepoUri\") } }")
 
-            fun CompiledProject.checkProgramCompilationCommandLine(check: (String) -> Unit) {
-                output.lineSequence().filter {
-                    it.contains("Run tool: \"konanc\"") && it.contains("-p program")
-                }.toList().also {
-                    assertTrue(it.isNotEmpty())
-                }.forEach(check)
-            }
-
             fun CompiledProject.checkAppBuild() {
                 assertSuccessful()
                 assertTasksExecuted(*compileTasksNames.toTypedArray())
@@ -159,8 +153,8 @@ class NewMultiplatformIT : BaseGradleIT() {
                 assertFileExists("build/bin/linux64/mainDebugExecutable/$nativeExeName")
 
                 // Check that linker options were correctly passed to the K/N compiler.
-                checkProgramCompilationCommandLine {
-                    assertTrue(it.contains("-linker-option -L."))
+                checkNativeCommandLineArguments(":linkMainDebugExecutableLinux64") { arguments ->
+                    assertTrue(arguments.containsSequentially("-linker-option", "-L."))
                 }
             }
 
@@ -712,7 +706,7 @@ class NewMultiplatformIT : BaseGradleIT() {
                 assertTasksExecuted(":$it")
                 assertContains(
                     "-XXLanguage:+InlineClasses",
-                    " -progressive", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
+                    "-progressive", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
                     "-Xopt-in=kotlin.contracts.ExperimentalContracts",
                     "-Xno-inline"
                 )
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt
index 9c8f6120eed..7d50d6b448d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin.Compan
 import org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin.Companion.POD_SPEC_TASK_NAME
 import org.jetbrains.kotlin.gradle.transformProjectWithPluginsDsl
 import org.jetbrains.kotlin.gradle.util.modify
+import org.jetbrains.kotlin.gradle.util.runProcess
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.junit.Assume.assumeTrue
 import org.junit.Before
@@ -64,6 +65,7 @@ class CocoaPodsIT : BaseGradleIT() {
 
     private val defaultPodRepo = "https://github.com/AFNetworking/AFNetworking"
     private val defaultPodName = "AFNetworking"
+    private val defaultLibraryPodName = "YandexMapKit"
     private val downloadUrlPodName = "podspecWithFilesExample"
     private val downloadUrlRepoName = "https://github.com/alozhkin/podspecWithFilesExample/raw/master"
     private val defaultTarget = "IOS"
@@ -729,6 +731,40 @@ class CocoaPodsIT : BaseGradleIT() {
         }
     }
 
+    @Test
+    fun testUseLibrariesMode() {
+        with(project) {
+            gradleBuildScript().appendToCocoapodsBlock("useLibraries()")
+            gradleBuildScript().addPod(defaultLibraryPodName)
+            testImport()
+        }
+    }
+
+    @Test
+    fun testCommaSeparatedTargets() {
+        with(project) {
+            gradleBuildScript().modify {
+                // Replace a single target with a pair (iosX64 + iosArm64) to test building a fat framework.
+                it.replace("iosX64(\"iOS\")", "ios()")
+            }
+            hooks.addHook {
+                // Check that a built universal framework includes both device and simulator architectures.
+                val framework = fileInWorkingDir("build/cocoapods/framework/cocoapods.framework/cocoapods")
+                with(runProcess(listOf("file", framework.absolutePath), projectDir)) {
+                    assertTrue(isSuccessful)
+                    assertTrue(output.contains("\\(for architecture x86_64\\):\\s+current ar archive".toRegex()))
+                    assertTrue(output.contains("\\(for architecture arm64\\):\\s+current ar archive".toRegex()))
+                }
+            }
+            // Run the build.
+            test(
+                "syncFramework",
+                "-Pkotlin.native.cocoapods.target=ios_x64,ios_arm64",
+                "-Pkotlin.native.cocoapods.configuration=DEBUG"
+            )
+        }
+    }
+
     // paths
 
     private fun CompiledProject.url() = externalSources().resolve("url")
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
index f5e6a2feb19..8edf25f5761 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
@@ -25,6 +25,7 @@ import org.junit.Assume
 import org.junit.Ignore
 import org.junit.Test
 import java.io.File
+import java.util.*
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
@@ -261,27 +262,27 @@ class GeneralNativeIT : BaseGradleIT() {
             fileInWorkingDir(headerPaths[0]).readText().contains("+ (int32_t)exported")
 
             // Check that by default release frameworks have bitcode embedded.
-            checkNativeCommandLineFor(":linkMainReleaseFrameworkIos") {
-                assertTrue(it.contains("-Xembed-bitcode"))
-                assertTrue(it.contains("-opt"))
+            checkNativeCommandLineArguments(":linkMainReleaseFrameworkIos") { arguments ->
+                assertTrue("-Xembed-bitcode" in arguments)
+                assertTrue("-opt" in arguments)
             }
             // Check that by default debug frameworks have bitcode marker embedded.
-            checkNativeCommandLineFor(":linkMainDebugFrameworkIos") {
-                assertTrue(it.contains("-Xembed-bitcode-marker"))
-                assertTrue(it.contains("-g"))
+            checkNativeCommandLineArguments(":linkMainDebugFrameworkIos") { arguments ->
+                assertTrue("-Xembed-bitcode-marker" in arguments)
+                assertTrue("-g" in arguments)
             }
             // Check that bitcode can be disabled by setting custom compiler options
-            checkNativeCommandLineFor(":linkCustomDebugFrameworkIos") {
-                assertTrue(it.contains("-linker-option -L."))
-                assertTrue(it.contains("-Xtime"))
-                assertTrue(it.contains("-Xstatic-framework"))
-                assertFalse(it.contains("-Xembed-bitcode-marker"))
-                assertFalse(it.contains("-Xembed-bitcode"))
+            checkNativeCommandLineArguments(":linkCustomDebugFrameworkIos") { arguments ->
+                assertTrue(arguments.containsSequentially("-linker-option", "-L."))
+                assertTrue("-Xtime" in arguments)
+                assertTrue("-Xstatic-framework" in arguments)
+                assertFalse("-Xembed-bitcode-marker" in arguments)
+                assertFalse("-Xembed-bitcode" in arguments)
             }
             // Check that bitcode is disabled for iOS simulator.
-            checkNativeCommandLineFor(":linkMainReleaseFrameworkIosSim", ":linkMainDebugFrameworkIosSim") {
-                assertFalse(it.contains("-Xembed-bitcode"))
-                assertFalse(it.contains("-Xembed-bitcode-marker"))
+            checkNativeCommandLineArguments(":linkMainReleaseFrameworkIosSim", ":linkMainDebugFrameworkIosSim") { arguments ->
+                assertFalse("-Xembed-bitcode" in arguments)
+                assertFalse("-Xembed-bitcode-marker" in arguments)
             }
         }
 
@@ -302,10 +303,12 @@ class GeneralNativeIT : BaseGradleIT() {
     fun testExportApiOnlyToLibraries() {
         val project = transformNativeTestProjectWithPluginDsl("libraries", directoryPrefix = "native-binaries")
 
-        testExportApi(project, listOf(
-            ExportApiTestData("linkDebugSharedHost", "debugShared"),
-            ExportApiTestData("linkDebugStaticHost", "debugStatic"),
-        ))
+        testExportApi(
+            project, listOf(
+                ExportApiTestData("linkDebugSharedHost", "debugShared"),
+                ExportApiTestData("linkDebugStaticHost", "debugStatic"),
+            )
+        )
     }
 
     @Test
@@ -313,9 +316,11 @@ class GeneralNativeIT : BaseGradleIT() {
         Assume.assumeTrue(HostManager.hostIsMac)
         val project = transformNativeTestProjectWithPluginDsl("frameworks", directoryPrefix = "native-binaries")
 
-        testExportApi(project, listOf(
-            ExportApiTestData("linkMainDebugFrameworkIos", "mainDebugFramework")
-        ))
+        testExportApi(
+            project, listOf(
+                ExportApiTestData("linkMainDebugFrameworkIos", "mainDebugFramework")
+            )
+        )
     }
 
     private data class ExportApiTestData(val taskName: String, val binaryName: String)
@@ -337,16 +342,6 @@ class GeneralNativeIT : BaseGradleIT() {
         }
     }
 
-    private fun CompiledProject.checkNativeCommandLineFor(vararg taskPaths: String, check: (String) -> Unit) =
-        taskPaths.forEach { taskPath ->
-            val commandLine = output.lineSequence().dropWhile {
-                !it.contains("Executing actions for task '$taskPath'")
-            }.first {
-                it.contains("Run tool: \"konanc\"")
-            }
-            check(commandLine)
-        }
-
     @Test
     fun testNativeExecutables() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) {
         val binaries = mutableListOf(
@@ -424,8 +419,8 @@ class GeneralNativeIT : BaseGradleIT() {
     ) {
         build(":compileKotlinHost") {
             assertSuccessful()
-            checkNativeCommandLineFor(":compileKotlinHost") {
-                assertFalse(it.contains("-verbose"))
+            checkNativeCommandLineArguments(":compileKotlinHost") { arguments ->
+                assertFalse("-verbose" in arguments)
             }
         }
 
@@ -438,8 +433,8 @@ class GeneralNativeIT : BaseGradleIT() {
         )
         build(":compileKotlinHost") {
             assertSuccessful()
-            checkNativeCommandLineFor(":compileKotlinHost") {
-                assertTrue(it.contains("-verbose"))
+            checkNativeCommandLineArguments(":compileKotlinHost") { arguments ->
+                assertTrue("-verbose" in arguments)
             }
         }
     }
@@ -822,9 +817,56 @@ class GeneralNativeIT : BaseGradleIT() {
 
         build("compileKotlin${nativeHostTargetName.capitalize()}") {
             assertSuccessful()
-            checkNativeCommandLineFor(":compileKotlin${nativeHostTargetName.capitalize()}") {
-                it.contains(fileWithSpacesInPath.absolutePath)
+            checkNativeCommandLineArguments(":compileKotlin${nativeHostTargetName.capitalize()}") { arguments ->
+                val escapedQuotedPath =
+                    "\"${fileWithSpacesInPath.absolutePath.replace("\\", "\\\\").replace("\"", "\\\"")}\""
+                assertTrue(
+                    escapedQuotedPath in arguments,
+                    """
+                        Command-line arguments do not contain path with spaces.
+                        Raw path = ${fileWithSpacesInPath.absolutePath}
+                        Escaped quoted path = $escapedQuotedPath
+                        Arguments: ${arguments.joinToString(separator = " ")}
+                    """.trimIndent()
+                )
             }
         }
     }
+
+    companion object {
+        fun List<String>.containsSequentially(vararg elements: String): Boolean {
+            check(elements.isNotEmpty())
+            return Collections.indexOfSubList(this, elements.toList()) != -1
+        }
+
+        fun CompiledProject.extractNativeCommandLineArguments(taskPath: String? = null, toolName: String): List<String> {
+            val arguments = output.lineSequence()
+                .run {
+                    if (taskPath != null) dropWhile { "Executing actions for task '$taskPath'" !in it }.drop(1) else this
+                }
+                .dropWhile {
+                    check(taskPath == null || "Executing actions for task" !in it) { "Unexpected log line with new Gradle task: $it" }
+                    "Run in-process tool \"$toolName\"" !in it && "Run \"$toolName\" tool in a separate JVM process" !in it
+                }
+                .drop(1)
+                .dropWhile {
+                    check(taskPath == null || "Executing actions for task" !in it) { "Unexpected log line with new Gradle task: $it" }
+                    "Arguments = [" !in it
+                }
+
+            val argumentsHeader = arguments.firstOrNull()
+            check(argumentsHeader != null && "Arguments = [" in argumentsHeader) { "No arguments in $argumentsHeader" }
+
+            return if (argumentsHeader.trimEnd().endsWith(']'))
+                emptyList() // no arguments
+            else
+                arguments.drop(1).map { it.trim() }.takeWhile { it != "]" }.toList()
+        }
+
+        fun CompiledProject.checkNativeCommandLineArguments(
+            vararg taskPaths: String,
+            toolName: String = "konanc",
+            check: (List<String>) -> Unit
+        ) = taskPaths.forEach { taskPath -> check(extractNativeCommandLineArguments(taskPath, toolName)) }
+    }
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt
index f38f0a5cf15..764396af6a8 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt
@@ -7,6 +7,8 @@ package org.jetbrains.kotlin.gradle.native
 
 import org.jetbrains.kotlin.gradle.*
 import org.jetbrains.kotlin.gradle.embedProject
+import org.jetbrains.kotlin.gradle.native.GeneralNativeIT.Companion.containsSequentially
+import org.jetbrains.kotlin.gradle.native.GeneralNativeIT.Companion.extractNativeCommandLineArguments
 import org.jetbrains.kotlin.gradle.transformProjectWithPluginsDsl
 import org.jetbrains.kotlin.gradle.util.modify
 import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
@@ -17,6 +19,7 @@ import org.jetbrains.kotlin.konan.util.DependencyDirectories
 import org.junit.Assume
 import org.junit.BeforeClass
 import org.junit.Test
+import kotlin.test.assertTrue
 
 class NativePlatformLibsIT : BaseGradleIT() {
 
@@ -213,7 +216,7 @@ class NativePlatformLibsIT : BaseGradleIT() {
         // Check that user can change generation mode used by the cinterop tool.
         buildWithLightDist("tasks", "-Pkotlin.native.platform.libraries.mode=metadata") {
             assertSuccessful()
-            assertContainsRegex("Run tool: \"generatePlatformLibraries\" with args: .* -mode metadata".toRegex())
+            assertTrue(extractNativeCommandLineArguments(toolName = "generatePlatformLibraries").containsSequentially("-mode", "metadata"))
         }
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle
index feee5ca6202..9ad20318610 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle
@@ -26,4 +26,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-android-extensions-runtime:$kotlin_version"
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build-js.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build-js.gradle
index 90f002e1ce5..62f6c9b017d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build-js.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build-js.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'kotlin2js'
 
 dependencies {
-    compile project(':lib')
+    implementation project(':lib')
     // do not remove until KT-25488 is fixed
-    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build.gradle
index b5432a9eb42..14dcf14ce9d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile project(':lib')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation project(':lib')
 }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build-js.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build-js.gradle
index 718db2a0c77..aaf051c9255 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build-js.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build-js.gradle
@@ -2,5 +2,5 @@ apply plugin: 'kotlin2js'
 
 dependencies {
     // do not remove until KT-25488 is fixed
-    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build.gradle
index ee7434e1b5d..83e41992508 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle
index a44e0f08e55..b347cdb6bbc 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle
@@ -18,8 +18,8 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
     kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index 1dfdc7ef9ff..df29e83b625 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -52,6 +52,8 @@ dependencies {
     compileOnly(project(":kotlin-scripting-compiler"))
     compileOnly(project(":kotlin-gradle-statistics"))
     embedded(project(":kotlin-gradle-statistics"))
+    compileOnly(project(":kotlin-gradle-build-metrics"))
+    embedded(project(":kotlin-gradle-build-metrics"))
 
     compile("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
     compile("de.undercouch:gradle-download-task:4.0.2")
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/JvmAndAndroidIntermediateSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/JvmAndAndroidIntermediateSourceSetTest.kt
new file mode 100644
index 00000000000..c3107a45f87
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/JvmAndAndroidIntermediateSourceSetTest.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle
+
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Project
+import org.gradle.api.internal.project.ProjectInternal
+import org.gradle.api.plugins.ExtraPropertiesExtension
+import org.gradle.testfixtures.ProjectBuilder
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.buildKotlinProjectStructureMetadata
+import kotlin.test.*
+
+class JvmAndAndroidIntermediateSourceSetTest {
+
+    private lateinit var project: ProjectInternal
+    private lateinit var kotlin: KotlinMultiplatformExtension
+    private lateinit var jvmAndAndroidMain: KotlinSourceSet
+
+    @BeforeTest
+    fun setup() {
+        project = ProjectBuilder.builder().build() as ProjectInternal
+        project.extensions.getByType(ExtraPropertiesExtension::class.java).set("kotlin.mpp.enableGranularSourceSetsMetadata", "true")
+
+        project.plugins.apply("kotlin-multiplatform")
+        project.plugins.apply("android-library")
+
+        /* Arbitrary minimal Android setup */
+        val android = project.extensions.getByName("android") as LibraryExtension
+        android.compileSdkVersion(30)
+
+        /* Kotlin Setup */
+        kotlin = project.multiplatformExtension
+        kotlin.jvm()
+        kotlin.android()
+        jvmAndAndroidMain = kotlin.sourceSets.create("jvmAndAndroidMain")
+        kotlin.sourceSets.run {
+            jvmAndAndroidMain.dependsOn(getByName("commonMain"))
+
+            getByName("jvmMain") {
+                it.dependsOn(jvmAndAndroidMain)
+            }
+            getByName("androidMain") {
+                it.dependsOn(jvmAndAndroidMain)
+            }
+        }
+    }
+
+    @Test
+    fun `metadata compilation is created and disabled`() {
+        /* evaluate */
+        project.evaluate()
+
+        /* Check if compilation is created correctly */
+        val jvmAndAndroidMainMetadataCompilations = kotlin.targets.flatMap { it.compilations }
+            .filterIsInstance<KotlinMetadataCompilation<*>>()
+            .filter { it.name == jvmAndAndroidMain.name }
+
+        assertEquals(
+            1, jvmAndAndroidMainMetadataCompilations.size,
+            "Expected exactly one metadata compilation created for jvmAndAndroidMain source set"
+        )
+
+        val compilation = jvmAndAndroidMainMetadataCompilations.single()
+        assertFalse(
+            compilation.compileKotlinTaskProvider.get().enabled,
+            "Expected compilation task to be disabled, because not supported yet"
+        )
+    }
+
+    @Test
+    fun `KotlinProjectStructureMetadata jvmAndAndroidMain exists in jvm variants`() {
+        project.evaluate()
+        val metadata = assertNotNull(buildKotlinProjectStructureMetadata(project))
+        assertTrue("jvmAndAndroidMain" in metadata.sourceSetNamesByVariantName["jvmApiElements"].orEmpty())
+        assertTrue("jvmAndAndroidMain" in metadata.sourceSetNamesByVariantName["jvmRuntimeElements"].orEmpty())
+    }
+
+    @Test
+    fun `KotlinProjectStructureMetadata jvmAndAndroidMain exists in android variants`() {
+        project.evaluate()
+        val metadata = assertNotNull(buildKotlinProjectStructureMetadata(project))
+        assertTrue("jvmAndAndroidMain" in metadata.sourceSetNamesByVariantName["debugApiElements"].orEmpty())
+        assertTrue("jvmAndAndroidMain" in metadata.sourceSetNamesByVariantName["debugRuntimeElements"].orEmpty())
+        assertTrue("jvmAndAndroidMain" in metadata.sourceSetNamesByVariantName["releaseApiElements"].orEmpty())
+        assertTrue("jvmAndAndroidMain" in metadata.sourceSetNamesByVariantName["releaseRuntimeElements"].orEmpty())
+    }
+
+    @Test
+    fun `Android Kotlin Components are marked as not publishable when variant is not published`() {
+        val target = kotlin.targets.getByName("android") as KotlinAndroidTarget
+        target.publishLibraryVariants = emptyList()
+        project.evaluate()
+        val kotlinComponents = target.kotlinComponents
+        assertTrue(kotlinComponents.isNotEmpty(), "Expected at least one KotlinComponent to be present")
+
+        kotlinComponents.forEach { component ->
+            assertFalse(component.publishable, "Expected component to not publishable, because no publication is configured")
+        }
+    }
+
+    @Test
+    fun `Android Kotlin Components are marked as publishable when variant is published`() {
+        val target = kotlin.targets.getByName("android") as KotlinAndroidTarget
+        target.publishLibraryVariants = listOf("release")
+        project.evaluate()
+        val kotlinComponents = target.kotlinComponents
+        assertTrue(kotlinComponents.isNotEmpty(), "Expected at least one KotlinComponent to be present")
+
+        kotlinComponents.forEach { component ->
+            val isReleaseComponent = "release" in component.name.toLowerCase()
+            if (isReleaseComponent) {
+                assertTrue(component.publishable, "Expected release component to be marked as publishable")
+            } else {
+                assertFalse(component.publishable, "Expected non-release component to be marked as not publishable")
+            }
+        }
+    }
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidDependsOnEdgesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidDependsOnEdgesTest.kt
index fa437508ba9..0cc60d7f636 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidDependsOnEdgesTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidDependsOnEdgesTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 // TODO KT-34102
-@file:Suppress("invisible_reference", "invisible_member")
+@file:Suppress("invisible_reference", "invisible_member", "FunctionName")
 package org.jetbrains.kotlin.gradle
 
 import com.android.build.gradle.LibraryExtension
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt
index d2a102af802..710b625d8b6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt
@@ -1,5 +1,7 @@
 package org.jetbrains.kotlin.compilerRunner
 
+import org.jetbrains.kotlin.build.report.metrics.BuildMetrics
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporterImpl
 import org.jetbrains.kotlin.daemon.common.CompilationResultCategory
 import org.jetbrains.kotlin.daemon.common.CompilationResults
 import org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface
@@ -22,7 +24,10 @@ internal class GradleCompilationResults(
         LoopbackNetworkInterface.serverLoopbackSocketFactory
     ) {
 
-    var icLogLines: List<String>? = null
+    var icLogLines: List<String> = emptyList()
+    private val buildMetricsReporter = BuildMetricsReporterImpl()
+    val buildMetrics: BuildMetrics
+        get() = buildMetricsReporter.getMetrics()
 
     @Throws(RemoteException::class)
     override fun add(compilationResultCategory: Int, value: Serializable) {
@@ -42,7 +47,10 @@ internal class GradleCompilationResults(
             CompilationResultCategory.BUILD_REPORT_LINES.code,
             CompilationResultCategory.VERBOSE_BUILD_REPORT_LINES.code -> {
                 @Suppress("UNCHECKED_CAST")
-                icLogLines = value as? List<String>
+                (value as? List<String>)?.let { icLogLines = it }
+            }
+            CompilationResultCategory.BUILD_METRICS.code -> {
+                buildMetricsReporter.addMetrics(value as? BuildMetrics)
             }
         }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt
index a731708da43..78b76bc1270 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.compilerRunner
 import org.gradle.api.file.FileCollection
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector
-import org.jetbrains.kotlin.gradle.report.BuildReportMode
+import org.jetbrains.kotlin.gradle.report.ReportingSettings
 import org.jetbrains.kotlin.gradle.tasks.findToolsJar
 import java.io.File
 
@@ -17,7 +17,7 @@ internal class GradleCompilerEnvironment(
     messageCollector: GradlePrintingMessageCollector,
     outputItemsCollector: OutputItemsCollector,
     val outputFiles: FileCollection,
-    val buildReportMode: BuildReportMode?,
+    val reportingSettings: ReportingSettings,
     val incrementalCompilationEnvironment: IncrementalCompilationEnvironment? = null,
     val kotlinScriptExtensions: Array<String> = emptyArray()
 ) : CompilerEnvironment(Services.EMPTY, messageCollector, outputItemsCollector) {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
index d0706b9f030..5bbb9eacf11 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
@@ -160,7 +160,7 @@ internal open class GradleCompilerRunner(protected val taskProvider: GradleCompi
             incrementalModuleInfo = modulesInfo,
             outputFiles = environment.outputFiles.toList(),
             taskPath = pathProvider,
-            buildReportMode = environment.buildReportMode,
+            reportingSettings = environment.reportingSettings,
             kotlinScriptExtensions = environment.kotlinScriptExtensions,
             allWarningsAsErrors = compilerArgs.allWarningsAsErrors
         )
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt
index e728e2bc51d..bd601c26920 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt
@@ -7,6 +7,8 @@ package org.jetbrains.kotlin.compilerRunner
 
 import org.gradle.api.Project
 import org.gradle.api.logging.Logger
+import org.jetbrains.kotlin.build.ExecutionStrategy
+import org.jetbrains.kotlin.build.report.metrics.*
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.config.Services
@@ -15,6 +17,7 @@ import org.jetbrains.kotlin.gradle.logging.*
 import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskExecutionResults
 import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskLoggers
 import org.jetbrains.kotlin.gradle.report.BuildReportMode
+import org.jetbrains.kotlin.gradle.report.ReportingSettings
 import org.jetbrains.kotlin.gradle.report.TaskExecutionResult
 import org.jetbrains.kotlin.gradle.tasks.clearLocalState
 import org.jetbrains.kotlin.gradle.tasks.throwGradleExceptionIfError
@@ -59,7 +62,7 @@ internal class GradleKotlinCompilerWorkArguments(
     val incrementalModuleInfo: IncrementalModuleInfo?,
     val outputFiles: List<File>,
     val taskPath: String,
-    val buildReportMode: BuildReportMode?,
+    val reportingSettings: ReportingSettings,
     val kotlinScriptExtensions: Array<String>,
     val allWarningsAsErrors: Boolean
 ) : Serializable {
@@ -98,10 +101,12 @@ internal class GradleKotlinCompilerWork @Inject constructor(
     private val incrementalModuleInfo = config.incrementalModuleInfo
     private val outputFiles = config.outputFiles
     private val taskPath = config.taskPath
-    private val buildReportMode = config.buildReportMode
+    private val reportingSettings = config.reportingSettings
     private val kotlinScriptExtensions = config.kotlinScriptExtensions
     private val allWarningsAsErrors = config.allWarningsAsErrors
     private val buildDir = config.projectFiles.buildDir
+    private val metrics = if (reportingSettings.reportMetrics) BuildMetricsReporterImpl() else DoNothingBuildMetricsReporter
+    private var icLogLines: List<String> = emptyList()
 
     private val log: KotlinLogger =
         TaskLoggers.get(taskPath)?.let { GradleKotlinLogger(it).apply { debug("Using '$taskPath' logger") } }
@@ -120,13 +125,18 @@ internal class GradleKotlinCompilerWork @Inject constructor(
         get() = incrementalCompilationEnvironment != null
 
     override fun run() {
-        val messageCollector = GradlePrintingMessageCollector(log, allWarningsAsErrors)
-        val exitCode = compileWithDaemonOrFallbackImpl(messageCollector)
-        if (incrementalCompilationEnvironment?.disableMultiModuleIC == true) {
-            incrementalCompilationEnvironment.multiModuleICSettings.buildHistoryFile.delete()
-        }
+        try {
+            val messageCollector = GradlePrintingMessageCollector(log, allWarningsAsErrors)
+            val exitCode = compileWithDaemonOrFallbackImpl(messageCollector)
+            if (incrementalCompilationEnvironment?.disableMultiModuleIC == true) {
+                incrementalCompilationEnvironment.multiModuleICSettings.buildHistoryFile.delete()
+            }
 
-        throwGradleExceptionIfError(exitCode)
+            throwGradleExceptionIfError(exitCode)
+        } finally {
+            val result = TaskExecutionResult(buildMetrics = metrics.getMetrics(), icLogLines = icLogLines)
+            TaskExecutionResults[taskPath] = result
+        }
     }
 
     private fun compileWithDaemonOrFallbackImpl(messageCollector: MessageCollector): ExitCode {
@@ -159,20 +169,21 @@ internal class GradleKotlinCompilerWork @Inject constructor(
         val isDebugEnabled = log.isDebugEnabled || System.getProperty("kotlin.daemon.debug.log")?.toBoolean() ?: true
         val daemonMessageCollector =
             if (isDebugEnabled) messageCollector else MessageCollector.NONE
-
         val connection =
-            try {
-                GradleCompilerRunner.getDaemonConnectionImpl(
-                    clientIsAliveFlagFile,
-                    sessionFlagFile,
-                    compilerFullClasspath,
-                    daemonMessageCollector,
-                    isDebugEnabled = isDebugEnabled
-                )
-            } catch (e: Throwable) {
-                log.error("Caught an exception trying to connect to Kotlin Daemon:")
-                log.error(e.stackTraceAsString())
-                null
+            metrics.measure(BuildTime.CONNECT_TO_DAEMON) {
+                try {
+                    GradleCompilerRunner.getDaemonConnectionImpl(
+                        clientIsAliveFlagFile,
+                        sessionFlagFile,
+                        compilerFullClasspath,
+                        daemonMessageCollector,
+                        isDebugEnabled = isDebugEnabled
+                    )
+                } catch (e: Throwable) {
+                    log.error("Caught an exception trying to connect to Kotlin Daemon:")
+                    log.error(e.stackTraceAsString())
+                    null
+                }
             }
         if (connection == null) {
             if (isIncremental) {
@@ -215,7 +226,9 @@ internal class GradleKotlinCompilerWork @Inject constructor(
         // often source of the NoSuchObjectException and UnmarshalException, probably caused by the failed/crashed/exited daemon
         // TODO: implement a proper logic to avoid remote calls in such cases
         try {
-            daemon.clearJarCache()
+            metrics.measure(BuildTime.CLEAR_JAR_CACHE) {
+                daemon.clearJarCache()
+            }
         } catch (e: RemoteException) {
             log.warn("Unable to clear jar cache after compilation, maybe daemon is already down: $e")
         }
@@ -229,6 +242,7 @@ internal class GradleKotlinCompilerWork @Inject constructor(
         targetPlatform: CompileService.TargetPlatform,
         bufferingMessageCollector: GradleBufferingMessageCollector
     ): CompileService.CallResult<Int> {
+        metrics.addAttribute(BuildAttribute.IC_IS_NOT_ENABLED)
         val compilationOptions = CompilationOptions(
             compilerMode = CompilerMode.NON_INCREMENTAL_COMPILER,
             targetPlatform = targetPlatform,
@@ -238,15 +252,8 @@ internal class GradleKotlinCompilerWork @Inject constructor(
             kotlinScriptExtensions = kotlinScriptExtensions
         )
         val servicesFacade = GradleCompilerServicesFacadeImpl(log, bufferingMessageCollector)
-        return try {
+        return metrics.measure(BuildTime.NON_INCREMENTAL_COMPILATION_DAEMON) {
             daemon.compile(sessionId, compilerArgs, compilationOptions, servicesFacade, compilationResults = null)
-        } finally {
-            reportExecutionResultIfNeeded {
-                TaskExecutionResult(
-                    executionStrategy = DAEMON_EXECUTION_STRATEGY,
-                    icLogLines = nonIcBuildLog("incremental compilation is not enabled for '$taskPath'")
-                )
-            }
         }
     }
 
@@ -258,14 +265,7 @@ internal class GradleKotlinCompilerWork @Inject constructor(
     ): CompileService.CallResult<Int> {
         val icEnv = incrementalCompilationEnvironment ?: error("incrementalCompilationEnvironment is null!")
         val knownChangedFiles = icEnv.changedFiles as? ChangedFiles.Known
-
-        val requestedCompilationResults = EnumSet.of(CompilationResultCategory.IC_COMPILE_ITERATION)
-        when (buildReportMode) {
-            BuildReportMode.SIMPLE -> CompilationResultCategory.BUILD_REPORT_LINES
-            BuildReportMode.VERBOSE -> CompilationResultCategory.VERBOSE_BUILD_REPORT_LINES
-            null -> null
-        }?.let { requestedCompilationResults.add(it) }
-
+        val requestedCompilationResults = requestedCompilationResults()
         val compilationOptions = IncrementalCompilationOptions(
             areFileChangesKnown = knownChangedFiles != null,
             modifiedFiles = knownChangedFiles?.modified,
@@ -286,36 +286,28 @@ internal class GradleKotlinCompilerWork @Inject constructor(
         log.info("Options for KOTLIN DAEMON: $compilationOptions")
         val servicesFacade = GradleIncrementalCompilerServicesFacadeImpl(log, bufferingMessageCollector)
         val compilationResults = GradleCompilationResults(log, projectRootFile)
-        val result = daemon.compile(sessionId, compilerArgs, compilationOptions, servicesFacade, compilationResults)
-
-        reportExecutionResultIfNeeded {
-            TaskExecutionResult(
-                executionStrategy = DAEMON_EXECUTION_STRATEGY,
-                icLogLines = compilationResults.icLogLines
-            )
+        return metrics.measure(BuildTime.RUN_COMPILER) {
+            daemon.compile(sessionId, compilerArgs, compilationOptions, servicesFacade, compilationResults)
+        }.also {
+            metrics.addMetrics(compilationResults.buildMetrics)
+            icLogLines = compilationResults.icLogLines
         }
-
-        return result
     }
 
     private fun compileOutOfProcess(): ExitCode {
-        clearLocalState(outputFiles, log, reason = "out-of-process execution strategy is non-incremental")
+        metrics.addAttribute(BuildAttribute.OUT_OF_PROCESS_EXECUTION)
+        clearLocalState(outputFiles, log, metrics, reason = "out-of-process execution strategy is non-incremental")
 
-        return try {
+        return metrics.measure(BuildTime.NON_INCREMENTAL_COMPILATION_OUT_OF_PROCESS) {
             runToolInSeparateProcess(compilerArgs, compilerClassName, compilerFullClasspath, log, buildDir)
-        } finally {
-            reportExecutionResultIfNeeded {
-                TaskExecutionResult(
-                    executionStrategy = OUT_OF_PROCESS_EXECUTION_STRATEGY,
-                    icLogLines = nonIcBuildLog("$OUT_OF_PROCESS_EXECUTION_STRATEGY execution strategy does not support incremental compilation")
-                )
-            }
         }
     }
 
     private fun compileInProcess(messageCollector: MessageCollector): ExitCode {
-        clearLocalState(outputFiles, log, reason = "in-process execution strategy is non-incremental")
+        metrics.addAttribute(BuildAttribute.IN_PROCESS_EXECUTION)
+        clearLocalState(outputFiles, log, metrics, reason = "in-process execution strategy is non-incremental")
 
+        metrics.startMeasure(BuildTime.NON_INCREMENTAL_COMPILATION_IN_PROCESS, System.nanoTime())
         // in-process compiler should always be run in a different thread
         // to avoid leaking thread locals from compiler (see KT-28037)
         val threadPool = Executors.newSingleThreadExecutor()
@@ -329,12 +321,7 @@ internal class GradleKotlinCompilerWork @Inject constructor(
             bufferingMessageCollector.flush(messageCollector)
             threadPool.shutdown()
 
-            reportExecutionResultIfNeeded {
-                TaskExecutionResult(
-                    executionStrategy = IN_PROCESS_EXECUTION_STRATEGY,
-                    icLogLines = nonIcBuildLog("$IN_PROCESS_EXECUTION_STRATEGY execution strategy does not support incremental compilation")
-                )
-            }
+            metrics.endMeasure(BuildTime.NON_INCREMENTAL_COMPILATION_IN_PROCESS, System.nanoTime())
         }
     }
 
@@ -366,6 +353,19 @@ internal class GradleKotlinCompilerWork @Inject constructor(
         return exitCode
     }
 
+    private fun requestedCompilationResults(): EnumSet<CompilationResultCategory> {
+        val requestedCompilationResults = EnumSet.of(CompilationResultCategory.IC_COMPILE_ITERATION)
+        when (reportingSettings.buildReportMode) {
+            BuildReportMode.NONE -> null
+            BuildReportMode.SIMPLE -> CompilationResultCategory.BUILD_REPORT_LINES
+            BuildReportMode.VERBOSE -> CompilationResultCategory.VERBOSE_BUILD_REPORT_LINES
+        }?.let { requestedCompilationResults.add(it) }
+        if (reportingSettings.reportMetrics) {
+            requestedCompilationResults.add(CompilationResultCategory.BUILD_METRICS)
+        }
+        return requestedCompilationResults
+    }
+
     private fun reportCategories(verbose: Boolean): Array<Int> =
         if (!verbose) {
             arrayOf(ReportCategory.COMPILER_MESSAGE.code)
@@ -379,14 +379,4 @@ internal class GradleKotlinCompilerWork @Inject constructor(
         } else {
             ReportSeverity.DEBUG.code
         }
-
-    private inline fun reportExecutionResultIfNeeded(fn: () -> TaskExecutionResult) {
-        if (buildReportMode != null) {
-            val result = fn()
-            TaskExecutionResults[taskPath] = result
-        }
-    }
-
-    private fun nonIcBuildLog(reason: String): List<String> =
-        listOf("Performing non-incremental build: $reason")
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt
index daaae6ceaec..39e406c9b86 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.compilerRunner
 
+import com.intellij.openapi.util.text.StringUtil.escapeStringCharacters
 import org.gradle.api.Project
 import org.jetbrains.kotlin.konan.target.HostManager
 import java.io.File
@@ -67,37 +68,60 @@ internal abstract class KotlinToolRunner(
     }
 
     fun run(args: List<String>) {
-        project.logger.info("Run tool: \"$displayName\" with args: ${args.joinToString(separator = " ")}")
         checkClasspath()
 
         if (mustRunViaExec) runViaExec(args) else runInProcess(args)
     }
 
     private fun runViaExec(args: List<String>) {
+        val transformedArgs = transformArgs(args)
+        val classpath = project.files(classpath)
+        val systemProperties = System.getProperties().asSequence()
+            .map { (k, v) -> k.toString() to v.toString() }
+            .filter { (k, _) -> k !in execSystemPropertiesBlacklist }
+            .escapeQuotesForWindows()
+            .toMap() + execSystemProperties
+
+        project.logger.info(
+            """|Run "$displayName" tool in a separate JVM process
+               |Main class = $mainClass
+               |Arguments = ${args.toPrettyString()}
+               |Transformed arguments = ${if (transformedArgs == args) "same as arguments" else transformedArgs.toPrettyString()}
+               |Classpath = ${classpath.files.map { it.absolutePath }.toPrettyString()}
+               |JVM options = ${jvmArgs.toPrettyString()}
+               |Java system properties = ${systemProperties.toPrettyString()}
+               |Suppressed ENV variables = ${execEnvironmentBlacklist.toPrettyString()}
+               |Custom ENV variables = ${execEnvironment.toPrettyString()}
+            """.trimMargin()
+        )
+
         project.javaexec { spec ->
             spec.main = mainClass
-            spec.classpath = project.files(classpath)
+            spec.classpath = classpath
             spec.jvmArgs(jvmArgs)
-            spec.systemProperties(
-                System.getProperties().asSequence()
-                    .map { (k, v) -> k.toString() to v.toString() }
-                    .filter { (k, _) -> k !in execSystemPropertiesBlacklist }
-                    .escapeQuotesForWindows()
-                    .toMap()
-            )
-            spec.systemProperties(execSystemProperties)
+            spec.systemProperties(systemProperties)
             execEnvironmentBlacklist.forEach { spec.environment.remove(it) }
             spec.environment(execEnvironment)
-            spec.args(transformArgs(args))
+            spec.args(transformedArgs)
         }
     }
 
     private fun runInProcess(args: List<String>) {
+        val transformedArgs = transformArgs(args)
+
+        project.logger.info(
+            """|Run in-process tool "$displayName"
+               |Entry point method = $mainClass.$daemonEntryPoint
+               |Arguments = ${args.toPrettyString()}
+               |Transformed arguments = ${if (transformedArgs == args) "same as arguments" else transformedArgs.toPrettyString()}
+            """.trimMargin()
+        )
+
         try {
             val mainClass = getIsolatedClassLoader().loadClass(mainClass)
             val entryPoint = mainClass.methods.single { it.name == daemonEntryPoint }
 
-            entryPoint.invoke(null, transformArgs(args).toTypedArray())
+            entryPoint.invoke(null, transformedArgs.toTypedArray())
         } catch (t: InvocationTargetException) {
             throw t.targetException
         }
@@ -110,5 +134,28 @@ internal abstract class KotlinToolRunner(
             if (HostManager.hostIsMingw) map { (key, value) -> key.escapeQuotes() to value.escapeQuotes() } else this
 
         private val isolatedClassLoadersMap = ConcurrentHashMap<Any, ClassLoader>()
+
+        private fun Map<String, String>.toPrettyString(): String = buildString {
+            append('{')
+            if (this@toPrettyString.isNotEmpty()) append('\n')
+            this@toPrettyString.entries.forEach { (key, value) ->
+                append('\t').append(key).append(" = ").append(value.toPrettyString()).append('\n')
+            }
+            append('}')
+        }
+
+        private fun Collection<String>.toPrettyString(): String = buildString {
+            append('[')
+            if (this@toPrettyString.isNotEmpty()) append('\n')
+            this@toPrettyString.forEach { append('\t').append(it.toPrettyString()).append('\n') }
+            append(']')
+        }
+
+        private fun String.toPrettyString(): String =
+            when {
+                isEmpty() -> "\"\""
+                any { it == '"' || it.isWhitespace() } -> '"' + escapeStringCharacters(this) + '"'
+                else -> this
+            }
     }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt
index 27328d5d5eb..bef1e6cf315 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.konan.properties.resolvablePropertyString
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.konan.util.DependencyDirectories
+import java.nio.file.Files
 import java.util.*
 
 private val Project.jvmArgs
@@ -127,7 +128,7 @@ internal class KotlinNativeCompilerRunner(project: Project) : KotlinNativeToolRu
     override fun transformArgs(args: List<String>): List<String> {
         if (!useArgFile) return super.transformArgs(args)
 
-        val argFile = createTempFile(prefix = "kotlinc-native-args", suffix = ".lst").apply { deleteOnExit() }
+        val argFile = Files.createTempFile(/* prefix = */ "kotlinc-native-args", /* suffix = */ ".lst").toFile().apply { deleteOnExit() }
         argFile.printWriter().use { w ->
             args.forEach { arg ->
                 val escapedArg = arg
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt
index 943a557fed7..0a5ea37eeae 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt
@@ -31,6 +31,7 @@ import org.jetbrains.org.objectweb.asm.ClassVisitor
 import org.jetbrains.org.objectweb.asm.FieldVisitor
 import org.jetbrains.org.objectweb.asm.Opcodes
 import java.io.File
+import java.nio.file.Files
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.zip.ZipFile
@@ -126,7 +127,7 @@ internal fun runToolInSeparateProcess(
 
 private fun writeArgumentsToFile(directory: File, argsArray: Array<String>): File {
     val compilerOptions =
-        File.createTempFile(LocalDateTime.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "_", ".compiler.options", directory)
+        Files.createTempFile(directory.toPath(), LocalDateTime.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "_", ".compiler.options").toFile()
     compilerOptions.deleteOnExit()
     compilerOptions.writeText(argsArray.joinToString(" ") { "\"${StringEscapeUtils.escapeJava(it)}\"" })
     return compilerOptions
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt
index c87f97ce0dd..c7f4e7ac8e0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt
@@ -24,9 +24,11 @@ import org.gradle.api.tasks.compile.AbstractCompile
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.process.CommandLineArgumentProvider
 import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
+import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
 import org.jetbrains.kotlin.gradle.internal.kapt.incremental.CLASS_STRUCTURE_ARTIFACT_TYPE
 import org.jetbrains.kotlin.gradle.internal.kapt.incremental.StructureTransformAction
+import org.jetbrains.kotlin.gradle.internal.kapt.incremental.StructureTransformLegacyAction
 import org.jetbrains.kotlin.gradle.model.builder.KaptModelBuilder
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation
@@ -448,7 +450,13 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
                 }
             }
 
-            kaptTask.kaptClasspathConfigurations = kaptClasspathConfigurations
+            val kaptClasspathConfiguration =
+                project.configurations.create("_kaptClasspath_" + kaptTask.name).setExtendsFrom(kaptClasspathConfigurations).also {
+                    it.isVisible = false
+                    it.isCanBeConsumed = false
+                }
+            kaptTask.kaptClasspath.from(kaptClasspathConfiguration)
+            kaptTask.kaptClasspathConfigurationNames.set(kaptClasspathConfigurations.map { it.name })
 
             KaptWithAndroid.androidVariantData(this)?.annotationProcessorOptionProviders?.let {
                 kaptTask.annotationProcessorOptionProviders.add(it)
@@ -516,12 +524,17 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
 
     private fun maybeRegisterTransform(project: Project) {
         if (!project.extensions.extraProperties.has("KaptStructureTransformAdded")) {
-            project.dependencies.registerTransform(StructureTransformAction::class.java) { transformSpec ->
+            val transformActionClass =
+                if (GradleVersion.current() >= GradleVersion.version("5.4"))
+                    StructureTransformAction::class.java
+                else
+                    StructureTransformLegacyAction::class.java
+            project.dependencies.registerTransform(transformActionClass) { transformSpec ->
                 transformSpec.from.attribute(artifactType, "jar")
                 transformSpec.to.attribute(artifactType, CLASS_STRUCTURE_ARTIFACT_TYPE)
             }
 
-            project.dependencies.registerTransform(StructureTransformAction::class.java) { transformSpec ->
+            project.dependencies.registerTransform(transformActionClass) { transformSpec ->
                 transformSpec.from.attribute(artifactType, "directory")
                 transformSpec.to.attribute(artifactType, CLASS_STRUCTURE_ARTIFACT_TYPE)
             }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
index 178c2f1aa0c..0560755c7d3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
@@ -1,10 +1,13 @@
 package org.jetbrains.kotlin.gradle.internal
 
-import org.gradle.api.artifacts.Configuration
+import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.ConventionTask
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.incremental.IncrementalTaskInputs
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporterImpl
 import org.jetbrains.kotlin.gradle.internal.kapt.incremental.ClasspathSnapshot
 import org.jetbrains.kotlin.gradle.internal.kapt.incremental.KaptClasspathChanges
 import org.jetbrains.kotlin.gradle.internal.kapt.incremental.KaptIncrementalChanges
@@ -41,8 +44,7 @@ abstract class KaptTask : ConventionTask(), TaskWithLocalState {
 
     @get:Classpath
     @get:InputFiles
-    val kaptClasspath: FileCollection
-        get() = objects.fileCollection().from(kaptClasspathConfigurations)
+    abstract val kaptClasspath: ConfigurableFileCollection
 
     @get:Classpath
     @get:InputFiles
@@ -51,7 +53,7 @@ abstract class KaptTask : ConventionTask(), TaskWithLocalState {
     }
 
     @get:Internal
-    internal lateinit var kaptClasspathConfigurations: List<Configuration>
+    internal abstract val kaptClasspathConfigurationNames: ListProperty<String>
 
 
     @get:PathSensitive(PathSensitivity.NONE)
@@ -137,6 +139,10 @@ abstract class KaptTask : ConventionTask(), TaskWithLocalState {
     protected val javaSourceRoots: Set<File>
         get() = unfilteredJavaSourceRoots.filterTo(HashSet(), ::isRootAllowed)
 
+    @get:Internal
+    override val metrics: BuildMetricsReporter =
+        BuildMetricsReporterImpl()
+
     private fun isRootAllowed(file: File): Boolean =
         file.exists() &&
                 !isAncestor(destinationDir, file) &&
@@ -189,7 +195,7 @@ abstract class KaptTask : ConventionTask(), TaskWithLocalState {
                             + "\nThe following files, containing annotation processors, are not present in KAPT classpath:\n"
                             + processorsAbsentInKaptClasspath.joinToString("\n") { "  '$it'" }
                             + "\nAdd corresponding dependencies to any of the following configurations:\n"
-                            + kaptClasspathConfigurations.joinToString("\n") { " '${it.name}'" }
+                            + kaptClasspathConfigurationNames.get().joinToString("\n") { " '$it'" }
                 )
             } else {
                 logger.warn(
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt
index b1d21e872fa..00ec520482f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.gradle.utils.optionalProvider
 import org.jetbrains.kotlin.gradle.utils.toSortedPathsArray
 import java.io.File
 
-open class KaptWithKotlincTask : KaptTask(), CompilerArgumentAwareWithInput<K2JVMCompilerArguments> {
+abstract class KaptWithKotlincTask : KaptTask(), CompilerArgumentAwareWithInput<K2JVMCompilerArguments> {
     @get:Internal
     internal val pluginOptions = CompilerPluginOptions()
 
@@ -84,7 +84,7 @@ open class KaptWithKotlincTask : KaptTask(), CompilerArgumentAwareWithInput<K2JV
     private var processIncrementally = false
 
     private val javaPackagePrefix by project.optionalProvider { kotlinCompileTask.javaPackagePrefix }
-    private val buildReportMode by project.optionalProvider { kotlinCompileTask.buildReportMode }
+    private val reportingSettings by project.provider { kotlinCompileTask.reportingSettings }
 
     @TaskAction
     fun compile(inputs: IncrementalTaskInputs) {
@@ -104,7 +104,7 @@ open class KaptWithKotlincTask : KaptTask(), CompilerArgumentAwareWithInput<K2JV
         val outputItemCollector = OutputItemsCollectorImpl()
         val environment = GradleCompilerEnvironment(
             compilerClasspath, messageCollector, outputItemCollector,
-            buildReportMode = buildReportMode,
+            reportingSettings = reportingSettings,
             outputFiles = allOutputFiles()
         )
         if (environment.toolsJar == null && !isAtLeastJava9) {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt
index 375c385de27..13ddd296c08 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt
@@ -24,7 +24,7 @@ import java.net.URL
 import java.net.URLClassLoader
 import javax.inject.Inject
 
-open class KaptWithoutKotlincTask @Inject constructor(private val workerExecutor: WorkerExecutor) : KaptTask() {
+abstract class KaptWithoutKotlincTask @Inject constructor(private val workerExecutor: WorkerExecutor) : KaptTask() {
     @get:InputFiles
     @get:Classpath
     @Suppress("unused")
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzer.kt
index 6366f939195..72454c280d6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzer.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzer.kt
@@ -9,6 +9,8 @@ import org.gradle.api.artifacts.transform.InputArtifact
 import org.gradle.api.artifacts.transform.TransformAction
 import org.gradle.api.artifacts.transform.TransformOutputs
 import org.gradle.api.artifacts.transform.TransformParameters
+import org.gradle.api.file.FileSystemLocation
+import org.gradle.api.provider.Provider
 import org.jetbrains.org.objectweb.asm.ClassReader
 import org.jetbrains.org.objectweb.asm.ClassWriter
 import java.io.*
@@ -20,27 +22,47 @@ private const val MODULE_INFO = "module-info.class"
 
 abstract class StructureTransformAction : TransformAction<TransformParameters.None> {
     @get:InputArtifact
-    abstract val inputArtifact: File
+    abstract val inputArtifact: Provider<FileSystemLocation>
 
     override fun transform(outputs: TransformOutputs) {
         try {
-            val input = inputArtifact
-
-            val data = if (input.isDirectory) {
-                visitDirectory(input)
-            } else {
-                visitJar(input)
-            }
-
-            val dataFile = outputs.file("output.bin")
-            data.saveTo(dataFile)
-
+            transform(inputArtifact.get().asFile, outputs)
         } catch (e: Throwable) {
             throw e
         }
     }
 }
 
+/**
+ * [StructureTransformLegacyAction] is a legacy version of [StructureTransformAction] and should only be used when gradle version is 5.3
+ * or less. The reason of having this legacy artifact transform is that declaring inputArtifact as type Provider<FileSystemLocation> is not
+ * supported until gradle version 5.4. Once our minimal supported gradle version is 5.4 or above, this legacy artifact transform can be
+ * removed.
+ */
+abstract class StructureTransformLegacyAction : TransformAction<TransformParameters.None> {
+    @get:InputArtifact
+    abstract val inputArtifact: File
+
+    override fun transform(outputs: TransformOutputs) {
+        try {
+            transform(inputArtifact, outputs)
+        } catch (e: Throwable) {
+            throw e
+        }
+    }
+}
+
+private fun transform(input: File, outputs: TransformOutputs) {
+    val data = if (input.isDirectory) {
+        visitDirectory(input)
+    } else {
+        visitJar(input)
+    }
+
+    val dataFile = outputs.file("output.bin")
+    data.saveTo(dataFile)
+}
+
 private fun visitDirectory(directory: File): ClasspathEntryData {
     val entryData = ClasspathEntryData()
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/tasks/TaskWithLocalState.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/tasks/TaskWithLocalState.kt
index 205187e7655..0c5785b708d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/tasks/TaskWithLocalState.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/tasks/TaskWithLocalState.kt
@@ -7,9 +7,15 @@ package org.jetbrains.kotlin.gradle.internal.tasks
 
 import org.gradle.api.Task
 import org.gradle.api.file.FileCollection
+import org.gradle.api.tasks.Internal
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
+import org.jetbrains.kotlin.gradle.utils.outputsCompatible
 
 internal interface TaskWithLocalState : Task {
     fun localStateDirectories(): FileCollection
+
+    @get:Internal
+    val metrics: BuildMetricsReporter
 }
 
 internal fun TaskWithLocalState.allOutputFiles(): FileCollection =
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt
index fb005a80e4c..df753aff258 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt
@@ -44,7 +44,7 @@ class TCServiceMessagesTestExecutor(
 
     override fun execute(spec: TCServiceMessagesTestExecutionSpec, testResultProcessor: TestResultProcessor) {
         spec.wrapExecute {
-            val rootOperation = buildOperationExecutor.currentOperation.parentId
+            val rootOperation = buildOperationExecutor.currentOperation.parentId!!
 
             val client = spec.createClient(testResultProcessor, log)
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt
index 611d3d3b038..1d876744701 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt
@@ -13,10 +13,9 @@ import org.gradle.api.logging.Logging
 import org.jetbrains.kotlin.gradle.logging.kotlinDebug
 import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskExecutionResults
 import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskLoggers
-import org.jetbrains.kotlin.gradle.report.configureBuildReporter
+import org.jetbrains.kotlin.gradle.report.configureReporting
 import org.jetbrains.kotlin.gradle.utils.isConfigurationCacheAvailable
 
-
 //Support Gradle 6 and less. Move to
 internal class KotlinGradleBuildServices private constructor(
     private val gradle: Gradle
@@ -99,7 +98,7 @@ internal class KotlinGradleBuildServices private constructor(
         TaskLoggers.clear()
         TaskExecutionResults.clear()
 
-        configureBuildReporter(gradle, log)
+        configureReporting(gradle)
     }
 
     override fun buildFinished(result: BuildResult) {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt
index 0f1a5d588cb..3e408b4c360 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2010-2016 JetBrains s.r.o.
  *
@@ -28,6 +27,8 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.logging.kotlinWarn
 import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import org.jetbrains.kotlin.gradle.utils.SingleWarningPerBuild
+import org.jetbrains.kotlin.gradle.utils.androidPluginIds
+import java.util.concurrent.atomic.AtomicBoolean
 
 abstract class KotlinPlatformPluginBase(protected val platformName: String) : Plugin<Project> {
     companion object {
@@ -182,6 +183,7 @@ open class KotlinPlatformImplementationPluginBase(platformName: String) : Kotlin
     private fun getKotlinSourceSetsSafe(project: Project): NamedDomainObjectCollection<out Named> {
         // Access through reflection, because another project's KotlinProjectExtension might be loaded by a different class loader:
         val kotlinExt = project.extensions.getByName("kotlin")
+
         @Suppress("UNCHECKED_CAST")
         val sourceSets = kotlinExt.javaClass.getMethod("getSourceSets").invoke(kotlinExt) as NamedDomainObjectCollection<out Named>
         return sourceSets
@@ -210,8 +212,24 @@ open class KotlinPlatformImplementationPluginBase(platformName: String) : Kotlin
 internal fun <T> Project.whenEvaluated(fn: Project.() -> T) {
     if (state.executed) {
         fn()
-    } else {
-        afterEvaluate { it.fn() }
+        return
+    }
+
+    /* Make sure that all afterEvaluate blocks from the AndroidPlugin get scheduled first */
+    val isDispatched = AtomicBoolean(false)
+    androidPluginIds.forEach { androidPluginId ->
+        pluginManager.withPlugin(androidPluginId) {
+            if (!isDispatched.getAndSet(true)) {
+                afterEvaluate { fn() }
+            }
+        }
+    }
+
+    afterEvaluate {
+        /* If no Android plugin was loaded, then the action was not dispatched and we can freely execute it now */
+        if (!isDispatched.getAndSet(true)) {
+            fn()
+        }
     }
 }
 
@@ -263,4 +281,4 @@ private fun warnAboutKotlin12xMppDeprecation(project: Project) {
     if (project.findProperty(KOTLIN_12X_MPP_DEPRECATION_SUPPRESS_FLAG) != "true") {
         SingleWarningPerBuild.show(project, KOTLIN_12X_MPP_DEPRECATION_WARNING)
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 3627cd19f72..69564b3059a 100755
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -13,6 +13,7 @@ import org.gradle.api.*
 import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer
 import org.gradle.api.artifacts.maven.MavenResolver
 import org.gradle.api.attributes.Usage
+import org.gradle.api.file.ConfigurableFileTree
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.SourceDirectorySet
 import org.gradle.api.logging.Logging
@@ -22,6 +23,8 @@ import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.plugins.MavenPluginConvention
 import org.gradle.api.provider.Provider
 import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPom
+import org.gradle.api.artifacts.maven.MavenPom as OldMavenPom
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.compile.AbstractCompile
@@ -415,19 +418,32 @@ internal abstract class AbstractKotlinPlugin(
         project.components.addAll(target.components)
     }
 
+    private fun rewritePom(pom: MavenPom, rewriter: PomDependenciesRewriter, shouldRewritePom: Provider<Boolean>) {
+        pom.withXml { xml ->
+            if (shouldRewritePom.get())
+                rewriter.rewritePomMppDependenciesToActualTargetModules(xml)
+        }
+    }
+
+    private fun rewritePom(pom: OldMavenPom, rewriter: PomDependenciesRewriter, shouldRewritePom: Provider<Boolean>) {
+        pom.withXml { xml ->
+            if (shouldRewritePom.get())
+                rewriter.rewritePomMppDependenciesToActualTargetModules(xml)
+        }
+    }
+
     private fun rewriteMppDependenciesInPom(target: AbstractKotlinTarget) {
         val project = target.project
 
-        fun shouldRewritePoms(): Boolean =
+        val shouldRewritePoms = project.provider {
             PropertiesProvider(project).keepMppDependenciesIntactInPoms != true
+        }
 
         project.pluginManager.withPlugin("maven-publish") {
             project.extensions.configure(PublishingExtension::class.java) { publishing ->
+                val pomRewriter = PomDependenciesRewriter(project, target.kotlinComponents.single())
                 publishing.publications.withType(MavenPublication::class.java).all { publication ->
-                    publication.pom.withXml { xml ->
-                        if (shouldRewritePoms())
-                            project.rewritePomMppDependenciesToActualTargetModules(xml, target.kotlinComponents.single())
-                    }
+                    rewritePom(publication.pom, pomRewriter, shouldRewritePoms)
                 }
             }
         }
@@ -435,10 +451,8 @@ internal abstract class AbstractKotlinPlugin(
         project.pluginManager.withPlugin("maven") {
             project.tasks.withType(Upload::class.java).all { uploadTask ->
                 uploadTask.repositories.withType(MavenResolver::class.java).all { mavenResolver ->
-                    mavenResolver.pom.withXml { xml ->
-                        if (shouldRewritePoms())
-                            project.rewritePomMppDependenciesToActualTargetModules(xml, target.kotlinComponents.single())
-                    }
+                    val pomRewriter = PomDependenciesRewriter(project, target.kotlinComponents.single())
+                    rewritePom(mavenResolver.pom, pomRewriter, shouldRewritePoms)
                 }
             }
 
@@ -796,11 +810,6 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationTool
         kotlinOptions.noJdk = true
         ext.addExtension(KOTLIN_OPTIONS_DSL_NAME, kotlinOptions)
 
-        val androidPluginIds = listOf(
-            "android", "com.android.application", "android-library", "com.android.library",
-            "com.android.test", "com.android.feature", "com.android.dynamic-feature", "com.android.instantapp"
-        )
-
         val plugin by lazy {
             androidPluginIds.asSequence()
                 .mapNotNull { project.plugins.findPlugin(it) as? BasePlugin }
@@ -904,6 +913,7 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationTool
 
         // Trivial mapping of Android variants to Android source set names is impossible here,
         // because some variants have their dedicated source sets with mismatching names,
+        // because some variants have their dedicated source sets with mismatching names,
         // e.g. variant 'fooBarDebugAndroidTest' <-> source set 'androidTestFooBarDebug'
 
         // In single-platform projects, the Kotlin compilations already reference the Android plugin's configurations by the names,
@@ -974,6 +984,8 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationTool
 
         // Register the source only after the task is created, because the task is required for that:
         compilation.source(defaultSourceSet)
+
+        compilation.androidVariant.forEachKotlinSourceSet { kotlinSourceSet -> compilation.source(kotlinSourceSet) }
     }
 
     private fun postprocessVariant(
@@ -983,7 +995,6 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationTool
         androidExt: BaseExtension,
         androidPlugin: BasePlugin
     ) {
-        val javaTask = variantData.getJavaTaskProvider()
 
         getTestedVariantData(variantData)?.let { testedVariant ->
             val testedVariantName = getVariantName(testedVariant)
@@ -991,34 +1002,24 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationTool
             compilation.associateWith(testedCompilation)
         }
 
+        val javaTask = variantData.getJavaTaskProvider()
         val kotlinTask = compilation.compileKotlinTaskProvider
-        processAndroidKotlinAndJavaSources(
-            compilation,
-            addKotlinSources = { kotlinSourceSet -> compilation.source(kotlinSourceSet) },
-            addJavaSources = { sources -> compilation.compileKotlinTaskProvider.configure { it.source(sources) } }
-        )
+        compilation.androidVariant.forEachJavaSourceDir { sources -> kotlinTask.configure { it.source(sources.dir) } }
         wireKotlinTasks(project, compilation, androidPlugin, androidExt, variantData, javaTask, kotlinTask)
     }
 }
 
-private fun getAllJavaSources(variantData: BaseVariant): Iterable<File> =
-    variantData.getSourceFolders(SourceKind.JAVA).map { it.dir }
-
-internal fun processAndroidKotlinAndJavaSources(
-    compilation: KotlinJvmAndroidCompilation,
-    addKotlinSources: (KotlinSourceSet) -> Unit,
-    addJavaSources: (Iterable<File>) -> Unit
-) {
-    val variantData = compilation.androidVariant
-
-    for (provider in variantData.sourceSets) {
-        val kotlinSourceSet = provider.getConvention(KOTLIN_DSL_NAME) as? KotlinSourceSet ?: continue
-        addKotlinSources(kotlinSourceSet)
-    }
-
-    addJavaSources(getAllJavaSources(variantData))
+internal inline fun BaseVariant.forEachKotlinSourceSet(action: (KotlinSourceSet) -> Unit) {
+    sourceSets
+        .mapNotNull { provider -> provider.getConvention(KOTLIN_DSL_NAME) as? KotlinSourceSet }
+        .forEach(action)
 }
 
+internal inline fun BaseVariant.forEachJavaSourceDir(action: (ConfigurableFileTree) -> Unit) {
+    getSourceFolders(SourceKind.JAVA).forEach(action)
+}
+
+
 internal fun configureJavaTask(
     kotlinTaskProvider: TaskProvider<out KotlinCompile>,
     javaTaskProvider: TaskProvider<out AbstractCompile>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
index b92f271dd41..71c59fba972 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
@@ -57,9 +57,15 @@ internal class PropertiesProvider private constructor(private val project: Proje
     val coroutines: Coroutines?
         get() = property("kotlin.coroutines")?.let { Coroutines.byCompilerArgument(it) }
 
+    val singleBuildMetricsFile: File?
+        get() = property("kotlin.internal.single.build.metrics.file")?.let { File(it) }
+
     val buildReportEnabled: Boolean
         get() = booleanProperty("kotlin.build.report.enable") ?: false
 
+    val buildReportMetrics: Boolean
+        get() = booleanProperty("kotlin.build.report.metrics") ?: false
+
     val buildReportVerbose: Boolean
         get() = booleanProperty("kotlin.build.report.verbose") ?: false
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
index 9037842fd79..619e39f4274 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
@@ -486,4 +486,4 @@ fun Configuration.usesPlatformOf(target: KotlinTarget): Configuration {
         attributes.attribute(KotlinNativeTarget.konanTargetAttribute, target.konanTarget.name)
     }
     return this
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/RunOnceAfterEvaluated.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/RunOnceAfterEvaluated.kt
index cd92b89a3ce..00d24d97af3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/RunOnceAfterEvaluated.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/RunOnceAfterEvaluated.kt
@@ -51,12 +51,8 @@ internal fun Project.runOnceAfterEvaluated(name: String, task: TaskProvider<*>,
 }
 
 internal fun Project.runOnceAfterEvaluated(runOnce: RunOnceAfterEvaluated, task: TaskProvider<*>) {
-    if (state.executed) {
-        runOnce.onEvaluated()
-    } else {
-        afterEvaluate { runOnce.onEvaluated() }
-    }
+    whenEvaluated { runOnce.onEvaluated() }
     task.configure {
         runOnce.onConfigure()
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt
index b563c0e6fcb..7aa9279ca9e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt
@@ -114,11 +114,8 @@ class SubpluginEnvironment(
 
 internal fun addCompilationSourcesToExternalCompileTask(compilation: KotlinCompilation<*>, task: TaskProvider<out AbstractCompile>) {
     if (compilation is KotlinJvmAndroidCompilation) {
-        processAndroidKotlinAndJavaSources(
-            compilation,
-            addKotlinSources = { sourceSet -> task.configure { it.source(sourceSet.kotlin) } },
-            addJavaSources = { sources -> task.configure { it.source(sources) }}
-        )
+        compilation.androidVariant.forEachKotlinSourceSet { sourceSet -> task.configure { it.source(sourceSet.kotlin) } }
+        compilation.androidVariant.forEachJavaSourceDir { sources -> task.configure { it.source(sources.dir) } }
     } else {
         task.configure { taskInstance ->
             compilation.allKotlinSourceSets.forEach { sourceSet -> taskInstance.source(sourceSet.kotlin) }
@@ -174,4 +171,4 @@ internal fun findJavaTaskForKotlinCompilation(compilation: KotlinCompilation<*>)
         is KotlinWithJavaCompilation -> compilation.compileJavaTaskProvider
         is KotlinJvmCompilation -> compilation.compileJavaTaskProvider // may be null for Kotlin-only JVM target in MPP
         else -> null
-    }
\ No newline at end of file
+    }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt
index 6aa874f0be9..99f848782a4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt
@@ -38,4 +38,4 @@ class KotlinCommonCompilation(
             val friendSourceSets = getVisibleSourceSetsFromAssociateCompilations(target.project, defaultSourceSet)
             project.files(friendSourceSets.mapNotNull { target.compilations.findByName(it.name)?.output?.classesDirs })
         })
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
index 5d7ee49a12a..8fc0ace3c2a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
@@ -13,8 +13,10 @@ import org.gradle.api.attributes.AttributeContainer
 import org.gradle.api.internal.FeaturePreviews
 import org.gradle.api.internal.plugins.DslObject
 import org.gradle.api.plugins.JavaBasePlugin
+import org.gradle.api.provider.Provider
 import org.gradle.api.publish.PublicationContainer
 import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPom
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.internal.publication.MavenPublicationInternal
 import org.gradle.api.tasks.SourceTask
@@ -29,18 +31,16 @@ import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
 import org.jetbrains.kotlin.gradle.internal.customizeKotlinDependencies
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin.Companion.sourceSetFreeCompilerArgsPropertyName
+import org.jetbrains.kotlin.gradle.plugin.sources.*
 import org.jetbrains.kotlin.gradle.plugin.sources.DefaultLanguageSettingsBuilder
 import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope
-import org.jetbrains.kotlin.gradle.plugin.sources.checkSourceSetVisibilityRequirements
 import org.jetbrains.kotlin.gradle.plugin.sources.sourceSetDependencyConfigurationByScope
 import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService
 import org.jetbrains.kotlin.gradle.scripting.internal.ScriptingGradleSubplugin
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset
 import org.jetbrains.kotlin.gradle.targets.metadata.isKotlinGranularMetadataEnabled
-import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask
 import org.jetbrains.kotlin.gradle.tasks.locateTask
 import org.jetbrains.kotlin.gradle.tasks.registerTask
-import org.jetbrains.kotlin.gradle.tasks.withType
 import org.jetbrains.kotlin.gradle.utils.*
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget.*
@@ -111,6 +111,12 @@ class KotlinMultiplatformPlugin(
         project.pluginManager.apply(ScriptingGradleSubplugin::class.java)
 
         exportProjectStructureMetadataForOtherBuilds(project)
+
+        SingleActionPerBuild.run(project.rootProject, "cleanup-processed-metadata") {
+            project.gradle.buildFinished {
+                SourceSetMetadataStorageForIde.cleanupStaleEntries(project)
+            }
+        }
     }
 
     private fun exportProjectStructureMetadataForOtherBuilds(
@@ -230,6 +236,18 @@ class KotlinMultiplatformPlugin(
         project.components.add(kotlinSoftwareComponent)
     }
 
+    private fun rewritePom(
+        pom: MavenPom,
+        pomRewriter: PomDependenciesRewriter,
+        shouldRewritePomDependencies: Provider<Boolean>,
+        includeOnlySpecifiedDependencies: Provider<Set<ModuleCoordinates>>?
+    ) {
+        pom.withXml { xml ->
+            if (shouldRewritePomDependencies.get())
+                pomRewriter.rewritePomMppDependenciesToActualTargetModules(xml, includeOnlySpecifiedDependencies)
+        }
+    }
+
     private fun AbstractKotlinTarget.createMavenPublications(publications: PublicationContainer) {
         components
             .map { gradleComponent -> gradleComponent to kotlinComponents.single { it.name == gradleComponent.name } }
@@ -246,12 +264,16 @@ class KotlinMultiplatformPlugin(
                     (this as MavenPublicationInternal).publishWithOriginalFileName()
                     artifactId = kotlinComponent.defaultArtifactId
 
-                    pom.withXml { xml ->
-                        if (PropertiesProvider(project).keepMppDependenciesIntactInPoms != true)
-                            project.rewritePomMppDependenciesToActualTargetModules(xml, kotlinComponent) { id ->
-                                filterMetadataDependencies(this@createMavenPublications, id)
-                            }
-                    }
+                    val pomRewriter = PomDependenciesRewriter(project, kotlinComponent)
+                    val shouldRewritePomDependencies =
+                        project.provider { PropertiesProvider(project).keepMppDependenciesIntactInPoms != true }
+
+                    rewritePom(
+                        pom,
+                        pomRewriter,
+                        shouldRewritePomDependencies,
+                        dependenciesForPomRewriting(this@createMavenPublications)
+                    )
                 }
 
                 (kotlinComponent as? KotlinTargetComponentWithPublication)?.publicationDelegate = componentPublication
@@ -265,23 +287,24 @@ class KotlinMultiplatformPlugin(
      * can't read Gradle module metadata won't resolve a dependency on an MPP to the granular metadata variant and won't then choose the
      * right dependencies for each source set, we put only the dependencies of the legacy common variant into the POM, i.e. commonMain API.
      */
-    private fun filterMetadataDependencies(target: AbstractKotlinTarget, groupNameVersion: Triple<String?, String, String?>): Boolean {
-        if (target !is KotlinMetadataTarget || !target.project.isKotlinGranularMetadataEnabled) {
-            return true
+    private fun dependenciesForPomRewriting(target: AbstractKotlinTarget): Provider<Set<ModuleCoordinates>>? =
+        if (target !is KotlinMetadataTarget || !target.project.isKotlinGranularMetadataEnabled)
+            null
+        else {
+            val commonMain = target.project.kotlinExtension.sourceSets.findByName(KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME)
+            if (commonMain == null)
+                null
+            else
+                target.project.provider {
+                    val project = target.project
+
+                    // Only the commonMain API dependencies can be published for consumers who can't read Gradle project metadata
+                    val commonMainApi = project.sourceSetDependencyConfigurationByScope(commonMain, KotlinDependencyScope.API_SCOPE)
+                    val commonMainDependencies = commonMainApi.allDependencies
+                    commonMainDependencies.map { ModuleCoordinates(it.group, it.name, it.version) }.toSet()
+                }
         }
 
-        val (group, name, _) = groupNameVersion
-
-        val project = target.project
-        val commonMain = project.kotlinExtension.sourceSets?.findByName(KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME)
-            ?: return true
-
-        // Only the commonMain API dependencies can be published for consumers who can't read Gradle project metadata
-        val commonMainApi = project.sourceSetDependencyConfigurationByScope(commonMain, KotlinDependencyScope.API_SCOPE)
-
-        return commonMainApi.allDependencies.any { it.group == group && it.name == name }
-    }
-
     private fun configureSourceSets(project: Project) = with(project.multiplatformExtension) {
         val production = sourceSets.create(KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME)
         val test = sourceSets.create(KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt
index 38ec9ade5c2..3df0be30d5f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt
@@ -139,4 +139,4 @@ private fun Project.resolvableConfigurationFromCompilationByScope(
     }
 
     return project.configurations.getByName(configurationName)
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
index 8c7771f5480..6c35baf1ec5 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
@@ -363,4 +363,4 @@ internal object CompilationSourceSetUtil {
 private val invalidModuleNameCharactersRegex = """[\\/\r\n\t]""".toRegex()
 
 private fun filterModuleName(moduleName: String): String =
-    moduleName.replace(invalidModuleNameCharactersRegex, "_")
\ No newline at end of file
+    moduleName.replace(invalidModuleNameCharactersRegex, "_")
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
index 15a1cbc1ce2..6971fe16ee2 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
@@ -238,4 +238,4 @@ abstract class KotlinOnlyTarget<T : KotlinCompilation<*>>(
 
     override var disambiguationClassifier: String? = null
         internal set
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt
index 9e3d852cba7..1bf5caae4c3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt
@@ -14,82 +14,103 @@ import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.attributes.Usage
 import org.gradle.api.internal.component.SoftwareComponentInternal
 import org.gradle.api.internal.component.UsageContext
+import org.gradle.api.provider.Provider
 import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationToRunnableFiles
 import org.jetbrains.kotlin.gradle.plugin.KotlinTargetComponent
+import org.jetbrains.kotlin.gradle.utils.getValue
 
-internal fun Project.rewritePomMppDependenciesToActualTargetModules(
-    pomXml: XmlProvider,
-    component: KotlinTargetComponent,
-    filterDependencies: (groupNameVersion: Triple<String?, String, String?>) -> Boolean = { true }
+internal data class ModuleCoordinates(
+    val group: String?,
+    val name: String,
+    val version: String?
+)
+
+internal class PomDependenciesRewriter(
+    project: Project,
+
+    @field:Transient
+    private val component: KotlinTargetComponent
 ) {
-    if (component !is SoftwareComponentInternal)
-        return
-
-    val dependenciesNode = (pomXml.asNode().get("dependencies") as NodeList).filterIsInstance<Node>().singleOrNull() ?: return
-
-    val dependencyNodes = (dependenciesNode.get("dependency") as? NodeList).orEmpty().filterIsInstance<Node>()
-
-    val dependencyByNode = mutableMapOf<Node, ModuleDependency>()
-
-    // Collect all the dependencies from the nodes:
-    val dependencies = dependencyNodes.map { dependencyNode ->
-        fun Node.getSingleChildValueOrNull(childName: String): String? =
-            ((get(childName) as NodeList?)?.singleOrNull() as Node?)?.text()
-
-        val groupId = dependencyNode.getSingleChildValueOrNull("groupId")
-        val artifactId = dependencyNode.getSingleChildValueOrNull("artifactId")
-        val version = dependencyNode.getSingleChildValueOrNull("version")
-        (project.dependencies.module("$groupId:$artifactId:$version") as ModuleDependency)
-            .also { dependencyByNode[dependencyNode] = it }
-    }.toSet()
 
     // Get the dependencies mapping according to the component's UsageContexts:
-    val resultDependenciesForEachUsageContext =
-        component.usages.mapNotNull { usage ->
+    private val dependenciesMappingForEachUsageContext by project.provider {
+        (component as SoftwareComponentInternal).usages.mapNotNull { usage ->
             if (usage is KotlinUsageContext)
-                associateDependenciesWithActualModuleDependencies(usage, dependencies)
+                associateDependenciesWithActualModuleDependencies(usage)
                     // We are only interested in dependencies that are mapped to some other dependencies:
                     .filter { (from, to) -> Triple(from.group, from.name, from.version) != Triple(to.group, to.name, to.version) }
             else null
         }
+    }
 
-    // Rewrite the dependency nodes according to the mapping:
-    dependencyNodes.forEach { dependencyNode ->
-        val moduleDependency = dependencyByNode[dependencyNode]
+    fun rewritePomMppDependenciesToActualTargetModules(
+        pomXml: XmlProvider,
+        includeOnlySpecifiedDependencies: Provider<Set<ModuleCoordinates>>? = null
+    ) {
+        if (component !is SoftwareComponentInternal)
+            return
 
-        if (moduleDependency != null) {
-            val groupNameVersion = Triple(moduleDependency.group, moduleDependency.name, moduleDependency.version)
-            if (!filterDependencies(groupNameVersion)) {
-                dependenciesNode.remove(dependencyNode)
-                return@forEach
-            }
+        val dependenciesNode = (pomXml.asNode().get("dependencies") as NodeList).filterIsInstance<Node>().singleOrNull() ?: return
+
+        val dependencyNodes = (dependenciesNode.get("dependency") as? NodeList).orEmpty().filterIsInstance<Node>()
+
+        val dependencyByNode = mutableMapOf<Node, ModuleCoordinates>()
+
+        // Collect all the dependencies from the nodes:
+        val dependencies = dependencyNodes.map { dependencyNode ->
+            fun Node.getSingleChildValueOrNull(childName: String): String? =
+                ((get(childName) as NodeList?)?.singleOrNull() as Node?)?.text()
+
+            val groupId = dependencyNode.getSingleChildValueOrNull("groupId")
+            val artifactId = dependencyNode.getSingleChildValueOrNull("artifactId")
+                ?: error("unexpected dependency in POM with no artifact ID: $dependenciesNode")
+            val version = dependencyNode.getSingleChildValueOrNull("version")
+            (ModuleCoordinates(groupId, artifactId, version)).also { dependencyByNode[dependencyNode] = it }
+        }.toSet()
+
+        val resultDependenciesForEachUsageContext = dependencies.associate { key ->
+            val map = dependenciesMappingForEachUsageContext.find { key in it }
+            val value = map?.get(key) ?: key
+            key to value
         }
 
-        val mapDependencyTo = resultDependenciesForEachUsageContext.find { moduleDependency in it }?.get(moduleDependency)
+        val includeOnlySpecifiedDependenciesSet = includeOnlySpecifiedDependencies?.get()
 
-        if (mapDependencyTo != null) {
+        // Rewrite the dependency nodes according to the mapping:
+        dependencyNodes.forEach { dependencyNode ->
+            val moduleDependency = dependencyByNode[dependencyNode]
 
-            fun Node.setChildNodeByName(name: String, value: String?) {
-                val childNode: Node? = (get(name) as NodeList?)?.firstOrNull() as Node?
-                if (value != null) {
-                    (childNode ?: appendNode(name)).setValue(value)
-                } else {
-                    childNode?.let { remove(it) }
+            if (moduleDependency != null) {
+                if (includeOnlySpecifiedDependenciesSet != null && moduleDependency !in includeOnlySpecifiedDependenciesSet) {
+                    dependenciesNode.remove(dependencyNode)
+                    return@forEach
                 }
             }
 
-            dependencyNode.setChildNodeByName("groupId", mapDependencyTo.group)
-            dependencyNode.setChildNodeByName("artifactId", mapDependencyTo.name)
-            dependencyNode.setChildNodeByName("version", mapDependencyTo.version)
+            val mapDependencyTo = resultDependenciesForEachUsageContext.get(moduleDependency)
+
+            if (mapDependencyTo != null) {
+                fun Node.setChildNodeByName(name: String, value: String?) {
+                    val childNode: Node? = (get(name) as NodeList?)?.firstOrNull() as Node?
+                    if (value != null) {
+                        (childNode ?: appendNode(name)).setValue(value)
+                    } else {
+                        childNode?.let { remove(it) }
+                    }
+                }
+
+                dependencyNode.setChildNodeByName("groupId", mapDependencyTo.group)
+                dependencyNode.setChildNodeByName("artifactId", mapDependencyTo.name)
+                dependencyNode.setChildNodeByName("version", mapDependencyTo.version)
+            }
         }
     }
 }
 
 private fun associateDependenciesWithActualModuleDependencies(
-    usageContext: KotlinUsageContext,
-    moduleDependencies: Set<ModuleDependency>
-): Map<ModuleDependency, ModuleDependency> {
+    usageContext: KotlinUsageContext
+): Map<ModuleCoordinates, ModuleCoordinates> {
     val compilation = usageContext.compilation
     val project = compilation.target.project
 
@@ -119,17 +140,19 @@ private fun associateDependenciesWithActualModuleDependencies(
         }
     }
 
-    val resolvedModulesByRootModuleCoordinates = targetDependenciesConfiguration
+    return targetDependenciesConfiguration
         .allDependencies.withType(ModuleDependency::class.java)
         .associate { dependency ->
+            val coordinates = ModuleCoordinates(dependency.group, dependency.name, dependency.version)
+            val noMapping = coordinates to coordinates
             when (dependency) {
                 is ProjectDependency -> {
                     val dependencyProject = dependency.dependencyProject
                     val dependencyProjectKotlinExtension = dependencyProject.multiplatformExtensionOrNull
-                        ?: return@associate dependency to dependency
+                        ?: return@associate noMapping
 
                     val resolved = resolvedDependencies[Triple(dependency.group, dependency.name, dependency.version)]
-                        ?: return@associate dependency to dependency
+                        ?: return@associate noMapping
 
                     val resolvedToConfiguration = resolved.configuration
                     val dependencyTargetComponent: KotlinTargetComponent = run {
@@ -140,7 +163,7 @@ private fun associateDependenciesWithActualModuleDependencies(
                             }
                         }
                         // Failed to find a matching component:
-                        return@associate dependency to dependency
+                        return@associate noMapping
                     }
 
                     val targetModulePublication = (dependencyTargetComponent as? KotlinTargetComponentWithPublication)?.publicationDelegate
@@ -149,49 +172,37 @@ private fun associateDependenciesWithActualModuleDependencies(
                     // During Gradle POM generation, a project dependency is already written as the root module's coordinates. In the
                     // dependencies mapping, map the root module to the target's module:
 
-                    val rootModule = project.dependencies.module(
-                        listOf(
-                            rootModulePublication?.groupId ?: dependency.group,
-                            rootModulePublication?.artifactId ?: dependencyProject.name,
-                            rootModulePublication?.version ?: dependency.version
-                        ).joinToString(":")
-                    ) as ModuleDependency
+                    val rootModule = ModuleCoordinates(
+                        rootModulePublication?.groupId ?: dependency.group,
+                        rootModulePublication?.artifactId ?: dependencyProject.name,
+                        rootModulePublication?.version ?: dependency.version
+                    )
 
-                    rootModule to project.dependencies.module(
-                        listOf(
-                            targetModulePublication?.groupId ?: dependency.group,
-                            targetModulePublication?.artifactId ?: dependencyTargetComponent.defaultArtifactId,
-                            targetModulePublication?.version ?: dependency.version
-                        ).joinToString(":")
-                    ) as ModuleDependency
+                    rootModule to ModuleCoordinates(
+                        targetModulePublication?.groupId ?: dependency.group,
+                        targetModulePublication?.artifactId ?: dependencyTargetComponent.defaultArtifactId,
+                        targetModulePublication?.version ?: dependency.version
+                    )
                 }
                 else -> {
                     val resolvedDependency = resolvedDependencies[Triple(dependency.group, dependency.name, dependency.version)]
-                        ?: return@associate dependency to dependency
+                        ?: return@associate noMapping
 
                     if (resolvedDependency.moduleArtifacts.isEmpty() && resolvedDependency.children.size == 1) {
                         // This is a dependency on a module that resolved to another module; map the original dependency to the target module
                         val targetModule = resolvedDependency.children.single()
-                        dependency to project.dependencies.module(
-                            listOf(
-                                targetModule.moduleGroup,
-                                targetModule.moduleName,
-                                targetModule.moduleVersion
-                            ).joinToString(":")
-                        ) as ModuleDependency
+                        coordinates to ModuleCoordinates(
+                            targetModule.moduleGroup,
+                            targetModule.moduleName,
+                            targetModule.moduleVersion
+                        )
 
                     } else {
-                        dependency to dependency
+                        noMapping
                     }
                 }
             }
-        }.mapKeys { (key, _) -> Triple(key.group, key.name, key.version) }
-
-    return moduleDependencies.associate { dependency ->
-        val key = Triple(dependency.group, dependency.name, dependency.version)
-        val value = resolvedModulesByRootModuleCoordinates[key] ?: dependency
-        dependency to value
-    }
+        }
 }
 
 private fun KotlinTargetComponent.findUsageContext(configurationName: String): UsageContext? {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt
index 91196ed071d..51712cbfbd9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.GranularMetadataTransformation
 import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution
+import org.jetbrains.kotlin.gradle.plugin.whenEvaluated
 import org.jetbrains.kotlin.gradle.utils.*
 import java.io.File
 import java.lang.reflect.Constructor
@@ -84,7 +85,7 @@ class DefaultKotlinSourceSet(
         // Fail-fast approach: check on each new added edge and report a circular dependency at once when the edge is added.
         checkForCircularDependencies()
 
-        project.afterEvaluate { defaultSourceSetLanguageSettingsChecker.runAllChecks(this, other) }
+        project.whenEvaluated { defaultSourceSetLanguageSettingsChecker.runAllChecks(this@DefaultKotlinSourceSet, other) }
     }
 
     private val dependsOnSourceSetsImpl = mutableSetOf<KotlinSourceSet>()
@@ -155,7 +156,8 @@ class DefaultKotlinSourceSet(
                 ?.associateBy { ModuleIds.fromComponent(project, it.dependency) }
                 ?: emptyMap()
 
-        val baseDir = project.buildDir.resolve("tmp/kotlinMetadata/$name/${scope.scopeName}")
+        val baseDir = SourceSetMetadataStorageForIde.sourceSetStorage(project, this@DefaultKotlinSourceSet.name)
+
         if (metadataDependencyResolutionByModule.values.any { it is MetadataDependencyResolution.ChooseVisibleSourceSets }) {
             if (baseDir.isDirectory) {
                 baseDir.deleteRecursively()
@@ -246,4 +248,4 @@ private fun <T> Class<T>.constructorOrNull(vararg parameterTypes: Class<*>): Con
         getConstructor(*parameterTypes)
     } catch (e: NoSuchMethodException) {
         null
-    }
\ No newline at end of file
+    }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetMetadataStorageForIde.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetMetadataStorageForIde.kt
new file mode 100644
index 00000000000..922ad99e095
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetMetadataStorageForIde.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.plugin.sources
+
+import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull
+import java.io.File
+
+object SourceSetMetadataStorageForIde {
+    fun cleanupStaleEntries(project: Project) {
+        val projectStorageDirectories = project.rootProject.allprojects.associateBy { projectStorage(it) }
+        getStorageRoot(project).listFiles().orEmpty().filter { it.isDirectory }.forEach { directory ->
+            // If no project corresponds to the directory, remove the directory
+            if (directory !in projectStorageDirectories) {
+                directory.deleteRecursively()
+            } else {
+                // Under the project's directory, delete subdirectories that don't correspond to any source set:
+                val sourceSets = projectStorageDirectories.getValue(directory)?.project?.multiplatformExtensionOrNull?.sourceSets.orEmpty()
+                val sourceSetNames = sourceSets.map { it.name }
+                directory.listFiles().orEmpty().filter { it.isDirectory }.forEach { subdirectory ->
+                    if (subdirectory.name !in sourceSetNames)
+                        subdirectory.deleteRecursively()
+                }
+            }
+        }
+    }
+
+    private fun getStorageRoot(project: Project): File = project.rootDir.resolve(".gradle/kotlin/sourceSetMetadata")
+
+    private fun projectStorage(project: Project): File {
+        val projectPathSegments = generateSequence(project) { it.parent }.map { it.name }
+        return getStorageRoot(project).resolve(
+            // Escape dots in project names to avoid ambiguous paths.
+            projectPathSegments.joinToString(".") { it.replace(".", "_.") }
+        )
+    }
+
+    fun sourceSetStorage(project: Project, sourceSetName: String) = projectStorage(project).resolve(sourceSetName)
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/BuildDataRecorder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/BuildDataRecorder.kt
new file mode 100644
index 00000000000..3bbca37209f
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/BuildDataRecorder.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.report
+
+import org.gradle.BuildAdapter
+import org.gradle.BuildResult
+import org.gradle.api.Task
+import org.gradle.api.execution.TaskExecutionListener
+import org.gradle.api.invocation.Gradle
+import org.gradle.api.tasks.TaskState
+import org.jetbrains.kotlin.build.report.metrics.BuildMetrics
+import org.jetbrains.kotlin.build.report.metrics.BuildTime
+import org.jetbrains.kotlin.gradle.internal.tasks.TaskWithLocalState
+import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskExecutionResults
+import org.jetbrains.kotlin.gradle.report.data.BuildExecutionData
+import org.jetbrains.kotlin.gradle.report.data.BuildExecutionDataProcessor
+import org.jetbrains.kotlin.gradle.report.data.TaskExecutionData
+import java.util.*
+
+internal class BuildDataRecorder(
+    private val gradle: Gradle,
+    private val buildDataProcessors: Iterable<BuildExecutionDataProcessor>
+) : BuildAdapter(), TaskExecutionListener {
+    private val taskRecords = HashMap<Task, TaskRecord>()
+
+    @Synchronized
+    override fun beforeExecute(task: Task) {
+        val startNs = System.nanoTime()
+        taskRecords[task] = TaskRecord(task, startNs)
+    }
+
+    @Synchronized
+    override fun afterExecute(task: Task, state: TaskState) {
+        taskRecords[task]?.apply { processResult(state, TaskExecutionResults[task.path]) }
+    }
+
+    override fun buildFinished(result: BuildResult) {
+        val startParams = arrayListOf<String>()
+        gradle.startParameter.apply {
+            startParams.add("tasks = ${taskRequests.joinToString { it.args.toString() }}")
+            startParams.add("excluded tasks = $excludedTaskNames")
+            startParams.add("current dir = $currentDir")
+            startParams.add("project properties args = $projectProperties")
+            startParams.add("system properties args = $systemPropertiesArgs")
+        }
+        val buildData = BuildExecutionData(
+            startParameters = startParams,
+            failure = result.failure,
+            taskExecutionData = taskRecords.values.sortedBy { it.startNs }
+        )
+
+        buildDataProcessors.forEach { it.process(buildData) }
+    }
+}
+
+private class TaskRecord(
+    override val task: Task,
+    override val startNs: Long
+) : TaskExecutionData {
+    private var myEndNs: Long = 0
+    private lateinit var myTaskState: TaskState
+    private var myIcLogLines: List<String> = emptyList()
+    private val myBuildMetrics = BuildMetrics()
+
+    override val isKotlinTask by lazy {
+        task.javaClass.name.startsWith("org.jetbrains.kotlin")
+    }
+
+    override val endNs: Long
+        get() = myEndNs
+
+    override val totalTimeNs: Long
+        get() = endNs - startNs
+
+    override val resultState: TaskState
+        get() = myTaskState
+
+    override val icLogLines: List<String>
+        get() = myIcLogLines
+
+    override val buildMetrics: BuildMetrics
+        get() = myBuildMetrics
+
+    fun processResult(state: TaskState, executionResult: TaskExecutionResult?) {
+        myEndNs = System.nanoTime()
+        myTaskState = state
+        myBuildMetrics.buildTimes.add(BuildTime.GRADLE_TASK, totalTimeNs)
+
+        if (executionResult != null) {
+            myBuildMetrics.addAll(executionResult.buildMetrics)
+            myIcLogLines = executionResult.icLogLines
+        }
+
+        if (task is TaskWithLocalState) {
+            myBuildMetrics.addAll(task.metrics.getMetrics())
+        }
+    }
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportMode.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportMode.kt
index 4891949e858..5f5ea2e5611 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportMode.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportMode.kt
@@ -5,7 +5,14 @@
 
 package org.jetbrains.kotlin.gradle.report
 
-enum class BuildReportMode {
+import java.io.Serializable
+
+enum class BuildReportMode : Serializable {
+    NONE,
     SIMPLE,
-    VERBOSE
-}
\ No newline at end of file
+    VERBOSE;
+
+    companion object {
+        const val serialVersionUID: Long = 0
+    }
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/KotlinBuildReporter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/KotlinBuildReporter.kt
deleted file mode 100644
index c819d6668ed..00000000000
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/KotlinBuildReporter.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.gradle.report
-
-import org.gradle.BuildAdapter
-import org.gradle.BuildResult
-import org.gradle.api.Task
-import org.gradle.api.execution.TaskExecutionListener
-import org.gradle.api.invocation.Gradle
-import org.gradle.api.logging.Logger
-import org.gradle.api.tasks.TaskState
-import org.jetbrains.kotlin.gradle.logging.kotlinDebug
-import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
-import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskExecutionResults
-import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
-import org.jetbrains.kotlin.gradle.utils.isConfigurationCacheAvailable
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.*
-
-internal fun configureBuildReporter(gradle: Gradle, log: Logger) {
-    val rootProject = gradle.rootProject
-    val properties = PropertiesProvider(rootProject)
-
-    if (!properties.buildReportEnabled) return
-
-    val perfLogDir = properties.buildReportDir
-        ?: rootProject.buildDir.resolve("reports/kotlin-build").apply { mkdirs() }
-
-    if (perfLogDir.isFile) {
-        log.error("Kotlin build report cannot be created: '$perfLogDir' is a file")
-        return
-    }
-
-    perfLogDir.mkdirs()
-    val ts = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(Calendar.getInstance().time)
-
-    val perfReportFile = perfLogDir.resolve("${gradle.rootProject.name}-build-$ts.txt")
-
-    if (!isConfigurationCacheAvailable(gradle)) {
-        val reporter = KotlinBuildReporter(gradle, perfReportFile)
-        gradle.addBuildListener(reporter)
-    }
-
-    val buildReportMode = if (properties.buildReportVerbose) BuildReportMode.VERBOSE else BuildReportMode.SIMPLE
-
-    gradle.taskGraph.whenReady { graph ->
-        graph.allTasks.asSequence()
-            .filterIsInstance<AbstractKotlinCompile<*>>()
-            .forEach { it.buildReportMode = buildReportMode }
-    }
-
-    log.kotlinDebug { "Configured Kotlin build reporter" }
-}
-
-internal class KotlinBuildReporter(
-    private val gradle: Gradle,
-    private val perfReportFile: File
-) : BuildAdapter(), TaskExecutionListener {
-    init {
-        val dir = perfReportFile.parentFile
-        check(dir.isDirectory) { "$dir does not exist or is a file" }
-        check(!perfReportFile.isFile) { "Build report log file $perfReportFile exists already" }
-    }
-
-    private val taskStartNs = HashMap<Task, Long>()
-    private val kotlinTaskTimeNs = HashMap<Task, Long>()
-    private val tasksSb = StringBuilder()
-
-    @Volatile
-    private var allTasksTimeNs: Long = 0L
-
-    @Synchronized
-    override fun beforeExecute(task: Task) {
-        taskStartNs[task] = System.nanoTime()
-    }
-
-    @Synchronized
-    override fun afterExecute(task: Task, state: TaskState) {
-        val startNs = taskStartNs[task] ?: return
-
-        val endNs = System.nanoTime()
-        val timeNs = endNs - startNs
-        allTasksTimeNs += timeNs
-
-        if (!task.javaClass.name.startsWith("org.jetbrains.kotlin")) {
-            return
-        }
-
-        kotlinTaskTimeNs[task] = timeNs
-        tasksSb.appendln()
-
-        val skipMessage = state.skipMessage
-        if (skipMessage != null) {
-            tasksSb.appendln("$task was skipped: $skipMessage")
-        } else {
-            tasksSb.appendln("$task finished in ${formatTime(timeNs)}")
-        }
-
-        val path = task.path
-        val executionResult = TaskExecutionResults[path]
-        if (executionResult != null) {
-            tasksSb.appendln("Execution strategy: ${executionResult.executionStrategy}")
-
-            executionResult.icLogLines?.let { lines ->
-                tasksSb.appendln("Compilation log for $task:")
-                lines.forEach { tasksSb.appendln("  $it") }
-            }
-        }
-    }
-
-    @Synchronized
-    override fun buildFinished(result: BuildResult) {
-        KotlinBuildReporterHandler().buildFinished(gradle, perfReportFile, kotlinTaskTimeNs.mapKeys{it.key.path}, allTasksTimeNs, result.failure)
-    }
-}
-
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/KotlinBuildReporterListener.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/KotlinBuildReporterListener.kt
index 6d95799f3f9..9c9e06b7fdb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/KotlinBuildReporterListener.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/KotlinBuildReporterListener.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.gradle.report
 
-import com.intellij.util.text.DateFormatUtil.formatTime
 import org.gradle.api.invocation.Gradle
 import org.gradle.tooling.events.FinishEvent
 import org.gradle.tooling.events.OperationCompletionListener
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/MetricsWriter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/MetricsWriter.kt
new file mode 100644
index 00000000000..3067d9e9a29
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/MetricsWriter.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.report
+
+import org.gradle.api.logging.Logger
+import org.jetbrains.kotlin.build.report.metrics.BuildAttribute
+import org.jetbrains.kotlin.build.report.metrics.BuildTime
+import org.jetbrains.kotlin.gradle.internal.build.metrics.GradleBuildMetricsData
+import org.jetbrains.kotlin.gradle.internal.build.metrics.TaskData
+import org.jetbrains.kotlin.gradle.logging.kotlinDebug
+import org.jetbrains.kotlin.gradle.report.data.BuildExecutionData
+import org.jetbrains.kotlin.gradle.report.data.BuildExecutionDataProcessor
+import java.io.File
+import java.io.ObjectOutputStream
+
+internal class MetricsWriter(
+    private val outputFile: File,
+    private val log: Logger
+) : BuildExecutionDataProcessor {
+    override fun process(build: BuildExecutionData) {
+        if (build.failure != null) return
+
+        try {
+            outputFile.parentFile?.apply { mkdirs() }
+
+            val buildMetricsData = GradleBuildMetricsData()
+            for (metric in BuildTime.values()) {
+                buildMetricsData.parentMetric[metric.name] = metric.parent?.name
+            }
+            for (attr in BuildAttribute.values()) {
+                buildMetricsData.buildAttributeKind[attr.name] = attr.kind.name
+            }
+
+            for (data in build.taskExecutionData) {
+                val path = data.task.path
+                val type = data.task::class.java.canonicalName
+                val buildTimes = data.buildMetrics.buildTimes.asMap().mapKeys { (k, _) -> k.name }
+                val buildAttributes = data.buildMetrics.buildAttributes.asMap().mapKeys { (k, _) -> k.name }
+                buildMetricsData.taskData[path] =
+                    TaskData(
+                        path = path,
+                        typeFqName = type,
+                        timeMetrics = buildTimes,
+                        buildAttributes = buildAttributes,
+                        didWork = data.task.didWork
+                    )
+            }
+
+            ObjectOutputStream(outputFile.outputStream().buffered()).use { out ->
+                out.writeObject(buildMetricsData)
+            }
+        } catch (e: Exception) {
+            log.kotlinDebug { "Could not write metrics to $outputFile: $e" }
+        }
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/PlainTextBuildReportWriter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/PlainTextBuildReportWriter.kt
new file mode 100644
index 00000000000..d349e63da7f
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/PlainTextBuildReportWriter.kt
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.report
+
+import org.gradle.api.logging.Logger
+import org.jetbrains.kotlin.build.report.metrics.BuildAttributes
+import org.jetbrains.kotlin.build.report.metrics.BuildMetrics
+import org.jetbrains.kotlin.build.report.metrics.BuildTime
+import org.jetbrains.kotlin.build.report.metrics.BuildTimes
+import org.jetbrains.kotlin.gradle.report.data.BuildExecutionData
+import org.jetbrains.kotlin.gradle.report.data.BuildExecutionDataProcessor
+import org.jetbrains.kotlin.gradle.report.data.TaskExecutionData
+import org.jetbrains.kotlin.gradle.utils.Printer
+import java.io.File
+import java.util.*
+import kotlin.math.max
+
+internal class PlainTextBuildReportWriter(
+    private val outputFile: File,
+    private val printMetrics: Boolean,
+    private val log: Logger
+) : BuildExecutionDataProcessor {
+
+    private lateinit var p: Printer
+
+    override fun process(build: BuildExecutionData) {
+        try {
+            outputFile.bufferedWriter().use { writer ->
+                p = Printer(writer)
+                printBuildReport(build)
+            }
+
+            log.lifecycle("Kotlin build report is written to ${outputFile.canonicalPath}")
+        } catch (e: Exception) {
+            log.error("Could not write Kotlin build report to ${outputFile.canonicalPath}", e)
+        }
+    }
+
+    private fun printBuildReport(build: BuildExecutionData) {
+        printBuildInfo(build)
+        printMetrics(build.aggregatedMetrics)
+        printTaskOverview(build)
+        printTasksLog(build)
+    }
+
+    private fun printBuildInfo(build: BuildExecutionData) {
+        p.withIndent("Gradle start parameters:") {
+            build.startParameters.forEach { p.println(it) }
+        }
+
+        p.println()
+        if (build.failure != null) {
+            p.println("Build failed: ${build.failure}")
+        }
+        p.println()
+    }
+
+    private fun printMetrics(buildMetrics: BuildMetrics) {
+        if (!printMetrics) return
+
+        printBuildTimes(buildMetrics.buildTimes)
+        printBuildAttributes(buildMetrics.buildAttributes)
+    }
+
+    private fun printBuildTimes(buildTimes: BuildTimes) {
+        val collectedBuildTimes = buildTimes.asMap()
+
+        if (collectedBuildTimes.isEmpty()) return
+
+        p.println("Time metrics:")
+        p.withIndent {
+            val visitedBuildTimes = HashSet<BuildTime>()
+            fun printBuildTime(buildTime: BuildTime) {
+                if (!visitedBuildTimes.add(buildTime)) return
+
+                val timeNs = collectedBuildTimes[buildTime] ?: return
+                p.println("${buildTime.name}: ${formatTime(timeNs)}")
+                p.withIndent {
+                    BuildTime.children[buildTime]?.forEach { printBuildTime(it) }
+                }
+            }
+
+            for (buildTime in BuildTime.values()) {
+                if (buildTime.parent != null) continue
+
+                printBuildTime(buildTime)
+            }
+        }
+        p.println()
+    }
+
+    private fun printBuildAttributes(buildAttributes: BuildAttributes) {
+        val allAttributes = buildAttributes.asMap()
+        if (allAttributes.isEmpty()) return
+
+        p.withIndent("Build attributes:") {
+            val attributesByKind = allAttributes.entries.groupBy { it.key.kind }.toSortedMap()
+            for ((kind, attributesCounts) in attributesByKind) {
+                printMap(p, kind.name, attributesCounts.map { (k, v) -> k.name to v }.toMap())
+            }
+        }
+        p.println()
+    }
+
+    private fun printTaskOverview(build: BuildExecutionData) {
+        var allTasksTimeNs = 0L
+        var kotlinTotalTimeNs = 0L
+        val kotlinTasks = ArrayList<TaskExecutionData>()
+
+        for (task in build.taskExecutionData) {
+            val taskTimeNs = task.totalTimeNs
+            allTasksTimeNs += taskTimeNs
+
+            if (task.isKotlinTask) {
+                kotlinTotalTimeNs += taskTimeNs
+                kotlinTasks.add(task)
+            }
+        }
+
+        if (kotlinTasks.isEmpty()) {
+            p.println("No Kotlin task was run")
+            return
+        }
+
+        val ktTaskPercent = (kotlinTotalTimeNs.toDouble() / allTasksTimeNs * 100).asString(1)
+        p.println("Total time for Kotlin tasks: ${formatTime(kotlinTotalTimeNs)} ($ktTaskPercent % of all tasks time)")
+
+        val table = TextTable("Time", "% of Kotlin time", "Task")
+        for (task in kotlinTasks.sortedByDescending { it.totalTimeNs }) {
+            val timeNs = task.totalTimeNs
+            val percent = (timeNs.toDouble() / kotlinTotalTimeNs * 100).asString(1)
+            table.addRow(formatTime(timeNs), "$percent %", task.task.path)
+        }
+        table.printTo(p)
+        p.println()
+    }
+
+    private fun printTasksLog(build: BuildExecutionData) {
+        for (task in build.taskExecutionData) {
+            printTaskLog(task)
+            p.println()
+        }
+    }
+
+    private fun printTaskLog(task: TaskExecutionData) {
+        val skipMessage = task.resultState.skipMessage
+        if (skipMessage != null) {
+            p.println("$task was skipped: $skipMessage")
+        } else {
+            p.println("$task finished in ${formatTime(task.totalTimeNs)}")
+        }
+
+        if (task.icLogLines.isNotEmpty()) {
+            p.withIndent("Compilation log for $task:") {
+                task.icLogLines.forEach { p.println(it) }
+            }
+        }
+
+        printMetrics(task.buildMetrics)
+    }
+}
+
+private fun printMap(p: Printer, name: String, mapping: Map<String, Int>) {
+    if (mapping.isEmpty()) return
+
+    if (mapping.size == 1) {
+        p.println("$name: ${mapping.keys.single()}")
+        return
+    }
+
+    p.withIndent("$name:") {
+        val sortedEnumMap = mapping.toSortedMap()
+        for ((k, v) in sortedEnumMap) {
+            p.println("$k($v)")
+        }
+    }
+}
+
+private class TextTable(vararg columnNames: String) {
+    private val rows = ArrayList<List<String>>()
+    private val columnsCount = columnNames.size
+    private val maxLengths = IntArray(columnsCount) { columnNames[it].length }
+
+    init {
+        rows.add(columnNames.toList())
+    }
+
+    fun addRow(vararg row: String) {
+        check(row.size == columnsCount) { "Row size ${row.size} differs from columns count $columnsCount" }
+        rows.add(row.toList())
+
+        for ((i, col) in row.withIndex()) {
+            maxLengths[i] = max(maxLengths[i], col.length)
+        }
+    }
+
+    fun printTo(p: Printer) {
+        for (row in rows) {
+            val rowStr = row.withIndex().joinToString("|") { (i, col) -> col.padEnd(maxLengths[i], ' ') }
+            p.println(rowStr)
+        }
+    }
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/ReportingSettings.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/ReportingSettings.kt
new file mode 100644
index 00000000000..7e289797a92
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/ReportingSettings.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.report
+
+import java.io.File
+import java.io.Serializable
+
+data class ReportingSettings(
+    val metricsOutputFile: File? = null,
+    val buildReportDir: File? = null,
+    val reportMetrics: Boolean = false,
+    val includeMetricsInReport: Boolean = false,
+    val buildReportMode: BuildReportMode = BuildReportMode.NONE
+) : Serializable {
+    companion object {
+        const val serialVersionUID: Long = 0
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/TaskExecutionResult.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/TaskExecutionResult.kt
index f92e2a23fa0..5522601c2e9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/TaskExecutionResult.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/TaskExecutionResult.kt
@@ -5,7 +5,9 @@
 
 package org.jetbrains.kotlin.gradle.report
 
+import org.jetbrains.kotlin.build.report.metrics.BuildMetrics
+
 internal class TaskExecutionResult(
-    val executionStrategy: String,
-    val icLogLines: List<String>?
+    val buildMetrics: BuildMetrics,
+    val icLogLines: List<String> = emptyList()
 )
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/configureReporing.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/configureReporing.kt
new file mode 100644
index 00000000000..f07adcb59b5
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/configureReporing.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.report
+
+import org.gradle.api.Project
+import org.gradle.api.invocation.Gradle
+import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
+import org.jetbrains.kotlin.gradle.report.data.BuildExecutionDataProcessor
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
+import org.jetbrains.kotlin.gradle.utils.isConfigurationCacheAvailable
+import java.text.SimpleDateFormat
+import java.util.*
+
+internal fun configureReporting(gradle: Gradle) {
+    val buildDataProcessors = ArrayList<BuildExecutionDataProcessor>()
+
+    val rootProject = gradle.rootProject
+    val reportingSettings = reportingSettings(rootProject)
+    gradle.taskGraph.whenReady { graph ->
+        graph.allTasks.asSequence()
+            .filterIsInstance<AbstractKotlinCompile<*>>()
+            .forEach { it.reportingSettings = reportingSettings }
+    }
+
+    if (reportingSettings.buildReportMode != BuildReportMode.NONE && reportingSettings.buildReportDir != null) {
+        configurePlainTextReportWriter(gradle, reportingSettings)?.let {
+            buildDataProcessors.add(it)
+        }
+    }
+
+    if (reportingSettings.metricsOutputFile != null) {
+        buildDataProcessors.add(MetricsWriter(reportingSettings.metricsOutputFile.absoluteFile, rootProject.logger))
+    }
+
+    if (buildDataProcessors.isNotEmpty() && !isConfigurationCacheAvailable(gradle)) {
+        val listener = BuildDataRecorder(gradle, buildDataProcessors)
+        gradle.addBuildListener(listener)
+    }
+}
+
+private fun reportingSettings(rootProject: Project): ReportingSettings {
+    val properties = PropertiesProvider(rootProject)
+    val buildReportMode =
+        when {
+            !properties.buildReportEnabled -> BuildReportMode.NONE
+            properties.buildReportVerbose -> BuildReportMode.VERBOSE
+            else -> BuildReportMode.SIMPLE
+        }
+    val metricsOutputFile = properties.singleBuildMetricsFile
+    val buildReportDir = properties.buildReportDir ?: rootProject.buildDir.resolve("reports/kotlin-build")
+    val includeMetricsInReport = properties.buildReportMetrics || buildReportMode == BuildReportMode.VERBOSE
+    return ReportingSettings(
+        metricsOutputFile = metricsOutputFile,
+        buildReportDir = buildReportDir,
+        reportMetrics = metricsOutputFile != null || includeMetricsInReport,
+        includeMetricsInReport = includeMetricsInReport,
+        buildReportMode = buildReportMode
+    )
+}
+
+private fun configurePlainTextReportWriter(
+    gradle: Gradle,
+    reportingSettings: ReportingSettings
+): BuildExecutionDataProcessor? {
+    val log = gradle.rootProject.logger
+    val reportDir = reportingSettings.buildReportDir!!.apply { mkdirs() }
+    if (reportDir.isFile) {
+        log.error("Kotlin build report cannot be created: '$reportDir' is a file")
+        return null
+    }
+    reportDir.mkdirs()
+    val ts = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(Calendar.getInstance().time)
+    val reportFile = reportDir.resolve("${gradle.rootProject.name}-build-$ts.txt")
+
+    return PlainTextBuildReportWriter(
+        outputFile = reportFile,
+        printMetrics = reportingSettings.includeMetricsInReport,
+        log = log
+    )
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/BuildExecutionData.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/BuildExecutionData.kt
new file mode 100644
index 00000000000..f286e1c41ad
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/BuildExecutionData.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.report.data
+
+import org.jetbrains.kotlin.build.report.metrics.BuildMetrics
+
+internal class BuildExecutionData(
+    val startParameters: Collection<String>,
+    val failure: Throwable?,
+    val taskExecutionData: Collection<TaskExecutionData>
+) {
+    val aggregatedMetrics by lazy {
+        BuildMetrics().also { acc ->
+            taskExecutionData.forEach { acc.addAll(it.buildMetrics) }
+        }
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/BuildExecutionDataProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/BuildExecutionDataProcessor.kt
new file mode 100644
index 00000000000..3437939a7a2
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/BuildExecutionDataProcessor.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.report.data
+
+internal interface BuildExecutionDataProcessor {
+    fun process(build: BuildExecutionData)
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/TaskExecutionData.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/TaskExecutionData.kt
new file mode 100644
index 00000000000..c521f682512
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/report/data/TaskExecutionData.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.report.data
+
+import org.gradle.api.Task
+import org.gradle.api.tasks.TaskState
+import org.jetbrains.kotlin.build.report.metrics.BuildMetrics
+
+internal interface TaskExecutionData {
+    val task: Task
+    val startNs: Long
+    val endNs: Long
+    val totalTimeNs: Long
+    val resultState: TaskState
+    val icLogLines: List<String>
+    val buildMetrics: BuildMetrics
+    val isKotlinTask: Boolean
+}
+
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
index 0597c24984a..7b2cde1e95e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
@@ -43,7 +43,9 @@ open class KotlinAndroidTarget(
      * all library variants will be published, but not test or application variants. */
     var publishLibraryVariants: List<String>? = listOf()
         // Workaround for Groovy GString items in a list:
-        set(value) { field = value?.map(Any::toString) }
+        set(value) {
+            field = value?.map(Any::toString)
+        }
 
     /** Add Android library variant names to [publishLibraryVariants]. */
     fun publishLibraryVariants(vararg names: String) {
@@ -91,11 +93,16 @@ open class KotlinAndroidTarget(
         KotlinAndroidPlugin.androidTargetHandler(project.getKotlinPluginVersion()!!, this).doCreateComponents()
     }
 
+    private fun isVariantPublished(variant: BaseVariant): Boolean {
+        return publishLibraryVariants?.contains(getVariantName(variant)) ?: true
+    }
+
     private fun AbstractAndroidProjectHandler.doCreateComponents(): Set<KotlinTargetComponent> {
+
         val publishableVariants = mutableListOf<BaseVariant>()
             .apply { project.forEachVariant { add(it) } }
             .toList() // Defensive copy against unlikely modification by the lambda that captures the list above in forEachVariant { }
-            .filter { getLibraryOutputTask(it) != null && publishLibraryVariants?.contains(getVariantName(it)) ?: true }
+            .filter { getLibraryOutputTask(it) != null }
 
         val publishableVariantGroups = publishableVariants.groupBy { variant ->
             val flavorNames = getFlavorNames(variant)
@@ -118,12 +125,12 @@ open class KotlinAndroidTarget(
 
                 val artifactClassifier = buildTypeName.takeIf { it != "release" && publishLibraryVariantsGroupedByFlavor }
 
-                val usageContexts = createAndroidUsageContexts(androidVariant, compilation, artifactClassifier)
                 createKotlinVariant(
                     lowerCamelCaseName(compilation.target.name, *flavorGroupNameParts.toTypedArray()),
                     compilation,
-                    usageContexts
+                    createAndroidUsageContexts(androidVariant, compilation, artifactClassifier)
                 ).apply {
+                    publishable = isVariantPublished(androidVariant)
                     sourcesArtifacts = setOf(
                         sourcesJarArtifact(
                             compilation, compilation.disambiguateName(""),
@@ -148,10 +155,10 @@ open class KotlinAndroidTarget(
 
             if (publishLibraryVariantsGroupedByFlavor) {
                 JointAndroidKotlinTargetComponent(
-                    this@KotlinAndroidTarget,
-                    nestedVariants,
-                    flavorGroupNameParts,
-                    nestedVariants.flatMap { it.sourcesArtifacts }.toSet()
+                    target = this@KotlinAndroidTarget,
+                    nestedVariants = nestedVariants.filter { it.publishable }.toSet(),
+                    flavorNames = flavorGroupNameParts,
+                    sourcesArtifacts = nestedVariants.filter { it.publishable }.flatMap { it.sourcesArtifacts }.toSet()
                 )
             } else {
                 nestedVariants.single()
@@ -195,4 +202,4 @@ open class KotlinAndroidTarget(
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt
index 99c57d1ac63..4a7fe1ae336 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt
@@ -40,9 +40,10 @@ class AndroidExtensionsSubpluginIndicator @Inject internal constructor(private v
         project.plugins.apply(AndroidSubplugin::class.java)
 
         project.logger.warn(
-            "'kotlin-android-extensions' plugin is deprecated. " +
-                    "Use 'kotlin-parcelize' for the @Parcelize functionality, " +
-                    "and View Binding (https://developer.android.com/topic/libraries/view-binding) instead of synthetic view accessors."
+            "Warning: The 'kotlin-android-extensions' Gradle plugin is deprecated. " +
+                    "Please use this migration guide (https://goo.gle/kotlin-android-extensions-deprecation) to start " +
+                    "working with View Binding (https://developer.android.com/topic/libraries/view-binding) " +
+                    "and the 'kotlin-parcelize' plugin."
         )
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/ParcelizeSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/ParcelizeSubplugin.kt
index fcb64f2e1ab..788ab3bd7a0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/ParcelizeSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/ParcelizeSubplugin.kt
@@ -70,4 +70,4 @@ class ParcelizeSubplugin : KotlinCompilerPluginSupportPlugin {
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsDcePlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsDcePlugin.kt
index 9abe4433d6f..b5d537b0eaa 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsDcePlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsDcePlugin.kt
@@ -88,4 +88,4 @@ class KotlinJsDcePlugin : Plugin<Project> {
         private const val DCE_TASK_PREFIX = "runDce"
         private const val DEFAULT_OUT_DIR = "kotlin-js-min"
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt
index 3df34b22c05..75e86aa811f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt
@@ -98,4 +98,4 @@ internal fun jsPluginDeprecationMessage(id: String): String =
             The `$id` Gradle plugin has been deprecated.
             Please use `org.jetbrains.kotlin.js` plugin instead `kotlin2js` and `org.jetbrains.kotlin.frontend`
             For usage details, see https://kotlinlang.org/docs/reference/js-project-setup.html
-    """.trimIndent()
\ No newline at end of file
+    """.trimIndent()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
index a7e320a2b59..42d69f3f31a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
@@ -128,4 +128,4 @@ class KotlinJsSingleTargetPreset(
     override fun createKotlinTargetConfigurator() = KotlinJsTargetConfigurator(
         kotlinPluginVersion
     )
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
index c4fc3f51bc5..00c8e6f723f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
@@ -89,7 +89,9 @@ internal class DukatCompilationResolverPlugin(
 
         val target = compilation.target
         val externalsOutputFormat = compilation.externalsOutputFormat
-        if (target is KotlinJsTarget && externalsOutputFormat == ExternalsOutputFormat.SOURCE) {
+        val legacyTargetReuseIrTask =
+            target is KotlinJsTarget && (target.irTarget != null && externalsOutputFormat == ExternalsOutputFormat.SOURCE)
+        if (legacyTargetReuseIrTask) {
             return
         }
 
@@ -105,7 +107,7 @@ internal class DukatCompilationResolverPlugin(
     }
 
     companion object {
-        const val VERSION = "2"
+        const val VERSION = "3"
     }
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt
index 32ac555e611..0984b51efd4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt
@@ -40,7 +40,7 @@ class DukatExecutor(
         versionFile.delete()
 
         npmProject.externalsDirRoot.mkdirs()
-        val inputs = typeDefinitions.joinToString("\n") { it.inputKey }
+        val inputs = "$externalsOutputFormat: " + typeDefinitions.joinToString("\n") { it.inputKey }
 
         if (!compareInputs || !inputsFile.isFile || inputsFile.readText() != inputs) {
             // delete file to run visit on error even without package.json updates
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt
index b102777bf3c..7ad6c4e6456 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt
@@ -256,4 +256,4 @@ abstract class KotlinJsIrSubTarget(
 
         const val PREPARE_JS_LIBRARY_TASK_NAME = "prepare"
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt
index cb3edae4660..6b5666a536d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt
@@ -94,4 +94,4 @@ class KotlinJsIrSingleTargetPreset(
 
     override fun createKotlinTargetConfigurator(): KotlinOnlyTargetConfigurator<KotlinJsIrCompilation, KotlinJsIrTarget> =
         KotlinJsIrTargetConfigurator(kotlinPluginVersion)
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
index b74da88dde3..699f363a05d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
@@ -127,4 +127,4 @@ internal class KotlinProjectNpmResolver(
  */
 internal fun <T : Task, R : Any> TaskCollection<T>.implementing(kclass: KClass<R>): TaskCollection<T> =
     @Suppress("UNCHECKED_CAST")
-    withType(kclass.java as Class<T>)
\ No newline at end of file
+    withType(kclass.java as Class<T>)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
index 8c38540eb47..7a7930dd4b8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
@@ -166,4 +166,4 @@ abstract class KotlinJsSubTarget(
     companion object {
         const val RUN_TASK_NAME = "run"
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt
index ca5a0bdd768..899c3465013 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt
@@ -76,4 +76,4 @@ class KotlinJvmTargetConfigurator(kotlinPluginVersion: String) :
         val tasksProvider = KotlinTasksProvider(compilation.target.targetName)
         return Kotlin2JvmSourceSetProcessor(tasksProvider, compilation, kotlinPluginVersion)
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilation.kt
index 177cfca900c..c74b0f8d1b3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilation.kt
@@ -77,4 +77,4 @@ import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 
     val compileJavaTaskProvider: TaskProvider<out JavaCompile>
         get() = target.project.tasks.withType(JavaCompile::class.java).named(javaSourceSet.compileJavaTaskName)
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
index 3140523aeba..d73523ab350 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
+import org.jetbrains.kotlin.gradle.plugin.mpp.CompilationSourceSetUtil.compilationsBySourceSets
 import org.jetbrains.kotlin.gradle.plugin.sources.*
 import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService
 import org.jetbrains.kotlin.gradle.tasks.*
@@ -64,14 +65,15 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
             KotlinBuildStatsService.getInstance()?.report(BooleanMetrics.ENABLED_HMPP, true)
 
             target.compilations.withType(KotlinCommonCompilation::class.java).getByName(KotlinCompilation.MAIN_COMPILATION_NAME).run {
-                if (target.project.isCompatibilityMetadataVariantEnabled) {
+                val isCompatibilityMetadataVariantEnabled = target.project.isCompatibilityMetadataVariantEnabled
+                if (isCompatibilityMetadataVariantEnabled) {
                     // Force the default 'main' compilation to produce *.kotlin_metadata regardless of the klib feature flag.
                     forceCompilationToKotlinMetadata = true
                 } else {
                     // Clear the dependencies of the compilation so that they don't take time resolving during task graph construction:
                     compileDependencyFiles = target.project.files()
                 }
-                compileKotlinTaskProvider.configure { it.onlyIf { target.project.isCompatibilityMetadataVariantEnabled } }
+                compileKotlinTaskProvider.configure { it.onlyIf { isCompatibilityMetadataVariantEnabled } }
             }
 
             createMergedAllSourceSetsConfigurations(target)
@@ -163,7 +165,7 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
 
     private fun setupDependencyTransformationForCommonSourceSets(target: KotlinMetadataTarget) {
         target.project.whenEvaluated {
-            val publishedCommonSourceSets: Set<KotlinSourceSet> = getPublishedCommonSourceSets(project)
+            val publishedCommonSourceSets: Set<KotlinSourceSet> = getCommonSourceSetsForMetadataCompilation(project)
 
             kotlinExtension.sourceSets.all {
                 setupDependencyTransformationForSourceSet(target.project, it, it in publishedCommonSourceSets)
@@ -177,12 +179,17 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
     ) = target.project.whenEvaluated {
         // Do this after all targets are configured by the user build script
 
-        val publishedCommonSourceSets: Set<KotlinSourceSet> = getPublishedCommonSourceSets(project)
+        val publishedCommonSourceSets: Set<KotlinSourceSet> = getCommonSourceSetsForMetadataCompilation(project)
         val hostSpecificSourceSets: Set<KotlinSourceSet> = getHostSpecificSourceSets(project).toSet()
 
-        val sourceSetsWithMetadataCompilations: Map<KotlinSourceSet, AbstractKotlinCompilation<*>> =
-            publishedCommonSourceSets.associate { sourceSet ->
-                sourceSet to createMetadataCompilation(target, sourceSet, allMetadataJar, sourceSet in hostSpecificSourceSets)
+        val sourceSetsWithMetadataCompilations: Map<KotlinSourceSet, AbstractKotlinCompilation<*>> = publishedCommonSourceSets
+            .associateWith { sourceSet ->
+                createMetadataCompilation(target, sourceSet, allMetadataJar, sourceSet in hostSpecificSourceSets)
+            }
+            .onEach { (sourceSet, compilation) ->
+                if (!isMetadataCompilationSupported(target.project, sourceSet)) {
+                    compilation.compileKotlinTaskProvider.configure { it.enabled = false }
+                }
             }
 
         if (project.isCompatibilityMetadataVariantEnabled) {
@@ -195,6 +202,30 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
         }
     }
 
+    private fun isMetadataCompilationSupported(project: Project, sourceSet: KotlinSourceSet): Boolean {
+        val platforms = compilationsBySourceSets(project)[sourceSet].orEmpty()
+            .filter { it.target !is KotlinMetadataTarget }
+            .map { it.target.platformType }.distinct()
+
+        /*
+        Android and jvm do share the JVM backend which is not supported for metadata compilation
+        See [HMPP: Bad IDEA dependencies for JVM and Android intermediate source set](https://youtrack.jetbrains.com/issue/KT-42383)
+        See [HMPP: JVM and Android intermediate source set publication](https://youtrack.jetbrains.com/issue/KT-42468)
+        */
+        if (platforms.all { it == KotlinPlatformType.jvm || it == KotlinPlatformType.androidJvm }) {
+            return false
+        }
+
+        /* Metadata compilation for a single platform is only supported native and common source sets */
+        if (platforms.size == 1) {
+            val platform = platforms.single()
+            return platform == KotlinPlatformType.native || platform == KotlinPlatformType.common
+        }
+
+        /* Source sets sharing code between multiple backends are supported */
+        return true
+    }
+
     private fun configureProjectStructureMetadataGeneration(project: Project, allMetadataJar: TaskProvider<out Jar>) {
         val generateMetadata = project.createGenerateProjectStructureMetadataTask()
 
@@ -256,7 +287,7 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
 
         val compilationName = sourceSet.name
 
-        val platformCompilations = CompilationSourceSetUtil.compilationsBySourceSets(project).getValue(sourceSet)
+        val platformCompilations = compilationsBySourceSets(project).getValue(sourceSet)
 
         val isNativeSourceSet = platformCompilations.all { compilation -> compilation.target is KotlinNativeTarget }
 
@@ -271,7 +302,6 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
         return compilationFactory.create(compilationName).apply {
             target.compilations.add(this@apply)
             addExactSourceSetsEagerly(setOf(sourceSet))
-
             configureMetadataDependenciesForCompilation(this@apply)
 
             if (!isHostSpecific) {
@@ -513,14 +543,18 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
         }
 }
 
-internal fun getPublishedCommonSourceSets(project: Project): Set<KotlinSourceSet> {
+/**
+ * @return All common source sets that can potentially be published. Right now, not all combinations of platforms actually
+ * support metadata compilation (see [KotlinMetadataTargetConfigurator.isMetadataCompilationSupported].
+ * Those compilations will be created but the corresponding tasks will be disabled.
+ */
+internal fun getCommonSourceSetsForMetadataCompilation(project: Project): Set<KotlinSourceSet> {
     val compilationsBySourceSet: Map<KotlinSourceSet, Set<KotlinCompilation<*>>> =
-        CompilationSourceSetUtil.compilationsBySourceSets(project)
+        compilationsBySourceSets(project)
 
     val sourceSetsUsedInMultipleTargets = compilationsBySourceSet.filterValues { compilations ->
         compilations.map { it.target.platformType }.distinct().run {
-            size > 1 && toSet() != setOf(KotlinPlatformType.androidJvm, KotlinPlatformType.jvm) ||
-                    singleOrNull() == KotlinPlatformType.native && compilations.map { it.target }.distinct().size > 1
+            size > 1 || singleOrNull() == KotlinPlatformType.native && compilations.map { it.target }.distinct().size > 1
             // TODO: platform-shared source sets other than Kotlin/Native ones are not yet supported; support will be needed for JVM, JS
         }
     }
@@ -565,4 +599,4 @@ internal fun Project.filesWithUnpackedArchives(from: FileCollection, extensions:
 
 internal fun Project.getMetadataCompilationForSourceSet(sourceSet: KotlinSourceSet): AbstractKotlinCompilation<*>? {
     return multiplatformExtension.metadata().compilations.findByName(sourceSet.name)
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt
index f5da104ff82..e2ec2f2d765 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt
@@ -29,11 +29,10 @@ abstract class AbstractKotlinNativeCompilation(
     compilationName: String
 ) : AbstractKotlinCompilation<KotlinCommonOptions>(target, compilationName) {
 
-    override val kotlinOptions: KotlinCommonOptions = NativeCompileOptions()
+    override val kotlinOptions: KotlinCommonOptions = NativeCompileOptions { defaultSourceSet.languageSettings }
 
-    private inner class NativeCompileOptions : KotlinCommonOptions {
-        private val languageSettings: LanguageSettingsBuilder
-            get() = defaultSourceSet.languageSettings
+    private class NativeCompileOptions(languageSettingsProvider: () -> LanguageSettingsBuilder) : KotlinCommonOptions {
+        private val languageSettings: LanguageSettingsBuilder by lazy(languageSettingsProvider)
 
         override var apiVersion: String?
             get() = languageSettings.apiVersion
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
index 753de8b5282..680598acec1 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
@@ -64,7 +64,8 @@ open class KotlinNativeTarget @Inject constructor(
                     metadataJar.archiveAppendix.set(project.provider { disambiguationClassifier.orEmpty().toLowerCase() })
                     metadataJar.archiveClassifier.set("metadata")
 
-                    metadataJar.onlyIf { this@KotlinNativeTarget.publishable }
+                    val publishable = this@KotlinNativeTarget.publishable
+                    metadataJar.onlyIf { publishable }
 
                     val metadataCompilations = hostSpecificSourceSets.mapNotNull {
                         project.getMetadataCompilationForSourceSet(it)
@@ -166,4 +167,4 @@ open class KotlinNativeTargetWithHostTests @Inject constructor(project: Project,
     KotlinNativeTargetWithTests<KotlinNativeHostTestRun>(project, konanTarget)
 
 open class KotlinNativeTargetWithSimulatorTests @Inject constructor(project: Project, konanTarget: KonanTarget) :
-    KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>(project, konanTarget)
\ No newline at end of file
+    KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>(project, konanTarget)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
index e3cd7074268..eda05f6daf8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
@@ -31,6 +31,7 @@ sealed class NativeBinary(
     private val name: String,
     baseNameProvided: String,
     val buildType: NativeBuildType,
+    @Transient
     var compilation: KotlinNativeCompilation
 ) : Named {
     open var baseName: String
@@ -92,8 +93,9 @@ sealed class NativeBinary(
         buildDir.resolve("bin/$targetSubDirectory${this@NativeBinary.name}")
     }
 
-    val outputFile: File
-        get() = linkTask.outputFile.get()
+    val outputFile: File by lazy {
+        linkTask.outputFile.get()
+    }
 
     // Named implementation.
     override fun getName(): String = name
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt
index 26cc026f4d7..00639d9740d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt
@@ -45,6 +45,16 @@ open class CocoapodsExtension(private val project: Project) {
         needPodspec = false
     }
 
+    /**
+     * Setup cocoapods-generate to produce xcodeproj compatible with static libraries
+     */
+    fun useLibraries() {
+        useLibraries = true
+    }
+
+    @get:Input
+    internal var useLibraries: Boolean = false
+
     /**
      * Configure license of the pod built from this project.
      */
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt
index 5f16b71783b..9434d17ecc6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt
@@ -197,7 +197,8 @@ open class KotlinCocoapodsPlugin : Plugin<Project> {
         val frameworkPlatforms: List<KonanTarget> = when (requestedTargetName) {
             KOTLIN_TARGET_FOR_IOS_DEVICE -> listOf(IOS_ARM64, IOS_ARM32)
             KOTLIN_TARGET_FOR_WATCHOS_DEVICE -> listOf(WATCHOS_ARM32, WATCHOS_ARM64)
-            else -> listOf(HostManager().targetByName(requestedTargetName)) // A requested target doesn't require building a fat framework.
+            // A request parameter can be comma separated list of targets.
+            else -> requestedTargetName.split(",").map { HostManager().targetByName(it) }.toList()
         }
 
         val frameworkTargets = frameworkPlatforms.flatMap { kotlinExtension.targetsForPlatform(it) }
@@ -281,9 +282,9 @@ open class KotlinCocoapodsPlugin : Plugin<Project> {
                                 project.tasks.named(target.toValidSDK.toBuildDependenciesTaskName(pod), PodBuildTask::class.java)
                             val buildSettings =
                                 podBuildTaskProvider.get().buildSettingsFile.get()
-                                    .inputStream()
+                                    .reader()
                                     .use {
-                                        PodBuildSettingsProperties.readSettingsFromStream(it)
+                                        PodBuildSettingsProperties.readSettingsFromReader(it)
                                     }
 
                             buildSettings.cflags?.let { args ->
@@ -407,6 +408,7 @@ open class KotlinCocoapodsPlugin : Plugin<Project> {
             project.tasks.register(family.toPodGenTaskName, PodGenTask::class.java) {
                 it.description = "Сreates a synthetic Xcode project to retrieve CocoaPods dependencies"
                 it.podspec = podspecTaskProvider.map { task -> task.outputFileProvider.get() }
+                it.useLibraries = project.provider { cocoapodsExtension.useLibraries }
                 it.specRepos = project.provider { cocoapodsExtension.specRepos }
                 it.family = family
                 it.pods.set(cocoapodsExtension.pods)
@@ -591,4 +593,4 @@ open class KotlinCocoapodsPlugin : Plugin<Project> {
             gemListRetCode == 0 && gemListOutput.contains("cocoapods-generate")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTask.kt
index 1cf3146c264..ae524b03a9d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTask.kt
@@ -105,11 +105,10 @@ internal data class CommonizerTaskParams(
                         val parentDir = destinationDir.parentFile
                         parentDir.mkdirs()
 
-                        val destinationTmpDir = createTempDir(
-                            prefix = "tmp-" + destinationDir.name,
-                            suffix = ".new",
-                            directory = parentDir
-                        )
+                        val destinationTmpDir = Files.createTempDirectory(
+                            /* dir = */ parentDir.toPath(),
+                            /* prefix = */ "tmp-new-" + destinationDir.name
+                        ).toFile()
 
                         commandLineArguments += "native-dist-commonize"
                         commandLineArguments += "-distribution-path"
@@ -256,16 +255,16 @@ private fun renameToTempAndDelete(directory: File) {
         directory
     } else {
         // first, rename the directory to some temp directory
-        val tempDir = createTempFile(
-            prefix = "tmp-" + directory.name,
-            suffix = ".old",
-            directory = directory.parentFile
+        val tempDir = Files.createTempFile(
+            /* dir = */ directory.parentFile.toPath(),
+            /* prefix = */ "tmp-old-" + directory.name,
+            /* suffix = */ null
         )
-        tempDir.delete()
+        Files.delete(tempDir)
 
-        Files.move(directory.toPath(), tempDir.toPath(), StandardCopyOption.ATOMIC_MOVE)
+        Files.move(directory.toPath(), tempDir, StandardCopyOption.ATOMIC_MOVE)
 
-        tempDir
+        tempDir.toFile()
     }
 
     dirToRemove.deleteRecursively()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt
index 5f9c75392de..c2ddb8f6089 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt
@@ -10,6 +10,7 @@ import org.gradle.api.artifacts.repositories.ArtifactRepository
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.FileTree
 import org.gradle.api.file.RelativePath
+import org.gradle.api.logging.Logger
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.Optional
@@ -22,8 +23,7 @@ import org.jetbrains.kotlin.gradle.tasks.PodspecTask.Companion.retrievePods
 import org.jetbrains.kotlin.gradle.tasks.PodspecTask.Companion.retrieveSpecRepos
 import org.jetbrains.kotlin.konan.target.Family
 import java.io.File
-import java.io.FileInputStream
-import java.io.InputStream
+import java.io.Reader
 import java.net.URI
 import java.util.*
 import kotlin.concurrent.thread
@@ -108,6 +108,11 @@ open class PodInstallTask : DefaultTask() {
     }
 }
 
+private interface ExtendedErrorDiagnostic {
+    fun isAppropriateOutput(output: String): Boolean
+    val message: String
+}
+
 abstract class DownloadCocoapodsTask : DefaultTask() {
     @get:Input
     internal lateinit var podName: Provider<String>
@@ -233,14 +238,14 @@ open class PodDownloadGitTask : DownloadCocoapodsTask() {
     }
 
     private fun retrieveCommit(url: URI, commit: String) {
+        val logger = project.logger
         val initCommand = listOf(
             "git",
             "init"
         )
         val repo = repo.get()
         repo.mkdir()
-        val configProcess: ProcessBuilder.() -> Unit = { directory(repo) }
-        runCommand(initCommand, configProcess)
+        runCommand(initCommand, logger) { directory(repo) }
 
         val fetchCommand = listOf(
             "git",
@@ -249,14 +254,14 @@ open class PodDownloadGitTask : DownloadCocoapodsTask() {
             "$url",
             commit
         )
-        runCommand(fetchCommand, configProcess)
+        runCommand(fetchCommand, logger) { directory(repo) }
 
         val checkoutCommand = listOf(
             "git",
             "checkout",
             "FETCH_HEAD"
         )
-        runCommand(checkoutCommand, configProcess)
+        runCommand(checkoutCommand, logger) { directory(repo) }
     }
 
     private fun cloneShallow(url: URI, branch: String) {
@@ -268,8 +273,7 @@ open class PodDownloadGitTask : DownloadCocoapodsTask() {
             "--branch", branch,
             "--depth", "1"
         )
-        val configProcess: ProcessBuilder.() -> Unit = { directory(gitDir) }
-        runCommand(shallowCloneCommand, configProcess)
+        runCommand(shallowCloneCommand, project.logger) { directory(gitDir) }
     }
 
     private fun cloneHead(podspecLocation: Git) {
@@ -280,8 +284,7 @@ open class PodDownloadGitTask : DownloadCocoapodsTask() {
             podName.get(),
             "--depth", "1"
         )
-        val configProcess: ProcessBuilder.() -> Unit = { directory(gitDir) }
-        runCommand(cloneHeadCommand, configProcess)
+        runCommand(cloneHeadCommand, project.logger) { directory(gitDir) }
     }
 
     private fun fallback(podspecLocation: Git) {
@@ -293,21 +296,20 @@ open class PodDownloadGitTask : DownloadCocoapodsTask() {
             "${podspecLocation.url}",
             podName.get()
         )
-        val configProcess: ProcessBuilder.() -> Unit = { directory(gitDir) }
-        runCommand(cloneAllCommand, configProcess)
+        runCommand(cloneAllCommand, project.logger) { directory(gitDir) }
     }
 }
 
 private fun runCommand(
     command: List<String>,
-    processConfiguration: ((ProcessBuilder.() -> Unit))? = null,
-    errorHandler: ((retCode: Int, process: Process) -> Unit)? = null
+    logger: Logger,
+    extendedErrorDiagnostic: ExtendedErrorDiagnostic? = null,
+    errorHandler: ((retCode: Int, process: Process) -> Unit)? = null,
+    processConfiguration: ProcessBuilder.() -> Unit = { }
 ): String {
     val process = ProcessBuilder(command)
         .apply {
-            if (processConfiguration != null) {
-                this.processConfiguration()
-            }
+            this.processConfiguration()
         }.start()
 
     var inputText = ""
@@ -329,9 +331,22 @@ private fun runCommand(
     errorThread.join()
 
     val retCode = process.waitFor()
+    logger.info(
+        """
+            |Information about "${command.joinToString(" ")}" call:
+            |
+            |${inputText}
+        """.trimMargin()
+    )
+
     check(retCode == 0) {
         errorHandler?.invoke(retCode, process)
-            ?: "Executing of '${command.joinToString(" ")}' failed with code $retCode and message: $errorText"
+            ?: """
+                |Executing of '${command.joinToString(" ")}' failed with code $retCode and message: 
+                |
+                |$errorText
+                |${extendedErrorDiagnostic?.takeIf { it.isAppropriateOutput(inputText) }?.message ?: ""}
+                """.trimMargin()
     }
 
     return inputText
@@ -352,6 +367,9 @@ open class PodGenTask : DefaultTask() {
     @get:InputFile
     internal lateinit var podspec: Provider<File>
 
+    @get:Input
+    internal lateinit var useLibraries: Provider<Boolean>
+
     @get:Internal
     lateinit var family: Family
 
@@ -379,6 +397,7 @@ open class PodGenTask : DefaultTask() {
 
         val podGenProcessArgs = listOfNotNull(
             "pod", "gen",
+            "--use-libraries".takeIf { useLibraries.get() },
             "--platforms=${family.platformLiteral}",
             "--gen-directory=${syntheticDir.absolutePath}",
             localPodspecPaths.takeIf { it.isNotEmpty() }?.joinToString(separator = ",")?.let { "--local-sources=$it" },
@@ -386,32 +405,24 @@ open class PodGenTask : DefaultTask() {
             podspec.get().absolutePath
         )
 
-        val podGenProcess = ProcessBuilder(podGenProcessArgs).apply {
-            directory(syntheticDir)
-        }.start()
-        val podGenRetCode = podGenProcess.waitFor()
-        val outputText = podGenProcess.inputStream.use { it.reader().readText() }
+        val podGenDiagnostic = object : ExtendedErrorDiagnostic {
+            override fun isAppropriateOutput(output: String): Boolean =
+                output.contains("deployment target") || output.contains("requested platforms: [\"${family.platformLiteral}\"]")
 
-        check(podGenRetCode == 0) {
-            listOfNotNull(
-                "Executing of '${podGenProcessArgs.joinToString(" ")}' failed with code $podGenRetCode and message:",
-                outputText,
-                outputText.takeIf {
-                    it.contains("deployment target")
-                            || it.contains("requested platforms: [\"${family.platformLiteral}\"]")
-                }?.let {
+            override val message: String
+                get() =
                     """
-                        Tip: try to configure deployment_target for ALL targets as follows:
-                        cocoapods {
-                            ...
-                            ${family.name.toLowerCase()}.deploymentTarget = "..."
-                            ...
-                        }
-                    """.trimIndent()
-                }
-            ).joinToString("\n")
+                        |Tip: try to configure deployment_target for ALL targets as follows:
+                        |cocoapods {
+                        |   ...
+                        |   ${family.name.toLowerCase()}.deploymentTarget = "..."
+                        |   ...
+                        |}
+                    """.trimMargin()
         }
 
+        runCommand(podGenProcessArgs, project.logger, podGenDiagnostic) { directory(syntheticDir) }
+
         val podsXcprojFile = podsXcodeProjDir.get()
         check(podsXcprojFile.exists() && podsXcprojFile.isDirectory) {
             "The directory '${podsXcprojFile.path}' was not created as a result of the `pod gen` call."
@@ -452,23 +463,11 @@ open class PodSetupBuildTask : DefaultTask() {
             "-sdk", sdk.get()
         )
 
-        val buildSettingsProcess = ProcessBuilder(buildSettingsReceivingCommand)
-            .apply {
-                directory(podsXcodeProjDir.parentFile)
-            }.start()
+        val outputText = runCommand(buildSettingsReceivingCommand, project.logger) { directory(podsXcodeProjDir.parentFile) }
 
-        val buildSettingsRetCode = buildSettingsProcess.waitFor()
-        check(buildSettingsRetCode == 0) {
-            listOf(
-                "Executing of '${buildSettingsReceivingCommand.joinToString(" ")}' failed with code $buildSettingsRetCode and message:",
-                buildSettingsProcess.errorStream.use { it.reader().readText() }
-            ).joinToString("\n")
-        }
-
-        val stdOut = buildSettingsProcess.inputStream
-        val buildSettingsProperties = PodBuildSettingsProperties.readSettingsFromStream(stdOut)
-        buildSettingsFile.get().let {
-            buildSettingsProperties.writeSettings(it)
+        val buildSettingsProperties = PodBuildSettingsProperties.readSettingsFromReader(outputText.reader())
+        buildSettingsFile.get().let { bsf ->
+            buildSettingsProperties.writeSettings(bsf)
         }
     }
 }
@@ -490,20 +489,12 @@ open class PodBuildTask : DefaultTask() {
     @get:InputFiles
     internal val srcDir: FileTree
         get() = project.fileTree(
-            buildSettingsFile.map {
-                PodBuildSettingsProperties.readSettingsFromStream(
-                    FileInputStream(it)
-                ).podsTargetSrcRoot
-            }
+            buildSettingsFile.map { PodBuildSettingsProperties.readSettingsFromReader(it.reader()).podsTargetSrcRoot }
         )
 
     @get:Internal
     internal var buildDir: Provider<File> = project.provider {
-        project.file(
-            PodBuildSettingsProperties.readSettingsFromStream(
-                FileInputStream(buildSettingsFile.get())
-            ).buildDir
-        )
+        project.file(PodBuildSettingsProperties.readSettingsFromReader(buildSettingsFile.get().reader()).buildDir)
     }
 
     @get:Input
@@ -522,9 +513,7 @@ open class PodBuildTask : DefaultTask() {
 
     @TaskAction
     fun buildDependencies() {
-        val podBuildSettings = PodBuildSettingsProperties.readSettingsFromStream(
-            FileInputStream(buildSettingsFile.get())
-        )
+        val podBuildSettings = PodBuildSettingsProperties.readSettingsFromReader(buildSettingsFile.get().reader())
 
         val podsXcodeProjDir = podsXcodeProjDir.get()
 
@@ -536,19 +525,7 @@ open class PodBuildTask : DefaultTask() {
             "-configuration", podBuildSettings.configuration
         )
 
-        val podBuildProcess = ProcessBuilder(podXcodeBuildCommand)
-            .apply {
-                directory(podsXcodeProjDir.parentFile)
-                inheritIO()
-            }.start()
-
-        val podBuildRetCode = podBuildProcess.waitFor()
-        check(podBuildRetCode == 0) {
-            listOf(
-                "Executing of '${podXcodeBuildCommand.joinToString(" ")}' failed with code $podBuildRetCode and message:",
-                podBuildProcess.errorStream.use { it.reader().readText() }
-            ).joinToString("\n")
-        }
+        runCommand(podXcodeBuildCommand, project.logger) { directory(podsXcodeProjDir.parentFile) }
     }
 }
 
@@ -592,9 +569,9 @@ internal data class PodBuildSettingsProperties(
         const val HEADER_SEARCH_PATHS = "HEADER_SEARCH_PATHS"
         const val FRAMEWORK_SEARCH_PATHS = "FRAMEWORK_SEARCH_PATHS"
 
-        fun readSettingsFromStream(inputStream: InputStream): PodBuildSettingsProperties {
+        fun readSettingsFromReader(reader: Reader): PodBuildSettingsProperties {
             with(Properties()) {
-                load(inputStream)
+                load(reader)
                 return PodBuildSettingsProperties(
                     readProperty(BUILD_DIR),
                     readProperty(CONFIGURATION),
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 329bbd7da68..a3b8ee549ab 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -14,10 +14,10 @@ import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.FileTree
 import org.gradle.api.logging.Logger
-import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.compile.AbstractCompile
 import org.jetbrains.kotlin.compilerRunner.*
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions
@@ -112,10 +112,15 @@ private fun Collection<File>.filterKlibsPassedToCompiler(project: Project) = fil
 }
 
 // endregion
-abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : AbstractKotlinNativeCompilation> : SourceTask() {
+abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : AbstractKotlinNativeCompilation> : AbstractCompile() {
     @get:Internal
     abstract val compilation: Provider<K>
 
+    @get:Internal
+    internal val compilationIsShared by lazy {
+        compilation.get() is KotlinSharedNativeCompilation
+    }
+
     // region inputs/outputs
     @get:Input
     abstract val outputKind: CompilerOutputKind
@@ -129,6 +134,14 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
     @get:Internal
     abstract val baseName: String
 
+    @get:Internal
+    internal val objects = project.objects
+
+    @get:Internal
+    internal val konanTarget by lazy {
+        compilation.get().konanTarget
+    }
+
     // Inputs and outputs
     @InputFiles
     @SkipWhenEmpty
@@ -140,15 +153,16 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
     @get:Classpath
     val libraries: FileCollection by project.provider {
         // Avoid resolving these dependencies during task graph construction when we can't build the target:
-        if (compilation.get().konanTarget.enabledOnCurrentHost)
+        if (konanTarget.enabledOnCurrentHost)
             compilation.get().compileDependencyFiles.filterOutPublishableInteropLibs(project)
-        else project.files()
+        else objects.fileCollection()
     }
 
-    @get:Internal
-    @get:Deprecated("Use libraries instead", ReplaceWith("libraries"))
-    val classpath: FileCollection
-        get() = libraries
+    @Deprecated("For native tasks use 'libraries' instead", ReplaceWith("libraries"))
+    override fun getClasspath(): FileCollection = libraries
+    override fun setClasspath(configuration: FileCollection?) {
+        throw UnsupportedOperationException("Setting classpath directly is unsupported.")
+    }
 
     @get:Input
     val target: String by project.provider { compilation.get().konanTarget.name }
@@ -179,17 +193,8 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
     val kotlinNativeVersion: String
         get() = project.konanVersion.toString()
 
-    private val destinationDirectory = getProject().getObjects().directoryProperty()
-
-    @get:Internal
-    open var destinationDir: File
-        get() = destinationDirectory.get().asFile
-        set(value) = destinationDirectory.set(value)
-
     @Internal
     open val outputFile: Provider<File> = project.provider {
-        val konanTarget = compilation.get().konanTarget
-
         val prefix = outputKind.prefix(konanTarget)
         val suffix = outputKind.suffix(konanTarget)
         val filename = "$prefix${baseName}$suffix".let {
@@ -227,6 +232,11 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
     val defaultSerializedCompilerArguments: List<String>
         get() = buildCommonArgs(true)
 
+    @get:Internal
+    internal val languageSettingsBuilder by lazy {
+        compilation.get().defaultSourceSet.languageSettings
+    }
+
     // Args used by both the compiler and IDEA.
     protected open fun buildCommonArgs(defaultsOnly: Boolean = false): List<String> = mutableListOf<String>().apply {
         add("-Xmulti-platform")
@@ -256,7 +266,7 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
             addAll(additionalCompilerOptions.get())
         }
 
-        (compilation.get().defaultSourceSet.languageSettings as? DefaultLanguageSettingsBuilder)?.run {
+        (languageSettingsBuilder as? DefaultLanguageSettingsBuilder)?.run {
             addAll(freeCompilerArgs)
         }
     }
@@ -283,10 +293,10 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
         addKey("-g", debuggable)
         addKey("-ea", debuggable)
 
-        addArg("-target", target)
+        addArg("-target", konanTarget.name)
         addArg("-p", outputKind.name.toLowerCase())
 
-        if (compilation.get() is KotlinSharedNativeCompilation) {
+        if (compilationIsShared) {
             add("-Xexpect-actual-linker")
             add("-Xmetadata-klib")
             addArg("-manifest", manifestFile.get().absolutePath)
@@ -313,7 +323,7 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
         val output = outputFile.get()
         output.parentFile.mkdirs()
 
-        if (compilation.get() is KotlinSharedNativeCompilation) {
+        if (compilationIsShared) {
             val manifestFile: File = manifestFile.get()
             manifestFile.ensureParentDirsCreated()
             val properties = java.util.Properties()
@@ -402,8 +412,9 @@ open class KotlinNativeCompile : AbstractKotlinNativeCompile<KotlinCommonOptions
     // endregion.
 
     // region Kotlin options.
-    override val kotlinOptions: KotlinCommonOptions
-        get() = compilation.get().kotlinOptions
+    override val kotlinOptions: KotlinCommonOptions by lazy {
+        compilation.get().kotlinOptions
+    }
 
     @get:Input
     override val additionalCompilerOptions: Provider<Collection<String>> = project.provider {
@@ -474,7 +485,6 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
     }
 
     @Internal
-    @Transient
     lateinit var binary: NativeBinary
 
     @Internal // Taken into account by getSources().
@@ -485,12 +495,16 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
     @InputFiles
     @SkipWhenEmpty
     override fun getSource(): FileTree =
-        project.files(intermediateLibrary.get()).asFileTree
+        objects.fileCollection().from(intermediateLibrary.get()).asFileTree
 
-    @get:OutputDirectory
-    override var destinationDir: File
-        get() = binary.outputDirectory
-        set(value) { binary.outputDirectory = value }
+    @OutputDirectory
+    override fun getDestinationDir(): File {
+        return binary.outputDirectory
+    }
+
+    override fun setDestinationDir(destinationDir: File) {
+        binary.outputDirectory = destinationDir
+    }
 
     override val outputKind: CompilerOutputKind
         @Input get() = binary.outputKind.compilerOutputKind
@@ -505,8 +519,9 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
         @Input get() = binary.baseName
 
     @get:Input
-    protected val konanCacheKind: NativeCacheKind
-        get() = project.konanCacheKind
+    protected val konanCacheKind: NativeCacheKind by lazy {
+        project.konanCacheKind
+    }
 
     inner class NativeLinkOptions : KotlinCommonToolOptions {
         override var allWarningsAsErrors: Boolean = false
@@ -545,14 +560,15 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
         @Input get() = binary is TestExecutable
 
     @get:Classpath
-    val exportLibraries: FileCollection
-        get() = binary.let {
+    val exportLibraries: FileCollection by lazy {
+        binary.let {
             if (it is AbstractNativeLibrary) {
                 project.configurations.getByName(it.exportConfigurationName)
             } else {
-                project.files()
+                objects.fileCollection()
             }
         }
+    }
 
     @get:Input
     val isStaticFramework: Boolean by project.provider {
@@ -567,7 +583,7 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
     override fun buildCompilerArgs(): List<String> = mutableListOf<String>().apply {
         addAll(super.buildCompilerArgs())
 
-        addAll(CacheBuilder(project, binary).buildCompilerArgs())
+        addAll(CacheBuilder(project, binary, konanTarget).buildCompilerArgs())
 
         addKey("-tr", processTests)
         addArgIfNotNull("-entry", entryPoint)
@@ -645,7 +661,7 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
     }
 }
 
-internal class CacheBuilder(val project: Project, val binary: NativeBinary) {
+internal class CacheBuilder(val project: Project, val binary: NativeBinary, val konanTarget: KonanTarget) {
 
     private val nativeSingleFileResolveStrategy: SingleFileKlibResolveStrategy
         get() = CompilerSingleFileKlibResolveAllowingIrProvidersStrategy(
@@ -668,10 +684,10 @@ internal class CacheBuilder(val project: Project, val binary: NativeBinary) {
         get() = compilation.compileDependencyFiles.filterOutPublishableInteropLibs(project)
 
     private val target: String
-        get() = compilation.konanTarget.name
+        get() = konanTarget.name
 
     private val rootCacheDirectory by lazy {
-        getRootCacheDirectory(File(project.konanHome), compilation.konanTarget, debuggable, konanCacheKind)
+        getRootCacheDirectory(File(project.konanHome), konanTarget, debuggable, konanCacheKind)
     }
 
     private fun getAllDependencies(dependency: ResolvedDependency): Set<ResolvedDependency> {
@@ -832,7 +848,7 @@ internal class CacheBuilder(val project: Project, val binary: NativeBinary) {
 
     private fun ensureCompilerProvidedLibsPrecached() {
         val distribution = Distribution(project.konanHome)
-        val platformLibs = (listOf(File(distribution.stdlib)) + File(distribution.platformLibs(compilation.konanTarget))
+        val platformLibs = (listOf(File(distribution.stdlib)) + File(distribution.platformLibs(konanTarget))
             .listFiles()).associateBy { it.name }
         val visitedLibs = mutableSetOf<String>()
         for (platformLibName in platformLibs.keys)
@@ -841,7 +857,7 @@ internal class CacheBuilder(val project: Project, val binary: NativeBinary) {
 
 
     fun buildCompilerArgs(): List<String> = mutableListOf<String>().apply {
-        if (konanCacheKind != NativeCacheKind.NONE && !optimized && cacheWorksFor(compilation.konanTarget)) {
+        if (konanCacheKind != NativeCacheKind.NONE && !optimized && cacheWorksFor(konanTarget)) {
             rootCacheDirectory.mkdirs()
             ensureCompilerProvidedLibsPrecached()
             add("-Xcache-directory=${rootCacheDirectory.absolutePath}")
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
index 96fc0cd5a87..146ce7ca6fb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
@@ -40,8 +40,8 @@ import java.io.File
 @CacheableTask
 open class KotlinCompileCommon : AbstractKotlinCompile<K2MetadataCompilerArguments>(), KotlinCommonCompile {
 
-    override val kotlinOptions: KotlinMultiplatformCommonOptions
-        get() = taskData.compilation.kotlinOptions as KotlinMultiplatformCommonOptionsImpl
+    override val kotlinOptions: KotlinMultiplatformCommonOptions =
+        taskData.compilation.kotlinOptions as KotlinMultiplatformCommonOptionsImpl
 
     override fun createCompilerArgs(): K2MetadataCompilerArguments =
         K2MetadataCompilerArguments()
@@ -99,7 +99,7 @@ open class KotlinCompileCommon : AbstractKotlinCompile<K2MetadataCompilerArgumen
         val compilerRunner = compilerRunner
         val environment = GradleCompilerEnvironment(
             computedCompilerClasspath, messageCollector, outputItemCollector,
-            buildReportMode = buildReportMode,
+            reportingSettings = reportingSettings,
             outputFiles = allOutputFiles()
         )
         compilerRunner.runMetadataCompilerAsync(sourceRoots.kotlinSourceFiles, args, environment)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 5df1e0d974f..6357f14a8a3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -16,6 +16,10 @@ import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.incremental.IncrementalTaskInputs
 import org.gradle.workers.WorkerExecutor
 import org.jetbrains.kotlin.build.DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporterImpl
+import org.jetbrains.kotlin.build.report.metrics.BuildTime
+import org.jetbrains.kotlin.build.report.metrics.measure
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
@@ -38,7 +42,7 @@ import org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME
 import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.mpp.associateWithTransitiveClosure
 import org.jetbrains.kotlin.gradle.plugin.mpp.ownModuleName
-import org.jetbrains.kotlin.gradle.report.BuildReportMode
+import org.jetbrains.kotlin.gradle.report.ReportingSettings
 import org.jetbrains.kotlin.gradle.utils.*
 import org.jetbrains.kotlin.gradle.utils.isParentOf
 import org.jetbrains.kotlin.gradle.utils.pathsAsStringRelativeTo
@@ -92,6 +96,10 @@ abstract class AbstractKotlinCompileTool<T : CommonToolArguments>
     @get:Input
     internal var useFallbackCompilerSearch: Boolean = false
 
+    @get:Internal
+    override val metrics: BuildMetricsReporter =
+        BuildMetricsReporterImpl()
+
     @get:Classpath
     @get:InputFiles
     internal val computedCompilerClasspath: List<File> by lazy {
@@ -195,7 +203,7 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
         incremental
 
     @get:Internal
-    internal var buildReportMode: BuildReportMode? = null
+    internal var reportingSettings = ReportingSettings()
 
     @get:Internal
     internal val taskData: KotlinCompileTaskData = KotlinCompileTaskData.get(project, name)
@@ -327,20 +335,22 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
         // To prevent this, we backup outputs before incremental build and restore when exception is thrown
         val outputsBackup: TaskOutputsBackup? =
             if (isIncrementalCompilationEnabled() && inputs.isIncremental)
-                kotlinLogger.logTime("Backing up outputs for incremental build") {
+                metrics.measure(BuildTime.BACKUP_OUTPUT) {
                     TaskOutputsBackup(allOutputFiles())
                 }
             else null
 
         if (!isIncrementalCompilationEnabled()) {
             clearLocalState("IC is disabled")
+        } else if (!inputs.isIncremental) {
+            clearLocalState("Task cannot run incrementally")
         }
 
         try {
             executeImpl(inputs)
         } catch (t: Throwable) {
             if (outputsBackup != null) {
-                kotlinLogger.logTime("Restoring previous outputs on error") {
+                metrics.measure(BuildTime.RESTORE_OUTPUT_FROM_BACKUP) {
                     outputsBackup.restoreOutputs()
                 }
             }
@@ -523,7 +533,7 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
         val environment = GradleCompilerEnvironment(
             computedCompilerClasspath, messageCollector, outputItemCollector,
             outputFiles = allOutputFiles(),
-            buildReportMode = buildReportMode,
+            reportingSettings = reportingSettings,
             incrementalCompilationEnvironment = icEnv,
             kotlinScriptExtensions = sourceFilesExtensions.toTypedArray()
         )
@@ -750,7 +760,7 @@ open class Kotlin2JsCompile : AbstractKotlinCompile<K2JSCompilerArguments>(), Ko
         val environment = GradleCompilerEnvironment(
             computedCompilerClasspath, messageCollector, outputItemCollector,
             outputFiles = allOutputFiles(),
-            buildReportMode = buildReportMode,
+            reportingSettings = reportingSettings,
             incrementalCompilationEnvironment = icEnv
         )
         compilerRunner.runJsCompilerAsync(sourceRoots.kotlinSourceFiles, commonSourceSet.toList(), args, environment)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt
index 1f46ac220dd..7e2a05fb0b6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt
@@ -27,6 +27,7 @@ internal open class KotlinCompileTaskData(
         File(File(compilation.target.project.buildDir, KOTLIN_BUILD_DIR_NAME), taskName)
     }
 
+    //TODO
     val buildHistoryFile: File by project.provider {
         File(taskBuildDirectory, "build-history.bin")
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt
index 5cfc78f35bf..9921c40e322 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt
@@ -1,6 +1,9 @@
 package org.jetbrains.kotlin.gradle.tasks
 
 import org.gradle.api.GradleException
+import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
+import org.jetbrains.kotlin.build.report.metrics.BuildTime
+import org.jetbrains.kotlin.build.report.metrics.measure
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.compilerRunner.KotlinLogger
 import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger
@@ -22,26 +25,33 @@ fun throwGradleExceptionIfError(exitCode: ExitCode) {
 
 internal fun TaskWithLocalState.clearLocalState(reason: String? = null) {
     val log = GradleKotlinLogger(logger)
-    clearLocalState(allOutputFiles(), log, reason)
+    clearLocalState(allOutputFiles(), log, metrics, reason)
 }
 
-internal fun clearLocalState(outputFiles: Iterable<File>, log: KotlinLogger, reason: String? = null) {
+internal fun clearLocalState(
+    outputFiles: Iterable<File>,
+    log: KotlinLogger,
+    metrics: BuildMetricsReporter,
+    reason: String? = null
+) {
     log.kotlinDebug {
         val suffix = reason?.let { " ($it)" }.orEmpty()
         "Clearing output$suffix:"
     }
 
-    for (file in outputFiles) {
-        if (!file.exists()) continue
-        when {
-            file.isDirectory -> {
-                log.debug("Deleting output directory: $file")
-                file.deleteRecursively()
-                file.mkdirs()
-            }
-            file.isFile -> {
-                log.debug("Deleting output file: $file")
-                file.delete()
+    metrics.measure(BuildTime.CLEAR_OUTPUT) {
+        for (file in outputFiles) {
+            if (!file.exists()) continue
+            when {
+                file.isDirectory -> {
+                    log.debug("Deleting output directory: $file")
+                    file.deleteRecursively()
+                    file.mkdirs()
+                }
+                file.isFile -> {
+                    log.debug("Deleting output file: $file")
+                    file.delete()
+                }
             }
         }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/Printer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/Printer.kt
new file mode 100644
index 00000000000..71ef31d50de
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/Printer.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.kotlin.gradle.utils
+
+import java.io.IOException
+
+private val LINE_SEPARATOR = System.getProperty("line.separator")
+
+internal class Printer(
+    private val out: Appendable,
+    private val indentUnit: String = "  ",
+    private var indent: String = ""
+) {
+    private fun append(s: String) {
+        try {
+            out.append(s)
+        } catch (e: IOException) { // Do nothing
+        }
+    }
+
+    fun println(vararg strings: String) {
+        this.print(*strings)
+        printLineSeparator()
+    }
+
+    private fun printLineSeparator() {
+        append(LINE_SEPARATOR)
+    }
+
+    fun print(vararg strings: String) {
+        if (strings.isNotEmpty()) {
+            this.printIndent()
+        }
+        this.printWithNoIndent(*strings)
+    }
+
+    private fun printIndent() {
+        append(indent)
+    }
+
+    private fun printWithNoIndent(vararg strings: String) {
+        for (s in strings) {
+            append(s)
+        }
+    }
+
+    fun pushIndent() {
+        indent += indentUnit
+    }
+
+    fun popIndent() {
+        check(indent.length >= indentUnit.length) { "No indentation to pop" }
+        indent = indent.substring(indentUnit.length)
+    }
+
+    inline fun <T> withIndent(headLine: String? = null, fn: () -> T): T {
+        if (headLine != null) {
+            this.println(headLine)
+        }
+        pushIndent()
+
+        return try {
+            fn()
+        } finally {
+            popIndent()
+        }
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/androidPluginIds.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/androidPluginIds.kt
new file mode 100644
index 00000000000..93902bd610b
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/androidPluginIds.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.utils
+
+internal val androidPluginIds = listOf(
+    "android", "com.android.application", "android-library", "com.android.library",
+    "com.android.test", "com.android.feature", "com.android.dynamic-feature", "com.android.instantapp"
+)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt
index 06bb7469272..4353ac6ef62 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.utils
 
 import org.gradle.api.Project
 import java.io.File
+import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.*
 
@@ -28,10 +29,10 @@ internal fun File.relativeToRoot(project: Project): String =
 internal fun Iterable<File>.toSortedPathsArray(): Array<String> =
     map { it.canonicalPath }.toTypedArray().also { Arrays.sort(it) }
 
-internal fun newTmpFile(prefix: String, suffix: String? = null, directory: File? = null, deleteOnExit: Boolean = true) =
-    File.createTempFile(prefix, suffix, directory).apply {
-        if (deleteOnExit) deleteOnExit()
-    }
+internal fun newTmpFile(prefix: String, suffix: String? = null, directory: File? = null, deleteOnExit: Boolean = true): File =
+    (if (directory == null) Files.createTempFile(prefix, suffix) else Files.createTempFile(directory.toPath(), prefix, suffix))
+        .toFile()
+        .apply { if (deleteOnExit) deleteOnExit() }
 
 internal fun File.isParentOf(childCandidate: File, strict: Boolean = false): Boolean {
     val parentPath = Paths.get(this.absolutePath).normalize()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/gradleConfigurationUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/gradleConfigurationUtils.kt
index 0f93a13fa67..903a26f80ef 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/gradleConfigurationUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/gradleConfigurationUtils.kt
@@ -6,11 +6,14 @@
 package org.jetbrains.kotlin.gradle.utils
 
 import org.gradle.api.Project
+import java.lang.RuntimeException
 
 fun Project.addExtendsFromRelation(extendingConfigurationName: String, extendsFromConfigurationName: String, forced: Boolean = true) {
-    if (extendingConfigurationName != extendsFromConfigurationName) {
-        if (forced || configurations.findByName(extendingConfigurationName) != null) {
-            project.dependencies.add(extendingConfigurationName, project.configurations.getByName(extendsFromConfigurationName))
-        }
-    }
+    if (extendingConfigurationName == extendsFromConfigurationName) return
+
+    val extending = configurations.findByName(extendingConfigurationName)
+        ?: if (forced) throw RuntimeException("Configuration $extendingConfigurationName does not exist.")
+        else return
+
+    extending.extendsFrom(configurations.getByName(extendsFromConfigurationName))
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt
index 140e3377089..87fbeb98536 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt
@@ -8,9 +8,8 @@ package org.jetbrains.kotlin.gradle.internal.kapt.incremental
 import org.gradle.api.artifacts.transform.TransformOutputs
 import org.gradle.api.artifacts.transform.TransformParameters
 import org.gradle.api.file.FileSystemLocation
-import org.gradle.api.internal.file.DefaultFileSystemLocation
-import org.gradle.api.internal.provider.DefaultProvider
 import org.gradle.api.provider.Provider
+import org.gradle.testfixtures.ProjectBuilder
 import org.jetbrains.org.objectweb.asm.ClassWriter
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.junit.Assert.*
@@ -18,7 +17,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
 import java.io.File
-import java.util.concurrent.Callable
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
@@ -41,7 +39,7 @@ class ClasspathAnalyzerTest {
             }
         }
         val outputs = TransformOutputsMock(tmp.newFolder())
-        StructureTransformTestAction(classesDir).transform(outputs)
+        StructureTransformTestAction(classesDir, tmp.newFolder("project")).transform(outputs)
 
         val data = ClasspathEntryData.ClasspathEntrySerializer.loadFrom(outputs.createdOutputs.single())
         assertEquals(setOf("test/A", "test/B"), data.classAbiHash.keys)
@@ -77,7 +75,7 @@ class ClasspathAnalyzerTest {
             }
         }
         val outputs = TransformOutputsMock(tmp.newFolder())
-        StructureTransformTestAction(inputJar).transform(outputs)
+        StructureTransformTestAction(inputJar, tmp.newFolder("project")).transform(outputs)
 
         val data = ClasspathEntryData.ClasspathEntrySerializer.loadFrom(outputs.createdOutputs.single())
         assertEquals(setOf("test/A", "test/B"), data.classAbiHash.keys)
@@ -103,7 +101,7 @@ class ClasspathAnalyzerTest {
             }
         }
         val outputsA = TransformOutputsMock(tmp.newFolder())
-        StructureTransformTestAction(jarA).transform(outputsA)
+        StructureTransformTestAction(jarA, tmp.newFolder("projectA")).transform(outputsA)
 
         val jarB = tmp.newFile("inputB.jar").also { jar ->
             ZipOutputStream(jar.outputStream()).use {
@@ -117,14 +115,14 @@ class ClasspathAnalyzerTest {
             }
         }
         val outputsB = TransformOutputsMock(tmp.newFolder())
-        StructureTransformTestAction(jarB).transform(outputsB)
+        StructureTransformTestAction(jarB, tmp.newFolder("projectB")).transform(outputsB)
 
         assertArrayEquals(outputsA.createdOutputs.single().readBytes(), outputsB.createdOutputs.single().readBytes())
     }
 
     @Test
     fun emptyInput() {
-        val transformAction = StructureTransformTestAction(tmp.newFolder("input"))
+        val transformAction = StructureTransformTestAction(tmp.newFolder("input"), tmp.newFolder("project"))
         val outputs = TransformOutputsMock(tmp.newFolder())
 
         transformAction.transform(outputs)
@@ -151,7 +149,7 @@ class ClasspathAnalyzerTest {
                 it.closeEntry()
             }
         }
-        val transformAction = StructureTransformTestAction(inputJar)
+        val transformAction = StructureTransformTestAction(inputJar, tmp.newFolder("project"))
         val outputs = TransformOutputsMock(tmp.newFolder())
 
         transformAction.transform(outputs)
@@ -168,8 +166,10 @@ class ClasspathAnalyzerTest {
     }
 }
 
-class StructureTransformTestAction(val input: File) : StructureTransformAction() {
-    override val inputArtifact: File = input
+class StructureTransformTestAction(val input: File, val projectDir: File) : StructureTransformAction() {
+    private val project = ProjectBuilder.builder().withProjectDir(projectDir).build()
+
+    override val inputArtifact: Provider<FileSystemLocation> = project.provider { project.objects.fileProperty().fileValue(input).get() }
 
     override fun getParameters(): TransformParameters.None? {
         //no need for StructureTransformAction and so for test
diff --git a/libraries/tools/kotlin-gradle-statistics/test/org/jetbrains/kotlin/statistics/BuildSessionLoggerTest.kt b/libraries/tools/kotlin-gradle-statistics/test/org/jetbrains/kotlin/statistics/BuildSessionLoggerTest.kt
index b0a38705c29..25f8906ef74 100644
--- a/libraries/tools/kotlin-gradle-statistics/test/org/jetbrains/kotlin/statistics/BuildSessionLoggerTest.kt
+++ b/libraries/tools/kotlin-gradle-statistics/test/org/jetbrains/kotlin/statistics/BuildSessionLoggerTest.kt
@@ -15,6 +15,7 @@ import org.junit.After
 import org.junit.Before
 import java.io.File
 import java.lang.IllegalStateException
+import java.nio.file.Files
 import kotlin.test.*
 
 class BuildSessionLoggerTest {
@@ -25,7 +26,7 @@ class BuildSessionLoggerTest {
 
     @Before
     fun prepareFolder() {
-        rootFolder = File.createTempFile("kotlin-stats", "")
+        rootFolder = Files.createTempFile("kotlin-stats", "").toFile()
         rootFolder.delete()
         rootFolder.mkdirs()
     }
diff --git a/libraries/tools/kotlin-main-kts-test/build.gradle.kts b/libraries/tools/kotlin-main-kts-test/build.gradle.kts
index dc962f8d886..2355fdf5d0e 100644
--- a/libraries/tools/kotlin-main-kts-test/build.gradle.kts
+++ b/libraries/tools/kotlin-main-kts-test/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     testCompile(project(":kotlin-main-kts"))
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
+    testCompile(kotlinStdlib("jdk8"))
     testCompile(commonDep("junit"))
     testCompile(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
     testRuntime(project(":kotlin-compiler-embeddable"))
diff --git a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt
index db1434b5377..cfc0aa9c456 100644
--- a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt
+++ b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt
@@ -17,6 +17,8 @@ import org.junit.Assert
 import org.junit.Ignore
 import org.junit.Test
 import java.io.File
+import java.nio.file.Path
+import kotlin.io.path.*
 
 class MainKtsIT {
 
@@ -51,42 +53,44 @@ class MainKtsIT {
         runWithKotlincAndMainKts("$TEST_DATA_ROOT/context-classloader.main.kts", listOf("MainKtsConfigurator"))
     }
 
+    @OptIn(ExperimentalPathApi::class)
     @Test
     fun testCachedReflection() {
-        val cache = createTempDir("main.kts.test")
+        val cache = createTempDirectory("main.kts.test")
 
         try {
             runWithKotlinRunner("$TEST_DATA_ROOT/use-reflect.main.kts", listOf("false"), cacheDir = cache)
             // second run uses the cached script
             runWithKotlinRunner("$TEST_DATA_ROOT/use-reflect.main.kts", listOf("false"), cacheDir = cache)
         } finally {
-            cache.deleteRecursively()
+            cache.toFile().deleteRecursively()
         }
     }
 
+    @OptIn(ExperimentalPathApi::class)
     @Test
     fun testCache() {
         val script = File("$TEST_DATA_ROOT/import-test.main.kts").absolutePath
-        val cache = createTempDir("main.kts.test")
+        val cache = createTempDirectory("main.kts.test")
 
         try {
-            Assert.assertTrue(cache.exists() && cache.listFiles { f: File -> f.extension == "jar" }?.isEmpty() == true)
+            Assert.assertTrue(cache.exists() && cache.listDirectoryEntries("*.jar").isEmpty())
             runWithKotlinRunner(script, OUT_FROM_IMPORT_TEST, cacheDir = cache)
-            val cacheFile = cache.listFiles { f: File -> f.extension.equals("jar", ignoreCase = true) }?.firstOrNull()
+            val cacheFile = cache.listDirectoryEntries("*.jar").firstOrNull()
             Assert.assertTrue(cacheFile != null && cacheFile.exists())
 
             // run generated jar with java
             val javaExecutable = File(File(System.getProperty("java.home"), "bin"), "java")
-            val args = listOf(javaExecutable.absolutePath, "-jar", cacheFile!!.path)
+            val args = listOf(javaExecutable.absolutePath, "-jar", cacheFile!!.toString())
             runAndCheckResults(
                 args, OUT_FROM_IMPORT_TEST,
-                additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to cache.absolutePath)
+                additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to cache.toAbsolutePath().toString())
             )
 
             // this run should use the cached script
             runWithKotlinRunner(script, OUT_FROM_IMPORT_TEST, cacheDir = cache)
         } finally {
-            cache.deleteRecursively()
+            cache.toFile().deleteRecursively()
         }
     }
 
@@ -127,11 +131,11 @@ fun runWithKotlinRunner(
     scriptPath: String,
     expectedOutPatterns: List<String> = emptyList(),
     expectedExitCode: Int = 0,
-    cacheDir: File? = null
+    cacheDir: Path? = null
 ) {
     runWithKotlinLauncherScript(
         "kotlin", listOf(scriptPath), expectedOutPatterns, expectedExitCode,
-        additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to (cacheDir?.absolutePath ?: ""))
+        additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to (cacheDir?.toAbsolutePath()?.toString() ?: ""))
     )
 }
 
diff --git a/libraries/tools/kotlin-main-kts/src/org/jetbrains/kotlin/mainKts/impl/ivy.kt b/libraries/tools/kotlin-main-kts/src/org/jetbrains/kotlin/mainKts/impl/ivy.kt
index d145470a658..db4a8d3f800 100644
--- a/libraries/tools/kotlin-main-kts/src/org/jetbrains/kotlin/mainKts/impl/ivy.kt
+++ b/libraries/tools/kotlin-main-kts/src/org/jetbrains/kotlin/mainKts/impl/ivy.kt
@@ -19,6 +19,7 @@ import org.apache.ivy.plugins.resolver.IBiblioResolver
 import org.apache.ivy.util.DefaultMessageLogger
 import org.apache.ivy.util.Message
 import java.io.File
+import java.nio.file.Files
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
 import kotlin.script.experimental.dependencies.RepositoryCoordinates
@@ -134,7 +135,7 @@ class IvyResolver : ExternalDependenciesResolver {
         // val report = ivy.resolve(moduleDescriptor, resolveOptions)
 
         //creates an ivy configuration file
-        val ivyFile = createTempFile("ivy", ".xml").apply { deleteOnExit() }
+        val ivyFile = Files.createTempFile("ivy", ".xml").toFile().apply { deleteOnExit() }
         XmlModuleDescriptorWriter.write(moduleDescriptor, ivyFile)
         val report = ivy.resolve(ivyFile.toURI().toURL(), resolveOptions)
 
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java
index 9050707c2aa..e85cb4f6c0a 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java
@@ -53,9 +53,10 @@ import org.jetbrains.kotlin.scripting.compiler.plugin.ConfigurationKt;
 import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar;
 import org.jetbrains.kotlin.utils.ParametersMapKt;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -138,17 +139,17 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
                 buildDirectory.mkdirs();
             }
 
-            File scriptFile = File.createTempFile("kotlin-maven-plugin-inline-script-", ".tmp.kts", buildDirectory);
-            FileOutputStream stream = new FileOutputStream(scriptFile);
-            stream.write(script.getBytes("UTF-8"));
-            stream.close();
+            Path scriptFile = Files.createTempFile(buildDirectory.toPath(), "kotlin-maven-plugin-inline-script-", ".tmp.kts");
+            try (BufferedWriter writer = Files.newBufferedWriter(scriptFile, StandardCharsets.UTF_8)) {
+                writer.write(script);
+            }
 
             try {
-                executeScriptFile(scriptFile);
+                executeScriptFile(scriptFile.toFile());
             } finally {
-                boolean deleted = scriptFile.delete();
+                boolean deleted = Files.deleteIfExists(scriptFile);
                 if (!deleted) {
-                    getLog().warn("Error deleting " + scriptFile.getAbsolutePath());
+                    getLog().warn("Error deleting " + scriptFile.toAbsolutePath());
                 }
             }
         } catch (IOException e) {
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/incremental/MavenICReporter.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/incremental/MavenICReporter.java
index 05809d2ba83..8031b21606a 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/incremental/MavenICReporter.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/incremental/MavenICReporter.java
@@ -20,7 +20,7 @@ import kotlin.jvm.functions.Function0;
 import org.apache.maven.plugin.logging.Log;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.ExitCode;
-import org.jetbrains.kotlin.incremental.ICReporterBase;
+import org.jetbrains.kotlin.build.report.ICReporterBase;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
index e1d638f1a04..c1a7fbb243e 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
@@ -46,6 +46,7 @@ fun main(args: Array<String>) {
             targetBaseDirs[KotlinTarget.JVM] = baseDir.resolveExistingDir("libraries/stdlib/jvm/src/generated")
             targetBaseDirs[KotlinTarget.JS] = baseDir.resolveExistingDir("libraries/stdlib/js/src/generated")
             targetBaseDirs[KotlinTarget.JS_IR] = baseDir.resolveExistingDir("libraries/stdlib/js-ir/src/generated")
+            targetBaseDirs[KotlinTarget.WASM] = baseDir.resolveExistingDir("libraries/stdlib/wasm/src/generated")
         }
         2 -> {
             val (targetName, targetDir) = args
@@ -65,6 +66,7 @@ fun main(args: Array<String>) {
         val targetDir = targetBaseDirs[target] ?: error("Target $target directory is not configured")
         val platformSuffix = when (val platform = target.platform) {
             Platform.Common -> ""
+            Platform.Native -> if (target.backend == Backend.Wasm) "Wasm" else "Native"
             else -> platform.name.toLowerCase().capitalize()
         }
         targetDir.resolve("_${source.name.capitalize()}$platformSuffix.kt")
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Aggregates.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Aggregates.kt
index 9053798c478..c32ca90865b 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Aggregates.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Aggregates.kt
@@ -324,7 +324,7 @@ object Aggregates : TemplateGroupBase() {
                 val isFloat = primitive?.isFloatingPoint() == true
 
                 if (!nullable) {
-                    deprecate(Deprecation("Use ${op}OrNull instead.", "${op}OrNull()", DeprecationLevel.WARNING, warningSince = "1.4"))
+                    deprecate(Deprecation("Use ${op}OrNull instead.", "this.${op}OrNull()", DeprecationLevel.WARNING, warningSince = "1.4"))
 
                     val isGeneric = f in listOf(Iterables, Sequences, ArraysOfObjects)
                     if (isFloat && isGeneric) {
@@ -391,7 +391,7 @@ object Aggregates : TemplateGroupBase() {
                 returns("T?")
 
                 if (!nullable) {
-                    deprecate(Deprecation("Use ${op}OrNull instead.", "${op}OrNull(selector)", DeprecationLevel.WARNING, warningSince = "1.4"))
+                    deprecate(Deprecation("Use ${op}OrNull instead.", "this.${op}OrNull(selector)", DeprecationLevel.WARNING, warningSince = "1.4"))
                     body { "return ${op}OrNull(selector)" }
                     return@builder
                 }
@@ -458,7 +458,7 @@ object Aggregates : TemplateGroupBase() {
                 returns("T?")
 
                 if (!nullable) {
-                    deprecate(Deprecation("Use ${op}OrNull instead.", "${op}OrNull(comparator)", DeprecationLevel.WARNING, warningSince = "1.4"))
+                    deprecate(Deprecation("Use ${op}OrNull instead.", "this.${op}OrNull(comparator)", DeprecationLevel.WARNING, warningSince = "1.4"))
                     body { "return ${op}OrNull(comparator)" }
                     return@builder
                 }
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
index c7899caff50..196ffc4f090 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
@@ -919,6 +919,9 @@ object ArrayOps : TemplateGroupBase() {
                         """
                     }
                 }
+                on(Backend.Wasm) {
+                    body { """TODO("Wasm stdlib: $signature")""" }
+                }
             }
         }
     }
@@ -1046,6 +1049,9 @@ object ArrayOps : TemplateGroupBase() {
             return result
             """
         }
+        on(Backend.Wasm) {
+            body { """TODO("Wasm stdlib: $signature")""" }
+        }
     }
 
     val f_copyOf = fn("copyOf()") {
@@ -1154,6 +1160,9 @@ object ArrayOps : TemplateGroupBase() {
             }
             on(Platform.Native) {
                 body { "return this.copyOfNulls(newSize)" }
+                on(Backend.Wasm) {
+                    body { """TODO("Wasm stdlib: $signature")""" }
+                }
             }
         }
         specialFor(ArraysOfPrimitives, InvariantArraysOfObjects) {
@@ -1233,6 +1242,9 @@ object ArrayOps : TemplateGroupBase() {
             }
             on(Platform.Native) {
                 body { """if (size > 1) sortArray(this, 0, size)""" }
+                on(Backend.Wasm) {
+                    body { """TODO("Wasm stdlib: $signature")""" }
+                }
             }
         }
     }
@@ -1255,6 +1267,9 @@ object ArrayOps : TemplateGroupBase() {
         }
         on(Platform.Native) {
             body { """if (size > 1) sortArrayWith(this, 0, size, comparator)""" }
+            on(Backend.Wasm) {
+                body { """TODO("Wasm stdlib: $signature")""" }
+            }
         }
     }
 
@@ -1363,6 +1378,9 @@ object ArrayOps : TemplateGroupBase() {
                 sortArray(this, fromIndex, toIndex)
                 """
             }
+            on(Backend.Wasm) {
+                body { """TODO("Wasm stdlib: $signature")""" }
+            }
         }
         on(Platform.JS) {
             since("1.4")
@@ -1419,6 +1437,9 @@ object ArrayOps : TemplateGroupBase() {
                 sortArrayWith(this, fromIndex, toIndex, comparator)
                 """
             }
+            on(Backend.Wasm) {
+                body { """TODO("Wasm stdlib: $signature")""" }
+            }
         }
         on(Platform.JS) {
             since("1.4")
@@ -1624,6 +1645,9 @@ object ArrayOps : TemplateGroupBase() {
                 body {
                     "arrayFill(this, fromIndex, toIndex, element)"
                 }
+                on(Backend.Wasm) {
+                    body { """TODO("Wasm stdlib: $signature")""" }
+                }
             }
             on(Platform.Common) {
                 since("1.3")
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt
index 79050071b25..4fc603b84af 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt
@@ -5,6 +5,8 @@
 
 package templates
 
+import templates.DocExtensions.collection
+import templates.DocExtensions.element
 import templates.Family.*
 import templates.SequenceClass.*
 
@@ -567,13 +569,19 @@ object Elements : TemplateGroupBase() {
         body { "return firstOrNull(predicate)"}
     }
 
+    private val Family.sampleClass: String
+        get() = when (this) {
+            Strings, CharSequences -> "samples.text.Strings"
+            else -> "samples.collections.Collections.Elements"
+        }
 
     val f_last = fn("last()") {
         includeDefault()
         include(CharSequences, Lists, ArraysOfUnsigned)
     } builder {
-        doc { """Returns the last ${f.element}.
-        @throws [NoSuchElementException] if the ${f.collection} is empty.""" }
+        doc { "Returns the last ${f.element}." }
+        throws("NoSuchElementException", "if the ${f.collection} is empty.")
+        sample("${f.sampleClass}.last")
         returns("T")
         body {
             """
@@ -621,6 +629,7 @@ object Elements : TemplateGroupBase() {
         include(Lists, CharSequences, ArraysOfUnsigned)
     } builder {
         doc { "Returns the last ${f.element}, or `null` if the ${f.collection} is empty." }
+        sample("${f.sampleClass}.last")
         returns("T?")
         body {
             """
@@ -668,8 +677,9 @@ object Elements : TemplateGroupBase() {
         inline()
         specialFor(ArraysOfUnsigned) { inlineOnly() }
 
-        doc { """Returns the last ${f.element} matching the given [predicate].
-        @throws [NoSuchElementException] if no such ${f.element} is found.""" }
+        doc { "Returns the last ${f.element} matching the given [predicate]." }
+        throws("NoSuchElementException", "if no such ${f.element} is found.")
+        sample("${f.sampleClass}.last")
         returns("T")
         body {
             """
@@ -716,6 +726,7 @@ object Elements : TemplateGroupBase() {
         specialFor(ArraysOfUnsigned) { inlineOnly() }
 
         doc { "Returns the last ${f.element} matching the given [predicate], or `null` if no such ${f.element} was found." }
+        sample("${f.sampleClass}.last")
         returns("T?")
         body {
             """
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
index 9826eafe482..7287b41a336 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
@@ -642,7 +642,7 @@ object Generators : TemplateGroupBase() {
 
             Note that the ${f.viewResult} passed to the [transform] function is ephemeral and is valid only inside that function.
             You should not store it or allow it to escape in some way, unless you made a snapshot of it.
-            Several last ${f.viewResult.pluralize()} may have less ${f.element.pluralize()} than the given [size].
+            Several last ${f.viewResult.pluralize()} may have fewer ${f.element.pluralize()} than the given [size].
 
             Both [size] and [step] must be positive and can be greater than the number of elements in this ${f.collection}.
             @param size the number of elements to take in each window
@@ -724,7 +724,7 @@ object Generators : TemplateGroupBase() {
             sliding along this ${f.collection} with the given [step], where each
             snapshot is ${f.snapshotResult.prefixWithArticle()}.
 
-            Several last ${f.snapshotResult.pluralize()} may have less ${f.element.pluralize()} than the given [size].
+            Several last ${f.snapshotResult.pluralize()} may have fewer ${f.element.pluralize()} than the given [size].
 
             Both [size] and [step] must be positive and can be greater than the number of elements in this ${f.collection}.
             @param size the number of elements to take in each window
@@ -778,7 +778,7 @@ object Generators : TemplateGroupBase() {
 
             Note that the ${f.viewResult} passed to the [transform] function is ephemeral and is valid only inside that function.
             You should not store it or allow it to escape in some way, unless you made a snapshot of it.
-            Several last ${f.viewResult.pluralize()} may have less ${f.element.pluralize()} than the given [size].
+            Several last ${f.viewResult.pluralize()} may have fewer ${f.element.pluralize()} than the given [size].
 
             Both [size] and [step] must be positive and can be greater than the number of elements in this ${f.collection}.
             @param size the number of elements to take in each window
@@ -814,7 +814,7 @@ object Generators : TemplateGroupBase() {
             sliding along this ${f.collection} with the given [step], where each
             snapshot is ${f.snapshotResult.prefixWithArticle()}.
 
-            Several last ${f.snapshotResult.pluralize()} may have less ${f.element.pluralize()} than the given [size].
+            Several last ${f.snapshotResult.pluralize()} may have fewer ${f.element.pluralize()} than the given [size].
 
             Both [size] and [step] must be positive and can be greater than the number of elements in this ${f.collection}.
             @param size the number of elements to take in each window
@@ -842,7 +842,7 @@ object Generators : TemplateGroupBase() {
 
             Note that the ${f.viewResult} passed to the [transform] function is ephemeral and is valid only inside that function.
             You should not store it or allow it to escape in some way, unless you made a snapshot of it.
-            The last ${f.viewResult} may have less ${f.element.pluralize()} than the given [size].
+            The last ${f.viewResult} may have fewer ${f.element.pluralize()} than the given [size].
 
             @param size the number of elements to take in each ${f.viewResult}, must be positive and can be greater than the number of elements in this ${f.collection}.
             """
@@ -869,7 +869,7 @@ object Generators : TemplateGroupBase() {
             """
             Splits this ${f.collection} into a ${f.mapResult} of ${f.snapshotResult.pluralize()} each not exceeding the given [size].
 
-            The last ${f.snapshotResult} in the resulting ${f.mapResult} may have less ${f.element.pluralize()} than the given [size].
+            The last ${f.snapshotResult} in the resulting ${f.mapResult} may have fewer ${f.element.pluralize()} than the given [size].
 
             @param size the number of elements to take in each ${f.snapshotResult}, must be positive and can be greater than the number of elements in this ${f.collection}.
             """
@@ -898,7 +898,7 @@ object Generators : TemplateGroupBase() {
 
             Note that the ${f.viewResult} passed to the [transform] function is ephemeral and is valid only inside that function.
             You should not store it or allow it to escape in some way, unless you made a snapshot of it.
-            The last ${f.viewResult} may have less ${f.element.pluralize()} than the given [size].
+            The last ${f.viewResult} may have fewer ${f.element.pluralize()} than the given [size].
 
             @param size the number of elements to take in each ${f.viewResult}, must be positive and can be greater than the number of elements in this ${f.collection}.
             """
@@ -923,7 +923,7 @@ object Generators : TemplateGroupBase() {
             """
             Splits this ${f.collection} into a sequence of ${f.snapshotResult.pluralize()} each not exceeding the given [size].
 
-            The last ${f.snapshotResult} in the resulting sequence may have less ${f.element.pluralize()} than the given [size].
+            The last ${f.snapshotResult} in the resulting sequence may have fewer ${f.element.pluralize()} than the given [size].
 
             @param size the number of elements to take in each ${f.snapshotResult}, must be positive and can be greater than the number of elements in this ${f.collection}.
             """
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt
index a29e2b82b70..e0ef31999c3 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt
@@ -106,13 +106,14 @@ enum class Platform {
     Common,
     JVM,
     JS,
-    Native
+    Native,
 }
 
 enum class Backend {
     Any,
     Legacy,
-    IR
+    IR,
+    Wasm,
 }
 
 enum class KotlinTarget(val platform: Platform, val backend: Backend) {
@@ -120,6 +121,7 @@ enum class KotlinTarget(val platform: Platform, val backend: Backend) {
     JVM(Platform.JVM, Backend.Any),
     JS(Platform.JS, Backend.Legacy),
     JS_IR(Platform.JS, Backend.IR),
+    WASM(Platform.Native, Backend.Wasm),
     Native(Platform.Native, Backend.IR);
 
     val fullName get() = "Kotlin/$name"
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/MemberBuilder.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/MemberBuilder.kt
index 9a3acc6e0fa..fe73be79907 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/MemberBuilder.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/MemberBuilder.kt
@@ -159,7 +159,7 @@ class MemberBuilder(
     }
 
     fun on(backend: Backend, action: () -> Unit) {
-        require(target.platform == Platform.JS)
+        require(target.platform == Platform.JS || target.platform == Platform.Native)
         if (target.backend == backend) action()
     }
 
diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts
index 27a5c314945..6cf0f54bf85 100644
--- a/libraries/tools/kotlinp/build.gradle.kts
+++ b/libraries/tools/kotlinp/build.gradle.kts
@@ -29,9 +29,7 @@ dependencies {
 
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency", "platform-objectSerializer") }
-    }
+    testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency", "platform-objectSerializer") }
 
     shadows(project(":kotlinx-metadata-jvm", configuration = "runtime"))
     shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion")
diff --git a/libraries/tools/kotlinp/testData/Annotations.txt b/libraries/tools/kotlinp/testData/Annotations.txt
index bf6e094ba26..94c37648cea 100644
--- a/libraries/tools/kotlinp/testData/Annotations.txt
+++ b/libraries/tools/kotlinp/testData/Annotations.txt
@@ -79,48 +79,56 @@ public final annotation class A : kotlin/Annotation {
     public final get
 
   // requires language version 1.3.0 (level=ERROR)
+  // requires compiler version 1.4.30 (level=ERROR)
   // requires language version 1.4.0 (level=ERROR)
   // getter: ub()B
   public final val ub: kotlin/UByte
     public final get
 
   // requires language version 1.3.0 (level=ERROR)
+  // requires compiler version 1.4.30 (level=ERROR)
   // requires language version 1.4.0 (level=ERROR)
   // getter: ub_max()B
   public final val ub_max: kotlin/UByte
     public final get
 
   // requires language version 1.3.0 (level=ERROR)
+  // requires compiler version 1.4.30 (level=ERROR)
   // requires language version 1.4.0 (level=ERROR)
   // getter: ui()I
   public final val ui: kotlin/UInt
     public final get
 
   // requires language version 1.3.0 (level=ERROR)
+  // requires compiler version 1.4.30 (level=ERROR)
   // requires language version 1.4.0 (level=ERROR)
   // getter: ui_max()I
   public final val ui_max: kotlin/UInt
     public final get
 
   // requires language version 1.3.0 (level=ERROR)
+  // requires compiler version 1.4.30 (level=ERROR)
   // requires language version 1.4.0 (level=ERROR)
   // getter: ul()J
   public final val ul: kotlin/ULong
     public final get
 
   // requires language version 1.3.0 (level=ERROR)
+  // requires compiler version 1.4.30 (level=ERROR)
   // requires language version 1.4.0 (level=ERROR)
   // getter: ul_max()J
   public final val ul_max: kotlin/ULong
     public final get
 
   // requires language version 1.3.0 (level=ERROR)
+  // requires compiler version 1.4.30 (level=ERROR)
   // requires language version 1.4.0 (level=ERROR)
   // getter: us()S
   public final val us: kotlin/UShort
     public final get
 
   // requires language version 1.3.0 (level=ERROR)
+  // requires compiler version 1.4.30 (level=ERROR)
   // requires language version 1.4.0 (level=ERROR)
   // getter: us_max()S
   public final val us_max: kotlin/UShort
diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts
index 40240a32a17..cbfb8cf572f 100644
--- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts
+++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm") version "1.4.0"
-    id("org.jetbrains.compose") version "0.1.0-build63"
+    id("org.jetbrains.compose") version "0.1.0-dev106"
     application
 }
 
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation(compose.desktop.all)
+    implementation(compose.desktop.currentOs)
 }
 
 tasks.withType<KotlinCompile>() {
diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts
index 1941da42f10..de5d976f7c5 100644
--- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts
+++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.compose") version "0.1.0-build63"
+    id("org.jetbrains.compose") version "0.1.0-dev106"
     id("com.android.application")
     kotlin("android")
 }
diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts
index 8d1b62e30ea..a0f12fc64e9 100644
--- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts
+++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.compose") version "0.1.0-build63"
+    id("org.jetbrains.compose") version "0.1.0-dev106"
     id("com.android.library")
     id("kotlin-android-extensions")
 }
@@ -18,7 +18,7 @@ kotlin {
     android()
     jvm("desktop") {
         compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.jvmTarget = "11"
         }
     }
     sourceSets {
diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts
index 7477099ec0b..2adf05c2f3a 100644
--- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts
+++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts
@@ -1,22 +1,29 @@
 import org.jetbrains.compose.compose
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm")
-    id("org.jetbrains.compose") version "0.1.0-build63"
+    kotlin("multiplatform")
+    id("org.jetbrains.compose") version "0.1.0-dev106"
     application
 }
 
 group = "me.user"
 version = "1.0-SNAPSHOT"
 
-dependencies {
-    implementation(project(":common"))
-    implementation(compose.desktop.all)
-}
-
-tasks.withType<KotlinCompile>() {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
+    }
+    sourceSets {
+        val jvmMain by getting {
+            dependencies {
+                implementation(project(":common"))
+                implementation(compose.desktop.currentOs)
+            }
+        }
+        val jvmTest by getting
+    }
 }
 
 application {
diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt
index a0bf8b54c11..919e396e7fa 100644
--- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt
+++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt
@@ -26,7 +26,7 @@ abstract class AbstractBuildFileGenerationTest : UsefulTestCase() {
 
         val buildSystemsToRunFor = listOfNotNull(
             BuildSystem.GRADLE_KOTLIN_DSL,
-            BuildSystem.GRADLE_GROOVY_DSL,
+            if (testParameters.runForGradleGroovy) BuildSystem.GRADLE_GROOVY_DSL else null,
             if (testParameters.runForMaven) BuildSystem.MAVEN else null
         )
 
diff --git a/libraries/tools/new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties b/libraries/tools/new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties
index b751f2c2292..90203cd278d 100644
--- a/libraries/tools/new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties
+++ b/libraries/tools/new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties
@@ -40,6 +40,7 @@ project.kind.kotlin.js=Kotlin/JS
 project.kind.multiplatform=Multiplatform
 project.kind.singleplatform=JVM
 project.kind.compose=JetBrains Compose (Experimental)
+project.kind.compose.short.name=JetBrains Compose
 
 project=Project
 
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
index 3b845ff14be..9befdf3a708 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
@@ -14,7 +14,7 @@ object Versions {
     val KTOR = version("1.4.0")
     val JUNIT = version("4.13")
     val JUNIT5 = version("5.6.0")
-    val JETBRAINS_COMPOSE = version("0.1.0-build63")
+    val JETBRAINS_COMPOSE = version("0.1.0-dev106")
 
     val KOTLIN_VERSION_FOR_COMPOSE = version("1.4.0")
 
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/BuildSystemPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/BuildSystemPlugin.kt
index 22ea146b37c..22484825a22 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/BuildSystemPlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/BuildSystemPlugin.kt
@@ -43,19 +43,17 @@ abstract class BuildSystemPlugin(context: Context) : Plugin(context) {
             }
 
             validate { buildSystemType ->
-                if (!buildSystemType.isGradle
-                    && KotlinPlugin.projectKind.notRequiredSettingValue != ProjectKind.Singleplatform
-                ) {
-                    val projectKind = KotlinPlugin.projectKind.notRequiredSettingValue?.text?.capitalize()
-                        ?: KotlinNewProjectWizardBundle.message("project")
-                    ValidationResult.ValidationError(
+                val projectKind = KotlinPlugin.projectKind.notRequiredSettingValue ?: ProjectKind.Multiplatform
+                when (buildSystemType) {
+                    in projectKind.supportedBuildSystems -> ValidationResult.OK
+                    else -> ValidationResult.ValidationError(
                         KotlinNewProjectWizardBundle.message(
                             "plugin.buildsystem.setting.type.error.wrong.project.kind",
-                            projectKind,
+                            projectKind.shortName.capitalize(),
                             buildSystemType.fullText
                         )
                     )
-                } else ValidationResult.OK
+                }
             }
         }
 
@@ -171,6 +169,10 @@ enum class BuildSystemType(
 
     override val greyText: String?
         get() = null
+
+    companion object {
+        val ALL_GRADLE = setOf(GradleKotlinDsl, GradleGroovyDsl)
+    }
 }
 
 val BuildSystemType.isGradle
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt
index 8f9361b52dd..47b9a904d0a 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.inContextOfM
 import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.plugins.StructurePlugin
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemPlugin
+import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.buildSystemType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.pomIR
 import org.jetbrains.kotlin.tools.projectWizard.plugins.projectPath
@@ -194,12 +195,25 @@ class KotlinPlugin(context: Context) : Plugin(context) {
 
 }
 
-enum class ProjectKind(override val text: String, val message: String? = null) : DisplayableSettingItem {
-    Singleplatform(KotlinNewProjectWizardBundle.message("project.kind.singleplatform")),
-    Multiplatform(KotlinNewProjectWizardBundle.message("project.kind.multiplatform")),
-    Android(KotlinNewProjectWizardBundle.message("project.kind.android")),
-    Js(KotlinNewProjectWizardBundle.message("project.kind.kotlin.js")),
-    COMPOSE(KotlinNewProjectWizardBundle.message("project.kind.compose"), message = "uses Kotlin ${Versions.KOTLIN_VERSION_FOR_COMPOSE}")
+enum class ProjectKind(
+    override val text: String,
+    val supportedBuildSystems: Set<BuildSystemType>,
+    val shortName: String = text,
+    val message: String? = null,
+) : DisplayableSettingItem {
+    Singleplatform(
+        KotlinNewProjectWizardBundle.message("project.kind.singleplatform"),
+        supportedBuildSystems = BuildSystemType.values().toSet()
+    ),
+    Multiplatform(KotlinNewProjectWizardBundle.message("project.kind.multiplatform"), supportedBuildSystems = BuildSystemType.ALL_GRADLE),
+    Android(KotlinNewProjectWizardBundle.message("project.kind.android"), supportedBuildSystems = BuildSystemType.ALL_GRADLE),
+    Js(KotlinNewProjectWizardBundle.message("project.kind.kotlin.js"), supportedBuildSystems = BuildSystemType.ALL_GRADLE),
+    COMPOSE(
+        KotlinNewProjectWizardBundle.message("project.kind.compose"),
+        supportedBuildSystems = setOf(BuildSystemType.GradleKotlinDsl),
+        shortName = KotlinNewProjectWizardBundle.message("project.kind.compose.short.name"),
+        message = "uses Kotlin ${Versions.KOTLIN_VERSION_FOR_COMPOSE}"
+    )
 }
 
 fun List<Module>.withAllSubModules(includeSourcesets: Boolean = false): List<Module> = buildList {
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt
index 78aee3b53ad..98be940aebe 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt
@@ -144,21 +144,7 @@ class ModulesToIRsConverter(
         state: ModulesToIrsState
     ): TaskResult<List<BuildFileIR>> = computeM {
         val modulePath = calculatePathForModule(module, state.parentPath)
-        val (moduleDependencies) = forModuleEachDependency(module) { from, to, dependencyType ->
-            with(dependencyType) {
-                @Suppress("DEPRECATION")
-                with(unsafeSettingWriter) {
-                    runArbitraryTask(
-                        module,
-                        to,
-                        to.path.considerSingleRootModuleMode(data.isSingleRootModuleMode).asPath(),
-                        data
-                    ).ensure()
-                }
-                irsToAddToModules.getOrPut(to) { mutableListOf() } += createToIRs(module, to, data).get()
-                createDependencyIrs(module, to, data).asSuccess()
-            }
-        }.map { it.flatten() }
+        val (moduleDependencies) = createModuleDependencies(module)
         mutateProjectStructureByModuleConfigurator(module, modulePath)
         val buildFileIR = run {
             if (!configurator.needCreateBuildFile) return@run null
@@ -214,50 +200,69 @@ class ModulesToIRsConverter(
     private fun Writer.createMultiplatformModule(
         module: Module,
         state: ModulesToIrsState
-    ): TaskResult<List<BuildFileIR>> = with(data) {
-        val modulePath = calculatePathForModule(module, state.parentPath)
-        mutateProjectStructureByModuleConfigurator(module, modulePath)
-        val targetIrs = module.subModules.flatMap { subModule ->
-            with(subModule.configurator as TargetConfigurator) { createTargetIrs(subModule) }
-        }
+    ): TaskResult<List<BuildFileIR>> = compute {
+        with(data) {
+            val modulePath = calculatePathForModule(module, state.parentPath)
+            mutateProjectStructureByModuleConfigurator(module, modulePath)
+            val targetIrs = module.subModules.flatMap { subModule ->
+                with(subModule.configurator as TargetConfigurator) { createTargetIrs(subModule) }
+            }
 
-        val targetModuleIrs = module.subModules.map { target ->
-            createTargetModule(target, modulePath)
-        }
+            val (targetModuleIrs) = module.subModules.mapSequence { target ->
+                createTargetModule(target, modulePath)
+            }
 
-        return BuildFileIR(
-            projectName,
-            modulePath,
-            MultiplatformModulesStructureIR(
-                targetIrs,
-                FakeMultiplatformModuleIR(
-                    module.name,
-                    modulePath,
-                    module.template,
+            BuildFileIR(
+                projectName,
+                modulePath,
+                MultiplatformModulesStructureIR(
+                    targetIrs,
+                    FakeMultiplatformModuleIR(
+                        module.name,
+                        modulePath,
+                        module.template,
+                        targetModuleIrs,
+                        module,
+                    ),
                     targetModuleIrs,
-                    module,
+                    persistentListOf()
                 ),
-                targetModuleIrs,
-                persistentListOf()
-            ),
-            module.subModules + module,
-            pomIr,
-            isRoot = false,
-            renderPomIr = StructurePlugin.renderPomIR.settingValue,
-            buildPersistenceList {
-                +createBuildFileIRs(module, state)
-                module.subModules.forEach { +createBuildFileIRs(it, state) }
-            }
-        ).also { buildFile ->
-            moduleToBuildFile[module] = buildFile
-            module.subModules.forEach { subModule ->
-                moduleToBuildFile[subModule] = buildFile
-            }
-        }.asSingletonList().asSuccess()
-
+                module.subModules + module,
+                pomIr,
+                isRoot = false,
+                renderPomIr = StructurePlugin.renderPomIR.settingValue,
+                buildPersistenceList {
+                    +createBuildFileIRs(module, state)
+                    module.subModules.forEach { +createBuildFileIRs(it, state) }
+                }
+            ).also { buildFile ->
+                moduleToBuildFile[module] = buildFile
+                module.subModules.forEach { subModule ->
+                    moduleToBuildFile[subModule] = buildFile
+                }
+            }.asSingletonList()
+        }
     }
 
-    private fun Writer.createTargetModule(target: Module, modulePath: Path): MultiplatformModuleIR {
+    private fun Writer.createModuleDependencies(module: Module): TaskResult<List<BuildSystemIR>> =
+        forModuleEachDependency(module) { from, to, dependencyType ->
+            with(dependencyType) {
+                @Suppress("DEPRECATION")
+                unsafeSettingWriter {
+                    runArbitraryTask(
+                        module,
+                        to,
+                        to.path.considerSingleRootModuleMode(data.isSingleRootModuleMode).asPath(),
+                        data
+                    ).ensure()
+                }
+                irsToAddToModules.getOrPut(to) { mutableListOf() } += createToIRs(module, to, data).get()
+                createDependencyIrs(module, to, data).asSuccess()
+            }
+        }.map { it.flatten() }
+
+    private fun Writer.createTargetModule(target: Module, modulePath: Path): TaskResult<MultiplatformModuleIR> = compute {
+        val (moduleDependencies) = createModuleDependencies(target)
         mutateProjectStructureByModuleConfigurator(target, modulePath)
         val sourcesetss = target.sourcesets.map { sourceset ->
             val sourcesetName = target.name + sourceset.sourcesetType.name.capitalize()
@@ -269,10 +274,13 @@ class ModulesToIRsConverter(
                 sourceset
             )
         }
-        return MultiplatformModuleIR(
+        MultiplatformModuleIR(
             target.name,
             modulePath,
-            with(target.configurator) { createModuleIRs(this@createTargetModule, data, target) }.toPersistentList(),
+            buildPersistenceList {
+                +moduleDependencies
+                with(target.configurator) { +createModuleIRs(this@createTargetModule, data, target) }
+            },
             target.template,
             target,
             sourcesetss
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
index 011b00ec9a8..3bc98464fed 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
@@ -515,6 +515,7 @@ object ComposeMultiplatformApplicationProjectTemplate : ProjectTemplate() {
                         subModules = emptyList()
                     ).withConfiguratorSettings(JvmTargetConfigurator) {
                         ModuleConfiguratorWithTests.testFramework withValue KotlinTestFramework.NONE
+                        JvmModuleConfigurator.targetJvmVersion withValue TargetJvmVersion.JVM_11
                     }
                 )
             )
@@ -530,14 +531,23 @@ object ComposeMultiplatformApplicationProjectTemplate : ProjectTemplate() {
             }
             +Module(
                 "desktop",
-                JvmSinglePlatformModuleConfigurator,
-                template = ComposeJvmDesktopTemplate(),
+                MppModuleConfigurator,
+                template = null,
                 sourcesets = createDefaultSourcesets(),
-                subModules = emptyList(),
-                dependencies = mutableListOf(ModuleReference.ByModule(common))
-            ).withConfiguratorSettings(JvmSinglePlatformModuleConfigurator) {
-                ModuleConfiguratorWithTests.testFramework withValue KotlinTestFramework.NONE
-            }
+                subModules = listOf(
+                    Module(
+                        "jvm",
+                        JvmTargetConfigurator,
+                        template = ComposeJvmDesktopTemplate(),
+                        sourcesets = createDefaultSourcesets(),
+                        subModules = emptyList(),
+                        dependencies = mutableListOf(ModuleReference.ByModule(common))
+                    ).withConfiguratorSettings(JvmTargetConfigurator) {
+                        ModuleConfiguratorWithTests.testFramework withValue KotlinTestFramework.NONE
+                        JvmModuleConfigurator.targetJvmVersion withValue TargetJvmVersion.JVM_11
+                    }
+                ),
+            )
             +common
         }
 }
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt
index 69fe0970837..e43dc1c229c 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt
@@ -86,6 +86,14 @@ sealed class ModuleDependencyType(
         to = MppModuleConfigurator::class
     )
 
+    object JVMTargetToMPP : ModuleDependencyType(
+        from = JvmTargetConfigurator::class,
+        to = MppModuleConfigurator::class
+    ) {
+        override fun additionalAcceptanceChecker(from: Module, to: Module): Boolean =
+            from !in to.subModules
+    }
+
     object IOSToMppSinglePlatformToMPP : ModuleDependencyType(
         from = IOSSinglePlatformModuleConfigurator::class,
         to = MppModuleConfigurator::class
@@ -184,6 +192,7 @@ sealed class ModuleDependencyType(
             JVMSinglePlatformToJVMSinglePlatform,
             JVMSinglePlatformToMPP,
             AndroidSinglePlatformToMPP,
+            JVMTargetToMPP,
             IOSToMppSinglePlatformToMPP
         )
 
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt
index fca244ff40e..82327c024e9 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt
@@ -38,6 +38,7 @@ class ComposeJvmDesktopTemplate : Template() {
 
     override fun isApplicableTo(reader: Reader, module: Module): Boolean =
         module.kind == ModuleKind.singleplatformJvm
+                || module.kind == ModuleKind.target
 
     override fun Writer.getIrsToAddToBuildFile(
         module: ModuleIR
@@ -51,7 +52,7 @@ class ComposeJvmDesktopTemplate : Template() {
     }
 
     override fun Writer.getRequiredLibraries(module: ModuleIR): List<DependencyIR> = listOf(
-        CustomGradleDependencyDependencyIR("compose.desktop.all", dependencyType = DependencyType.MAIN, DependencyKind.implementation)
+        CustomGradleDependencyDependencyIR("compose.desktop.currentOs", dependencyType = DependencyType.MAIN, DependencyKind.implementation)
     )
 
     override fun Writer.runArbitratyTask(module: ModuleIR): TaskResult<Unit> =
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index 9704249ac00..6f9c169593d 100644
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -36,8 +36,8 @@ compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xnormalize-constructor-calls=enable",
-            "-module-name", project.name
     ]
+    kotlinOptions.moduleName = project.name
 }
 
 configureJvmIrBackend(project)
diff --git a/license/README.md b/license/README.md
index 9ed84957d45..42a92549719 100644
--- a/license/README.md
+++ b/license/README.md
@@ -88,10 +88,11 @@ the Kotlin IntelliJ IDEA plugin:
  - Path: plugins/lint/lint-idea
       - License: Apache 2 ([license/third_party/aosp_license.txt][aosp])
       - Origin: Copyright (C) 2011-15 The Android Open Source Project
+          
+ - Path: wasm/ir/src/org/jetbrains/kotlin/wasm/ir/convertors
+      - License: MIT ([license/third_party/asmble_license.txt][asmble])
+      - Origin: Copyright (C) 2018 Chad Retz
       
- - Path: idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl
-       - License: Apache 2 ([license/third_party/gradle_license.txt][gradle])
-       - Origin: Gradle, Copyright 2002-2017 Gradle, Inc.
 
 ## Kotlin Test Data
 
diff --git a/license/third_party/asmble_license.txt b/license/third_party/asmble_license.txt
new file mode 100644
index 00000000000..6a6444d0eca
--- /dev/null
+++ b/license/third_party/asmble_license.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Chad Retz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/native/commonizer-embeddable/build.gradle.kts b/native/commonizer-embeddable/build.gradle.kts
index 1b29e79d792..6e3758720af 100644
--- a/native/commonizer-embeddable/build.gradle.kts
+++ b/native/commonizer-embeddable/build.gradle.kts
@@ -20,5 +20,5 @@ publish()
 noDefaultJar()
 
 runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
-sourcesJar()
-javadocJar()
+sourcesJar { includeEmptyDirs = false; eachFile { exclude() } } // empty Jar, no public sources
+javadocJar { includeEmptyDirs = false; eachFile { exclude() } } // empty Jar, no public javadocs
diff --git a/native/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts
index a03f5c07521..008bba5da8d 100644
--- a/native/commonizer/build.gradle.kts
+++ b/native/commonizer/build.gradle.kts
@@ -46,4 +46,6 @@ projectTest(parallel = true) {
     workingDir = rootDir
 }
 
-standardPublicJars()
+runtimeJar()
+sourcesJar { includeEmptyDirs = false; eachFile { exclude() } } // empty Jar, no public sources
+javadocJar { includeEmptyDirs = false; eachFile { exclude() } } // empty Jar, no public javadocs
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedAnnotationDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedAnnotationDescriptor.kt
index 5ce070970d3..e3f01500670 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedAnnotationDescriptor.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedAnnotationDescriptor.kt
@@ -8,7 +8,8 @@ package org.jetbrains.kotlin.descriptors.commonizer.builder
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
-import org.jetbrains.kotlin.descriptors.commonizer.utils.concat
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactConcat
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMapValues
 import org.jetbrains.kotlin.resolve.constants.AnnotationValue
 import org.jetbrains.kotlin.storage.getValue
 
@@ -21,7 +22,7 @@ class CommonizedAnnotationDescriptor(
     }
 
     override val allValueArguments by targetComponents.storageManager.createLazyValue {
-        cirAnnotation.constantValueArguments concat cirAnnotation.annotationValueArguments.mapValues { (_, nestedCirAnnotation) ->
+        cirAnnotation.constantValueArguments compactConcat cirAnnotation.annotationValueArguments.compactMapValues { (_, nestedCirAnnotation) ->
             AnnotationValue(CommonizedAnnotationDescriptor(targetComponents, nestedCirAnnotation))
         }
     }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedPackageFragmentProvider.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedPackageFragmentProvider.kt
index c6be0379a67..1da0bb061d4 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedPackageFragmentProvider.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedPackageFragmentProvider.kt
@@ -7,10 +7,11 @@ package org.jetbrains.kotlin.descriptors.commonizer.builder
 
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackageFragmentProviderOptimized
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
-internal class CommonizedPackageFragmentProvider : PackageFragmentProvider {
+internal class CommonizedPackageFragmentProvider : PackageFragmentProviderOptimized {
     private val packageFragments = ArrayList<PackageFragmentDescriptor>()
 
     operator fun plusAssign(packageFragment: PackageFragmentDescriptor) {
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt
index f667a93faab..976c0dd2152 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt
@@ -17,12 +17,12 @@ import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.types.asSimpleType
 
 class CommonizedTypeAliasDescriptor(
-        override val storageManager: StorageManager,
-        containingDeclaration: DeclarationDescriptor,
-        annotations: Annotations,
-        name: Name,
-        visibility: DescriptorVisibility,
-        private val isActual: Boolean
+    override val storageManager: StorageManager,
+    containingDeclaration: DeclarationDescriptor,
+    annotations: Annotations,
+    name: Name,
+    visibility: DescriptorVisibility,
+    private val isActual: Boolean
 ) : AbstractTypeAliasDescriptor(containingDeclaration, annotations, name, SourceElement.NO_SOURCE, visibility) {
 
     private lateinit var underlyingTypeImpl: NotNullLazyValue<SimpleType>
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeParameterDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeParameterDescriptor.kt
index 1ca2df9e0e3..41afa3f784b 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeParameterDescriptor.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeParameterDescriptor.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.descriptors.SupertypeLoopChecker
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.KotlinType
@@ -40,7 +41,7 @@ class CommonizedTypeParameterDescriptor(
         return if (cirUpperBounds.isEmpty())
             listOf(targetComponents.builtIns.defaultBound)
         else
-            cirUpperBounds.map { it.buildType(targetComponents, typeParameterResolver) }
+            cirUpperBounds.compactMap { it.buildType(targetComponents, typeParameterResolver) }
     }
 
     override fun reportSupertypeLoopError(type: KotlinType) =
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
index 65a9a910066..a5ca5b6a189 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
@@ -8,7 +8,9 @@ package org.jetbrains.kotlin.descriptors.commonizer.builder
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
-import org.jetbrains.kotlin.descriptors.commonizer.utils.isUnderStandardKotlinPackages
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compact
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMapIndexed
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
 import org.jetbrains.kotlin.resolve.DescriptorFactory
 import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -22,7 +24,7 @@ internal fun List<CirTypeParameter>.buildDescriptorsAndTypeParameterResolver(
     containingDeclaration: DeclarationDescriptor,
     typeParametersIndexOffset: Int = 0
 ): Pair<List<TypeParameterDescriptor>, TypeParameterResolver> {
-    val ownTypeParameters = mutableListOf<TypeParameterDescriptor>()
+    val ownTypeParameters = ArrayList<TypeParameterDescriptor>(size)
 
     val typeParameterResolver = TypeParameterResolverImpl(
         ownTypeParameters = ownTypeParameters,
@@ -50,7 +52,7 @@ internal fun List<CirValueParameter>.buildDescriptors(
     targetComponents: TargetDeclarationsBuilderComponents,
     typeParameterResolver: TypeParameterResolver,
     containingDeclaration: CallableDescriptor
-): List<ValueParameterDescriptor> = mapIndexed { index, param ->
+): List<ValueParameterDescriptor> = compactMapIndexed { index, param ->
     ValueParameterDescriptorImpl(
         containingDeclaration,
         null,
@@ -67,10 +69,7 @@ internal fun List<CirValueParameter>.buildDescriptors(
 }
 
 internal fun List<CirAnnotation>.buildDescriptors(targetComponents: TargetDeclarationsBuilderComponents): Annotations =
-    if (isEmpty())
-        Annotations.EMPTY
-    else
-        Annotations.create(map { CommonizedAnnotationDescriptor(targetComponents, it) })
+    Annotations.create(compactMap { CommonizedAnnotationDescriptor(targetComponents, it) })
 
 internal fun CirExtensionReceiver.buildExtensionReceiver(
     targetComponents: TargetDeclarationsBuilderComponents,
@@ -101,31 +100,32 @@ internal fun CirSimpleType.buildType(
     targetComponents: TargetDeclarationsBuilderComponents,
     typeParameterResolver: TypeParameterResolver,
     expandTypeAliases: Boolean
-): SimpleType {
-    val classifier: ClassifierDescriptor = when (val classifierId = classifierId) {
-        is CirClassifierId.Class -> {
-            targetComponents.findClassOrTypeAlias(classifierId.classId).checkClassifierType<ClassDescriptor>()
-        }
-        is CirClassifierId.TypeAlias -> {
-            val classId = classifierId.classId
-            val classOrTypeAlias: ClassifierDescriptorWithTypeParameters = targetComponents.findClassOrTypeAlias(classId)
+): SimpleType = when (this) {
+    is CirClassType -> buildSimpleType(
+        classifier = targetComponents.findClassOrTypeAlias(classifierId).checkClassifierType<ClassDescriptor>(),
+        arguments = collectArguments(targetComponents, typeParameterResolver, expandTypeAliases),
+        isMarkedNullable = isMarkedNullable
+    )
+    is CirTypeAliasType -> {
+        val typeAliasDescriptor = targetComponents.findClassOrTypeAlias(classifierId).checkClassifierType<TypeAliasDescriptor>()
+        val arguments = this.arguments.compactMap { it.buildArgument(targetComponents, typeParameterResolver, expandTypeAliases) }
 
-            if (classId.packageFqName.isUnderStandardKotlinPackages || !targetComponents.isCommon) {
-                // classifier type could be only type alias
-                classOrTypeAlias.checkClassifierType<TypeAliasDescriptor>()
-            } else {
-                // classifier could be class or type alias
-                classOrTypeAlias
-            }
-        }
-        is CirClassifierId.TypeParameter -> {
-            typeParameterResolver.resolve(classifierId.index)
-                ?: error("Type parameter $classifierId not found in ${typeParameterResolver::class.java}, $typeParameterResolver for ${targetComponents.target}")
-        }
+        if (expandTypeAliases)
+            buildExpandedType(typeAliasDescriptor, arguments, isMarkedNullable)
+        else
+            buildSimpleType(typeAliasDescriptor, arguments, isMarkedNullable)
     }
+    is CirTypeParameterType -> buildSimpleType(
+        classifier = typeParameterResolver.resolve(index)
+            ?: error("Type parameter with index=$index not found in ${typeParameterResolver::class.java}, $typeParameterResolver for ${targetComponents.target}"),
+        arguments = emptyList(),
+        isMarkedNullable = isMarkedNullable
+    )
+}
 
-    val arguments = arguments.map { it.buildArgument(targetComponents, typeParameterResolver, expandTypeAliases) }
-    val simpleType = simpleType(
+@Suppress("NOTHING_TO_INLINE")
+private inline fun buildSimpleType(classifier: ClassifierDescriptor, arguments: List<TypeProjection>, isMarkedNullable: Boolean) =
+    simpleType(
         annotations = Annotations.EMPTY,
         constructor = classifier.typeConstructor,
         arguments = arguments,
@@ -133,29 +133,46 @@ internal fun CirSimpleType.buildType(
         kotlinTypeRefiner = null
     )
 
-    return if (expandTypeAliases && classifier is TypeAliasDescriptor) {
-        val expandedType = TypeAliasExpander.NON_REPORTING.expandWithoutAbbreviation(
-            TypeAliasExpansion.create(null, classifier, arguments),
-            Annotations.EMPTY
-        )
+@Suppress("NOTHING_TO_INLINE")
+private inline fun buildExpandedType(classifier: TypeAliasDescriptor, arguments: List<TypeProjection>, isMarkedNullable: Boolean) =
+    TypeAliasExpander.NON_REPORTING.expand(
+        TypeAliasExpansion.create(null, classifier, arguments),
+        Annotations.EMPTY
+    ).makeNullableAsSpecified(isMarkedNullable)
 
-        expandedType.makeNullableAsSpecified(simpleType.isMarkedNullable).withAbbreviation(simpleType)
-    } else
-        simpleType
-}
 
 private inline fun <reified T : ClassifierDescriptorWithTypeParameters> ClassifierDescriptorWithTypeParameters.checkClassifierType(): T {
     check(this is T) { "Mismatched classifier kinds.\nFound: ${this::class.java}, $this\nShould be: ${T::class.java}" }
     return this
 }
 
+private fun CirClassType.collectArguments(
+    targetComponents: TargetDeclarationsBuilderComponents,
+    typeParameterResolver: TypeParameterResolver,
+    expandTypeAliases: Boolean
+): List<TypeProjection> {
+    return if (outerType == null) {
+        arguments.compactMap { it.buildArgument(targetComponents, typeParameterResolver, expandTypeAliases) }
+    } else {
+        val allTypes = generateSequence(this) { it.outerType }.toList()
+        val arguments = mutableListOf<TypeProjection>()
+
+        for (index in allTypes.size - 1 downTo 0) {
+            allTypes[index].arguments.mapTo(arguments) { it.buildArgument(targetComponents, typeParameterResolver, expandTypeAliases) }
+        }
+
+        arguments.compact()
+    }
+}
+
 private fun CirTypeProjection.buildArgument(
     targetComponents: TargetDeclarationsBuilderComponents,
     typeParameterResolver: TypeParameterResolver,
     expandTypeAliases: Boolean
-): TypeProjection =
-    if (isStarProjection) {
-        StarProjectionForAbsentTypeParameter(targetComponents.builtIns)
-    } else {
-        TypeProjectionImpl(projectionKind, type.buildType(targetComponents, typeParameterResolver, expandTypeAliases))
-    }
+): TypeProjection = when (this) {
+    is CirStarTypeProjection -> StarProjectionForAbsentTypeParameter(targetComponents.builtIns)
+    is CirTypeProjectionImpl -> TypeProjectionImpl(
+        projectionKind,
+        type.buildType(targetComponents, typeParameterResolver, expandTypeAliases)
+    )
+}
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirAnnotation.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirAnnotation.kt
index 0025b1e847f..e8a042ff233 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirAnnotation.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirAnnotation.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
 
 interface CirAnnotation {
-    val type: CirSimpleType
+    val type: CirClassType
     val constantValueArguments: Map<Name, ConstantValue<*>>
     val annotationValueArguments: Map<Name, CirAnnotation>
 }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt
index 3cbf040122f..e9be4f7c01d 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt
@@ -16,5 +16,7 @@ interface CirClass : CirClassifier, CirHasModality {
     val isInline: Boolean
     val isInner: Boolean
     val isExternal: Boolean
-    val supertypes: MutableCollection<CirType>
+    val supertypes: Collection<CirType>
+
+    fun setSupertypes(supertypes: Collection<CirType>)
 }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassifierId.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassifierId.kt
deleted file mode 100644
index 4e2ca2bc0bb..00000000000
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassifierId.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.descriptors.commonizer.cir
-
-import org.jetbrains.kotlin.name.ClassId
-
-sealed class CirClassifierId {
-    interface ClassOrTypeAlias {
-        val classId: ClassId
-    }
-
-    data class Class(override val classId: ClassId) : ClassOrTypeAlias, CirClassifierId()
-    data class TypeAlias(override val classId: ClassId) : ClassOrTypeAlias, CirClassifierId()
-    data class TypeParameter(val index: Int) : CirClassifierId()
-}
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt
index 24eee73dbe8..e407bf3129e 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt
@@ -23,9 +23,6 @@ interface CirFunctionOrProperty :
     val returnType: CirType
     val kind: CallableMemberDescriptor.Kind
 
-    fun isNonAbstractMemberInInterface(): Boolean =
-        modality != Modality.ABSTRACT && containingClassDetails?.kind == ClassKind.INTERFACE
-
     fun isVirtual(): Boolean =
         visibility != DescriptorVisibilities.PRIVATE
                 && modality != Modality.FINAL
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
index 0edb01fe947..6f2d7f958d0 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
@@ -5,31 +5,107 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeFactory
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.types.AbbreviatedType
 import org.jetbrains.kotlin.types.Variance
 
 typealias CirTypeSignature = String
 
-sealed class CirType
+/**
+ * The hierarchy of [CirType]:
+ *
+ *                 [CirType]
+ *                 /       \
+ * [CirFlexibleType]       [CirSimpleType]
+ *                          /           \
+ *     [CirTypeParameterType]           [CirClassOrTypeAliasType]
+ *                                            /           \
+ *                               [CirClassType]           [CirTypeAliasType]
+ */
+sealed class CirType {
+    final override fun toString() = buildString { appendDescriptionTo(this) }
+    internal abstract fun appendDescriptionTo(builder: StringBuilder)
+}
+
+data class CirFlexibleType(val lowerBound: CirSimpleType, val upperBound: CirSimpleType) : CirType() {
+    override fun appendDescriptionTo(builder: StringBuilder) {
+        builder.append("lower = ")
+        lowerBound.appendDescriptionTo(builder)
+        builder.append(", upper = ")
+        upperBound.appendDescriptionTo(builder)
+    }
+}
+
+/**
+ * Note: Annotations at simple types are not preserved. After commonization all annotations assigned to types will be lost.
+ */
+sealed class CirSimpleType : CirType() {
+    abstract val isMarkedNullable: Boolean
+
+    override fun appendDescriptionTo(builder: StringBuilder) {
+        if (isMarkedNullable) builder.append('?')
+    }
+}
+
+data class CirTypeParameterType(
+    val index: Int,
+    override val isMarkedNullable: Boolean
+) : CirSimpleType() {
+    override fun appendDescriptionTo(builder: StringBuilder) {
+        builder.append('#').append(index)
+        super.appendDescriptionTo(builder)
+    }
+}
+
+sealed class CirClassOrTypeAliasType : CirSimpleType() {
+    abstract val classifierId: ClassId
+    abstract val arguments: List<CirTypeProjection>
+
+    override fun appendDescriptionTo(builder: StringBuilder) {
+        builder.append(classifierId.asString())
+        if (arguments.isNotEmpty()) arguments.joinTo(builder, prefix = "<", postfix = ">")
+        super.appendDescriptionTo(builder)
+    }
+}
+
+abstract class CirClassType : CirClassOrTypeAliasType(), CirHasVisibility {
+    abstract val outerType: CirClassType?
+
+    override fun appendDescriptionTo(builder: StringBuilder) {
+        outerType?.let {
+            it.appendDescriptionTo(builder)
+            builder.append('.')
+        }
+        super.appendDescriptionTo(builder)
+    }
+}
 
 /**
  * All attributes are read from the abbreviation type: [AbbreviatedType.abbreviation].
  *
  * This is necessary to properly compare types for type aliases, where abbreviation type represents the type alias itself while
  * expanded type represents right-hand side declaration that should be processed separately.
- *
- * There is no difference between "abbreviation" and "expanded" for types representing classes and type parameters.
- * For details, see [CirTypeFactory].
- *
- * Note: Annotations at simple types are not preserved. After commonization all annotations assigned to types will be lost.
  */
-abstract class CirSimpleType : CirType(), CirHasVisibility {
-    abstract val classifierId: CirClassifierId
-    abstract val arguments: List<CirTypeProjection>
-    abstract val isMarkedNullable: Boolean
+abstract class CirTypeAliasType : CirClassOrTypeAliasType() {
+    abstract val underlyingType: CirClassOrTypeAliasType
+
+    override fun appendDescriptionTo(builder: StringBuilder) {
+        super.appendDescriptionTo(builder)
+        builder.append(" -> ")
+        underlyingType.appendDescriptionTo(builder)
+    }
 }
 
-data class CirFlexibleType(val lowerBound: CirSimpleType, val upperBound: CirSimpleType) : CirType()
+sealed class CirTypeProjection
 
-data class CirTypeProjection(val projectionKind: Variance, val isStarProjection: Boolean, val type: CirType)
+object CirStarTypeProjection : CirTypeProjection() {
+    override fun toString() = "*"
+}
+
+data class CirTypeProjectionImpl(val projectionKind: Variance, val type: CirType) : CirTypeProjection() {
+    override fun toString() = buildString {
+        append(projectionKind)
+        if (isNotEmpty()) append(' ')
+        type.appendDescriptionTo(this)
+    }
+}
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeAlias.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeAlias.kt
index e9592c4fb71..149397d8a1b 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeAlias.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeAlias.kt
@@ -6,6 +6,6 @@
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
 interface CirTypeAlias : CirClassifier, CirLiftedUpDeclaration {
-    val underlyingType: CirSimpleType
-    val expandedType: CirSimpleType
+    val underlyingType: CirClassOrTypeAliasType
+    val expandedType: CirClassType
 }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirAnnotationFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirAnnotationFactory.kt
index 226fd087fe6..4bf9a745fb9 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirAnnotationFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirAnnotationFactory.kt
@@ -8,10 +8,11 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
 import gnu.trove.THashMap
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleType
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassType
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirAnnotationImpl
-import org.jetbrains.kotlin.descriptors.commonizer.utils.Interner
+import org.jetbrains.kotlin.descriptors.commonizer.utils.*
 import org.jetbrains.kotlin.descriptors.commonizer.utils.checkConstantSupportedInCommonization
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compact
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.AnnotationValue
@@ -21,14 +22,14 @@ object CirAnnotationFactory {
     private val interner = Interner<CirAnnotation>()
 
     fun create(source: AnnotationDescriptor): CirAnnotation {
-        val type = CirTypeFactory.create(source.type) as CirSimpleType
+        val type = CirTypeFactory.create(source.type, useAbbreviation = false) as CirClassType
 
         val allValueArguments: Map<Name, ConstantValue<*>> = source.allValueArguments
         if (allValueArguments.isEmpty())
             return create(type = type, constantValueArguments = emptyMap(), annotationValueArguments = emptyMap())
 
-        val constantValueArguments: MutableMap<Name, ConstantValue<*>> = THashMap()
-        val annotationValueArguments: MutableMap<Name, CirAnnotation> = THashMap()
+        val constantValueArguments: MutableMap<Name, ConstantValue<*>> = THashMap(allValueArguments.size)
+        val annotationValueArguments: MutableMap<Name, CirAnnotation> = THashMap(allValueArguments.size)
 
         allValueArguments.forEach { (name, constantValue) ->
             checkConstantSupportedInCommonization(
@@ -46,13 +47,13 @@ object CirAnnotationFactory {
 
         return create(
             type = type,
-            constantValueArguments = constantValueArguments,
-            annotationValueArguments = annotationValueArguments
+            constantValueArguments = constantValueArguments.compact(),
+            annotationValueArguments = annotationValueArguments.compact()
         )
     }
 
     fun create(
-        type: CirSimpleType,
+        type: CirClassType,
         constantValueArguments: Map<Name, ConstantValue<*>>,
         annotationValueArguments: Map<Name, CirAnnotation>
     ): CirAnnotation {
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt
index 7d0e19e9e37..b9445dc44ad 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt
@@ -10,6 +10,8 @@ import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassConstructorImpl
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMapNotNull
 
 object CirClassConstructorFactory {
     fun create(source: ClassConstructorDescriptor): CirClassConstructor {
@@ -18,14 +20,14 @@ object CirClassConstructorFactory {
         }
 
         return create(
-            annotations = source.annotations.map(CirAnnotationFactory::create),
-            typeParameters = source.typeParameters.mapNotNull { typeParameter ->
+            annotations = source.annotations.compactMap(CirAnnotationFactory::create),
+            typeParameters = source.typeParameters.compactMapNotNull { typeParameter ->
                 // save only type parameters that are contributed by the constructor itself
                 typeParameter.takeIf { it.containingDeclaration == source }?.let(CirTypeParameterFactory::create)
             },
             visibility = source.visibility,
             containingClassDetails = CirContainingClassDetailsFactory.create(source),
-            valueParameters = source.valueParameters.map(CirValueParameterFactory::create),
+            valueParameters = source.valueParameters.compactMap(CirValueParameterFactory::create),
             hasStableParameterNames = source.hasStableParameterNames(),
             isPrimary = source.isPrimary
         )
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassFactory.kt
index 92459040e7c..51757cf2e5f 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassFactory.kt
@@ -11,17 +11,17 @@ import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClass
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeParameter
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassImpl
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.name.Name
 
 object CirClassFactory {
     fun create(source: ClassDescriptor): CirClass = create(
-        annotations = source.annotations.map(CirAnnotationFactory::create),
+        annotations = source.annotations.compactMap(CirAnnotationFactory::create),
         name = source.name.intern(),
-        typeParameters = source.declaredTypeParameters.map(CirTypeParameterFactory::create),
+        typeParameters = source.declaredTypeParameters.compactMap(CirTypeParameterFactory::create),
         visibility = source.visibility,
         modality = source.modality,
         kind = source.kind,
@@ -30,25 +30,25 @@ object CirClassFactory {
         isData = source.isData,
         isInline = source.isInline,
         isInner = source.isInner,
-        isExternal = source.isExternal,
-        supertypes = source.typeConstructor.supertypes.mapTo(mutableListOf()) { CirTypeFactory.create(it) }
-    )
+        isExternal = source.isExternal
+    ).apply {
+        setSupertypes(source.typeConstructor.supertypes.compactMap { CirTypeFactory.create(it) })
+    }
 
     @Suppress("NOTHING_TO_INLINE")
     inline fun create(
-            annotations: List<CirAnnotation>,
-            name: Name,
-            typeParameters: List<CirTypeParameter>,
-            visibility: DescriptorVisibility,
-            modality: Modality,
-            kind: ClassKind,
-            companion: Name?,
-            isCompanion: Boolean,
-            isData: Boolean,
-            isInline: Boolean,
-            isInner: Boolean,
-            isExternal: Boolean,
-            supertypes: MutableCollection<CirType>
+        annotations: List<CirAnnotation>,
+        name: Name,
+        typeParameters: List<CirTypeParameter>,
+        visibility: DescriptorVisibility,
+        modality: Modality,
+        kind: ClassKind,
+        companion: Name?,
+        isCompanion: Boolean,
+        isData: Boolean,
+        isInline: Boolean,
+        isInner: Boolean,
+        isExternal: Boolean
     ): CirClass {
         return CirClassImpl(
             annotations = annotations,
@@ -62,8 +62,7 @@ object CirClassFactory {
             isData = isData,
             isInline = isInline,
             isInner = isInner,
-            isExternal = isExternal,
-            supertypes = supertypes
+            isExternal = isExternal
         )
     }
 }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassifierIdFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassifierIdFactory.kt
deleted file mode 100644
index 02839ff12ea..00000000000
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassifierIdFactory.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
-
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifierId
-import org.jetbrains.kotlin.descriptors.commonizer.utils.Interner
-import org.jetbrains.kotlin.descriptors.commonizer.utils.internedClassId
-import org.jetbrains.kotlin.name.ClassId
-
-@Suppress("MemberVisibilityCanBePrivate")
-object CirClassifierIdFactory {
-    private val interner = Interner<CirClassifierId>()
-
-    fun create(source: ClassifierDescriptor): CirClassifierId {
-        return when (source) {
-            is ClassDescriptor -> createForClass(source.internedClassId)
-            is TypeAliasDescriptor -> createForTypeAlias(source.internedClassId)
-            is TypeParameterDescriptor -> createForTypeParameter(source.typeParameterIndex)
-            else -> error("Unexpected classifier descriptor type: ${source::class.java}, $this")
-        }
-    }
-
-    fun createForClass(classId: ClassId): CirClassifierId = interner.intern(CirClassifierId.Class(classId))
-    fun createForTypeAlias(classId: ClassId): CirClassifierId = interner.intern(CirClassifierId.TypeAlias(classId))
-    fun createForTypeParameter(index: Int): CirClassifierId = interner.intern(CirClassifierId.TypeParameter(index))
-}
-
-private inline val TypeParameterDescriptor.typeParameterIndex: Int
-    get() {
-        var index = index
-        var parent = containingDeclaration
-
-        while ((parent as? ClassifierDescriptorWithTypeParameters)?.isInner != false) {
-            parent = parent.containingDeclaration as? ClassifierDescriptorWithTypeParameters ?: break
-            index += parent.declaredTypeParameters.size
-        }
-
-        return index
-    }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirExtensionReceiverFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirExtensionReceiverFactory.kt
index 2fe81210572..c8ae23fac71 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirExtensionReceiverFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirExtensionReceiverFactory.kt
@@ -10,10 +10,11 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirExtensionReceiver
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirExtensionReceiverImpl
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 
 object CirExtensionReceiverFactory {
     fun create(source: ReceiverParameterDescriptor): CirExtensionReceiver = create(
-        annotations = source.annotations.map(CirAnnotationFactory::create),
+        annotations = source.annotations.compactMap(CirAnnotationFactory::create),
         type = CirTypeFactory.create(source.type)
     )
 
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt
index 5f349d4124c..ff0f5331d16 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt
@@ -8,18 +8,19 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirFunctionImpl
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.name.Name
 
 object CirFunctionFactory {
     fun create(source: SimpleFunctionDescriptor): CirFunction = create(
-        annotations = source.annotations.map(CirAnnotationFactory::create),
+        annotations = source.annotations.compactMap(CirAnnotationFactory::create),
         name = source.name.intern(),
-        typeParameters = source.typeParameters.map(CirTypeParameterFactory::create),
+        typeParameters = source.typeParameters.compactMap(CirTypeParameterFactory::create),
         visibility = source.visibility,
         modality = source.modality,
         containingClassDetails = CirContainingClassDetailsFactory.create(source),
-        valueParameters = source.valueParameters.map(CirValueParameterFactory::create),
+        valueParameters = source.valueParameters.compactMap(CirValueParameterFactory::create),
         hasStableParameterNames = source.hasStableParameterNames(),
         extensionReceiver = source.extensionReceiverParameter?.let(CirExtensionReceiverFactory::create),
         returnType = CirTypeFactory.create(source.returnType!!),
@@ -29,18 +30,18 @@ object CirFunctionFactory {
 
     @Suppress("NOTHING_TO_INLINE")
     inline fun create(
-            annotations: List<CirAnnotation>,
-            name: Name,
-            typeParameters: List<CirTypeParameter>,
-            visibility: DescriptorVisibility,
-            modality: Modality,
-            containingClassDetails: CirContainingClassDetails?,
-            valueParameters: List<CirValueParameter>,
-            hasStableParameterNames: Boolean,
-            extensionReceiver: CirExtensionReceiver?,
-            returnType: CirType,
-            kind: CallableMemberDescriptor.Kind,
-            modifiers: CirFunctionModifiers
+        annotations: List<CirAnnotation>,
+        name: Name,
+        typeParameters: List<CirTypeParameter>,
+        visibility: DescriptorVisibility,
+        modality: Modality,
+        containingClassDetails: CirContainingClassDetails?,
+        valueParameters: List<CirValueParameter>,
+        hasStableParameterNames: Boolean,
+        extensionReceiver: CirExtensionReceiver?,
+        returnType: CirType,
+        kind: CallableMemberDescriptor.Kind,
+        modifiers: CirFunctionModifiers
     ): CirFunction {
         return CirFunctionImpl(
             annotations = annotations,
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt
index a871ea56abb..c806528394e 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirPropertyImpl
 import org.jetbrains.kotlin.descriptors.commonizer.utils.checkConstantSupportedInCommonization
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
@@ -28,9 +29,9 @@ object CirPropertyFactory {
         }
 
         return create(
-            annotations = source.annotations.map(CirAnnotationFactory::create),
+            annotations = source.annotations.compactMap(CirAnnotationFactory::create),
             name = source.name.intern(),
-            typeParameters = source.typeParameters.map(CirTypeParameterFactory::create),
+            typeParameters = source.typeParameters.compactMap(CirTypeParameterFactory::create),
             visibility = source.visibility,
             modality = source.modality,
             containingClassDetails = CirContainingClassDetailsFactory.create(source),
@@ -44,33 +45,33 @@ object CirPropertyFactory {
             isDelegate = source.isDelegated,
             getter = source.getter?.let(CirPropertyGetterFactory::create),
             setter = source.setter?.let(CirPropertySetterFactory::create),
-            backingFieldAnnotations = source.backingField?.annotations?.map(CirAnnotationFactory::create),
-            delegateFieldAnnotations = source.delegateField?.annotations?.map(CirAnnotationFactory::create),
+            backingFieldAnnotations = source.backingField?.annotations?.compactMap(CirAnnotationFactory::create),
+            delegateFieldAnnotations = source.delegateField?.annotations?.compactMap(CirAnnotationFactory::create),
             compileTimeInitializer = source.compileTimeInitializer
         )
     }
 
     @Suppress("NOTHING_TO_INLINE")
     inline fun create(
-            annotations: List<CirAnnotation>,
-            name: Name,
-            typeParameters: List<CirTypeParameter>,
-            visibility: DescriptorVisibility,
-            modality: Modality,
-            containingClassDetails: CirContainingClassDetails?,
-            isExternal: Boolean,
-            extensionReceiver: CirExtensionReceiver?,
-            returnType: CirType,
-            kind: CallableMemberDescriptor.Kind,
-            isVar: Boolean,
-            isLateInit: Boolean,
-            isConst: Boolean,
-            isDelegate: Boolean,
-            getter: CirPropertyGetter?,
-            setter: CirPropertySetter?,
-            backingFieldAnnotations: List<CirAnnotation>?,
-            delegateFieldAnnotations: List<CirAnnotation>?,
-            compileTimeInitializer: ConstantValue<*>?
+        annotations: List<CirAnnotation>,
+        name: Name,
+        typeParameters: List<CirTypeParameter>,
+        visibility: DescriptorVisibility,
+        modality: Modality,
+        containingClassDetails: CirContainingClassDetails?,
+        isExternal: Boolean,
+        extensionReceiver: CirExtensionReceiver?,
+        returnType: CirType,
+        kind: CallableMemberDescriptor.Kind,
+        isVar: Boolean,
+        isLateInit: Boolean,
+        isConst: Boolean,
+        isDelegate: Boolean,
+        getter: CirPropertyGetter?,
+        setter: CirPropertySetter?,
+        backingFieldAnnotations: List<CirAnnotation>?,
+        delegateFieldAnnotations: List<CirAnnotation>?,
+        compileTimeInitializer: ConstantValue<*>?
     ): CirProperty {
         return CirPropertyImpl(
             annotations = annotations,
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyGetterFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyGetterFactory.kt
index e373cbe504e..0ffd7ede42a 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyGetterFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyGetterFactory.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPropertyGetter
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirPropertyGetterImpl
 import org.jetbrains.kotlin.descriptors.commonizer.utils.Interner
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 
 object CirPropertyGetterFactory {
     private val interner = Interner<CirPropertyGetter>()
@@ -27,7 +28,7 @@ object CirPropertyGetterFactory {
             DEFAULT_NO_ANNOTATIONS
         else
             create(
-                annotations = source.annotations.map(CirAnnotationFactory::create),
+                annotations = source.annotations.compactMap(CirAnnotationFactory::create),
                 isDefault = source.isDefault,
                 isExternal = source.isExternal,
                 isInline = source.isInline
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertySetterFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertySetterFactory.kt
index fad47cc88ac..faa47c53241 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertySetterFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertySetterFactory.kt
@@ -12,13 +12,14 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPropertySetter
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirPropertySetterImpl
 import org.jetbrains.kotlin.descriptors.commonizer.utils.Interner
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 
 object CirPropertySetterFactory {
     private val interner = Interner<CirPropertySetter>()
 
     fun create(source: PropertySetterDescriptor): CirPropertySetter = create(
-        annotations = source.annotations.map(CirAnnotationFactory::create),
-        parameterAnnotations = source.valueParameters[0].annotations.map(CirAnnotationFactory::create),
+        annotations = source.annotations.compactMap(CirAnnotationFactory::create),
+        parameterAnnotations = source.valueParameters[0].annotations.compactMap(CirAnnotationFactory::create),
         visibility = source.visibility,
         isDefault = source.isDefault,
         isExternal = source.isExternal,
@@ -26,12 +27,12 @@ object CirPropertySetterFactory {
     )
 
     fun create(
-            annotations: List<CirAnnotation>,
-            parameterAnnotations: List<CirAnnotation>,
-            visibility: DescriptorVisibility,
-            isDefault: Boolean,
-            isExternal: Boolean,
-            isInline: Boolean
+        annotations: List<CirAnnotation>,
+        parameterAnnotations: List<CirAnnotation>,
+        visibility: DescriptorVisibility,
+        isDefault: Boolean,
+        isExternal: Boolean,
+        isInline: Boolean
     ): CirPropertySetter {
         return interner.intern(
             CirPropertySetterImpl(
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeAliasFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeAliasFactory.kt
index 8926083b578..bb4c3716fdb 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeAliasFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeAliasFactory.kt
@@ -7,32 +7,30 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
 
 import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleType
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeAlias
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeParameter
+import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirTypeAliasImpl
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.name.Name
 
 object CirTypeAliasFactory {
     fun create(source: TypeAliasDescriptor): CirTypeAlias = create(
-        annotations = source.annotations.map(CirAnnotationFactory::create),
+        annotations = source.annotations.compactMap(CirAnnotationFactory::create),
         name = source.name.intern(),
-        typeParameters = source.declaredTypeParameters.map(CirTypeParameterFactory::create),
+        typeParameters = source.declaredTypeParameters.compactMap(CirTypeParameterFactory::create),
         visibility = source.visibility,
-        underlyingType = CirTypeFactory.create(source.underlyingType),
-        expandedType = CirTypeFactory.create(source.expandedType, useAbbreviation = false)
+        underlyingType = CirTypeFactory.create(source.underlyingType, useAbbreviation = true) as CirClassOrTypeAliasType,
+        expandedType = CirTypeFactory.create(source.expandedType, useAbbreviation = false) as CirClassType
     )
 
     @Suppress("NOTHING_TO_INLINE")
     inline fun create(
-            annotations: List<CirAnnotation>,
-            name: Name,
-            typeParameters: List<CirTypeParameter>,
-            visibility: DescriptorVisibility,
-            underlyingType: CirSimpleType,
-            expandedType: CirSimpleType
+        annotations: List<CirAnnotation>,
+        name: Name,
+        typeParameters: List<CirTypeParameter>,
+        visibility: DescriptorVisibility,
+        underlyingType: CirClassOrTypeAliasType,
+        expandedType: CirClassType
     ): CirTypeAlias {
         return CirTypeAliasImpl(
             annotations = annotations,
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
index 685e31d1f7e..e5585ef8b5b 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
@@ -5,58 +5,188 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
 
-import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
-import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
-import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirSimpleTypeImpl
-import org.jetbrains.kotlin.descriptors.commonizer.utils.Interner
+import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassTypeImpl
+import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirTypeAliasTypeImpl
+import org.jetbrains.kotlin.descriptors.commonizer.utils.*
 import org.jetbrains.kotlin.descriptors.commonizer.utils.declarationDescriptor
+import org.jetbrains.kotlin.descriptors.commonizer.utils.extractExpandedType
+import org.jetbrains.kotlin.descriptors.commonizer.utils.internedClassId
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.types.*
 
 object CirTypeFactory {
-    private val interner = Interner<CirSimpleType>()
+    private val classTypeInterner = Interner<CirClassType>()
+    private val typeAliasTypeInterner = Interner<CirTypeAliasType>()
+    private val typeParameterTypeInterner = Interner<CirTypeParameterType>()
 
-    fun create(source: KotlinType): CirType = source.unwrap().run {
+    fun create(source: KotlinType, useAbbreviation: Boolean = true): CirType = source.unwrap().run {
         when (this) {
-            is SimpleType -> create(this)
-            is FlexibleType -> CirFlexibleType(create(lowerBound), create(upperBound))
+            is SimpleType -> create(this, useAbbreviation)
+            is FlexibleType -> CirFlexibleType(create(lowerBound, useAbbreviation), create(upperBound, useAbbreviation))
         }
     }
 
-    fun create(source: SimpleType, useAbbreviation: Boolean = true): CirSimpleType {
-        @Suppress("NAME_SHADOWING")
-        val source = if (useAbbreviation && source is AbbreviatedType) source.abbreviation else source
-        val classifierDescriptor: ClassifierDescriptor = source.declarationDescriptor
+    fun create(source: SimpleType, useAbbreviation: Boolean): CirSimpleType {
+        if (useAbbreviation && source is AbbreviatedType) {
+            val abbreviation = source.abbreviation
+            when (val classifierDescriptor = abbreviation.declarationDescriptor) {
+                is TypeAliasDescriptor -> {
+                    return createTypeAliasType(
+                        typeAliasId = classifierDescriptor.internedClassId,
+                        underlyingType = create(extractExpandedType(source), useAbbreviation = true) as CirClassOrTypeAliasType,
+                        arguments = createArguments(abbreviation.arguments, useAbbreviation = true),
+                        isMarkedNullable = abbreviation.isMarkedNullable
+                    )
+                }
+                else -> error("Unexpected classifier descriptor type for abbreviation type: ${classifierDescriptor::class.java}, $classifierDescriptor, ${source.abbreviation}")
+            }
+        }
 
-        return create(
-            classifierId = CirClassifierIdFactory.create(classifierDescriptor),
-            visibility = (classifierDescriptor as? ClassifierDescriptorWithTypeParameters)?.visibility ?: DescriptorVisibilities.UNKNOWN,
-            arguments = source.arguments.map { projection ->
-                CirTypeProjection(
-                    projectionKind = projection.projectionKind,
-                    isStarProjection = projection.isStarProjection,
-                    type = create(projection.type)
+        return when (val classifierDescriptor = source.declarationDescriptor) {
+            is ClassDescriptor -> createClassTypeWithAllOuterTypes(
+                classDescriptor = classifierDescriptor,
+                arguments = createArguments(source.arguments, useAbbreviation),
+                isMarkedNullable = source.isMarkedNullable
+            )
+            is TypeAliasDescriptor -> {
+                val abbreviatedType = TypeAliasExpander.NON_REPORTING.expand(
+                    TypeAliasExpansion.create(null, classifierDescriptor, source.arguments),
+                    Annotations.EMPTY
+                ) as AbbreviatedType
+
+                createTypeAliasType(
+                    typeAliasId = classifierDescriptor.internedClassId,
+                    underlyingType = create(extractExpandedType(abbreviatedType), useAbbreviation = true) as CirClassOrTypeAliasType,
+                    arguments = createArguments(source.arguments, useAbbreviation = true),
+                    isMarkedNullable = source.isMarkedNullable
                 )
-            },
-            isMarkedNullable = source.isMarkedNullable
-        )
+            }
+            is TypeParameterDescriptor -> createTypeParameterType(classifierDescriptor.typeParameterIndex, source.isMarkedNullable)
+            else -> error("Unexpected classifier descriptor type: ${classifierDescriptor::class.java}, $classifierDescriptor, $source")
+        }
     }
 
-    fun create(
-            classifierId: CirClassifierId,
-            visibility: DescriptorVisibility,
-            arguments: List<CirTypeProjection>,
-            isMarkedNullable: Boolean
-    ): CirSimpleType {
-        return interner.intern(
-            CirSimpleTypeImpl(
-                classifierId = classifierId,
+    fun createClassType(
+        classId: ClassId,
+        outerType: CirClassType?,
+        visibility: DescriptorVisibility,
+        arguments: List<CirTypeProjection>,
+        isMarkedNullable: Boolean
+    ): CirClassType {
+        return classTypeInterner.intern(
+            CirClassTypeImpl(
+                classifierId = classId,
+                outerType = outerType,
                 visibility = visibility,
                 arguments = arguments,
                 isMarkedNullable = isMarkedNullable
             )
         )
     }
+
+    fun createTypeAliasType(
+        typeAliasId: ClassId,
+        underlyingType: CirClassOrTypeAliasType,
+        arguments: List<CirTypeProjection>,
+        isMarkedNullable: Boolean
+    ): CirTypeAliasType {
+        return typeAliasTypeInterner.intern(
+            CirTypeAliasTypeImpl(
+                classifierId = typeAliasId,
+                underlyingType = underlyingType,
+                arguments = arguments,
+                isMarkedNullable = isMarkedNullable
+            )
+        )
+    }
+
+    fun createTypeParameterType(
+        index: Int,
+        isMarkedNullable: Boolean
+    ): CirTypeParameterType {
+        return typeParameterTypeInterner.intern(
+            CirTypeParameterType(
+                index = index,
+                isMarkedNullable = isMarkedNullable
+            )
+        )
+    }
+
+    fun makeNullable(classOrTypeAliasType: CirClassOrTypeAliasType): CirClassOrTypeAliasType =
+        if (classOrTypeAliasType.isMarkedNullable)
+            classOrTypeAliasType
+        else
+            when (classOrTypeAliasType) {
+                is CirClassType -> createClassType(
+                    classId = classOrTypeAliasType.classifierId,
+                    outerType = classOrTypeAliasType.outerType,
+                    visibility = classOrTypeAliasType.visibility,
+                    arguments = classOrTypeAliasType.arguments,
+                    isMarkedNullable = true
+                )
+                is CirTypeAliasType -> createTypeAliasType(
+                    typeAliasId = classOrTypeAliasType.classifierId,
+                    underlyingType = makeNullable(classOrTypeAliasType.underlyingType),
+                    arguments = classOrTypeAliasType.arguments,
+                    isMarkedNullable = true
+                )
+            }
+
+    private fun createClassTypeWithAllOuterTypes(
+        classDescriptor: ClassDescriptor,
+        arguments: List<CirTypeProjection>,
+        isMarkedNullable: Boolean
+    ): CirClassType {
+        val outerType: CirClassType?
+        val remainingArguments: List<CirTypeProjection>
+
+        if (classDescriptor.isInner) {
+            val declaredTypeParametersCount = classDescriptor.declaredTypeParameters.size
+            outerType = createClassTypeWithAllOuterTypes(
+                classDescriptor = classDescriptor.containingDeclaration as ClassDescriptor,
+                arguments = arguments.subList(0, arguments.size - declaredTypeParametersCount),
+                isMarkedNullable = false // don't pass nullable flag to outer types
+            )
+            remainingArguments = arguments.subList(arguments.size - declaredTypeParametersCount, arguments.size)
+        } else {
+            outerType = null
+            remainingArguments = arguments
+        }
+
+        return createClassType(
+            classId = classDescriptor.internedClassId,
+            outerType = outerType,
+            visibility = classDescriptor.visibility,
+            arguments = remainingArguments,
+            isMarkedNullable = isMarkedNullable
+        )
+    }
+
+    @Suppress("NOTHING_TO_INLINE")
+    private inline fun createArguments(arguments: List<TypeProjection>, useAbbreviation: Boolean): List<CirTypeProjection> =
+        arguments.compactMap { projection ->
+            if (projection.isStarProjection)
+                CirStarTypeProjection
+            else
+                CirTypeProjectionImpl(
+                    projectionKind = projection.projectionKind,
+                    type = create(projection.type, useAbbreviation)
+                )
+        }
+
+    private inline val TypeParameterDescriptor.typeParameterIndex: Int
+        get() {
+            var index = index
+            var parent = containingDeclaration
+
+            while ((parent as? ClassifierDescriptorWithTypeParameters)?.isInner != false) {
+                parent = parent.containingDeclaration as? ClassifierDescriptorWithTypeParameters ?: break
+                index += parent.declaredTypeParameters.size
+            }
+
+            return index
+        }
 }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeParameterFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeParameterFactory.kt
index a0cb0db9d7d..e52130ac410 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeParameterFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeParameterFactory.kt
@@ -10,17 +10,18 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeParameter
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirTypeParameterImpl
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.Variance
 
 object CirTypeParameterFactory {
     fun create(source: TypeParameterDescriptor): CirTypeParameter = create(
-        annotations = source.annotations.map(CirAnnotationFactory::create),
+        annotations = source.annotations.compactMap(CirAnnotationFactory::create),
         name = source.name.intern(),
         isReified = source.isReified,
         variance = source.variance,
-        upperBounds = source.upperBounds.map(CirTypeFactory::create)
+        upperBounds = source.upperBounds.compactMap(CirTypeFactory::create)
     )
 
     @Suppress("NOTHING_TO_INLINE")
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirValueParameterFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirValueParameterFactory.kt
index 11204f98c21..165e7df9e20 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirValueParameterFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirValueParameterFactory.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirValueParameter
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirValueParameterImpl
 import org.jetbrains.kotlin.descriptors.commonizer.utils.Interner
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.name.Name
 
@@ -18,7 +19,7 @@ object CirValueParameterFactory {
     private val interner = Interner<CirValueParameter>()
 
     fun create(source: ValueParameterDescriptor): CirValueParameter = create(
-        annotations = source.annotations.map(CirAnnotationFactory::create),
+        annotations = source.annotations.compactMap(CirAnnotationFactory::create),
         name = source.name.intern(),
         returnType = CirTypeFactory.create(source.returnType!!),
         varargElementType = source.varargElementType?.let(CirTypeFactory::create),
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirAnnotationImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirAnnotationImpl.kt
index db9bc13945d..01c4ea35f9d 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirAnnotationImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirAnnotationImpl.kt
@@ -6,14 +6,14 @@
 package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
 
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleType
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassType
 import org.jetbrains.kotlin.descriptors.commonizer.utils.appendHashCode
 import org.jetbrains.kotlin.descriptors.commonizer.utils.hashCode
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
 
 data class CirAnnotationImpl(
-    override val type: CirSimpleType,
+    override val type: CirClassType,
     override val constantValueArguments: Map<Name, ConstantValue<*>>,
     override val annotationValueArguments: Map<Name, CirAnnotation>
 ) : CirAnnotation {
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassImpl.kt
index 1b9fd9437cf..49dd69552ad 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassImpl.kt
@@ -15,17 +15,26 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeParameter
 import org.jetbrains.kotlin.name.Name
 
 data class CirClassImpl(
-        override val annotations: List<CirAnnotation>,
-        override val name: Name,
-        override val typeParameters: List<CirTypeParameter>,
-        override val visibility: DescriptorVisibility,
-        override val modality: Modality,
-        override val kind: ClassKind,
-        override var companion: Name?,
-        override val isCompanion: Boolean,
-        override val isData: Boolean,
-        override val isInline: Boolean,
-        override val isInner: Boolean,
-        override val isExternal: Boolean,
-        override val supertypes: MutableCollection<CirType>
-) : CirClass
+    override val annotations: List<CirAnnotation>,
+    override val name: Name,
+    override val typeParameters: List<CirTypeParameter>,
+    override val visibility: DescriptorVisibility,
+    override val modality: Modality,
+    override val kind: ClassKind,
+    override var companion: Name?,
+    override val isCompanion: Boolean,
+    override val isData: Boolean,
+    override val isInline: Boolean,
+    override val isInner: Boolean,
+    override val isExternal: Boolean,
+) : CirClass {
+    private var _supertypes: Collection<CirType>? = null
+
+    override val supertypes: Collection<CirType>
+        get() = _supertypes.orEmpty()
+
+    override fun setSupertypes(supertypes: Collection<CirType>) {
+        check(_supertypes == null)
+        _supertypes = supertypes
+    }
+}
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassTypeImpl.kt
similarity index 60%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt
rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassTypeImpl.kt
index 2392c002d39..7d91040dd2a 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassTypeImpl.kt
@@ -6,20 +6,24 @@
 package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
 
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
-import org.jetbrains.kotlin.descriptors.commonizer.cir.*
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassType
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeProjection
 import org.jetbrains.kotlin.descriptors.commonizer.utils.appendHashCode
 import org.jetbrains.kotlin.descriptors.commonizer.utils.hashCode
+import org.jetbrains.kotlin.name.ClassId
 
-data class CirSimpleTypeImpl(
-        override val classifierId: CirClassifierId,
-        override val visibility: DescriptorVisibility, // visibility of the classifier descriptor
-        override val arguments: List<CirTypeProjection>,
-        override val isMarkedNullable: Boolean
-) : CirSimpleType() {
+data class CirClassTypeImpl(
+    override val classifierId: ClassId,
+    override val outerType: CirClassType?,
+    override val visibility: DescriptorVisibility, // visibility of the class descriptor
+    override val arguments: List<CirTypeProjection>,
+    override val isMarkedNullable: Boolean,
+) : CirClassType() {
     // See also org.jetbrains.kotlin.types.KotlinType.cachedHashCode
     private var cachedHashCode = 0
 
     private fun computeHashCode() = hashCode(classifierId)
+        .appendHashCode(outerType)
         .appendHashCode(visibility)
         .appendHashCode(arguments)
         .appendHashCode(isMarkedNullable)
@@ -33,13 +37,14 @@ data class CirSimpleTypeImpl(
         return currentHashCode
     }
 
-    override fun equals(other: Any?) = when {
+    override fun equals(other: Any?): Boolean = when {
         other === this -> true
-        other is CirSimpleType -> {
-            isMarkedNullable == other.isMarkedNullable
-                    && classifierId == other.classifierId
+        other is CirClassType -> {
+            classifierId == other.classifierId
+                    && isMarkedNullable == other.isMarkedNullable
                     && visibility == other.visibility
                     && arguments == other.arguments
+                    && outerType == other.outerType
         }
         else -> false
     }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirDeclarationImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirDeclarationImpl.kt
index 4d436795730..d0f9b00d659 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirDeclarationImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirDeclarationImpl.kt
@@ -8,4 +8,4 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration
 
 @Suppress("unused", "NOTHING_TO_INLINE")
-internal inline fun CirDeclaration.unsupported(): Nothing = error("This method should never be called")
+internal inline fun CirDeclaration.unsupported(): Nothing = error("This method should never be called on ${this::class.java}, $this")
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt
index ba6cb37a489..80c3dc4d8bd 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt
@@ -12,16 +12,16 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.name.Name
 
 data class CirFunctionImpl(
-        override val annotations: List<CirAnnotation>,
-        override val name: Name,
-        override val typeParameters: List<CirTypeParameter>,
-        override val visibility: DescriptorVisibility,
-        override val modality: Modality,
-        override val containingClassDetails: CirContainingClassDetails?,
-        override var valueParameters: List<CirValueParameter>,
-        override var hasStableParameterNames: Boolean,
-        override val extensionReceiver: CirExtensionReceiver?,
-        override val returnType: CirType,
-        override val kind: CallableMemberDescriptor.Kind,
-        override val modifiers: CirFunctionModifiers
+    override val annotations: List<CirAnnotation>,
+    override val name: Name,
+    override val typeParameters: List<CirTypeParameter>,
+    override val visibility: DescriptorVisibility,
+    override val modality: Modality,
+    override val containingClassDetails: CirContainingClassDetails?,
+    override var valueParameters: List<CirValueParameter>,
+    override var hasStableParameterNames: Boolean,
+    override val extensionReceiver: CirExtensionReceiver?,
+    override val returnType: CirType,
+    override val kind: CallableMemberDescriptor.Kind,
+    override val modifiers: CirFunctionModifiers
 ) : CirFunction
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt
index d4ba5f9b61d..f7b5654ce2a 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt
@@ -13,25 +13,25 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
 
 data class CirPropertyImpl(
-        override val annotations: List<CirAnnotation>,
-        override val name: Name,
-        override val typeParameters: List<CirTypeParameter>,
-        override val visibility: DescriptorVisibility,
-        override val modality: Modality,
-        override val containingClassDetails: CirContainingClassDetails?,
-        override val isExternal: Boolean,
-        override val extensionReceiver: CirExtensionReceiver?,
-        override val returnType: CirType,
-        override val kind: CallableMemberDescriptor.Kind,
-        override val isVar: Boolean,
-        override val isLateInit: Boolean,
-        override var isConst: Boolean,
-        override val isDelegate: Boolean,
-        override val getter: CirPropertyGetter?,
-        override val setter: CirPropertySetter?,
-        override val backingFieldAnnotations: List<CirAnnotation>?,
-        override val delegateFieldAnnotations: List<CirAnnotation>?,
-        override val compileTimeInitializer: ConstantValue<*>?
+    override val annotations: List<CirAnnotation>,
+    override val name: Name,
+    override val typeParameters: List<CirTypeParameter>,
+    override val visibility: DescriptorVisibility,
+    override val modality: Modality,
+    override val containingClassDetails: CirContainingClassDetails?,
+    override val isExternal: Boolean,
+    override val extensionReceiver: CirExtensionReceiver?,
+    override val returnType: CirType,
+    override val kind: CallableMemberDescriptor.Kind,
+    override val isVar: Boolean,
+    override val isLateInit: Boolean,
+    override var isConst: Boolean,
+    override val isDelegate: Boolean,
+    override val getter: CirPropertyGetter?,
+    override val setter: CirPropertySetter?,
+    override val backingFieldAnnotations: List<CirAnnotation>?,
+    override val delegateFieldAnnotations: List<CirAnnotation>?,
+    override val compileTimeInitializer: ConstantValue<*>?
 ) : CirProperty {
     // const property in "common" fragment is already lifted up
     override val isLiftedUp get() = isConst
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertySetterImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertySetterImpl.kt
index df7d7320ef9..67422c5e92f 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertySetterImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertySetterImpl.kt
@@ -10,10 +10,10 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPropertySetter
 
 data class CirPropertySetterImpl(
-        override val annotations: List<CirAnnotation>,
-        override val parameterAnnotations: List<CirAnnotation>,
-        override val visibility: DescriptorVisibility,
-        override val isDefault: Boolean,
-        override val isExternal: Boolean,
-        override val isInline: Boolean
+    override val annotations: List<CirAnnotation>,
+    override val parameterAnnotations: List<CirAnnotation>,
+    override val visibility: DescriptorVisibility,
+    override val isDefault: Boolean,
+    override val isExternal: Boolean,
+    override val isInline: Boolean
 ) : CirPropertySetter
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasImpl.kt
index bc3ba945615..6cb409db0a3 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasImpl.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasImpl.kt
@@ -6,19 +6,16 @@
 package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
 
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleType
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeAlias
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeParameter
+import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.name.Name
 
 data class CirTypeAliasImpl(
-        override val annotations: List<CirAnnotation>,
-        override val name: Name,
-        override val typeParameters: List<CirTypeParameter>,
-        override val visibility: DescriptorVisibility,
-        override val underlyingType: CirSimpleType,
-        override val expandedType: CirSimpleType // only for commonization algorithm; does not participate in building resulting declarations
+    override val annotations: List<CirAnnotation>,
+    override val name: Name,
+    override val typeParameters: List<CirTypeParameter>,
+    override val visibility: DescriptorVisibility,
+    override val underlyingType: CirClassOrTypeAliasType,
+    override val expandedType: CirClassType // only for commonization algorithm; does not participate in building resulting declarations
 ) : CirTypeAlias {
     // any TA in "common" fragment is already lifted up
     override val isLiftedUp get() = true
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasTypeImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasTypeImpl.kt
new file mode 100644
index 00000000000..9631f7a0ae0
--- /dev/null
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasTypeImpl.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
+
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassOrTypeAliasType
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeAliasType
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeProjection
+import org.jetbrains.kotlin.descriptors.commonizer.utils.appendHashCode
+import org.jetbrains.kotlin.descriptors.commonizer.utils.hashCode
+import org.jetbrains.kotlin.name.ClassId
+
+data class CirTypeAliasTypeImpl(
+    override val classifierId: ClassId,
+    override val underlyingType: CirClassOrTypeAliasType,
+    override val arguments: List<CirTypeProjection>,
+    override val isMarkedNullable: Boolean
+) : CirTypeAliasType() {
+    // See also org.jetbrains.kotlin.types.KotlinType.cachedHashCode
+    private var cachedHashCode = 0
+
+    private fun computeHashCode() = hashCode(classifierId)
+        .appendHashCode(underlyingType)
+        .appendHashCode(arguments)
+        .appendHashCode(isMarkedNullable)
+
+    override fun hashCode(): Int {
+        var currentHashCode = cachedHashCode
+        if (currentHashCode != 0) return currentHashCode
+
+        currentHashCode = computeHashCode()
+        cachedHashCode = currentHashCode
+        return currentHashCode
+    }
+
+    override fun equals(other: Any?): Boolean = when {
+        other === this -> true
+        other is CirTypeAliasType -> {
+            classifierId == other.classifierId
+                    && underlyingType == other.underlyingType
+                    && isMarkedNullable == other.isMarkedNullable
+                    && arguments == other.arguments
+        }
+        else -> false
+    }
+}
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/RecursionMarkers.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/RecursionMarkers.kt
index 11bc1035935..20648badf71 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/RecursionMarkers.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/RecursionMarkers.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClass
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifier
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirRecursionMarker
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
 import org.jetbrains.kotlin.name.Name
 
 object CirClassRecursionMarker : CirClass, CirRecursionMarker {
@@ -26,6 +27,7 @@ object CirClassRecursionMarker : CirClass, CirRecursionMarker {
     override val isInner get() = unsupported()
     override val isExternal get() = unsupported()
     override val supertypes get() = unsupported()
+    override fun setSupertypes(supertypes: Collection<CirType>) = unsupported()
 }
 
 object CirClassifierRecursionMarker : CirClassifier, CirRecursionMarker {
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
index cad31c5d08d..818b66989a3 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
@@ -29,8 +29,7 @@ abstract class AbstractFunctionOrPropertyCommonizer<T : CirFunctionOrProperty>(
     }
 
     override fun doCommonizeWith(next: T): Boolean =
-        !next.isNonAbstractMemberInInterface() // non-abstract callable members declared in interface can't be commonized
-                && next.kind != DELEGATION // delegated members should not be commonized
+        next.kind != DELEGATION // delegated members should not be commonized
                 && (next.kind != SYNTHESIZED || next.containingClassDetails?.isData != true) // synthesized members of data classes should not be commonized
                 && kind == next.kind
                 && modality.commonizeWith(next.modality)
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt
index 6811e38b8cf..747560f9224 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt
@@ -7,12 +7,12 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifierId
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirAnnotationFactory
-import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirClassifierIdFactory
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeFactory
 import org.jetbrains.kotlin.descriptors.commonizer.core.AnnotationsCommonizer.Companion.FALLBACK_MESSAGE
 import org.jetbrains.kotlin.descriptors.commonizer.utils.DEPRECATED_ANNOTATION_CID
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMap
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMapOf
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.descriptors.commonizer.utils.internedClassId
 import org.jetbrains.kotlin.name.ClassId
@@ -38,9 +38,7 @@ class AnnotationsCommonizer : AbstractStandardCommonizer<List<CirAnnotation>, Li
     override fun initialize(first: List<CirAnnotation>) = Unit
 
     override fun doCommonizeWith(next: List<CirAnnotation>): Boolean {
-        val nextDeprecatedAnnotation = next.firstOrNull { annotation ->
-            (annotation.type.classifierId as? CirClassifierId.Class)?.classId == DEPRECATED_ANNOTATION_CID
-        } ?: return true
+        val nextDeprecatedAnnotation = next.firstOrNull { it.type.classifierId == DEPRECATED_ANNOTATION_CID } ?: return true
 
         val deprecatedAnnotationCommonizer = deprecatedAnnotationCommonizer
             ?: DeprecatedAnnotationCommonizer().also { this.deprecatedAnnotationCommonizer = it }
@@ -66,18 +64,18 @@ private class DeprecatedAnnotationCommonizer : Commonizer<CirAnnotation, CirAnno
 
             val constantValueArguments: Map<Name, ConstantValue<*>> = if (level == WARNING) {
                 // don't populate with the default level value
-                mapOf(PROPERTY_NAME_MESSAGE to messageValue)
+                compactMapOf(PROPERTY_NAME_MESSAGE, messageValue)
             } else
-                hashMapOf(
-                    PROPERTY_NAME_MESSAGE to messageValue,
-                    PROPERTY_NAME_LEVEL to level.toDeprecationLevelValue()
+                compactMapOf(
+                    PROPERTY_NAME_MESSAGE, messageValue,
+                    PROPERTY_NAME_LEVEL, level.toDeprecationLevelValue()
                 )
 
             val annotationValueArguments: Map<Name, CirAnnotation> = if (replaceWithExpression.isEmpty() && replaceWithImports.isEmpty()) {
                 // don't populate with empty (default) ReplaceWith
                 emptyMap()
             } else
-                mapOf(PROPERTY_NAME_REPLACE_WITH to replaceWithExpression.toReplaceWithValue(replaceWithImports))
+                compactMapOf(PROPERTY_NAME_REPLACE_WITH, replaceWithExpression.toReplaceWithValue(replaceWithImports))
 
             return CirAnnotationFactory.create(
                 type = DEPRECATED_ANNOTATION_TYPE,
@@ -160,8 +158,9 @@ private class DeprecatedAnnotationCommonizer : Commonizer<CirAnnotation, CirAnno
             it.name to EnumValue(DEPRECATION_LEVEL_CID, Name.identifier(it.name).intern())
         }
 
-        private fun buildAnnotationType(classId: ClassId) = CirTypeFactory.create(
-            classifierId = CirClassifierIdFactory.createForClass(classId),
+        private fun buildAnnotationType(classId: ClassId) = CirTypeFactory.createClassType(
+            classId = classId,
+            outerType = null,
             visibility = DescriptorVisibilities.PUBLIC,
             arguments = emptyList(),
             isMarkedNullable = false
@@ -208,7 +207,7 @@ private class DeprecatedAnnotationCommonizer : Commonizer<CirAnnotation, CirAnno
             val elements: List<ConstantValue<*>> = (this[name] as? ArrayValue)?.value ?: return null
             if (elements.isEmpty()) return emptyList()
 
-            val result = mutableListOf<String>()
+            val result = ArrayList<String>(elements.size)
             for (element in elements) {
                 if (element is StringValue) {
                     result += element.value
@@ -222,10 +221,10 @@ private class DeprecatedAnnotationCommonizer : Commonizer<CirAnnotation, CirAnno
         private inline fun createReplaceWithAnnotation(expression: String, imports: List<String>): CirAnnotation =
             CirAnnotationFactory.create(
                 type = REPLACE_WITH_ANNOTATION_TYPE,
-                constantValueArguments = mapOf(
-                    PROPERTY_NAME_EXPRESSION to StringValue(expression),
-                    PROPERTY_NAME_IMPORTS to ArrayValue(
-                        value = imports.map { StringValue(it) },
+                constantValueArguments = compactMapOf(
+                    PROPERTY_NAME_EXPRESSION, StringValue(expression),
+                    PROPERTY_NAME_IMPORTS, ArrayValue(
+                        value = imports.compactMap { StringValue(it) },
                         computeType = { it.builtIns.getArrayElementType(it.builtIns.stringType) }
                     )
                 ),
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableValueParametersCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableValueParametersCommonizer.kt
index 0980a8038a3..f172172befe 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableValueParametersCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableValueParametersCommonizer.kt
@@ -7,13 +7,13 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import com.intellij.util.containers.FactoryMap
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirCallableMemberWithParameters
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifierId
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirHasAnnotations
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirValueParameter
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirValueParameterFactory
 import org.jetbrains.kotlin.descriptors.commonizer.core.CallableValueParametersCommonizer.CallableToPatch.Companion.doNothing
 import org.jetbrains.kotlin.descriptors.commonizer.core.CallableValueParametersCommonizer.CallableToPatch.Companion.patchCallables
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirClassifiersCache
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMapIndexed
 import org.jetbrains.kotlin.descriptors.commonizer.utils.intern
 import org.jetbrains.kotlin.descriptors.commonizer.utils.isObjCInteropCallableAnnotation
 import org.jetbrains.kotlin.name.Name
@@ -49,7 +49,7 @@ class CallableValueParametersCommonizer(
                     callablesToPatch.forEach { callableToPatch ->
                         val callable = callableToPatch.callable
                         callable.hasStableParameterNames = false
-                        callable.valueParameters = callable.valueParameters.mapIndexed { index, valueParameter ->
+                        callable.valueParameters = callable.valueParameters.compactMapIndexed { index, valueParameter ->
                             val newName = newNames[index]
                             if (valueParameter.name != newName) {
                                 CirValueParameterFactory.create(
@@ -229,9 +229,7 @@ class CallableValueParametersCommonizer(
         }
 
         private fun CirCallableMemberWithParameters.canNamesBeOverwritten(): Boolean {
-            return (this as CirHasAnnotations).annotations.none { annotation ->
-                (annotation.type.classifierId as? CirClassifierId.ClassOrTypeAlias)?.classId?.isObjCInteropCallableAnnotation == true
-            }
+            return (this as CirHasAnnotations).annotations.none { it.type.classifierId.isObjCInteropCallableAnnotation }
         }
 
         private fun failIllegalState(current: ValueParameterNames?, next: ValueParameterNames): Nothing =
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt
index bb9078c06a3..2030d50752f 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt
@@ -33,8 +33,7 @@ class ClassCommonizer(cache: CirClassifiersCache) : AbstractStandardCommonizer<C
         isData = false,
         isInline = isInline,
         isInner = isInner,
-        isExternal = false,
-        supertypes = mutableListOf()
+        isExternal = false
     )
 
     override fun initialize(first: CirClass) {
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt
index 1f6b43629a6..4e963e8699c 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt
@@ -6,13 +6,12 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClass
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifierId
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.*
 import org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroup
+import org.jetbrains.kotlin.descriptors.commonizer.utils.compactMapNotNull
 import org.jetbrains.kotlin.descriptors.commonizer.utils.internedClassId
 import org.jetbrains.kotlin.descriptors.commonizer.utils.isUnderStandardKotlinPackages
-import org.jetbrains.kotlin.utils.addToStdlib.cast
 
 internal class CommonizationVisitor(
     private val root: CirRootNode
@@ -128,7 +127,7 @@ internal class CommonizationVisitor(
     private fun CirTypeAliasNode.collectCommonSupertypes(): Map<CirType, CommonizedGroup<CirType>>? {
         val supertypesMap: MutableMap<CirType, CommonizedGroup<CirType>> = linkedMapOf() // preserve supertype order
         for ((index, typeAlias) in targetDeclarations.withIndex()) {
-            val expandedClassId = typeAlias!!.expandedType.classifierId.cast<CirClassifierId.Class>().classId
+            val expandedClassId = typeAlias!!.expandedType.classifierId
             if (expandedClassId.packageFqName.isUnderStandardKotlinPackages)
                 return null // this case is not supported
 
@@ -144,11 +143,11 @@ internal class CommonizationVisitor(
     }
 
     private fun CirClass.commonizeSupertypes(supertypesMap: Map<CirType, CommonizedGroup<CirType>>?) {
-        supertypesMap ?: return
-        for ((_, supertypesGroup) in supertypesMap) {
-            val commonSupertype = commonize(supertypesGroup, TypeCommonizer(root.cache))
-            if (commonSupertype != null)
-                supertypes.add(commonSupertype)
-        }
+        setSupertypes(
+            if (supertypesMap.isNullOrEmpty())
+                emptyList()
+            else
+                supertypesMap.values.compactMapNotNull { supertypesGroup -> commonize(supertypesGroup, TypeCommonizer(root.cache)) }
+        )
     }
 }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt
index d073f21474c..1a9333f74d4 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt
@@ -56,7 +56,7 @@ fun Commonizer<*, *>.failInEmptyState(): Nothing = throw IllegalCommonizerStateE
 @Suppress("unused")
 fun Commonizer<*, *>.failInErrorState(): Nothing = throw IllegalCommonizerStateException("empty")
 
-fun <T : Any> Commonizer<*, *>.checkState(value: T?, error: Boolean): T = when {
+inline fun <reified T : Any> Commonizer<*, *>.checkState(value: T?, error: Boolean): T = when {
     value == null -> failInEmptyState()
     error -> failInErrorState()
     else -> value
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt
index 5180f86637b..dcbe9bd1c50 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirClassFactory
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeAliasFactory
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirClassifiersCache
+import org.jetbrains.kotlin.descriptors.commonizer.utils.isUnderStandardKotlinPackages
 import org.jetbrains.kotlin.name.Name
 
 /**
@@ -32,7 +33,6 @@ class TypeAliasCommonizer(cache: CirClassifiersCache) : AbstractStandardCommoniz
 
     override fun initialize(first: CirTypeAlias) = Unit
 
-    @Suppress("ReplaceNegatedIsEmptyWithIsNotEmpty")
     override fun doCommonizeWith(next: CirTypeAlias): Boolean {
         val primaryResult = primary.commonizeWith(next)
         val secondaryResult = secondary.commonizeWith(next)
@@ -45,19 +45,60 @@ class TypeAliasCommonizer(cache: CirClassifiersCache) : AbstractStandardCommoniz
 
 private class TypeAliasShortCircuitingCommonizer(cache: CirClassifiersCache) : AbstractStandardCommonizer<CirTypeAlias, CirTypeAlias>() {
     private lateinit var name: Name
+    private val typeParameters = TypeParameterListCommonizer(cache)
+    private lateinit var underlyingType: CirClassOrTypeAliasType
     private val expandedType = TypeCommonizer(cache)
     private val visibility = VisibilityCommonizer.lowering()
 
+    override fun commonizationResult() = CirTypeAliasFactory.create(
+        annotations = emptyList(),
+        name = name,
+        typeParameters = typeParameters.result,
+        visibility = visibility.result,
+        underlyingType = computeCommonizedUnderlyingType(underlyingType),
+        expandedType = expandedType.result as CirClassType
+    )
+
+    val resultOrNull: CirTypeAlias?
+        get() = if (hasResult) commonizationResult() else null
+
+    override fun initialize(first: CirTypeAlias) {
+        name = first.name
+        underlyingType = first.underlyingType
+    }
+
+    override fun doCommonizeWith(next: CirTypeAlias) =
+        typeParameters.commonizeWith(next.typeParameters)
+                && expandedType.commonizeWith(next.expandedType)
+                && visibility.commonizeWith(next)
+
+    private tailrec fun computeCommonizedUnderlyingType(underlyingType: CirClassOrTypeAliasType): CirClassOrTypeAliasType {
+        return when (underlyingType) {
+            is CirClassType -> underlyingType
+            is CirTypeAliasType -> if (underlyingType.classifierId.packageFqName.isUnderStandardKotlinPackages)
+                underlyingType
+            else
+                computeCommonizedUnderlyingType(underlyingType.underlyingType)
+        }
+    }
+}
+
+private class TypeAliasLiftingUpCommonizer(cache: CirClassifiersCache) : AbstractStandardCommonizer<CirTypeAlias, CirTypeAlias>() {
+    private lateinit var name: Name
+    private val typeParameters = TypeParameterListCommonizer(cache)
+    private val underlyingType = TypeCommonizer(cache)
+    private val visibility = VisibilityCommonizer.lowering()
+
     override fun commonizationResult(): CirTypeAlias {
-        val expandedType = expandedType.result as CirSimpleType
+        val underlyingType = underlyingType.result as CirClassOrTypeAliasType
 
         return CirTypeAliasFactory.create(
             annotations = emptyList(),
             name = name,
-            typeParameters = emptyList(),
+            typeParameters = typeParameters.result,
             visibility = visibility.result,
-            underlyingType = expandedType, // pass expanded type as underlying type
-            expandedType = expandedType
+            underlyingType = underlyingType,
+            expandedType = computeCommonizedExpandedType(underlyingType)
         )
     }
 
@@ -68,41 +109,17 @@ private class TypeAliasShortCircuitingCommonizer(cache: CirClassifiersCache) : A
         name = first.name
     }
 
-    override fun doCommonizeWith(next: CirTypeAlias) =
-        next.typeParameters.isEmpty() // short-circuiting of TAs with type parameters is too complex case, consider implementing it later
-                && next.expandedType.arguments.isEmpty() // short-circuiting of TAs with type arguments in expanded type is too complex case
-                && expandedType.commonizeWith(next.expandedType)
-                && visibility.commonizeWith(next)
-}
-
-private class TypeAliasLiftingUpCommonizer(cache: CirClassifiersCache) : AbstractStandardCommonizer<CirTypeAlias, CirTypeAlias>() {
-    private lateinit var name: Name
-    private val typeParameters = TypeParameterListCommonizer(cache)
-    private val underlyingType = TypeCommonizer(cache)
-    private lateinit var expandedType: CirSimpleType
-    private val visibility = VisibilityCommonizer.lowering()
-
-    override fun commonizationResult(): CirTypeAlias = CirTypeAliasFactory.create(
-        annotations = emptyList(),
-        name = name,
-        typeParameters = typeParameters.result,
-        visibility = visibility.result,
-        underlyingType = underlyingType.result as CirSimpleType,
-        expandedType = expandedType
-    )
-
-    val resultOrNull: CirTypeAlias?
-        get() = if (hasResult) commonizationResult() else null
-
-    override fun initialize(first: CirTypeAlias) {
-        name = first.name
-        expandedType = first.expandedType
-    }
-
     override fun doCommonizeWith(next: CirTypeAlias) =
         typeParameters.commonizeWith(next.typeParameters)
                 && underlyingType.commonizeWith(next.underlyingType)
                 && visibility.commonizeWith(next)
+
+    private tailrec fun computeCommonizedExpandedType(underlyingType: CirClassOrTypeAliasType): CirClassType {
+        return when (underlyingType) {
+            is CirClassType -> underlyingType
+            is CirTypeAliasType -> computeCommonizedExpandedType(underlyingType.underlyingType)
+        }
+    }
 }
 
 private class TypeAliasExpectClassCommonizer : AbstractStandardCommonizer<CirTypeAlias, CirClass>() {
@@ -121,17 +138,26 @@ private class TypeAliasExpectClassCommonizer : AbstractStandardCommonizer<CirTyp
         isData = false,
         isInline = false,
         isInner = false,
-        isExternal = false,
-        supertypes = mutableListOf()
+        isExternal = false
     )
 
     override fun initialize(first: CirTypeAlias) {
         name = first.name
     }
 
-    override fun doCommonizeWith(next: CirTypeAlias) =
-        next.typeParameters.isEmpty() // TAs with declared type parameters can't be commonized
-                && next.underlyingType.arguments.isEmpty() // TAs with functional types or types with parameters at the right-hand side can't be commonized
-                && next.underlyingType.classifierId is CirClassifierId.Class // right-hand side could have only class
-                && classVisibility.commonizeWith(next.underlyingType) // the visibilities of the right-hand classes should be equal
+    override fun doCommonizeWith(next: CirTypeAlias): Boolean {
+        if (next.typeParameters.isNotEmpty())
+            return false // TAs with declared type parameters can't be commonized
+
+        val underlyingType = next.underlyingType as? CirClassType ?: return false // right-hand side could have only class
+        return hasNoArguments(underlyingType) // TAs with functional types or types with arguments at the right-hand side can't be commonized
+                && classVisibility.commonizeWith(underlyingType) // the visibilities of the right-hand classes should be equal
+    }
+
+    private tailrec fun hasNoArguments(type: CirClassType?): Boolean =
+        when {
+            type == null -> true
+            type.arguments.isNotEmpty() -> false
+            else -> hasNoArguments(type.outerType)
+        }
 }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt
index 4ff0cf25761..ee123b61882 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt
@@ -5,105 +5,237 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
+import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
+import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeFactory
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirClassifiersCache
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirNode
 import org.jetbrains.kotlin.descriptors.commonizer.utils.isUnderStandardKotlinPackages
-import org.jetbrains.kotlin.types.AbstractStrictEqualityTypeChecker
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.types.Variance
 
 class TypeCommonizer(private val cache: CirClassifiersCache) : AbstractStandardCommonizer<CirType, CirType>() {
-    private lateinit var temp: CirType
+    private lateinit var wrapped: Commonizer<*, CirType>
 
-    override fun commonizationResult() = temp
+    override fun commonizationResult() = wrapped.result
 
     override fun initialize(first: CirType) {
-        temp = first
+        @Suppress("UNCHECKED_CAST")
+        wrapped = when (first) {
+            is CirClassType -> ClassTypeCommonizer(cache)
+            is CirTypeAliasType -> TypeAliasTypeCommonizer(cache)
+            is CirTypeParameterType -> TypeParameterTypeCommonizer()
+            is CirFlexibleType -> FlexibleTypeCommonizer(cache)
+        } as Commonizer<*, CirType>
     }
 
-    override fun doCommonizeWith(next: CirType) = areTypesEqual(cache, temp, next)
+    override fun doCommonizeWith(next: CirType) = when (next) {
+        is CirClassType -> (wrapped as? ClassTypeCommonizer)?.commonizeWith(next) == true
+        is CirTypeAliasType -> (wrapped as? TypeAliasTypeCommonizer)?.commonizeWith(next) == true
+        is CirTypeParameterType -> (wrapped as? TypeParameterTypeCommonizer)?.commonizeWith(next) == true
+        is CirFlexibleType -> (wrapped as? FlexibleTypeCommonizer)?.commonizeWith(next) == true
+    }
 }
 
-/**
- * See also [AbstractStrictEqualityTypeChecker].
- */
-@Suppress("IntroduceWhenSubject")
-internal fun areTypesEqual(cache: CirClassifiersCache, a: CirType, b: CirType): Boolean = when {
-    a is CirSimpleType -> (b is CirSimpleType) && areSimpleTypesEqual(cache, a, b)
-    a is CirFlexibleType -> (b is CirFlexibleType)
-            && areSimpleTypesEqual(cache, a.lowerBound, b.lowerBound)
-            && areSimpleTypesEqual(cache, a.upperBound, b.upperBound)
-    else -> false
+private class ClassTypeCommonizer(private val cache: CirClassifiersCache) : AbstractStandardCommonizer<CirClassType, CirClassType>() {
+    private lateinit var classId: ClassId
+    private val outerType = OuterClassTypeCommonizer(cache)
+    private lateinit var anyVisibility: DescriptorVisibility
+    private val arguments = TypeArgumentListCommonizer(cache)
+    private var isMarkedNullable = false
+
+    override fun commonizationResult() = CirTypeFactory.createClassType(
+        classId = classId,
+        outerType = outerType.result,
+        // N.B. The 'visibility' field in class types is needed ONLY for TA commonization. The class type constructed here is
+        // intended to be used in "common" target. It could not participate in TA commonization. So, it does not matter which
+        // exactly visibility will be recorded for commonized class type. Passing the visibility of the first class type
+        // to reach better interning rate.
+        visibility = anyVisibility,
+        arguments = arguments.result,
+        isMarkedNullable = isMarkedNullable
+    )
+
+    override fun initialize(first: CirClassType) {
+        classId = first.classifierId
+        anyVisibility = first.visibility
+        isMarkedNullable = first.isMarkedNullable
+    }
+
+    override fun doCommonizeWith(next: CirClassType) =
+        isMarkedNullable == next.isMarkedNullable
+                && classId == next.classifierId
+                && outerType.commonizeWith(next.outerType)
+                && commonizeClassifier(classId, cache.classes).first
+                && arguments.commonizeWith(next.arguments)
 }
 
-private fun areSimpleTypesEqual(cache: CirClassifiersCache, a: CirSimpleType, b: CirSimpleType): Boolean {
-    val aId = a.classifierId
-    val bId = b.classifierId
+private class OuterClassTypeCommonizer(cache: CirClassifiersCache) :
+    AbstractNullableCommonizer<CirClassType, CirClassType, CirClassType, CirClassType>(
+        wrappedCommonizerFactory = { ClassTypeCommonizer(cache) },
+        extractor = { it },
+        builder = { it }
+    )
 
-    if (a !== b) {
-        if (a.arguments.size != b.arguments.size || a.isMarkedNullable != b.isMarkedNullable) {
+private class TypeAliasTypeCommonizer(private val cache: CirClassifiersCache) :
+    AbstractStandardCommonizer<CirTypeAliasType, CirClassOrTypeAliasType>() {
+
+    private lateinit var typeAliasId: ClassId
+    private val arguments = TypeArgumentListCommonizer(cache)
+    private var isMarkedNullable = false
+    private var commonizedTypeBuilder: CommonizedTypeAliasTypeBuilder? = null // null means not selected yet
+
+    override fun commonizationResult() =
+        (commonizedTypeBuilder ?: failInEmptyState()).build(
+            typeAliasId = typeAliasId,
+            arguments = arguments.result,
+            isMarkedNullable = isMarkedNullable
+        )
+
+    override fun initialize(first: CirTypeAliasType) {
+        typeAliasId = first.classifierId
+        isMarkedNullable = first.isMarkedNullable
+    }
+
+    override fun doCommonizeWith(next: CirTypeAliasType): Boolean {
+        if (isMarkedNullable != next.isMarkedNullable || typeAliasId != next.classifierId)
             return false
+
+        if (commonizedTypeBuilder == null) {
+            val (commonized, commonClassifier) = commonizeClassifier(typeAliasId, cache.typeAliases)
+            if (!commonized)
+                return false
+
+            commonizedTypeBuilder = when (commonClassifier) {
+                is CirClass -> CommonizedTypeAliasTypeBuilder.forClass(commonClassifier)
+                is CirTypeAlias -> CommonizedTypeAliasTypeBuilder.forTypeAlias(commonClassifier)
+                null -> CommonizedTypeAliasTypeBuilder.forKnownUnderlyingType(next.underlyingType)
+                else -> error("Unexpected common classifier type: ${commonClassifier::class.java}, $commonClassifier")
+            }
         }
 
-        if (aId is CirClassifierId.ClassOrTypeAlias) {
-            if (bId !is CirClassifierId.ClassOrTypeAlias || aId.classId != bId.classId) return false
-        }
-
-        if (aId is CirClassifierId.TypeParameter) {
-            if (bId !is CirClassifierId.TypeParameter || aId.index != bId.index) return false
-        }
+        return arguments.commonizeWith(next.arguments)
     }
 
-    // N.B. only for descriptors that represent classes or type aliases, but not type parameters!
-    fun isClassOrTypeAliasUnderStandardKotlinPackages(): Boolean {
-        return (aId as? CirClassifierId.ClassOrTypeAlias)?.classId?.packageFqName?.isUnderStandardKotlinPackages == true
-    }
+    // builds a new type for "common" library fragment for the given combination of type alias types in "platform" fragments
+    private interface CommonizedTypeAliasTypeBuilder {
+        fun build(typeAliasId: ClassId, arguments: List<CirTypeProjection>, isMarkedNullable: Boolean): CirClassOrTypeAliasType
 
-    fun descriptorsCanBeCommonizedThemselves(): Boolean {
-        return when (aId) {
-            is CirClassifierId.Class -> bId is CirClassifierId.Class && cache.classes[aId.classId].canBeCommonized()
-            is CirClassifierId.TypeAlias -> bId is CirClassifierId.TypeAlias && cache.typeAliases[aId.classId].canBeCommonized()
-            is CirClassifierId.TypeParameter -> {
-                // Real type parameter commonization is performed in TypeParameterCommonizer.
-                // Here it is enough to check that FQ names are equal (which is already done above).
-                true
+        companion object {
+            // type alias has been commonized to expect class, need to build type for expect class
+            fun forClass(commonClass: CirClass) = object : CommonizedTypeAliasTypeBuilder {
+                override fun build(typeAliasId: ClassId, arguments: List<CirTypeProjection>, isMarkedNullable: Boolean) =
+                    CirTypeFactory.createClassType(
+                        classId = typeAliasId,
+                        outerType = null, // there can't be outer type
+                        visibility = commonClass.visibility,
+                        arguments = arguments,
+                        isMarkedNullable = isMarkedNullable
+                    )
+            }
+
+            // type alias has been commonized to another type alias with the different underlying type, need to build type for
+            // new type alias
+            fun forTypeAlias(modifiedTypeAlias: CirTypeAlias) = forKnownUnderlyingType(modifiedTypeAlias.underlyingType)
+
+            // type alias don't needs to be commonized because it is from the standard library
+            fun forKnownUnderlyingType(underlyingType: CirClassOrTypeAliasType) = object : CommonizedTypeAliasTypeBuilder {
+                override fun build(typeAliasId: ClassId, arguments: List<CirTypeProjection>, isMarkedNullable: Boolean): CirTypeAliasType {
+                    val underlyingTypeWithProperNullability = if (isMarkedNullable && !underlyingType.isMarkedNullable)
+                        CirTypeFactory.makeNullable(underlyingType)
+                    else
+                        underlyingType
+
+                    return CirTypeFactory.createTypeAliasType(
+                        typeAliasId = typeAliasId,
+                        underlyingType = underlyingTypeWithProperNullability, // TODO replace arguments???
+                        arguments = arguments,
+                        isMarkedNullable = isMarkedNullable
+                    )
+                }
             }
         }
     }
+}
 
-    val descriptorsCanBeCommonized =
-        /* either class or type alias from Kotlin stdlib */ isClassOrTypeAliasUnderStandardKotlinPackages()
-            || /* or descriptors themselves can be commonized */ descriptorsCanBeCommonizedThemselves()
+private class TypeParameterTypeCommonizer : AbstractStandardCommonizer<CirTypeParameterType, CirTypeParameterType>() {
+    private lateinit var temp: CirTypeParameterType
 
-    if (!descriptorsCanBeCommonized)
-        return false
+    override fun commonizationResult() = temp
 
-    // N.B. both lists of arguments are already known to be of the same size
-    for (i in a.arguments.indices) {
-        val aArg = a.arguments[i]
-        val bArg = b.arguments[i]
+    override fun initialize(first: CirTypeParameterType) {
+        temp = first
+    }
 
-        if (aArg.isStarProjection != bArg.isStarProjection)
-            return false
+    override fun doCommonizeWith(next: CirTypeParameterType): Boolean {
+        // Real type parameter commonization is performed in TypeParameterCommonizer.
+        // Here it is enough to check that type parameter indices and nullability are equal.
+        return temp == next
+    }
+}
 
-        if (!aArg.isStarProjection) {
-            if (aArg.projectionKind != bArg.projectionKind)
-                return false
+private class FlexibleTypeCommonizer(cache: CirClassifiersCache) : AbstractStandardCommonizer<CirFlexibleType, CirFlexibleType>() {
+    private val lowerBound = TypeCommonizer(cache)
+    private val upperBound = TypeCommonizer(cache)
 
-            if (!areTypesEqual(cache, aArg.type, bArg.type))
-                return false
+    override fun commonizationResult() = CirFlexibleType(
+        lowerBound = lowerBound.result as CirSimpleType,
+        upperBound = upperBound.result as CirSimpleType
+    )
+
+    override fun initialize(first: CirFlexibleType) = Unit
+
+    override fun doCommonizeWith(next: CirFlexibleType) =
+        lowerBound.commonizeWith(next.lowerBound) && upperBound.commonizeWith(next.upperBound)
+}
+
+private class TypeArgumentCommonizer(cache: CirClassifiersCache) : AbstractStandardCommonizer<CirTypeProjection, CirTypeProjection>() {
+    private var isStar = false
+    private lateinit var projectionKind: Variance
+    private val type = TypeCommonizer(cache)
+
+    override fun commonizationResult() = if (isStar) CirStarTypeProjection else CirTypeProjectionImpl(
+        projectionKind = projectionKind,
+        type = type.result
+    )
+
+    override fun initialize(first: CirTypeProjection) {
+        when (first) {
+            is CirStarTypeProjection -> isStar = true
+            is CirTypeProjectionImpl -> projectionKind = first.projectionKind
         }
     }
 
-    return true
+    override fun doCommonizeWith(next: CirTypeProjection) = when (next) {
+        is CirStarTypeProjection -> isStar
+        is CirTypeProjectionImpl -> !isStar && projectionKind == next.projectionKind && type.commonizeWith(next.type)
+    }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-private inline fun CirNode<*, *>?.canBeCommonized() =
-    if (this == null) {
-        // No node means that the class or type alias was not subject for commonization at all, probably it lays
-        // not in commonized module descriptors but somewhere in their dependencies.
-        true
-    } else {
-        // If entry is present, then contents (common declaration) should not be null.
-        commonDeclaration() != null
+private class TypeArgumentListCommonizer(cache: CirClassifiersCache) : AbstractListCommonizer<CirTypeProjection, CirTypeProjection>(
+    singleElementCommonizerFactory = { TypeArgumentCommonizer(cache) }
+)
+
+private inline fun <reified T : CirClassifier> commonizeClassifier(
+    classifierId: ClassId,
+    classifierNodes: Map<ClassId, CirNode<*, T>>,
+): Pair<Boolean, T?> {
+    if (classifierId.packageFqName.isUnderStandardKotlinPackages) {
+        /* either class or type alias from Kotlin stdlib */
+        return true to null
     }
+
+    /* or descriptors themselves can be commonized */
+    return when (val node = classifierNodes[classifierId]) {
+        null -> {
+            // No node means that the class or type alias was not subject for commonization at all, probably it lays
+            // not in commonized module descriptors but somewhere in their dependencies.
+            true to null
+        }
+        else -> {
+            // If entry is present, then contents (common declaration) should not be null.
+            val commonClassifier = node.commonDeclaration()
+            (commonClassifier != null) to commonClassifier
+        }
+    }
+}
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/approximationKeys.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/approximationKeys.kt
index e642dcfa562..c10d2af88ba 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/approximationKeys.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/approximationKeys.kt
@@ -25,7 +25,7 @@ data class PropertyApproximationKey(
 }
 
 /** Used for approximation of [SimpleFunctionDescriptor]s before running concrete [Commonizer]s */
-class FunctionApproximationKey(
+data class FunctionApproximationKey(
     private val name: Name,
     private val valueParametersTypes: Array<CirTypeSignature>,
     private val additionalValueParametersNamesHash: Int,
@@ -55,7 +55,7 @@ class FunctionApproximationKey(
 }
 
 /** Used for approximation of [ConstructorDescriptor]s before running concrete [Commonizer]s */
-class ConstructorApproximationKey(
+data class ConstructorApproximationKey(
     private val valueParametersTypes: Array<CirTypeSignature>,
     private val additionalValueParametersNamesHash: Int
 ) {
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt
index bb13a9a2d9a..04e86cd44be 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt
@@ -5,8 +5,15 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.utils
 
+import com.intellij.util.SmartFMap
 import gnu.trove.THashMap
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
+import java.util.*
+import java.util.Collections.singletonList
+import java.util.Collections.singletonMap
+import kotlin.collections.ArrayList
 
 internal fun <T> Sequence<T>.toList(expectedCapacity: Int): List<T> {
     val result = ArrayList<T>(expectedCapacity)
@@ -14,16 +21,77 @@ internal fun <T> Sequence<T>.toList(expectedCapacity: Int): List<T> {
     return result
 }
 
-internal infix fun <K, V> Map<K, V>.concat(other: Map<K, V>): Map<K, V> =
+internal infix fun <K, V> Map<K, V>.compactConcat(other: Map<K, V>): Map<K, V> =
     when {
         isEmpty() -> other
         other.isEmpty() -> this
-        else -> THashMap<K, V>(size + other.size, 1F).apply {
-            putAll(this@concat)
-            putAll(other)
+        else -> when (val capacity = size + other.size) {
+            0, 1 -> error("Unreachable code")
+            2, 3 -> SmartFMap.emptyMap<K, V>().plusAll(this).plusAll(other)
+            else -> THashMap<K, V>(capacity).also { it.putAll(this); it.putAll(other) }
         }
     }
 
+internal inline fun <K : Any, V, R> Map<K, V>.compactMapValues(transform: (Map.Entry<K, V>) -> R): Map<K, R> =
+    when (size) {
+        0 -> emptyMap()
+        1 -> with(entries.iterator().next()) { singletonMap(key, transform(this)) }
+        2, 3 -> entries.fold(SmartFMap.emptyMap()) { acc, entry -> acc.plus(entry.key, transform(entry)) }
+        else -> mapValuesTo(THashMap(size), transform)
+    }
+
+internal inline fun <T, R> Collection<T>.compactMap(transform: (T) -> R): List<R> =
+    when (size) {
+        0 -> emptyList()
+        1 -> singletonList(transform(if (this is List) this[0] else iterator().next()))
+        else -> mapTo(ArrayList(size), transform)
+    }
+
+internal inline fun <T, reified R : Any> Collection<T>.compactMapNotNull(transform: (T) -> R?): List<R> =
+    if (isEmpty()) emptyList() else mapNotNullTo(ArrayList(size), transform).compact()
+
+internal inline fun <T, R> Collection<T>.compactMapIndexed(transform: (index: Int, T) -> R): List<R> =
+    when (size) {
+        0 -> emptyList()
+        1 -> singletonList(transform(0, if (this is List) this[0] else iterator().next()))
+        else -> mapIndexedTo(ArrayList(size), transform)
+    }
+
+internal inline fun <reified T> List<T>.compact(): List<T> =
+    when (size) {
+        0 -> emptyList()
+        1 -> singletonList(this[0])
+        else -> when (this) {
+            is java.util.ArrayList -> {
+                trimToSize()
+                this
+            }
+            else -> {
+                @Suppress("ReplaceJavaStaticMethodWithKotlinAnalog")
+                Arrays.asList(*toTypedArray())
+            }
+        }
+    }
+
+internal inline fun <reified R> Annotations.compactMap(transform: (AnnotationDescriptor) -> R): List<R> =
+    if (isEmpty()) emptyList() else map(transform).compact()
+
+internal fun <K, V> Map<K, V>.compact(): Map<K, V> =
+    when (size) {
+        0 -> emptyMap()
+        1 -> with(entries.iterator().next()) { singletonMap(key, value) }
+        2, 3 -> SmartFMap.emptyMap<K, V>().plusAll(this)
+        else -> THashMap(this)
+    }
+
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <K : Any, V> compactMapOf(key: K, value: V): Map<K, V> =
+    singletonMap(key, value)
+
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <K : Any, V> compactMapOf(key1: K, value1: V, key2: K, value2: V): Map<K, V> =
+    SmartFMap.emptyMap<K, V>().plus(key1, value1).plus(key2, value2)
+
 internal inline fun <reified T> Iterable<T?>.firstNonNull() = firstIsInstance<T>()
 
 internal fun Any?.isNull(): Boolean = this == null
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt
index c2f4b813bc3..d55607fe847 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt
@@ -12,15 +12,24 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeSignature
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.resolve.descriptorUtil.classId
-import org.jetbrains.kotlin.types.AbbreviatedType
-import org.jetbrains.kotlin.types.KotlinType
-import org.jetbrains.kotlin.types.TypeUtils
-import org.jetbrains.kotlin.types.Variance
+import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
 
 internal inline val KotlinType.declarationDescriptor: ClassifierDescriptor
     get() = (constructor.declarationDescriptor ?: error("No declaration descriptor found for $constructor"))
 
+// eliminate unnecessary repeated abbreviations
+internal fun extractExpandedType(abbreviated: AbbreviatedType): SimpleType {
+    var expanded = abbreviated.expandedType
+    while (expanded is AbbreviatedType) {
+        if (expanded.abbreviation.declarationDescriptor !== abbreviated.abbreviation.declarationDescriptor)
+            break
+        else
+            expanded = expanded.expandedType
+    }
+    return expanded
+}
+
 internal val ClassifierDescriptorWithTypeParameters.internedClassId: ClassId
     get() = when (val owner = containingDeclaration) {
         is PackageFragmentDescriptor -> internedClassId(owner.fqName.intern(), name.intern())
diff --git a/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/common/package_root.kt b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/common/package_root.kt
new file mode 100644
index 00000000000..797de95d8cf
--- /dev/null
+++ b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/common/package_root.kt
@@ -0,0 +1,3 @@
+expect interface Interface {
+    open fun openFun()
+}
diff --git a/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/js/package_root.kt
new file mode 100644
index 00000000000..99b9d92f63f
--- /dev/null
+++ b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/js/package_root.kt
@@ -0,0 +1,5 @@
+actual interface Interface {
+    actual fun openFun() = Unit
+    fun openFunWithOtherParams(param: Int) = Unit
+    fun openInJs_abstractInJvm() = Unit
+}
diff --git a/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/jvm/package_root.kt
new file mode 100644
index 00000000000..afb2a58fabf
--- /dev/null
+++ b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/commonized/jvm/package_root.kt
@@ -0,0 +1,5 @@
+actual interface Interface {
+    actual fun openFun() = Unit
+    fun openFunWithOtherParams(param: Double) = Unit
+    fun openInJs_abstractInJvm()
+}
diff --git a/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/original/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/original/js/package_root.kt
new file mode 100644
index 00000000000..d344e96a346
--- /dev/null
+++ b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/original/js/package_root.kt
@@ -0,0 +1,5 @@
+interface Interface {
+    fun openFun() = Unit
+    fun openFunWithOtherParams(param: Int) = Unit
+    fun openInJs_abstractInJvm() = Unit
+}
diff --git a/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/original/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/original/jvm/package_root.kt
new file mode 100644
index 00000000000..39e18dc61c6
--- /dev/null
+++ b/native/commonizer/testData/callableMemberCommonization/openCallableMemberInInterface/original/jvm/package_root.kt
@@ -0,0 +1,5 @@
+interface Interface {
+    fun openFun() = Unit
+    fun openFunWithOtherParams(param: Double) = Unit
+    fun openInJs_abstractInJvm()
+}
diff --git a/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/common/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/common/package_root.kt
index b9c447c812e..77e197d25b9 100644
--- a/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/common/package_root.kt
+++ b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/common/package_root.kt
@@ -40,3 +40,19 @@ expect fun functionWithTypeParametersInReturnType12(): Box<Fox>
 expect fun <T> functionWithUnsubstitutedTypeParametersInReturnType1(): T
 expect fun <T> functionWithUnsubstitutedTypeParametersInReturnType2(): T
 expect fun <T> functionWithUnsubstitutedTypeParametersInReturnType8(): Box<T>
+
+expect class Outer<A>() {
+    class Nested<B>() {
+        class Nested<C>()
+        inner class Inner<D>()
+    }
+    inner class Inner<E>() {
+        inner class Inner<F>()
+    }
+}
+
+expect fun <T> returnOuter(): Outer<T>
+expect fun <T> returnOuterNested(): Outer.Nested<T>
+expect fun <T> returnOuterNestedNested(): Outer.Nested.Nested<T>
+expect fun <T, R> returnOuterInner(): Outer<T>.Inner<R>
+expect fun <T, R, S> returnOuterInnerInner(): Outer<T>.Inner<R>.Inner<S>
diff --git a/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/js/package_root.kt
index a637f15a8c0..caf75ba0f35 100644
--- a/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/js/package_root.kt
+++ b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/js/package_root.kt
@@ -61,3 +61,19 @@ fun <T> functionWithUnsubstitutedTypeParametersInReturnType6(): T = TODO()
 fun <T> functionWithUnsubstitutedTypeParametersInReturnType7(): T = TODO()
 actual fun <T> functionWithUnsubstitutedTypeParametersInReturnType8(): Box<T> = TODO()
 fun <T> functionWithUnsubstitutedTypeParametersInReturnType9(): Box<T> = TODO()
+
+actual class Outer<A> actual constructor() {
+    actual class Nested<B> actual constructor() {
+        actual class Nested<C> actual constructor()
+        actual inner class Inner<D> actual constructor()
+    }
+    actual inner class Inner<E> actual constructor() {
+        actual inner class Inner<F> actual constructor()
+    }
+}
+
+actual fun <T> returnOuter(): Outer<T> = TODO()
+actual fun <T> returnOuterNested(): Outer.Nested<T> = TODO()
+actual fun <T> returnOuterNestedNested(): Outer.Nested.Nested<T> = TODO()
+actual fun <T, R> returnOuterInner(): Outer<T>.Inner<R> = TODO()
+actual fun <T, R, S> returnOuterInnerInner(): Outer<T>.Inner<R>.Inner<S> = TODO()
diff --git a/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/jvm/package_root.kt
index f48c8e01d4f..23cc88db321 100644
--- a/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/jvm/package_root.kt
+++ b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/jvm/package_root.kt
@@ -61,3 +61,19 @@ fun <T, Q> functionWithUnsubstitutedTypeParametersInReturnType6(): Q = TODO()
 fun functionWithUnsubstitutedTypeParametersInReturnType7(): String = TODO()
 actual fun <T> functionWithUnsubstitutedTypeParametersInReturnType8(): Box<T> = TODO()
 fun functionWithUnsubstitutedTypeParametersInReturnType9(): Box<String> = TODO()
+
+actual class Outer<A> actual constructor() {
+    actual class Nested<B> actual constructor() {
+        actual class Nested<C> actual constructor()
+        actual inner class Inner<D> actual constructor()
+    }
+    actual inner class Inner<E> actual constructor() {
+        actual inner class Inner<F> actual constructor()
+    }
+}
+
+actual fun <T> returnOuter(): Outer<T> = TODO()
+actual fun <T> returnOuterNested(): Outer.Nested<T> = TODO()
+actual fun <T> returnOuterNestedNested(): Outer.Nested.Nested<T> = TODO()
+actual fun <T, R> returnOuterInner(): Outer<T>.Inner<R> = TODO()
+actual fun <T, R, S> returnOuterInnerInner(): Outer<T>.Inner<R>.Inner<S> = TODO()
diff --git a/native/commonizer/testData/callableMemberCommonization/returnTypes/original/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/original/js/package_root.kt
index 1d8883f6b4c..15237587e7f 100644
--- a/native/commonizer/testData/callableMemberCommonization/returnTypes/original/js/package_root.kt
+++ b/native/commonizer/testData/callableMemberCommonization/returnTypes/original/js/package_root.kt
@@ -64,3 +64,19 @@ fun <T> functionWithUnsubstitutedTypeParametersInReturnType6(): T = TODO()
 fun <T> functionWithUnsubstitutedTypeParametersInReturnType7(): T = TODO()
 fun <T> functionWithUnsubstitutedTypeParametersInReturnType8(): Box<T> = TODO()
 fun <T> functionWithUnsubstitutedTypeParametersInReturnType9(): Box<T> = TODO()
+
+class Outer<A> {
+    class Nested<B> {
+        class Nested<C>
+        inner class Inner<D>
+    }
+    inner class Inner<E> {
+        inner class Inner<F>
+    }
+}
+
+fun <T> returnOuter(): Outer<T> = TODO()
+fun <T> returnOuterNested(): Outer.Nested<T> = TODO()
+fun <T> returnOuterNestedNested(): Outer.Nested.Nested<T> = TODO()
+fun <T, R> returnOuterInner(): Outer<T>.Inner<R> = TODO()
+fun <T, R, S> returnOuterInnerInner(): Outer<T>.Inner<R>.Inner<S> = TODO()
diff --git a/native/commonizer/testData/callableMemberCommonization/returnTypes/original/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/original/jvm/package_root.kt
index 820bab8f1fb..8fa0b2b1f3b 100644
--- a/native/commonizer/testData/callableMemberCommonization/returnTypes/original/jvm/package_root.kt
+++ b/native/commonizer/testData/callableMemberCommonization/returnTypes/original/jvm/package_root.kt
@@ -64,3 +64,19 @@ fun <T, Q> functionWithUnsubstitutedTypeParametersInReturnType6(): Q = TODO()
 fun functionWithUnsubstitutedTypeParametersInReturnType7(): String = TODO()
 fun <T> functionWithUnsubstitutedTypeParametersInReturnType8(): Box<T> = TODO()
 fun functionWithUnsubstitutedTypeParametersInReturnType9(): Box<String> = TODO()
+
+class Outer<A> {
+    class Nested<B> {
+        class Nested<C>
+        inner class Inner<D>
+    }
+    inner class Inner<E> {
+        inner class Inner<F>
+    }
+}
+
+fun <T> returnOuter(): Outer<T> = TODO()
+fun <T> returnOuterNested(): Outer.Nested<T> = TODO()
+fun <T> returnOuterNestedNested(): Outer.Nested.Nested<T> = TODO()
+fun <T, R> returnOuterInner(): Outer<T>.Inner<R> = TODO()
+fun <T, R, S> returnOuterInnerInner(): Outer<T>.Inner<R>.Inner<S> = TODO()
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_kotlinx_cinterop.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_kotlinx_cinterop.kt
index 97a70aad3af..cf366643a8f 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_kotlinx_cinterop.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_kotlinx_cinterop.kt
@@ -1,5 +1,12 @@
 // this is to avoid missing Kotlin/Native stdlib
 package kotlinx.cinterop
 
-// fake class with the default constructor and no member scope
-public abstract class CStructVar()
+// fake classes with the default constructor and no member scope
+abstract class CStructVar
+class CPointer<T>
+@Suppress("FINAL_UPPER_BOUND") class UByteVarOf<T : UByte>
+class UByte
+
+// fake typealiases
+typealias CArrayPointer<T> = CPointer<T>
+typealias UByteVar = UByteVarOf<UByte>
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_root.kt
index e2b24c5e726..c20bf9b7dee 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_root.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_root.kt
@@ -12,6 +12,17 @@ typealias E = A // different TAs expanded to the same class at the RHS
 typealias F = List<String> // parameterized type at the RHS
 typealias H<T> = List<T> // TA with own parameters
 
+typealias I2<T> = List<T>
+typealias I3<R> = List<R>
+typealias I4 = List<String>
+
+typealias I5<V, K> = Map<K, V>
+typealias I6<T, R> = Map<R, T>
+
+typealias I7<K, V> = Map<K, V>
+typealias I8<T, R> = Map<R, T>
+typealias I9<Q, W> = Map<W, Q>
+
 typealias J<T> = Function<T> // function type at the RHS
 typealias M = () -> Unit // same return type
 typealias O = (String) -> Int // same argument type
@@ -31,3 +42,9 @@ typealias Y = V // TA at the RHS with the different nullability of own RHS
 
 // Supertypes:
 expect class FILE : kotlinx.cinterop.CStructVar
+
+typealias uuid_t = kotlinx.cinterop.CPointer<kotlinx.cinterop.UByteVarOf<kotlinx.cinterop.UByte>>
+//                                  ^^^ TODO: ideally, it should be CArrayPointer<UByteVar>
+typealias __darwin_uuid_t = kotlinx.cinterop.CArrayPointer<kotlinx.cinterop.UByteVar>
+
+expect val uuid: uuid_t
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/linux/package_kotlinx_cinterop.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/linux/package_kotlinx_cinterop.kt
index 97a70aad3af..cf366643a8f 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/linux/package_kotlinx_cinterop.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/linux/package_kotlinx_cinterop.kt
@@ -1,5 +1,12 @@
 // this is to avoid missing Kotlin/Native stdlib
 package kotlinx.cinterop
 
-// fake class with the default constructor and no member scope
-public abstract class CStructVar()
+// fake classes with the default constructor and no member scope
+abstract class CStructVar
+class CPointer<T>
+@Suppress("FINAL_UPPER_BOUND") class UByteVarOf<T : UByte>
+class UByte
+
+// fake typealiases
+typealias CArrayPointer<T> = CPointer<T>
+typealias UByteVar = UByteVarOf<UByte>
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/linux/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/linux/package_root.kt
index f4fafe51685..6e61a83b4a4 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/linux/package_root.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/linux/package_root.kt
@@ -20,3 +20,5 @@ typealias X = U? // different nullability of the RHS TA
 // Supertypes:
 actual typealias FILE = _IO_FILE
 final class _IO_FILE : kotlinx.cinterop.CStructVar {}
+
+actual val uuid: uuid_t get() = TODO()
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/macos/package_kotlinx_cinterop.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/macos/package_kotlinx_cinterop.kt
index 97a70aad3af..cf366643a8f 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/macos/package_kotlinx_cinterop.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/macos/package_kotlinx_cinterop.kt
@@ -1,5 +1,12 @@
 // this is to avoid missing Kotlin/Native stdlib
 package kotlinx.cinterop
 
-// fake class with the default constructor and no member scope
-public abstract class CStructVar()
+// fake classes with the default constructor and no member scope
+abstract class CStructVar
+class CPointer<T>
+@Suppress("FINAL_UPPER_BOUND") class UByteVarOf<T : UByte>
+class UByte
+
+// fake typealiases
+typealias CArrayPointer<T> = CPointer<T>
+typealias UByteVar = UByteVarOf<UByte>
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/macos/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/macos/package_root.kt
index 7f7bd4eecc3..44df04fb334 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/commonized/macos/package_root.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/macos/package_root.kt
@@ -21,6 +21,8 @@ typealias X = U // different nullability of the RHS TA
 actual typealias FILE = __sFILE
 final class __sFILE : kotlinx.cinterop.CStructVar {}
 
+actual val uuid: uuid_t get() = TODO()
+
 // Type alias chain that is present in one target only:
 class AA
 typealias BB = AA
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/original/linux/package_kotlinx_cinterop.kt b/native/commonizer/testData/classifierCommonization/typeAliases/original/linux/package_kotlinx_cinterop.kt
index 97a70aad3af..cf366643a8f 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/original/linux/package_kotlinx_cinterop.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/original/linux/package_kotlinx_cinterop.kt
@@ -1,5 +1,12 @@
 // this is to avoid missing Kotlin/Native stdlib
 package kotlinx.cinterop
 
-// fake class with the default constructor and no member scope
-public abstract class CStructVar()
+// fake classes with the default constructor and no member scope
+abstract class CStructVar
+class CPointer<T>
+@Suppress("FINAL_UPPER_BOUND") class UByteVarOf<T : UByte>
+class UByte
+
+// fake typealiases
+typealias CArrayPointer<T> = CPointer<T>
+typealias UByteVar = UByteVarOf<UByte>
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/original/linux/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/original/linux/package_root.kt
index 0c59bf287db..da6e54591eb 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/original/linux/package_root.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/original/linux/package_root.kt
@@ -15,6 +15,17 @@ typealias G = List<Int> // different parameterized types at the RHS
 typealias H<T> = List<T> // TA with own parameters
 typealias I<T> = List<T> // TAs with own parameters with different names
 
+typealias I2<T> = List<T>
+typealias I3<R> = I2<R>
+typealias I4 = I2<String>
+
+typealias I5<V, K> = Map<K, V>
+typealias I6<T, R> = I5<T, R>
+
+typealias I7<K, V> = Map<K, V>
+typealias I8<T, R> = I7<R, T>
+typealias I9<Q, W> = I8<Q, W>
+
 typealias J<T> = Function<T> // function type at the RHS
 typealias K<T> = Function<T> // function types with different type parameter names
 typealias L<T> = () -> T // different kinds of function types
@@ -40,3 +51,8 @@ typealias Y = V // TA at the RHS with the different nullability of own RHS
 // Supertypes:
 typealias FILE = _IO_FILE
 final class _IO_FILE : kotlinx.cinterop.CStructVar {}
+
+typealias uuid_t = __darwin_uuid_t
+typealias __darwin_uuid_t = kotlinx.cinterop.CArrayPointer<kotlinx.cinterop.UByteVar>
+
+val uuid: uuid_t get() = TODO()
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/original/macos/package_kotlinx_cinterop.kt b/native/commonizer/testData/classifierCommonization/typeAliases/original/macos/package_kotlinx_cinterop.kt
index 97a70aad3af..cf366643a8f 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/original/macos/package_kotlinx_cinterop.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/original/macos/package_kotlinx_cinterop.kt
@@ -1,5 +1,12 @@
 // this is to avoid missing Kotlin/Native stdlib
 package kotlinx.cinterop
 
-// fake class with the default constructor and no member scope
-public abstract class CStructVar()
+// fake classes with the default constructor and no member scope
+abstract class CStructVar
+class CPointer<T>
+@Suppress("FINAL_UPPER_BOUND") class UByteVarOf<T : UByte>
+class UByte
+
+// fake typealiases
+typealias CArrayPointer<T> = CPointer<T>
+typealias UByteVar = UByteVarOf<UByte>
diff --git a/native/commonizer/testData/classifierCommonization/typeAliases/original/macos/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/original/macos/package_root.kt
index af8ddc0560f..eccc25445c8 100644
--- a/native/commonizer/testData/classifierCommonization/typeAliases/original/macos/package_root.kt
+++ b/native/commonizer/testData/classifierCommonization/typeAliases/original/macos/package_root.kt
@@ -15,6 +15,17 @@ typealias G = List<String> // different parameterized types at the RHS
 typealias H<T> = List<T> // TA with own parameters
 typealias I<R> = List<R> // TAs with own parameters with different names
 
+typealias I2<T> = List<T>
+typealias I3<R> = I2<R>
+typealias I4 = I2<String>
+
+typealias I5<V, K> = Map<K, V>
+typealias I6<T, R> = I5<T, R>
+
+typealias I7<K, V> = Map<K, V>
+typealias I8<T, R> = I7<R, T>
+typealias I9<Q, W> = I8<Q, W>
+
 typealias J<T> = Function<T> // function type at the RHS
 typealias K<R> = Function<R> // function types with different type parameter names
 typealias L<T> = Function<T> // different kinds of function types
@@ -41,6 +52,11 @@ typealias Y = V // TA at the RHS with the different nullability of own RHS
 typealias FILE = __sFILE
 final class __sFILE : kotlinx.cinterop.CStructVar {}
 
+typealias uuid_t = __darwin_uuid_t
+typealias __darwin_uuid_t = kotlinx.cinterop.CArrayPointer<kotlinx.cinterop.UByteVar>
+
+val uuid: uuid_t get() = TODO()
+
 // Type alias chain that is present in one target only:
 class AA
 typealias BB = AA
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt
index e99cc407631..cf4409d281f 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt
@@ -15,4 +15,6 @@ class CallableMemberCommonizationFromSourcesTest : AbstractCommonizationFromSour
     fun testReturnTypes() = doTestSuccessfulCommonization()
 
     fun testExtensionReceivers() = doTestSuccessfulCommonization()
+
+    fun testOpenCallableMemberInInterface() = doTestSuccessfulCommonization()
 }
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizerTest.kt
index 5e3cbd67590..26a7a0e365a 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizerTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizerTest.kt
@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.descriptors.commonizer.core
 
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation
-import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleType
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassType
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirAnnotationFactory
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeFactory
 import org.jetbrains.kotlin.descriptors.commonizer.utils.mockClassType
@@ -290,7 +290,7 @@ private fun mockAnnotation(
     constantValueArguments: Map<Name, ConstantValue<*>> = emptyMap(),
     annotationValueArguments: Map<Name, CirAnnotation> = emptyMap()
 ): CirAnnotation = CirAnnotationFactory.create(
-    type = CirTypeFactory.create(mockClassType(fqName)) as CirSimpleType,
+    type = CirTypeFactory.create(mockClassType(fqName)) as CirClassType,
     constantValueArguments = constantValueArguments,
     annotationValueArguments = annotationValueArguments
 )
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt
index 40fd9e42177..fea71c5466c 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirClassFactory
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeAliasFactory
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeFactory
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirClassifiersCache
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirRootNode.CirClassifiersCacheImpl
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.buildClassNode
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.buildTypeAliasNode
@@ -274,7 +275,7 @@ class TypeCommonizerTest : AbstractCommonizerTest<CirType, CirType>() {
     @Test
     // why success: expect class/actual TAs
     fun taTypesInUserPackageWithDifferentClasses() = doTestSuccess(
-        expected = mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Foo") },
+        expected = mockClassType("org.sample.FooAlias"),
         mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Foo") },
         mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Bar") }
     )
@@ -444,7 +445,7 @@ class TypeCommonizerTest : AbstractCommonizerTest<CirType, CirType>() {
     @Test
     // why success: nullability of underlying type does not matter if expect class/actual TAs created
     fun taTypesInUserPackageWithDifferentNullability3() = doTestSuccess(
-        expected = mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Foo", nullable = false) },
+        expected = mockClassType("org.sample.FooAlias"),
         mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Foo", nullable = false) },
         mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Foo", nullable = true) }
     )
@@ -452,7 +453,7 @@ class TypeCommonizerTest : AbstractCommonizerTest<CirType, CirType>() {
     @Test
     // why success: nullability of underlying type does not matter if expect class/actual TAs created
     fun taTypesInUserPackageWithDifferentNullability4() = doTestSuccess(
-        expected = mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Foo", nullable = true) },
+        expected = mockClassType("org.sample.FooAlias"),
         mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Foo", nullable = true) },
         mockTAType("org.sample.FooAlias") { mockClassType("org.sample.Foo", nullable = false) }
     )
@@ -520,5 +521,10 @@ class TypeCommonizerTest : AbstractCommonizerTest<CirType, CirType>() {
 
     override fun createCommonizer() = TypeCommonizer(cache)
 
-    override fun isEqual(a: CirType?, b: CirType?) = (a === b) || (a != null && b != null && areTypesEqual(cache, a, b))
+    override fun isEqual(a: CirType?, b: CirType?) = (a === b) || (a != null && b != null && areEqual(cache, a, b))
+
+    companion object {
+        fun areEqual(cache: CirClassifiersCache, a: CirType, b: CirType): Boolean =
+            TypeCommonizer(cache).run { commonizeWith(a) && commonizeWith(b) }
+    }
 }
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt
index 71e08906c57..bedd1c0dabf 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirValueParameter
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeFactory
 import org.jetbrains.kotlin.descriptors.commonizer.core.CirTestValueParameter.Companion.areEqual
+import org.jetbrains.kotlin.descriptors.commonizer.core.TypeCommonizerTest.Companion.areEqual
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirClassifiersCache
 import org.jetbrains.kotlin.descriptors.commonizer.utils.EMPTY_CLASSIFIERS_CACHE
 import org.jetbrains.kotlin.descriptors.commonizer.utils.mockClassType
@@ -181,7 +182,7 @@ internal data class CirTestValueParameter(
     companion object {
         fun areEqual(cache: CirClassifiersCache, a: CirValueParameter, b: CirValueParameter): Boolean {
             if (a.name != b.name
-                || !areTypesEqual(cache, a.returnType, b.returnType)
+                || !areEqual(cache, a.returnType, b.returnType)
                 || a.declaresDefaultValue != b.declaresDefaultValue
                 || a.isCrossinline != b.isCrossinline
                 || a.isNoinline != b.isNoinline
@@ -194,7 +195,7 @@ internal data class CirTestValueParameter(
 
             return (aVarargElementType === bVarargElementType)
                     || (aVarargElementType != null && bVarargElementType != null
-                    && areTypesEqual(cache, aVarargElementType, bVarargElementType))
+                    && areEqual(cache, aVarargElementType, bVarargElementType))
         }
     }
 }
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/ComparingDeclarationsVisitor.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/ComparingDeclarationsVisitor.kt
index 82f84fb9aa0..ea06101a207 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/ComparingDeclarationsVisitor.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/ComparingDeclarationsVisitor.kt
@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.types.AbbreviatedType
 import org.jetbrains.kotlin.types.KotlinType
-import org.jetbrains.kotlin.types.SimpleType
 import kotlin.contracts.ExperimentalContracts
 import kotlin.reflect.KCallable
 import kotlin.test.fail
@@ -479,17 +478,6 @@ internal class ComparingDeclarationsVisitor(
         context.assertEquals(!expectedAbbreviated.isNull(), !actualAbbreviated.isNull(), "type is abbreviated")
 
         if (expectedAbbreviated != null && actualAbbreviated != null) {
-            fun extractExpandedType(abbreviated: AbbreviatedType): SimpleType { // eliminate unnecessary repeated abbreviations
-                var expanded = abbreviated.expandedType
-                while (expanded is AbbreviatedType) {
-                    if (expanded.abbreviation.declarationDescriptor !== abbreviated.abbreviation.declarationDescriptor)
-                        break
-                    else
-                        expanded = expanded.expandedType
-                }
-                return expanded
-            }
-
             visitType(
                 expectedAbbreviated.abbreviation,
                 actualAbbreviated.abbreviation,
diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
index 5b06f22c44f..e0f7658d425 100644
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
@@ -6,8 +6,9 @@
 package org.jetbrains.kotlin.konan.target
 
 import org.jetbrains.kotlin.konan.util.Named
+import java.io.Serializable
 
-sealed class KonanTarget(override val name: String, val family: Family, val architecture: Architecture) : Named {
+sealed class KonanTarget(override val name: String, val family: Family, val architecture: Architecture) : Named, Serializable {
     object ANDROID_X64 : KonanTarget("android_x64", Family.ANDROID, Architecture.X64)
     object ANDROID_X86 : KonanTarget("android_x86", Family.ANDROID, Architecture.X86)
     object ANDROID_ARM32 : KonanTarget("android_arm32", Family.ANDROID, Architecture.ARM32)
diff --git a/nj2k/build.gradle.kts b/nj2k/build.gradle.kts
index e902d3af696..f00dce65ee9 100644
--- a/nj2k/build.gradle.kts
+++ b/nj2k/build.gradle.kts
@@ -15,11 +15,9 @@ dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
     compileOnly(intellijDep()) { includeJars("platform-api", "platform-impl", rootProject = rootProject) }
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
-        testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
-        testRuntime(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
+    testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
+    testRuntime(intellijPluginDep("java"))
 
     testCompile(project(":idea"))
     testCompile(projectTests(":j2k"))
diff --git a/nj2k/nj2k-services/build.gradle.kts b/nj2k/nj2k-services/build.gradle.kts
index b0c61583736..6ae94333cf3 100644
--- a/nj2k/nj2k-services/build.gradle.kts
+++ b/nj2k/nj2k-services/build.gradle.kts
@@ -14,9 +14,7 @@ dependencies {
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
-    }
+    compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
 }
 
 sourceSets {
diff --git a/plugins/allopen/allopen-ide/build.gradle.kts b/plugins/allopen/allopen-ide/build.gradle.kts
index 184652efdad..b9525cbb3f7 100644
--- a/plugins/allopen/allopen-ide/build.gradle.kts
+++ b/plugins/allopen/allopen-ide/build.gradle.kts
@@ -44,11 +44,9 @@ dependencies {
     testCompileOnly(intellijDep())
     testRuntimeOnly(intellijDep())
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
+    testCompileOnly(intellijPluginDep("java"))
+    testRuntimeOnly(intellijPluginDep("java"))
 }
 
 sourceSets {
diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt
index ab1d15be4de..e7a12992954 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt
@@ -195,7 +195,8 @@ class ParcelableDeclarationChecker : DeclarationChecker {
             bindingContext,
             ClassBuilderMode.FULL,
             descriptor.module.name.asString(),
-            languageVersionSettings
+            languageVersionSettings,
+            useOldInlineClassesManglingScheme = false
         )
 
         for (parameter in primaryConstructor?.valueParameters.orEmpty<KtParameter>()) {
diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt
index 0be3714c4b3..13eef39532d 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.android.synthetic.forEachUntilLast
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackageFragmentProviderOptimized
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -132,7 +133,7 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider
 
 class AndroidSyntheticPackageFragmentProvider(
     val packages: Map<FqName, () -> PackageFragmentDescriptor>
-) : PackageFragmentProvider {
+) : PackageFragmentProviderOptimized {
     override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) =
         packageFragments.addIfNotNull(packages[fqName]?.invoke())
 
diff --git a/plugins/fir/fir-plugin-prototype/build.gradle.kts b/plugins/fir/fir-plugin-prototype/build.gradle.kts
index aff5b8dac74..c4a1836160e 100644
--- a/plugins/fir/fir-plugin-prototype/build.gradle.kts
+++ b/plugins/fir/fir-plugin-prototype/build.gradle.kts
@@ -27,10 +27,8 @@ dependencies {
     testRuntime(project(":kotlin-reflect"))
     testRuntime(project(":core:descriptors.runtime"))
 
-    Platform[192].orHigher {
-        testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-        testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenVisibilityTransformer.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenVisibilityTransformer.kt
index 03385adabee..b034ea958ee 100644
--- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenVisibilityTransformer.kt
+++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenVisibilityTransformer.kt
@@ -5,9 +5,10 @@
 
 package org.jetbrains.kotlin.fir.plugin
 
-import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
+import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus
@@ -61,7 +62,7 @@ class AllOpenVisibilityTransformer(session: FirSession) : FirStatusTransformerEx
         } ?: return null
         val argument = annotation.arguments.firstOrNull() as? FirQualifiedAccessExpression ?: return null
         val symbol = (argument.calleeReference as? FirResolvedNamedReference)?.resolvedSymbol as? FirVariableSymbol<*> ?: return null
-        val name = symbol.callableId.takeIf { it.classId == VisibilityClassId }?.callableName ?: return null
+        val name = symbol.takeIf { it.containingClass()?.classId == VisibilityClassId }?.callableId?.callableName ?: return null
         return when (name) {
             PublicName -> Visibilities.Public
             InternalName -> Visibilities.Internal
diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt
index 2ee78d6bbf2..652871e080d 100644
--- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt
+++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt
@@ -16,7 +16,7 @@ object DummyNameChecker : FirMemberDeclarationChecker() {
     override fun check(declaration: FirMemberDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
         if (declaration !is FirSimpleFunction) return
         if (declaration.name.asString() == "dummy") {
-            declaration.source?.let { reporter.report(FirErrors.SYNTAX_ERROR.on(it)) }
+            declaration.source?.let { reporter.report(FirErrors.SYNTAX.on(it)) }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMemberGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMemberGenerator.kt
index d4bdd0059d8..2dae57e0115 100644
--- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMemberGenerator.kt
+++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMemberGenerator.kt
@@ -46,7 +46,7 @@ class AllOpenMemberGenerator(session: FirSession) : FirDeclarationGenerationExte
             returnTypeRef = annotatedDeclaration.returnTypeRef
             status = annotatedDeclaration.status
             name = Name.identifier("hello${propertyName.capitalize()}")
-            symbol = FirNamedFunctionSymbol(CallableId(owner.classId, name), isFakeOverride = false)
+            symbol = FirNamedFunctionSymbol(CallableId(owner.classId, name))
         }
         return listOf(GeneratedDeclaration(function, owner))
     }
@@ -55,4 +55,4 @@ class AllOpenMemberGenerator(session: FirSession) : FirDeclarationGenerationExte
 
     override val key: FirPluginKey
         get() = AllOpenPluginKey
-}
\ No newline at end of file
+}
diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt
index 68bb29076d9..3bac27e971c 100644
--- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt
+++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt
@@ -81,7 +81,7 @@ class AllOpenNestedClassGenerator(session: FirSession) : FirDeclarationGeneratio
                 Modality.FINAL
             )
             name = Name.identifier("hello")
-            symbol = FirNamedFunctionSymbol(CallableId(classId, name), isFakeOverride = false)
+            symbol = FirNamedFunctionSymbol(CallableId(classId, name))
         }
         return listOf(constructor, function)
     }
diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt
index abb5816c428..37660925645 100644
--- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt
+++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt
@@ -59,7 +59,7 @@ class AllOpenTopLevelDeclarationsGenerator(session: FirSession) : FirDeclaration
                 Modality.FINAL
             )
             name = Name.identifier("hello")
-            symbol = FirNamedFunctionSymbol(CallableId(klass.symbol.classId, name), isFakeOverride = false)
+            symbol = FirNamedFunctionSymbol(CallableId(klass.symbol.classId, name))
         }
         return listOf(function)
     }
diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt
index a62f871836d..7b22ec9dc35 100644
--- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt
+++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt
@@ -10,14 +10,16 @@ import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import org.jetbrains.kotlin.config.Services
 import java.io.File
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.createTempDirectory
 
 abstract class BaseJvmAbiTest : TestCase() {
     private lateinit var workingDir: File
 
+    @OptIn(ExperimentalPathApi::class)
     override fun setUp() {
         super.setUp()
-        workingDir = createTempDir(javaClass.simpleName)
-        workingDir.deleteOnExit()
+        workingDir = createTempDirectory(javaClass.simpleName).toFile().apply { deleteOnExit() }
     }
 
     override fun tearDown() {
diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
index effc013bf75..8af68b8103b 100644
--- a/plugins/kapt3/kapt3-compiler/build.gradle.kts
+++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -16,9 +16,7 @@ dependencies {
 
     testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") }
 
-    Platform[192].orHigher {
-        testRuntime(intellijPluginDep("java"))
-    }
+    testRuntime(intellijPluginDep("java"))
 
     compile(project(":compiler:util"))
     compile(project(":compiler:cli"))
diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
index 47e14799614..b1e76f91cb5 100644
--- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
+++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
@@ -814,7 +814,7 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati
             ElementKind.METHOD, packageFqName, visibleAnnotations, method.invisibleAnnotations, descriptor.annotations
         )
 
-        if (containingClass.isInterface() && !method.isAbstract()) {
+        if (containingClass.isInterface() && !method.isAbstract() && !method.isStatic()) {
             modifiers.flags = modifiers.flags or Flags.DEFAULT
         }
 
diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/asmUtils.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/asmUtils.kt
index 088e1801d66..4a6c7c50258 100644
--- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/asmUtils.kt
+++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/asmUtils.kt
@@ -39,6 +39,7 @@ internal fun ClassNode.isAnnotation() = (access and Opcodes.ACC_ANNOTATION) != 0
 
 internal fun MethodNode.isVarargs() = (access and Opcodes.ACC_VARARGS) != 0
 internal fun MethodNode.isAbstract() = (access and Opcodes.ACC_ABSTRACT) != 0
+internal fun MethodNode.isStatic() = (access and Opcodes.ACC_STATIC) != 0
 
 internal fun FieldNode.isEnumValue() = (access and Opcodes.ACC_ENUM) != 0
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt
index b6dccdb66f5..f919195def0 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt
@@ -11,3 +11,10 @@ class JvmStaticTest {
     const val three: Byte = 3.toByte()
     const val d: Char = 'D'
 }
+
+interface FooComponent {
+    companion object {
+        @JvmStatic
+        fun create(context: String): String = "foo"
+    }
+}
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
index f09c3d3a89f..f92ab58e9c3 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
@@ -1,5 +1,36 @@
 import java.lang.System;
 
+@kotlin.Metadata()
+public abstract interface FooComponent {
+    @org.jetbrains.annotations.NotNull()
+    public static final FooComponent.Companion Companion = null;
+
+    @org.jetbrains.annotations.NotNull()
+    public static java.lang.String create(@org.jetbrains.annotations.NotNull()
+    java.lang.String context) {
+        return null;
+    }
+
+    @kotlin.Metadata()
+    public static final class Companion {
+
+        @org.jetbrains.annotations.NotNull()
+        public final java.lang.String create(@org.jetbrains.annotations.NotNull()
+        java.lang.String context) {
+            return null;
+        }
+
+        private Companion() {
+            super();
+        }
+    }
+}
+
+////////////////////
+
+
+import java.lang.System;
+
 @kotlin.Metadata()
 public final class JvmStaticTest {
     public final byte three = (byte)3;
diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts
index 1c85f9997d8..3a299066a7e 100644
--- a/plugins/kapt3/kapt3-idea/build.gradle.kts
+++ b/plugins/kapt3/kapt3-idea/build.gradle.kts
@@ -13,9 +13,7 @@ dependencies {
     compileOnly(project(":idea:idea-core"))
     compileOnly(project(":idea:idea-gradle"))
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
     compileOnly(intellijPluginDep("gradle"))
     compileOnly(intellijPluginDep("android"))
 }
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
index 15aade51a05..edf760f49a4 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
@@ -25,10 +25,7 @@ dependencies {
     testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-jvm:1.0-M1-1.4.0-rc") { isTransitive = false }
 
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
-    }
+    testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
 }
 
 sourceSets {
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/AbstractSerialGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/AbstractSerialGenerator.kt
index dda81c7cc1a..d3d5c2a0303 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/AbstractSerialGenerator.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/AbstractSerialGenerator.kt
@@ -46,11 +46,11 @@ abstract class AbstractSerialGenerator(val bindingContext: BindingContext, val c
         ).toSet()
     }
 
-    val additionalSerializersInScopeOfCurrentFile: Map<ClassDescriptor, ClassDescriptor> by lazy {
+    val additionalSerializersInScopeOfCurrentFile: Map<KotlinType, ClassDescriptor> by lazy {
         getKClassListFromFileAnnotation(SerializationAnnotations.additionalSerializersFqName, currentDeclaration)
             .associateBy(
                 {
-                    it.supertypes().find(::isKSerializer)?.arguments?.firstOrNull()?.type.toClassDescriptor
+                    it.supertypes().find(::isKSerializer)?.arguments?.firstOrNull()?.type
                         ?: throw AssertionError("Argument for ${SerializationAnnotations.additionalSerializersFqName} does not implement KSerializer or does not provide serializer for concrete type")
                 },
                 { it.toClassDescriptor!! }
@@ -59,4 +59,4 @@ abstract class AbstractSerialGenerator(val bindingContext: BindingContext, val c
 
     protected fun ClassDescriptor.getFuncDesc(funcName: String): Sequence<FunctionDescriptor> =
         unsubstitutedMemberScope.getDescriptorsFiltered { it == Name.identifier(funcName) }.asSequence().filterIsInstance<FunctionDescriptor>()
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt
index eab539e54a3..1fcb94c05d0 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt
@@ -34,7 +34,7 @@ open class SerialTypeInfo(
 )
 
 fun AbstractSerialGenerator.findAddOnSerializer(propertyType: KotlinType, module: ModuleDescriptor): ClassDescriptor? {
-    additionalSerializersInScopeOfCurrentFile[propertyType.toClassDescriptor]?.let { return it }
+    additionalSerializersInScopeOfCurrentFile[propertyType]?.let { return it }
     if (propertyType in contextualKClassListInCurrentFile)
         return module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer)
     if (propertyType.toClassDescriptor?.annotations?.hasAnnotation(SerializationAnnotations.polymorphicFqName) == true)
@@ -123,9 +123,12 @@ fun AbstractSerialGenerator.findTypeSerializerOrContextUnchecked(
 ): ClassDescriptor? {
     val annotations = kType.annotations
     if (kType.isTypeParameter()) return null
-    if (kType.isMarkedNullable) return findTypeSerializerOrContextUnchecked(module, kType.makeNotNullable())
     annotations.serializableWith(module)?.let { return it.toClassDescriptor }
-    additionalSerializersInScopeOfCurrentFile[kType.toClassDescriptor]?.let { return it }
+    additionalSerializersInScopeOfCurrentFile[kType]?.let { return it }
+    if (!kType.isMarkedNullable) {
+        additionalSerializersInScopeOfCurrentFile[kType.makeNullable()]?.let { return it }
+    }
+
     if (kType in contextualKClassListInCurrentFile) return module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer)
     return analyzeSpecialSerializers(module, annotations) ?: findTypeSerializer(module, kType)
 }
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt
index a891e6a5b74..d4c9f558c5d 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlinx.serialization.compiler.backend.ir
 
 import org.jetbrains.kotlin.backend.common.deepCopyWithVariables
 import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.ir.builders.*
@@ -21,11 +22,14 @@ import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
 import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.resolve.descriptorUtil.classId
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
+import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.types.typeUtil.isTypeParameter
 import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
@@ -90,7 +94,7 @@ interface IrBuilderExtension {
         irInvoke(
             dispatchReceiver,
             callee,
-            args = valueArguments.toTypedArray(),
+            *valueArguments.toTypedArray(),
             typeHint = returnTypeHint
         ).also { call -> typeArguments.forEachIndexed(call::putTypeArgument) }
 
@@ -220,15 +224,15 @@ interface IrBuilderExtension {
     }
 
     fun generateSimplePropertyWithBackingField(
-        ownerSymbol: IrValueSymbol,
         propertyDescriptor: PropertyDescriptor,
         propertyParent: IrClass,
-        declare: Boolean
+        declare: Boolean,
+        fieldName: Name = propertyDescriptor.name,
     ): IrProperty {
         val irPropertySymbol = compilerContext.symbolTable.referenceProperty(propertyDescriptor)
         assert(irPropertySymbol.isBound || declare)
 
-        if (declare) {
+        if (!irPropertySymbol.isBound) {
             with(propertyDescriptor) {
                 propertyParent.factory.createProperty(
                     propertyParent.startOffset, propertyParent.endOffset, SERIALIZABLE_PLUGIN_ORIGIN, irPropertySymbol,
@@ -241,7 +245,7 @@ interface IrBuilderExtension {
         }
         val irProperty = irPropertySymbol.owner
 
-        irProperty.backingField = generatePropertyBackingField(propertyDescriptor, irProperty).apply {
+        irProperty.backingField = generatePropertyBackingField(propertyDescriptor, irProperty, fieldName).apply {
             parent = propertyParent
             correspondingPropertySymbol = irPropertySymbol
         }
@@ -255,7 +259,8 @@ interface IrBuilderExtension {
 
     private fun generatePropertyBackingField(
         descriptor: PropertyDescriptor,
-        originProperty: IrProperty
+        originProperty: IrProperty,
+        name: Name,
     ): IrField {
         val fieldSymbol = compilerContext.symbolTable.referenceField(descriptor)
         if (fieldSymbol.isBound) return fieldSymbol.owner
@@ -269,7 +274,7 @@ interface IrBuilderExtension {
         }
     }
 
-    fun generatePropertyAccessor(
+    private fun generatePropertyAccessor(
         property: IrProperty,
         descriptor: PropertyAccessorDescriptor,
         fieldSymbol: IrFieldSymbol,
@@ -278,7 +283,7 @@ interface IrBuilderExtension {
         val symbol = compilerContext.symbolTable.referenceSimpleFunction(descriptor)
         assert(symbol.isBound || declare)
 
-        if (declare) {
+        if (!symbol.isBound) {
             with(descriptor) {
                 property.factory.createFunction(
                     fieldSymbol.owner.startOffset, fieldSymbol.owner.endOffset, SERIALIZABLE_PLUGIN_ORIGIN, symbol,
@@ -692,7 +697,7 @@ interface IrBuilderExtension {
 
         }
         if (serializerClassOriginal.classId == referenceArraySerializerId) {
-            args = listOf(classReference(kType.arguments[0].type)) + args
+            args = listOf(wrapperClassReference(kType.arguments.single().type)) + args
             typeArgs = listOf(typeArgs[0].makeNotNull()) + typeArgs
         }
 
@@ -713,6 +718,19 @@ interface IrBuilderExtension {
         return irInvoke(null, ctor, typeArguments = typeArgs, valueArguments = args, returnTypeHint = substitutedReturnType)
     }
 
+    private fun IrBuilderWithScope.wrapperClassReference(classType: KotlinType): IrClassReference {
+        if (compilerContext.platform.isJvm()) {
+            // "Byte::class" -> "java.lang.Byte::class"
+            val wrapperFqName = KotlinBuiltIns.getPrimitiveType(classType)?.let(JvmPrimitiveType::get)?.wrapperFqName
+            if (wrapperFqName != null) {
+                val wrapperClass = compilerContext.moduleDescriptor.findClassAcrossModuleDependencies(ClassId.topLevel(wrapperFqName))
+                    ?: error("Primitive wrapper class for $classType not found: $wrapperFqName")
+                return classReference(wrapperClass.defaultType)
+            }
+        }
+        return classReference(classType)
+    }
+
     private fun findSerializerConstructorForTypeArgumentsSerializers(serializer: ClassDescriptor): IrConstructorSymbol? {
         val serializableImplementationTypeArguments = extractKSerializerArgumentFromImplementation(serializer)?.arguments
             ?: throw AssertionError("Serializer does not implement KSerializer??")
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerialInfoImplJvmIrGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerialInfoImplJvmIrGenerator.kt
new file mode 100644
index 00000000000..a6261998af8
--- /dev/null
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerialInfoImplJvmIrGenerator.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlinx.serialization.compiler.backend.ir
+
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
+import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.declarations.IrProperty
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.expressions.impl.*
+import org.jetbrains.kotlin.ir.util.constructors
+import org.jetbrains.kotlin.ir.util.defaultType
+import org.jetbrains.kotlin.ir.util.kotlinFqName
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlinx.serialization.compiler.extensions.SerializationPluginContext
+import org.jetbrains.kotlinx.serialization.compiler.resolve.SerialEntityNames
+
+// This doesn't support annotation arguments of type KClass and Array<KClass> because the codegen doesn't compute JVM signatures for
+// such cases correctly (because inheriting from annotation classes is prohibited in Kotlin).
+// Currently it results in an "accidental override" error where a method with return type KClass conflicts with the one with Class.
+// TODO: support annotation properties of types KClass<...> and Array<KClass<...>>.
+class SerialInfoImplJvmIrGenerator(
+    private val context: SerializationPluginContext,
+) : IrBuilderExtension {
+    override val compilerContext: SerializationPluginContext
+        get() = context
+
+    private val jvmNameClass = context.referenceClass(DescriptorUtils.JVM_NAME)!!.owner
+
+    private val implGenerated = mutableSetOf<IrClass>()
+    private val annotationToImpl = mutableMapOf<IrClass, IrClass>()
+
+    fun getImplClass(serialInfoAnnotationClass: IrClass): IrClass =
+        annotationToImpl.getOrPut(serialInfoAnnotationClass) {
+            val implClassSymbol = context.referenceClass(serialInfoAnnotationClass.kotlinFqName.child(SerialEntityNames.IMPL_NAME))
+            implClassSymbol!!.owner.apply(this::generate)
+        }
+
+    fun generate(irClass: IrClass) {
+        if (!implGenerated.add(irClass)) return
+
+        val properties = irClass.declarations.filterIsInstance<IrProperty>()
+        if (properties.isEmpty()) return
+
+        val startOffset = UNDEFINED_OFFSET
+        val endOffset = UNDEFINED_OFFSET
+
+        val ctor = irClass.addConstructor {
+            visibility = DescriptorVisibilities.PUBLIC
+        }
+        val ctorBody = context.irFactory.createBlockBody(
+            startOffset, endOffset, listOf(
+                IrDelegatingConstructorCallImpl(
+                    startOffset, endOffset, context.irBuiltIns.unitType, context.irBuiltIns.anyClass.constructors.single(),
+                    typeArgumentsCount = 0, valueArgumentsCount = 0
+                )
+            )
+        )
+        ctor.body = ctorBody
+
+        for (property in properties) {
+            generateSimplePropertyWithBackingField(property.descriptor, irClass, true, Name.identifier("_" + property.name.asString()))
+
+            val getter = property.getter!!
+            getter.origin = SERIALIZABLE_SYNTHETIC_ORIGIN
+            // Add JvmName annotation to property getters to force the resulting JVM method name for 'x' be 'x', instead of 'getX',
+            // and to avoid having useless bridges for it generated in BridgeLowering.
+            // Unfortunately, this results in an extra `@JvmName` annotation in the bytecode, but it shouldn't matter very much.
+            getter.annotations += jvmName(property.name.asString())
+
+            val field = property.backingField!!
+            field.visibility = DescriptorVisibilities.PRIVATE
+            field.origin = SERIALIZABLE_SYNTHETIC_ORIGIN
+
+            val parameter = ctor.addValueParameter(property.name.asString(), getter.returnType)
+            ctorBody.statements += IrSetFieldImpl(
+                startOffset, endOffset, field.symbol,
+                IrGetValueImpl(startOffset, endOffset, irClass.thisReceiver!!.symbol),
+                IrGetValueImpl(startOffset, endOffset, parameter.symbol),
+                context.irBuiltIns.unitType,
+            )
+        }
+    }
+
+    private fun jvmName(name: String): IrConstructorCall =
+        IrConstructorCallImpl(
+            UNDEFINED_OFFSET, UNDEFINED_OFFSET, jvmNameClass.defaultType, jvmNameClass.constructors.single().symbol,
+            typeArgumentsCount = 0, constructorTypeArgumentsCount = 0, valueArgumentsCount = 1,
+        ).apply {
+            putValueArgument(0, IrConstImpl.string(UNDEFINED_OFFSET, UNDEFINED_OFFSET, context.irBuiltIns.stringType, name))
+        }
+}
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForEnumsGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForEnumsGenerator.kt
index c5471b75d7d..3cfc07836b6 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForEnumsGenerator.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForEnumsGenerator.kt
@@ -27,10 +27,9 @@ import org.jetbrains.kotlinx.serialization.compiler.resolve.*
 class SerializerForEnumsGenerator(
     irClass: IrClass,
     compilerContext: SerializationPluginContext,
-    bindingContext: BindingContext
-) :
-    SerializerIrGenerator(irClass, compilerContext, bindingContext, null) {
-
+    bindingContext: BindingContext,
+    serialInfoJvmGenerator: SerialInfoImplJvmIrGenerator,
+) : SerializerIrGenerator(irClass, compilerContext, bindingContext, null, serialInfoJvmGenerator) {
     override fun generateSave(function: FunctionDescriptor) = irClass.contributeFunction(function) { saveFunc ->
         fun irThis(): IrExpression =
             IrGetValueImpl(startOffset, endOffset, saveFunc.dispatchReceiverParameter!!.symbol)
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt
index e90e2f6fbda..dcbf0f23398 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt
@@ -14,21 +14,16 @@ import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrExpression
-import org.jetbrains.kotlin.ir.expressions.impl.IrBranchImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrDelegatingConstructorCallImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
+import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.expressions.mapValueParametersIndexed
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrAnonymousInitializerSymbolImpl
 import org.jetbrains.kotlin.ir.types.*
-import org.jetbrains.kotlin.ir.util.constructors
-import org.jetbrains.kotlin.ir.util.patchDeclarationParents
-import org.jetbrains.kotlin.ir.util.withReferenceScope
+import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
-import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.util.OperatorNameConventions
 import org.jetbrains.kotlinx.serialization.compiler.backend.common.SerializerCodegen
 import org.jetbrains.kotlinx.serialization.compiler.backend.common.getSerialTypeInfo
@@ -42,17 +37,18 @@ import org.jetbrains.kotlinx.serialization.compiler.resolve.SerialEntityNames.ST
 import org.jetbrains.kotlinx.serialization.compiler.resolve.SerialEntityNames.STRUCTURE_ENCODER_CLASS
 import org.jetbrains.kotlinx.serialization.compiler.resolve.SerialEntityNames.UNKNOWN_FIELD_EXC
 
-// Is creating synthetic origin is a good idea or not?
 object SERIALIZABLE_PLUGIN_ORIGIN : IrDeclarationOriginImpl("SERIALIZER")
 
+// TODO: use in places where elements need to have ACC_SYNTHETIC on JVM
+object SERIALIZABLE_SYNTHETIC_ORIGIN : IrDeclarationOriginImpl("SERIALIZER")
+
 open class SerializerIrGenerator(
     val irClass: IrClass,
     final override val compilerContext: SerializationPluginContext,
     bindingContext: BindingContext,
-    metadataPlugin: SerializationDescriptorSerializerPlugin?
-) :
-    SerializerCodegen(irClass.descriptor, bindingContext, metadataPlugin), IrBuilderExtension {
-
+    metadataPlugin: SerializationDescriptorSerializerPlugin?,
+    private val serialInfoJvmGenerator: SerialInfoImplJvmIrGenerator,
+) : SerializerCodegen(irClass.descriptor, bindingContext, metadataPlugin), IrBuilderExtension {
     protected val serializableIrClass = compilerContext.symbolTable.referenceClass(serializableDescriptor).owner
     protected val irAnySerialDescProperty = anySerialDescProperty?.let { compilerContext.symbolTable.referenceProperty(it) }
 
@@ -69,12 +65,11 @@ open class SerializerIrGenerator(
 
         // how to (auto)create backing field and getter/setter?
         compilerContext.symbolTable.withReferenceScope(irClass.descriptor) {
-
-            prop = generateSimplePropertyWithBackingField(thisAsReceiverParameter.symbol, desc, irClass, false)
+            prop = generateSimplePropertyWithBackingField(desc, irClass, false)
 
             // TODO: Do not use descriptors here
             localSerializersFieldsDescriptors.forEach {
-                generateSimplePropertyWithBackingField(thisAsReceiverParameter.symbol, it, irClass, true)
+                generateSimplePropertyWithBackingField(it, irClass, true)
             }
         }
 
@@ -160,9 +155,24 @@ open class SerializerIrGenerator(
         receiver: IrVariable,
         method: IrFunctionSymbol
     ) {
-        annotations.forEach { annotationCall ->
-            if ((annotationCall.symbol.descriptor as? ClassConstructorDescriptor)?.constructedClass?.isSerialInfoAnnotation == true)
-                +irInvoke(irGet(receiver), method, annotationCall.deepCopyWithVariables())
+        for (annotationCall in annotations) {
+            val annotationClass = annotationCall.symbol.owner.parentAsClass
+            if (!annotationClass.descriptor.isSerialInfoAnnotation) continue
+
+            val createAnnotation = if (compilerContext.platform.isJvm()) {
+                val implClass = serialInfoJvmGenerator.getImplClass(annotationClass)
+                val ctor = implClass.constructors.singleOrNull { it.valueParameters.size == annotationCall.valueArgumentsCount }
+                    ?: error("No constructor args found for SerialInfo annotation Impl class: ${implClass.render()}")
+                irCall(ctor).apply {
+                    for (i in 0 until annotationCall.valueArgumentsCount) {
+                        putValueArgument(i, annotationCall.getValueArgument(i)!!.deepCopyWithVariables())
+                    }
+                }
+            } else {
+                annotationCall.deepCopyWithVariables()
+            }
+
+            +irInvoke(irGet(receiver), method, createAnnotation)
         }
     }
 
@@ -496,13 +506,14 @@ open class SerializerIrGenerator(
             irClass: IrClass,
             context: SerializationPluginContext,
             bindingContext: BindingContext,
-            metadataPlugin: SerializationDescriptorSerializerPlugin?
+            metadataPlugin: SerializationDescriptorSerializerPlugin?,
+            serialInfoJvmGenerator: SerialInfoImplJvmIrGenerator,
         ) {
             val serializableDesc = getSerializableClassDescriptorBySerializer(irClass.symbol.descriptor) ?: return
             if (serializableDesc.isSerializableEnum()) {
-                SerializerForEnumsGenerator(irClass, context, bindingContext).generate()
+                SerializerForEnumsGenerator(irClass, context, bindingContext, serialInfoJvmGenerator).generate()
             } else {
-                SerializerIrGenerator(irClass, context, bindingContext, metadataPlugin).generate()
+                SerializerIrGenerator(irClass, context, bindingContext, metadataPlugin, serialInfoJvmGenerator).generate()
             }
             irClass.patchDeclarationParents(irClass.parent)
         }
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerializerCodegenImpl.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerializerCodegenImpl.kt
index 02d35959278..9d02e6ba726 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerializerCodegenImpl.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerializerCodegenImpl.kt
@@ -372,7 +372,6 @@ open class SerializerCodegenImpl(
             for ((index, property) in serializableProperties.withIndex()) {
                 val propertyType = codegen.typeMapper.mapType(property.type)
                 if (!property.transient) {
-                    val propertyAddressInBitMask = bitMaskOff(index)
                     // labelI:
                     visitLabel(labels[labelNum + 1])
                     callReadProperty(property, propertyType, index, inputVar, descVar, propVar)
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationLoweringExtension.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationLoweringExtension.kt
index 7453383e170..909bc9342b8 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationLoweringExtension.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationLoweringExtension.kt
@@ -6,8 +6,8 @@
 package org.jetbrains.kotlinx.serialization.compiler.extensions
 
 import org.jetbrains.kotlin.backend.common.ClassLoweringPass
-import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
+import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.runOnFilePostfix
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrClass
@@ -17,9 +17,12 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
+import org.jetbrains.kotlin.platform.jvm.isJvm
+import org.jetbrains.kotlinx.serialization.compiler.backend.ir.SerialInfoImplJvmIrGenerator
 import org.jetbrains.kotlinx.serialization.compiler.backend.ir.SerializableCompanionIrGenerator
 import org.jetbrains.kotlinx.serialization.compiler.backend.ir.SerializableIrGenerator
 import org.jetbrains.kotlinx.serialization.compiler.backend.ir.SerializerIrGenerator
+import org.jetbrains.kotlinx.serialization.compiler.resolve.KSerializerDescriptorResolver
 
 /**
  * Copy of [runOnFilePostfix], but this implementation first lowers declaration, then its children.
@@ -42,16 +45,23 @@ typealias SerializationPluginContext = IrPluginContext
 private class SerializerClassLowering(
     val context: SerializationPluginContext,
     val metadataPlugin: SerializationDescriptorSerializerPlugin?
-) :
-    IrElementTransformerVoid(), ClassLoweringPass {
+) : IrElementTransformerVoid(), ClassLoweringPass {
+    private val serialInfoJvmGenerator = SerialInfoImplJvmIrGenerator(context)
+
     override fun lower(irClass: IrClass) {
         SerializableIrGenerator.generate(irClass, context, context.bindingContext)
-        SerializerIrGenerator.generate(irClass, context, context.bindingContext, metadataPlugin)
+        SerializerIrGenerator.generate(irClass, context, context.bindingContext, metadataPlugin, serialInfoJvmGenerator)
         SerializableCompanionIrGenerator.generate(irClass, context, context.bindingContext)
+
+        if (context.platform.isJvm() && KSerializerDescriptorResolver.isSerialInfoImpl(irClass.descriptor)) {
+            serialInfoJvmGenerator.generate(irClass)
+        }
     }
 }
 
-open class SerializationLoweringExtension @JvmOverloads constructor(val metadataPlugin: SerializationDescriptorSerializerPlugin? = null) : IrGenerationExtension {
+open class SerializationLoweringExtension @JvmOverloads constructor(
+    val metadataPlugin: SerializationDescriptorSerializerPlugin? = null
+) : IrGenerationExtension {
     override fun generate(
         moduleFragment: IrModuleFragment,
         pluginContext: IrPluginContext
@@ -60,4 +70,4 @@ open class SerializationLoweringExtension @JvmOverloads constructor(val metadata
         for (file in moduleFragment.files)
             serializerClassLowering.runOnFileInOrder(file)
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt
index 353bc1875b8..47698a6facf 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt
@@ -588,13 +588,12 @@ object KSerializerDescriptorResolver {
     ) {
         if (isSerialInfoImpl(thisDescriptor)) {
             result.add(
-                fromSupertypes[0].copy(
-                    thisDescriptor,
-                    Modality.FINAL,
-                    DescriptorVisibilities.PUBLIC,
-                    CallableMemberDescriptor.Kind.SYNTHESIZED,
-                    true
-                ) as PropertyDescriptor
+                fromSupertypes.first().newCopyBuilder().apply {
+                    setOwner(thisDescriptor)
+                    setModality(Modality.FINAL)
+                    setKind(CallableMemberDescriptor.Kind.SYNTHESIZED)
+                    setDispatchReceiverParameter(thisDescriptor.thisAsReceiverParameter)
+                }.build()!!
             )
         }
     }
diff --git a/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts
index 2ef3944b795..4a8e1af0448 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts
+++ b/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts
@@ -15,9 +15,7 @@ dependencies {
     compile(project(":idea:idea-maven"))
     compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
     excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
     compileOnly(intellijPluginDep("gradle"))
 
diff --git a/plugins/noarg/noarg-ide/build.gradle.kts b/plugins/noarg/noarg-ide/build.gradle.kts
index 007cabd6d1d..069251a7016 100644
--- a/plugins/noarg/noarg-ide/build.gradle.kts
+++ b/plugins/noarg/noarg-ide/build.gradle.kts
@@ -44,12 +44,10 @@ dependencies {
     testCompileOnly(intellijDep())
     testRuntimeOnly(intellijDep())
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
+    compileOnly(intellijPluginDep("java"))
 
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    testCompileOnly(intellijPluginDep("java"))
+    testRuntimeOnly(intellijPluginDep("java"))
 }
 
 sourceSets {
diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts
index 94e04195844..34a043a72b5 100644
--- a/plugins/parcelize/parcelize-compiler/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     compileOnly(project(":compiler:backend.jvm"))
     compileOnly(project(":compiler:ir.tree.impl"))
     compileOnly(project(":plugins:parcelize:parcelize-runtime"))
+    compileOnly(project(":kotlin-android-extensions-runtime"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
 
@@ -29,6 +30,7 @@ dependencies {
     testCompile(project(":compiler:backend.jvm"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":plugins:parcelize:parcelize-runtime"))
+    testCompile(project(":kotlin-android-extensions-runtime"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(commonDep("junit:junit"))
@@ -38,10 +40,13 @@ dependencies {
     robolectricClasspath(commonDep("org.robolectric", "robolectric"))
     robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1")
     robolectricClasspath(project(":plugins:parcelize:parcelize-runtime")) { isTransitive = false }
+    robolectricClasspath(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
 
     embedded(project(":plugins:parcelize:parcelize-runtime")) { isTransitive = false }
+    embedded(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
 
     parcelizeRuntimeForTests(project(":plugins:parcelize:parcelize-runtime")) { isTransitive = false }
+    parcelizeRuntimeForTests(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
 }
 
 sourceSets {
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeAnnotationChecker.kt b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeAnnotationChecker.kt
index d1102a469ca..68359477038 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeAnnotationChecker.kt
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeAnnotationChecker.kt
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.parcelize
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.kotlin.backend.common.serialization.findPackage
 import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
@@ -36,23 +37,10 @@ import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
 import org.jetbrains.kotlin.types.typeUtil.supertypes
 
-class ParcelizeAnnotationChecker : CallChecker {
+open class ParcelizeAnnotationChecker : CallChecker {
     @Suppress("DEPRECATION")
     companion object {
-        val TYPE_PARCELER_FQ_NAMES = listOf(
-            FqName(kotlinx.parcelize.TypeParceler::class.java.name),
-            FqName(kotlinx.android.parcel.TypeParceler::class.java.name)
-        )
-
-        val WRITE_WITH_FQ_NAMES = listOf(
-            FqName(kotlinx.parcelize.WriteWith::class.java.name),
-            FqName(kotlinx.android.parcel.WriteWith::class.java.name)
-        )
-
-        val IGNORED_ON_PARCEL_FQ_NAMES = listOf(
-            FqName(kotlinx.parcelize.IgnoredOnParcel::class.java.name),
-            FqName(kotlinx.android.parcel.IgnoredOnParcel::class.java.name)
-        )
+        val DEPRECATED_RUNTIME_PACKAGE = FqName("kotlinx.android.parcel")
     }
 
     override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
@@ -64,14 +52,34 @@ class ParcelizeAnnotationChecker : CallChecker {
 
         if (annotationClass.fqNameSafe in TYPE_PARCELER_FQ_NAMES) {
             checkTypeParcelerUsage(resolvedCall, annotationEntry, context, annotationOwner)
+            checkDeprecatedAnnotations(resolvedCall, annotationEntry, context, isForbidden = true)
         }
 
         if (annotationClass.fqNameSafe in WRITE_WITH_FQ_NAMES) {
             checkWriteWithUsage(resolvedCall, annotationEntry, context, annotationOwner)
+            checkDeprecatedAnnotations(resolvedCall, annotationEntry, context, isForbidden = true)
         }
 
         if (annotationClass.fqNameSafe in IGNORED_ON_PARCEL_FQ_NAMES) {
             checkIgnoredOnParcelUsage(annotationEntry, context, annotationOwner)
+            checkDeprecatedAnnotations(resolvedCall, annotationEntry, context, isForbidden = false)
+        }
+
+        if (annotationClass.fqNameSafe in PARCELIZE_CLASS_FQ_NAMES || annotationClass.fqNameSafe in RAW_VALUE_ANNOTATION_FQ_NAMES) {
+            checkDeprecatedAnnotations(resolvedCall, annotationEntry, context, isForbidden = false)
+        }
+    }
+
+    private fun checkDeprecatedAnnotations(
+        resolvedCall: ResolvedCall<*>,
+        annotationEntry: KtAnnotationEntry,
+        context: CallCheckerContext,
+        isForbidden: Boolean
+    ) {
+        val descriptorPackage = resolvedCall.resultingDescriptor.findPackage()
+        if (descriptorPackage.fqName == DEPRECATED_RUNTIME_PACKAGE) {
+            val factory = if (isForbidden) ErrorsParcelize.FORBIDDEN_DEPRECATED_ANNOTATION else ErrorsParcelize.DEPRECATED_ANNOTATION
+            context.trace.report(factory.on(annotationEntry))
         }
     }
 
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeCodegenExtension.kt b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeCodegenExtension.kt
index 35dfb95aac1..13e25be12cd 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeCodegenExtension.kt
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeCodegenExtension.kt
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.parcelize.ParcelizeAnnotationChecker.Companion.TYPE_PARCELER_FQ_NAMES
 import org.jetbrains.kotlin.parcelize.ParcelizeResolveExtension.Companion.createMethod
 import org.jetbrains.kotlin.parcelize.ParcelizeSyntheticComponent.ComponentKind.*
 import org.jetbrains.kotlin.parcelize.serializers.*
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeDeclarationChecker.kt b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeDeclarationChecker.kt
index 56bcc1788b6..27aa799055b 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeDeclarationChecker.kt
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeDeclarationChecker.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.parcelize
 
+import org.jetbrains.kotlin.backend.common.serialization.findPackage
 import org.jetbrains.kotlin.codegen.ClassBuilderMode
 import org.jetbrains.kotlin.codegen.FrameMap
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
@@ -17,6 +18,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.diagnostics.DiagnosticSink
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.parcelize.ParcelizeAnnotationChecker.Companion.DEPRECATED_RUNTIME_PACKAGE
 import org.jetbrains.kotlin.parcelize.diagnostic.ErrorsParcelize
 import org.jetbrains.kotlin.parcelize.serializers.ParcelSerializer
 import org.jetbrains.kotlin.parcelize.serializers.isParcelable
@@ -29,16 +31,17 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import org.jetbrains.kotlin.resolve.jvm.annotations.findJvmFieldAnnotation
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.isError
+import org.jetbrains.kotlin.types.typeUtil.supertypes
 
 val ANDROID_PARCELABLE_CLASS_FQNAME = FqName("android.os.Parcelable")
 val ANDROID_PARCELABLE_CREATOR_CLASS_FQNAME = FqName("android.os.Parcelable.Creator")
 val ANDROID_PARCEL_CLASS_FQNAME = FqName("android.os.Parcel")
 
-class ParcelizeDeclarationChecker : DeclarationChecker {
+open class ParcelizeDeclarationChecker : DeclarationChecker {
     private companion object {
         private val IGNORED_ON_PARCEL_FQ_NAMES = listOf(
             FqName(kotlinx.parcelize.IgnoredOnParcel::class.java.canonicalName),
-            FqName(kotlinx.android.parcel.IgnoredOnParcel::class.java.canonicalName)
+            @Suppress("DEPRECATION") FqName(kotlinx.android.parcel.IgnoredOnParcel::class.java.canonicalName)
         )
     }
 
@@ -48,6 +51,7 @@ class ParcelizeDeclarationChecker : DeclarationChecker {
         when (descriptor) {
             is ClassDescriptor -> {
                 checkParcelableClass(descriptor, declaration, trace, trace.bindingContext, context.languageVersionSettings)
+                checkParcelerClass(descriptor, declaration, trace)
             }
             is SimpleFunctionDescriptor -> {
                 val containingClass = descriptor.containingDeclaration as? ClassDescriptor
@@ -116,6 +120,24 @@ class ParcelizeDeclarationChecker : DeclarationChecker {
         }
     }
 
+    private fun checkParcelerClass(
+        descriptor: ClassDescriptor,
+        declaration: KtDeclaration,
+        diagnosticHolder: DiagnosticSink,
+    ) {
+        if (!descriptor.isCompanionObject || declaration !is KtObjectDeclaration) {
+            return
+        }
+
+        for (type in descriptor.defaultType.supertypes()) {
+            if (type.constructor.declarationDescriptor?.fqNameSafe == OLD_PARCELER_FQNAME) {
+                val reportElement = declaration.nameIdentifier ?: declaration.getObjectKeyword() ?: declaration
+                diagnosticHolder.report(ErrorsParcelize.DEPRECATED_PARCELER.on(reportElement))
+                break
+            }
+        }
+    }
+
     private fun checkParcelableClass(
         descriptor: ClassDescriptor,
         declaration: KtDeclaration,
@@ -190,7 +212,8 @@ class ParcelizeDeclarationChecker : DeclarationChecker {
             bindingContext,
             ClassBuilderMode.FULL,
             descriptor.module.name.asString(),
-            languageVersionSettings
+            languageVersionSettings,
+            useOldInlineClassesManglingScheme = false
         )
 
         for (parameter in primaryConstructor?.valueParameters.orEmpty<KtParameter>()) {
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeResolveExtension.kt b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeResolveExtension.kt
index 05eaf8694d7..03d0687e39e 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeResolveExtension.kt
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ParcelizeResolveExtension.kt
@@ -169,13 +169,35 @@ interface ParcelizeSyntheticComponent {
     }
 }
 
+val TYPE_PARCELER_FQ_NAMES = listOf(
+    FqName(kotlinx.parcelize.TypeParceler::class.java.name),
+    FqName(kotlinx.android.parcel.TypeParceler::class.java.name)
+)
+
+val WRITE_WITH_FQ_NAMES = listOf(
+    FqName(kotlinx.parcelize.WriteWith::class.java.name),
+    FqName(kotlinx.android.parcel.WriteWith::class.java.name)
+)
+
+val IGNORED_ON_PARCEL_FQ_NAMES = listOf(
+    FqName(kotlinx.parcelize.IgnoredOnParcel::class.java.name),
+    FqName(kotlinx.android.parcel.IgnoredOnParcel::class.java.name)
+)
+
 val PARCELIZE_CLASS_FQ_NAMES: List<FqName> = listOf(
     FqName(kotlinx.parcelize.Parcelize::class.java.canonicalName),
     FqName(kotlinx.android.parcel.Parcelize::class.java.canonicalName)
 )
 
+val RAW_VALUE_ANNOTATION_FQ_NAMES = listOf(
+    FqName(kotlinx.parcelize.RawValue::class.java.name),
+    @Suppress("DEPRECATION") FqName(kotlinx.android.parcel.RawValue::class.java.name)
+)
+
 internal val PARCELER_FQNAME = FqName(kotlinx.parcelize.Parceler::class.java.canonicalName)
 
+internal val OLD_PARCELER_FQNAME = FqName(kotlinx.android.parcel.Parceler::class.java.canonicalName)
+
 val ClassDescriptor.isParcelize: Boolean
     get() {
         for (fqName in PARCELIZE_CLASS_FQ_NAMES) {
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/diagnostic/DefaultErrorMessagesParcelize.kt b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/diagnostic/DefaultErrorMessagesParcelize.kt
index 3ec3054a203..bbb3519c9f7 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/diagnostic/DefaultErrorMessagesParcelize.kt
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/diagnostic/DefaultErrorMessagesParcelize.kt
@@ -134,5 +134,20 @@ object DefaultErrorMessagesParcelize : DefaultErrorMessages.Extension {
             ErrorsParcelize.INAPPLICABLE_IGNORED_ON_PARCEL_CONSTRUCTOR_PROPERTY,
             "'@IgnoredOnParcel' is inapplicable to properties declared in the primary constructor"
         )
+
+        MAP.put(
+            ErrorsParcelize.FORBIDDEN_DEPRECATED_ANNOTATION,
+            "Parceler-related annotations from package 'kotlinx.android.parcel' are forbidden. Change package to 'kotlinx.parcelize'"
+        )
+
+        MAP.put(
+            ErrorsParcelize.DEPRECATED_ANNOTATION,
+            "Parcelize annotations from package 'kotlinx.android.parcel' are deprecated. Change package to 'kotlinx.parcelize'"
+        )
+
+        MAP.put(
+            ErrorsParcelize.DEPRECATED_PARCELER,
+            "'kotlinx.android.parcel.Parceler' is deprecated. Use 'kotlinx.parcelize.Parceler' instead"
+        )
     }
 }
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/diagnostic/ErrorsParcelize.java b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/diagnostic/ErrorsParcelize.java
index 87c178223d7..f9b41596ba1 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/diagnostic/ErrorsParcelize.java
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/diagnostic/ErrorsParcelize.java
@@ -47,6 +47,9 @@ public interface ErrorsParcelize {
     DiagnosticFactory0<PsiElement> DUPLICATING_TYPE_PARCELERS = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory1<PsiElement, KtClassOrObject> REDUNDANT_TYPE_PARCELER = DiagnosticFactory1.create(WARNING);
     DiagnosticFactory1<PsiElement, KtClassOrObject> CLASS_SHOULD_BE_PARCELIZE = DiagnosticFactory1.create(ERROR);
+    DiagnosticFactory0<PsiElement> FORBIDDEN_DEPRECATED_ANNOTATION = DiagnosticFactory0.create(ERROR);
+    DiagnosticFactory0<PsiElement> DEPRECATED_ANNOTATION = DiagnosticFactory0.create(WARNING);
+    DiagnosticFactory0<PsiElement> DEPRECATED_PARCELER = DiagnosticFactory0.create(ERROR);
 
     DiagnosticFactory0<PsiElement> INAPPLICABLE_IGNORED_ON_PARCEL = DiagnosticFactory0.create(WARNING);
     DiagnosticFactory0<PsiElement> INAPPLICABLE_IGNORED_ON_PARCEL_CONSTRUCTOR_PROPERTY = DiagnosticFactory0.create(WARNING);
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ir/IrParcelSerializerFactory.kt b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ir/IrParcelSerializerFactory.kt
index 20db59e9fd1..c3bbc02ca3a 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ir/IrParcelSerializerFactory.kt
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ir/IrParcelSerializerFactory.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.*
-import org.jetbrains.kotlin.parcelize.serializers.RAW_VALUE_ANNOTATION_FQ_NAMES
+import org.jetbrains.kotlin.parcelize.RAW_VALUE_ANNOTATION_FQ_NAMES
 
 class IrParcelSerializerFactory(symbols: AndroidSymbols) {
     /**
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ir/IrParcelerScope.kt b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ir/IrParcelerScope.kt
index 608c0e775b3..54ce163d652 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ir/IrParcelerScope.kt
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/ir/IrParcelerScope.kt
@@ -14,6 +14,8 @@ import org.jetbrains.kotlin.ir.types.typeOrNull
 import org.jetbrains.kotlin.ir.util.constructedClass
 import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
 import org.jetbrains.kotlin.parcelize.ParcelizeAnnotationChecker
+import org.jetbrains.kotlin.parcelize.TYPE_PARCELER_FQ_NAMES
+import org.jetbrains.kotlin.parcelize.WRITE_WITH_FQ_NAMES
 
 // Keep track of all custom parcelers which are currently in scope.
 // Note that custom parcelers are resolved in *reverse* lexical order.
@@ -29,7 +31,7 @@ class IrParcelerScope(private val parent: IrParcelerScope? = null) {
 }
 
 fun IrParcelerScope?.getCustomSerializer(irType: IrType): IrClass? {
-    return irType.getAnyAnnotation(ParcelizeAnnotationChecker.WRITE_WITH_FQ_NAMES)?.let { writeWith ->
+    return irType.getAnyAnnotation(WRITE_WITH_FQ_NAMES)?.let { writeWith ->
         (writeWith.type as IrSimpleType).arguments.single().typeOrNull!!.getClass()!!
     } ?: this?.get(irType)
 }
@@ -40,7 +42,7 @@ fun IrParcelerScope?.hasCustomSerializer(irType: IrType): Boolean {
 
 fun IrAnnotationContainer.getParcelerScope(parent: IrParcelerScope? = null): IrParcelerScope? {
     val typeParcelerAnnotations = annotations.filterTo(mutableListOf()) {
-        it.symbol.owner.constructedClass.fqNameWhenAvailable in ParcelizeAnnotationChecker.TYPE_PARCELER_FQ_NAMES
+        it.symbol.owner.constructedClass.fqNameWhenAvailable in TYPE_PARCELER_FQ_NAMES
     }
 
     if (typeParcelerAnnotations.isEmpty())
diff --git a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/serializers/ParcelSerializer.kt b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/serializers/ParcelSerializer.kt
index 0f2bd4021d2..afecad12621 100644
--- a/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/serializers/ParcelSerializer.kt
+++ b/plugins/parcelize/parcelize-compiler/src/org/jetbrains/kotlin/parcelize/serializers/ParcelSerializer.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
 import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.parcelize.RAW_VALUE_ANNOTATION_FQ_NAMES
 import org.jetbrains.kotlin.parcelize.findAnyAnnotation
 import org.jetbrains.kotlin.parcelize.hasAnyAnnotation
 import org.jetbrains.kotlin.parcelize.isParcelize
@@ -43,11 +44,6 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
-val RAW_VALUE_ANNOTATION_FQ_NAMES = listOf(
-    FqName(kotlinx.parcelize.RawValue::class.java.name),
-    FqName(kotlinx.android.parcel.RawValue::class.java.name)
-)
-
 internal typealias TypeParcelerMapping = Pair<KotlinType, KotlinType>
 
 interface ParcelSerializer {
@@ -70,7 +66,7 @@ interface ParcelSerializer {
     companion object {
         private val WRITE_WITH_FQ_NAMES = listOf(
             FqName(kotlinx.parcelize.WriteWith::class.java.name),
-            FqName(kotlinx.android.parcel.WriteWith::class.java.name),
+            @Suppress("DEPRECATION") FqName(kotlinx.android.parcel.WriteWith::class.java.name),
         )
 
         private fun KotlinTypeMapper.mapTypeSafe(type: KotlinType, forceBoxed: Boolean) = when {
diff --git a/plugins/parcelize/parcelize-compiler/testData/box/customParcelableDeprecated.kt b/plugins/parcelize/parcelize-compiler/testData/box/customParcelableDeprecated.kt
deleted file mode 100644
index a96f3b1443b..00000000000
--- a/plugins/parcelize/parcelize-compiler/testData/box/customParcelableDeprecated.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-// IGNORE_BACKEND: JVM
-// See KT-38105
-// Throws IllegalAccessError, since the code tries to access the private companion field directly from the generated User$Creator class.
-// WITH_RUNTIME
-
-@file:JvmName("TestKt")
-package test
-
-import kotlinx.android.parcel.*
-import android.os.Parcel
-import android.os.Parcelable
-
-data class User(val name: String, val age: Int)
-
-@Parcelize
-data class UserParcelable(val user: User) : Parcelable {
-    private companion object : Parceler<UserParcelable> {
-        override fun UserParcelable.write(parcel: Parcel, flags: Int) {
-            parcel.writeString(user.name)
-        }
-
-        override fun create(parcel: Parcel) = UserParcelable(User(parcel.readString(), 0))
-    }
-}
-
-fun box() = parcelTest { parcel ->
-    val userParcelable = UserParcelable(User("John", 20))
-    userParcelable.writeToParcel(parcel, 0)
-
-    val bytes = parcel.marshall()
-    parcel.unmarshall(bytes, 0, bytes.size)
-    parcel.setDataPosition(0)
-
-    val userParcelable2 = readFromParcel<UserParcelable>(parcel)
-
-    assert(userParcelable.user.name == userParcelable2.user.name)
-    assert(userParcelable2.user.age == 0)
-}
diff --git a/plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimpleDeprecated.kt b/plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimpleDeprecated.kt
deleted file mode 100644
index 67f39c82b5c..00000000000
--- a/plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimpleDeprecated.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-// WITH_RUNTIME
-
-@file:JvmName("TestKt")
-package test
-
-import kotlinx.android.parcel.*
-import android.os.Parcel
-import android.os.Parcelable
-
-object Parceler1 : Parceler<String> {
-    override fun create(parcel: Parcel) = parcel.readInt().toString()
-
-    override fun String.write(parcel: Parcel, flags: Int) {
-        parcel.writeInt(length)
-    }
-}
-
-typealias Parceler2 = Parceler1
-
-object Parceler3 : Parceler<String> {
-    override fun create(parcel: Parcel) = parcel.readString().toUpperCase()
-
-    override fun String.write(parcel: Parcel, flags: Int) {
-        parcel.writeString(this)
-    }
-}
-
-@Parcelize
-@TypeParceler<String, Parceler2>
-data class Test(
-        val a: String,
-        @TypeParceler<String, Parceler1> val b: String,
-        @TypeParceler<String, Parceler3> val c: CharSequence,
-        val d: @WriteWith<Parceler3> String
-) : Parcelable
-
-fun box() = parcelTest { parcel ->
-    val test = Test("Abc", "Abc", "Abc", "Abc")
-    test.writeToParcel(parcel, 0)
-
-    val bytes = parcel.marshall()
-    parcel.unmarshall(bytes, 0, bytes.size)
-    parcel.setDataPosition(0)
-
-    val test2 = readFromParcel<Test>(parcel)
-
-    assert(test.a == "Abc" && test.b == "Abc" && test.c == "Abc" && test.d == "Abc")
-    assert(test2.a == "3" && test2.b == "3" && test2.c == "Abc" && test2.d == "ABC")
-}
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWithDeprecated.kt b/plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWithDeprecated.kt
deleted file mode 100644
index 6accaee5b0c..00000000000
--- a/plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWithDeprecated.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-// IGNORE_BACKEND: JVM
-// See KT-38107
-// The JVM backend is missing support for custom parcelers in List<String>
-// WITH_RUNTIME
-
-@file:JvmName("TestKt")
-package test
-
-import kotlinx.android.parcel.*
-import android.os.Parcel
-import android.os.Parcelable
-
-object Parceler1 : Parceler<String> {
-    override fun create(parcel: Parcel) = parcel.readInt().toString()
-
-    override fun String.write(parcel: Parcel, flags: Int) {
-        parcel.writeInt(length)
-    }
-}
-
-object Parceler2 : Parceler<List<String>> {
-    override fun create(parcel: Parcel) = listOf(parcel.readString())
-
-    override fun List<String>.write(parcel: Parcel, flags: Int) {
-        parcel.writeString(this.joinToString(","))
-    }
-}
-
-@Parcelize
-data class Test(
-        val a: String,
-        val b: @WriteWith<Parceler1> String,
-        val c: List<@WriteWith<Parceler1> String>,
-        val d: @WriteWith<Parceler2> List<String>,
-        val e: @WriteWith<Parceler2> List<@WriteWith<Parceler1> String>
-) : Parcelable
-
-fun box() = parcelTest { parcel ->
-    val test = Test("Abc", "Abc", listOf("A", "bc"), listOf("A", "bc"), listOf("A", "bc"))
-    test.writeToParcel(parcel, 0)
-
-    val bytes = parcel.marshall()
-    parcel.unmarshall(bytes, 0, bytes.size)
-    parcel.setDataPosition(0)
-
-    val test2 = readFromParcel<Test>(parcel)
-
-    with (test) {
-        assert(a == "Abc" && b == "Abc" && c == listOf("A", "bc") && d == listOf("A", "bc") && e == listOf("A", "bc"))
-    }
-
-    with (test2) {
-        assert(a == "Abc" && b == "3" && c == listOf("1", "2") && d == listOf("A,bc") && e == listOf("A,bc"))
-    }
-}
diff --git a/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.ir.txt b/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.ir.txt
deleted file mode 100644
index 95ad349c472..00000000000
--- a/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.ir.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
-    private void <init>()
-
-    public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker)
-
-    public User create(android.os.Parcel parcel)
-
-    public java.lang.Object create(android.os.Parcel parcel)
-
-    public User[] newArray(int size) {
-        LABEL (L0)
-        LINENUMBER (10)
-          ALOAD (0)
-          CHECKCAST
-          ILOAD (1)
-          INVOKESTATIC (kotlinx/android/parcel/Parceler$DefaultImpls, newArray, (Lkotlinx/android/parcel/Parceler;I)[Ljava/lang/Object;)
-          CHECKCAST
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object[] newArray(int size) {
-        LABEL (L0)
-        LINENUMBER (10)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-
-    public void write(User $this$write, android.os.Parcel parcel, int flags)
-
-    public void write(java.lang.Object $this$write, android.os.Parcel parcel, int flags)
-}
-
-public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator {
-    public void <init>()
-
-    public final User createFromParcel(android.os.Parcel parcel) {
-        LABEL (L0)
-          ALOAD (1)
-          LDC (parcel)
-          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          INVOKESTATIC (User, access$getCompanion$p$s2645995, ()LUser$Companion;)
-          ALOAD (1)
-          INVOKEVIRTUAL (User$Companion, create, (Landroid/os/Parcel;)LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object createFromParcel(android.os.Parcel source) {
-        LABEL (L0)
-          ALOAD (0)
-          ALOAD (1)
-          INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-
-    public final User[] newArray(int size) {
-        LABEL (L0)
-          ILOAD (1)
-          ANEWARRAY
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object[] newArray(int size) {
-        LABEL (L0)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKEVIRTUAL (User$Creator, newArray, (I)[LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-}
-
-public final class User : java/lang/Object, android/os/Parcelable {
-    public final static android.os.Parcelable$Creator CREATOR
-
-    private final static User$Companion Companion
-
-    private final int age
-
-    private final java.lang.String firstName
-
-    private final java.lang.String lastName
-
-    static void <clinit>()
-
-    public void <init>(java.lang.String firstName, java.lang.String lastName, int age)
-
-    public final static User$Companion access$getCompanion$p$s2645995()
-
-    public int describeContents()
-
-    public final int getAge()
-
-    public final java.lang.String getFirstName()
-
-    public final java.lang.String getLastName()
-
-    public void writeToParcel(android.os.Parcel out, int flags) {
-        LABEL (L0)
-          ALOAD (1)
-          LDC (out)
-          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
-          ALOAD (0)
-          ALOAD (1)
-          ILOAD (2)
-          INVOKEVIRTUAL (User$Companion, write, (LUser;Landroid/os/Parcel;I)V)
-          RETURN
-        LABEL (L1)
-    }
-}
diff --git a/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.kt b/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.kt
deleted file mode 100644
index e7d594d59a0..00000000000
--- a/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// CURIOUS_ABOUT writeToParcel, createFromParcel, newArray
-// WITH_RUNTIME
-
-import kotlinx.android.parcel.*
-import android.os.Parcel
-import android.os.Parcelable
-
-@Parcelize
-class User(val firstName: String, val lastName: String, val age: Int) : Parcelable {
-    private companion object : Parceler<User> {
-        override fun User.write(parcel: Parcel, flags: Int) {
-            parcel.writeString(firstName)
-            parcel.writeString(lastName)
-            parcel.writeInt(age)
-        }
-
-        override fun create(parcel: Parcel) = User(parcel.readString(), parcel.readString(), parcel.readInt())
-    }
-}
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.txt b/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.txt
deleted file mode 100644
index 2469d37c714..00000000000
--- a/plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
-    private void <init>()
-
-    public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker)
-
-    public User create(android.os.Parcel parcel)
-
-    public java.lang.Object create(android.os.Parcel p0)
-
-    public User[] newArray(int size) {
-        LABEL (L0)
-        LINENUMBER (10)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKESTATIC (kotlinx/android/parcel/Parceler$DefaultImpls, newArray, (Lkotlinx/android/parcel/Parceler;I)[Ljava/lang/Object;)
-          CHECKCAST
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object[] newArray(int p0) {
-        LABEL (L0)
-        LINENUMBER (10)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
-          ARETURN
-    }
-
-    public void write(User $this$write, android.os.Parcel parcel, int flags)
-
-    public void write(java.lang.Object p0, android.os.Parcel p1, int p2)
-}
-
-public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator {
-    public void <init>()
-
-    public final User createFromParcel(android.os.Parcel in) {
-        LABEL (L0)
-          ALOAD (1)
-          LDC (in)
-          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
-          ALOAD (1)
-          INVOKEVIRTUAL (User$Companion, create, (Landroid/os/Parcel;)LUser;)
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object createFromParcel(android.os.Parcel p0) {
-        LABEL (L0)
-        LINENUMBER (9)
-          ALOAD (0)
-          ALOAD (1)
-          INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;)
-          ARETURN
-    }
-
-    public final User[] newArray(int size) {
-        LABEL (L0)
-          ILOAD (1)
-          ANEWARRAY
-          ARETURN
-        LABEL (L1)
-    }
-
-    public java.lang.Object[] newArray(int p0) {
-        LABEL (L0)
-        LINENUMBER (9)
-          ALOAD (0)
-          ILOAD (1)
-          INVOKEVIRTUAL (User$Creator, newArray, (I)[LUser;)
-          ARETURN
-    }
-}
-
-public final class User : java/lang/Object, android/os/Parcelable {
-    public final static android.os.Parcelable$Creator CREATOR
-
-    private final static User$Companion Companion
-
-    private final int age
-
-    private final java.lang.String firstName
-
-    private final java.lang.String lastName
-
-    static void <clinit>()
-
-    public void <init>(java.lang.String firstName, java.lang.String lastName, int age)
-
-    public int describeContents()
-
-    public final int getAge()
-
-    public final java.lang.String getFirstName()
-
-    public final java.lang.String getLastName()
-
-    public void writeToParcel(android.os.Parcel parcel, int flags) {
-        LABEL (L0)
-          ALOAD (1)
-          LDC (parcel)
-          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
-          ALOAD (0)
-          ALOAD (1)
-          ILOAD (2)
-          INVOKEVIRTUAL (User$Companion, write, (LUser;Landroid/os/Parcel;I)V)
-          RETURN
-        LABEL (L1)
-    }
-}
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt
index b14b28f295a..de9cbee93aa 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt
@@ -157,7 +157,7 @@ abstract class AbstractParcelizeBoxTest : CodegenTestCase() {
                 javaExe.absolutePath,
                 "-ea",
                 "-classpath",
-                (libraryClasspath + dirForTestClasses).joinToString(File.pathSeparator),
+                (libraryClasspath + dirForTestClasses).joinToString(File.pathSeparator) { it.absolutePath },
                 JUnitCore::class.java.name,
                 JUNIT_GENERATED_TEST_CLASS_FQNAME
             ).start()
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java
index fec50b63271..aae880f144d 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java
@@ -74,11 +74,6 @@ public class ParcelizeBoxTestGenerated extends AbstractParcelizeBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelable.kt");
     }
 
-    @TestMetadata("customParcelableDeprecated.kt")
-    public void testCustomParcelableDeprecated() throws Exception {
-        runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelableDeprecated.kt");
-    }
-
     @TestMetadata("customParcelerScoping.kt")
     public void testCustomParcelerScoping() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelerScoping.kt");
@@ -94,21 +89,11 @@ public class ParcelizeBoxTestGenerated extends AbstractParcelizeBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimple.kt");
     }
 
-    @TestMetadata("customSerializerSimpleDeprecated.kt")
-    public void testCustomSerializerSimpleDeprecated() throws Exception {
-        runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimpleDeprecated.kt");
-    }
-
     @TestMetadata("customSerializerWriteWith.kt")
     public void testCustomSerializerWriteWith() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWith.kt");
     }
 
-    @TestMetadata("customSerializerWriteWithDeprecated.kt")
-    public void testCustomSerializerWriteWithDeprecated() throws Exception {
-        runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWithDeprecated.kt");
-    }
-
     @TestMetadata("customSimple.kt")
     public void testCustomSimple() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSimple.kt");
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java
index 3077f06b23a..89fd28d75b6 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java
@@ -49,11 +49,6 @@ public class ParcelizeBytecodeListingTestGenerated extends AbstractParcelizeByte
         runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimple.kt");
     }
 
-    @TestMetadata("customSimpleDeprecated.kt")
-    public void testCustomSimpleDeprecated() throws Exception {
-        runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.kt");
-    }
-
     @TestMetadata("customSimpleWithNewArray.kt")
     public void testCustomSimpleWithNewArray() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleWithNewArray.kt");
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java
index ecde6ffbbc7..87ff0a316fb 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java
@@ -74,11 +74,6 @@ public class ParcelizeIrBoxTestGenerated extends AbstractParcelizeIrBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelable.kt");
     }
 
-    @TestMetadata("customParcelableDeprecated.kt")
-    public void testCustomParcelableDeprecated() throws Exception {
-        runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelableDeprecated.kt");
-    }
-
     @TestMetadata("customParcelerScoping.kt")
     public void testCustomParcelerScoping() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelerScoping.kt");
@@ -94,21 +89,11 @@ public class ParcelizeIrBoxTestGenerated extends AbstractParcelizeIrBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimple.kt");
     }
 
-    @TestMetadata("customSerializerSimpleDeprecated.kt")
-    public void testCustomSerializerSimpleDeprecated() throws Exception {
-        runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimpleDeprecated.kt");
-    }
-
     @TestMetadata("customSerializerWriteWith.kt")
     public void testCustomSerializerWriteWith() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWith.kt");
     }
 
-    @TestMetadata("customSerializerWriteWithDeprecated.kt")
-    public void testCustomSerializerWriteWithDeprecated() throws Exception {
-        runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWithDeprecated.kt");
-    }
-
     @TestMetadata("customSimple.kt")
     public void testCustomSimple() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSimple.kt");
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java
index 71fcbc719f7..ff96ef25d2d 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java
@@ -49,11 +49,6 @@ public class ParcelizeIrBytecodeListingTestGenerated extends AbstractParcelizeIr
         runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimple.kt");
     }
 
-    @TestMetadata("customSimpleDeprecated.kt")
-    public void testCustomSimpleDeprecated() throws Exception {
-        runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.kt");
-    }
-
     @TestMetadata("customSimpleWithNewArray.kt")
     public void testCustomSimpleWithNewArray() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleWithNewArray.kt");
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/testUtils.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/testUtils.kt
index 3c85c3e8a98..7ddf6213d8e 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/testUtils.kt
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/testUtils.kt
@@ -12,8 +12,9 @@ import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 
 fun addParcelizeRuntimeLibrary(environment: KotlinCoreEnvironment) {
-    val runtimeLibrary = File(PathUtil.kotlinPathsForCompiler.libPath, "parcelize-runtime.jar")
-    environment.updateClasspath(listOf(JvmClasspathRoot(runtimeLibrary)))
+    val runtimeLibrary = File(PathUtil.kotlinPathsForCompiler.libPath, PathUtil.PARCELIZE_RUNTIME_PLUGIN_JAR_NAME)
+    val androidExtensionsRuntimeLibrary = File(PathUtil.kotlinPathsForCompiler.libPath, PathUtil.ANDROID_EXTENSIONS_RUNTIME_PLUGIN_JAR_NAME)
+    environment.updateClasspath(listOf(JvmClasspathRoot(runtimeLibrary), JvmClasspathRoot(androidExtensionsRuntimeLibrary)))
 }
 
 fun addAndroidJarLibrary(environment: KotlinCoreEnvironment) {
diff --git a/plugins/parcelize/parcelize-ide/build.gradle.kts b/plugins/parcelize/parcelize-ide/build.gradle.kts
index eab842eaefe..1d8da1b19f9 100644
--- a/plugins/parcelize/parcelize-ide/build.gradle.kts
+++ b/plugins/parcelize/parcelize-ide/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:light-classes"))
     compile(project(":idea"))
+    compile(project(":idea:idea-gradle"))
     compile(project(":plugins:parcelize:parcelize-compiler"))
     compile(project(":plugins:parcelize:parcelize-runtime"))
 
@@ -22,9 +23,7 @@ dependencies {
         compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
     }
 
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
-    }
+    compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
 
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":plugins:parcelize:parcelize-compiler"))
@@ -38,9 +37,7 @@ dependencies {
 
     testRuntime(toolsJar())
 
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
+    testRuntimeOnly(intellijPluginDep("java"))
 }
 
 sourceSets {
diff --git a/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeAnnotationChecker.kt b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeAnnotationChecker.kt
new file mode 100644
index 00000000000..f6f97a5344b
--- /dev/null
+++ b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeAnnotationChecker.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.parcelize.ide
+
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.parcelize.ParcelizeAnnotationChecker
+import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext
+import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
+
+class IdeParcelizeAnnotationChecker : ParcelizeAnnotationChecker() {
+    override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
+        if (!ParcelizeAvailability.isAvailable(resolvedCall.call.callElement)) {
+            return
+        }
+
+        super.check(resolvedCall, reportOn, context)
+    }
+}
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeDeclarationChecker.kt b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeDeclarationChecker.kt
new file mode 100644
index 00000000000..29e13bca927
--- /dev/null
+++ b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeDeclarationChecker.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.parcelize.ide
+
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.parcelize.ParcelizeDeclarationChecker
+import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext
+
+class IdeParcelizeDeclarationChecker : ParcelizeDeclarationChecker() {
+    override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) {
+        if (!ParcelizeAvailability.isAvailable(declaration)) {
+            return
+        }
+
+        super.check(declaration, descriptor, context)
+    }
+}
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeDeclarationCheckerComponentContainerContributor.kt b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeDeclarationCheckerComponentContainerContributor.kt
new file mode 100644
index 00000000000..acebac671dc
--- /dev/null
+++ b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/IdeParcelizeDeclarationCheckerComponentContainerContributor.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.parcelize.ide
+
+import org.jetbrains.kotlin.container.StorageComponentContainer
+import org.jetbrains.kotlin.container.useInstance
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
+import org.jetbrains.kotlin.platform.TargetPlatform
+import org.jetbrains.kotlin.platform.jvm.isJvm
+
+class IdeParcelizeDeclarationCheckerComponentContainerContributor : StorageComponentContainerContributor {
+    override fun registerModuleComponents(
+        container: StorageComponentContainer,
+        platform: TargetPlatform,
+        moduleDescriptor: ModuleDescriptor,
+    ) {
+        if (platform.isJvm()) {
+            container.useInstance(IdeParcelizeDeclarationChecker())
+            container.useInstance(IdeParcelizeAnnotationChecker())
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/ParcelizeAvailability.kt b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/ParcelizeAvailability.kt
index aeada03a410..6cba9bbdd1e 100644
--- a/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/ParcelizeAvailability.kt
+++ b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/ParcelizeAvailability.kt
@@ -32,6 +32,6 @@ object ParcelizeAvailability {
         val path = ExternalSystemApiUtil.getExternalProjectPath(module) ?: return false
         val externalProjectInfo = ExternalSystemUtil.getExternalProjectInfo(module.project, GradleConstants.SYSTEM_ID, path) ?: return false
         val moduleData = GradleProjectResolverUtil.findModule(externalProjectInfo.externalProjectStructure, path) ?: return false
-        return moduleData.getCopyableUserData(ParcelizeProjectResolverExtension.KEY)?.isEnabled ?: false
+        return ExternalSystemApiUtil.find(moduleData, ParcelizeIdeModel.KEY)?.data?.isEnabled ?: false
     }
 }
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/ParcelizeProjectResolverExtension.kt b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/ParcelizeProjectResolverExtension.kt
index 9a7f0aaa272..fe2ce61898e 100644
--- a/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/ParcelizeProjectResolverExtension.kt
+++ b/plugins/parcelize/parcelize-ide/src/org/jetbrains/kotlin/parcelize/ide/ParcelizeProjectResolverExtension.kt
@@ -6,17 +6,30 @@
 package org.jetbrains.kotlin.parcelize.ide
 
 import com.intellij.openapi.externalSystem.model.DataNode
+import com.intellij.openapi.externalSystem.model.Key
+import com.intellij.openapi.externalSystem.model.ProjectKeys
+import com.intellij.openapi.externalSystem.model.project.AbstractExternalEntityData
 import com.intellij.openapi.externalSystem.model.project.ModuleData
-import com.intellij.openapi.util.Key
+import com.intellij.openapi.externalSystem.service.project.manage.AbstractProjectDataService
+import com.intellij.serialization.PropertyMapping
 import org.gradle.tooling.model.idea.IdeaModule
 import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
+import org.jetbrains.plugins.gradle.util.GradleConstants
+
+class ParcelizeIdeModel @PropertyMapping("isEnabled") constructor(
+    val isEnabled: Boolean
+) : AbstractExternalEntityData(GradleConstants.SYSTEM_ID) {
+    companion object {
+        val KEY = Key.create(ParcelizeIdeModel::class.java, ProjectKeys.CONTENT_ROOT.processingWeight + 1)
+    }
+}
+
+class ParcelizeIdeModelDataService : AbstractProjectDataService<ParcelizeIdeModel, Void>() {
+    override fun getTargetDataKey() = ParcelizeIdeModel.KEY
+}
 
 @Suppress("unused")
 class ParcelizeProjectResolverExtension : AbstractProjectResolverExtension() {
-    companion object {
-        val KEY = Key<ParcelizeGradleModel>("ParcelizeModel")
-    }
-
     override fun getExtraProjectModelClasses() = setOf(ParcelizeGradleModel::class.java)
     override fun getToolingExtensionsClasses() = setOf(ParcelizeModelBuilderService::class.java, Unit::class.java)
 
@@ -24,7 +37,7 @@ class ParcelizeProjectResolverExtension : AbstractProjectResolverExtension() {
         val parcelizeModel = resolverCtx.getExtraProject(gradleModule, ParcelizeGradleModel::class.java)
 
         if (parcelizeModel != null && parcelizeModel.isEnabled) {
-            ideModule.putCopyableUserData(KEY, ParcelizeGradleModelImpl(isEnabled = parcelizeModel.isEnabled))
+            ideModule.createChild(ParcelizeIdeModel.KEY, ParcelizeIdeModel(isEnabled = parcelizeModel.isEnabled))
         }
 
         super.populateModuleExtraModels(gradleModule, ideModule)
diff --git a/plugins/parcelize/parcelize-ide/testData/checker/deprecatedAnnotations.kt b/plugins/parcelize/parcelize-ide/testData/checker/deprecatedAnnotations.kt
new file mode 100644
index 00000000000..e563095c1f5
--- /dev/null
+++ b/plugins/parcelize/parcelize-ide/testData/checker/deprecatedAnnotations.kt
@@ -0,0 +1,46 @@
+// WITH_RUNTIME
+package test
+
+import kotlinx.android.parcel.*
+import android.os.Parcel
+import android.os.Parcelable
+
+object Parceler1 : Parceler<String> {
+    override fun create(parcel: Parcel) = parcel.readInt().toString()
+
+    override fun String.write(parcel: Parcel, flags: Int) {
+        parcel.writeInt(length)
+    }
+}
+
+object Parceler2 : Parceler<List<String>> {
+    override fun create(parcel: Parcel) = listOf(parcel.readString()!!)
+
+    override fun List<String>.write(parcel: Parcel, flags: Int) {
+        parcel.writeString(this.joinToString(","))
+    }
+}
+
+<warning descr="[DEPRECATED_ANNOTATION] Parcelize annotations from package 'kotlinx.android.parcel' are deprecated. Change package to 'kotlin.parcelize'">@Parcelize</warning>
+<error descr="[FORBIDDEN_DEPRECATED_ANNOTATION] Parceler-related annotations from package 'kotlinx.android.parcel' are forbidden. Change package to 'kotlinx.parcelize'">@TypeParceler<String, <error descr="[UPPER_BOUND_VIOLATED] Type argument is not within its bounds: should be subtype of 'Parceler<in String>'">Parceler2</error>></error>
+data class Test(
+    val a: String,
+    val b: <error descr="[FORBIDDEN_DEPRECATED_ANNOTATION] Parceler-related annotations from package 'kotlinx.android.parcel' are forbidden. Change package to 'kotlinx.parcelize'">@WriteWith<Parceler1></error> String,
+    val c: <error descr="[FORBIDDEN_DEPRECATED_ANNOTATION] Parceler-related annotations from package 'kotlinx.android.parcel' are forbidden. Change package to 'kotlinx.parcelize'">@WriteWith<Parceler2></error> List<<error descr="[FORBIDDEN_DEPRECATED_ANNOTATION] Parceler-related annotations from package 'kotlinx.android.parcel' are forbidden. Change package to 'kotlinx.parcelize'">@WriteWith<Parceler1></error> String>
+) : Parcelable {
+    <warning descr="[DEPRECATED_ANNOTATION] Parcelize annotations from package 'kotlinx.android.parcel' are deprecated. Change package to 'kotlin.parcelize'">@IgnoredOnParcel</warning>
+    val x by lazy { "foo" }
+}
+
+interface ParcelerForUser: Parceler<User>
+
+<warning descr="[DEPRECATED_ANNOTATION] Parcelize annotations from package 'kotlinx.android.parcel' are deprecated. Change package to 'kotlin.parcelize'">@Parcelize</warning>
+class User(val name: String) : Parcelable {
+    private companion <error descr="[DEPRECATED_PARCELER] 'kotlinx.android.parcel.Parceler' is deprecated. Use 'kotlinx.parcelize.Parceler' instead">object</error> : ParcelerForUser {
+        override fun User.write(parcel: Parcel, flags: Int) {
+            parcel.writeString(name)
+        }
+
+        override fun create(parcel: Parcel) = User(parcel.readString()!!)
+    }
+}
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/AbstractParcelizeCheckerTest.kt b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/AbstractParcelizeCheckerTest.kt
index d028918d3b8..d88f705b2ed 100644
--- a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/AbstractParcelizeCheckerTest.kt
+++ b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/AbstractParcelizeCheckerTest.kt
@@ -12,16 +12,11 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
 abstract class AbstractParcelizeCheckerTest : AbstractPsiCheckerTest() {
     override fun setUp() {
         super.setUp()
-
-        val androidJar = KotlinTestUtils.findAndroidApiJar()
-        ConfigLibraryUtil.addLibrary(module, "androidJar", androidJar.parentFile.absolutePath, arrayOf(androidJar.name))
-        ConfigLibraryUtil.addLibrary(module, "androidExtensionsRuntime", "dist/kotlinc/lib", arrayOf("parcelize-runtime.jar"))
+        addParcelizeLibraries(module)
     }
 
     override fun tearDown() {
-        ConfigLibraryUtil.removeLibrary(module, "androidJar")
-        ConfigLibraryUtil.removeLibrary(module, "androidExtensionsRuntime")
-
+        removeParcelizeLibraries(module)
         super.tearDown()
     }
 }
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/AbstractParcelizeQuickFixTest.kt b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/AbstractParcelizeQuickFixTest.kt
index 090a0708063..df21f9f1036 100644
--- a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/AbstractParcelizeQuickFixTest.kt
+++ b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/AbstractParcelizeQuickFixTest.kt
@@ -23,16 +23,11 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
 abstract class AbstractParcelizeQuickFixTest : AbstractQuickFixTest() {
     override fun setUp() {
         super.setUp()
-
-        val androidJar = KotlinTestUtils.findAndroidApiJar()
-        ConfigLibraryUtil.addLibrary(module, "androidJar", androidJar.parentFile.absolutePath, arrayOf(androidJar.name))
-        ConfigLibraryUtil.addLibrary(module, "androidExtensionsRuntime", "dist/kotlinc/lib", arrayOf("parcelize-runtime.jar"))
+        addParcelizeLibraries(module)
     }
 
     override fun tearDown() {
-        ConfigLibraryUtil.removeLibrary(module, "androidJar")
-        ConfigLibraryUtil.removeLibrary(module, "androidExtensionsRuntime")
-
+        removeParcelizeLibraries(module)
         super.tearDown()
     }
 }
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/ParcelizeCheckerTestGenerated.java b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/ParcelizeCheckerTestGenerated.java
index 66b4f7c25bc..df4773f5f2d 100644
--- a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/ParcelizeCheckerTestGenerated.java
+++ b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/ParcelizeCheckerTestGenerated.java
@@ -53,6 +53,11 @@ public class ParcelizeCheckerTestGenerated extends AbstractParcelizeCheckerTest
         runTest("plugins/parcelize/parcelize-ide/testData/checker/delegate.kt");
     }
 
+    @TestMetadata("deprecatedAnnotations.kt")
+    public void testDeprecatedAnnotations() throws Exception {
+        runTest("plugins/parcelize/parcelize-ide/testData/checker/deprecatedAnnotations.kt");
+    }
+
     @TestMetadata("emptyPrimaryConstructor.kt")
     public void testEmptyPrimaryConstructor() throws Exception {
         runTest("plugins/parcelize/parcelize-ide/testData/checker/emptyPrimaryConstructor.kt");
diff --git a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/parcelizeTestUtil.kt b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/parcelizeTestUtil.kt
new file mode 100644
index 00000000000..f42ed6a7f68
--- /dev/null
+++ b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/parcelizeTestUtil.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.pacelize.ide.test
+
+import com.intellij.openapi.module.Module
+import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
+import org.jetbrains.kotlin.test.KotlinTestUtils
+
+fun addParcelizeLibraries(module: Module) {
+    val androidJar = KotlinTestUtils.findAndroidApiJar()
+    ConfigLibraryUtil.addLibrary(module, "androidJar", androidJar.parentFile.absolutePath, arrayOf(androidJar.name))
+    ConfigLibraryUtil.addLibrary(module, "parcelizeRuntime", "dist/kotlinc/lib", arrayOf("parcelize-runtime.jar"))
+    ConfigLibraryUtil.addLibrary(module, "androidExtensionsRuntime", "dist/kotlinc/lib", arrayOf("android-extensions-runtime.jar"))
+}
+
+fun removeParcelizeLibraries(module: Module) {
+    ConfigLibraryUtil.removeLibrary(module, "androidJar")
+    ConfigLibraryUtil.removeLibrary(module, "parcelizeRuntime")
+    ConfigLibraryUtil.removeLibrary(module, "androidExtensionsRuntime")
+}
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-runtime/build.gradle.kts b/plugins/parcelize/parcelize-runtime/build.gradle.kts
index 95c548c287f..ce059b633c3 100644
--- a/plugins/parcelize/parcelize-runtime/build.gradle.kts
+++ b/plugins/parcelize/parcelize-runtime/build.gradle.kts
@@ -9,6 +9,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(kotlinStdlib())
+    compile(project(":kotlin-android-extensions-runtime"))
     compileOnly(commonDep("com.google.android", "android"))
 }
 
diff --git a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/IgnoredOnParcel.kt b/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/IgnoredOnParcel.kt
deleted file mode 100644
index 3d0d4af0e9a..00000000000
--- a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/IgnoredOnParcel.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlinx.android.parcel
-
-/**
- * The property annotated with [IgnoredOnParcel] will not be stored into parcel.
- */
-@Target(AnnotationTarget.PROPERTY)
-@Retention(AnnotationRetention.SOURCE)
-@Deprecated("Use kotlinx.parcelize.IgnoredOnParcel instead.", ReplaceWith("kotlinx.parcelize.IgnoredOnParcel"))
-annotation class IgnoredOnParcel
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/Parceler.kt b/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/Parceler.kt
deleted file mode 100644
index 469d0beebf6..00000000000
--- a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/Parceler.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@file:Suppress("unused")
-package kotlinx.android.parcel
-
-/**
- * The base interface for custom [Parcelize] serializers.
- */
-@Deprecated("Use kotlinx.parcelize.Parceler instead.", ReplaceWith("kotlinx.parcelize.Parceler"))
-interface Parceler<T> : kotlinx.parcelize.Parceler<T>
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/Parcelize.kt b/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/Parcelize.kt
deleted file mode 100644
index 16e09d77ae7..00000000000
--- a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/Parcelize.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlinx.android.parcel
-
-/**
- * Instructs the Kotlin compiler to generate `writeToParcel()`, `describeContents()` [android.os.Parcelable] methods,
- * as well as a `CREATOR` factory class automatically.
- *
- * The annotation is applicable only to classes that implements [android.os.Parcelable] (directly or indirectly).
- * Note that only the primary constructor properties will be serialized.
- */
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.BINARY)
-@Deprecated("Use kotlinx.parcelize.Parcelize instead.", ReplaceWith("kotlinx.parcelize.Parcelize"))
-annotation class Parcelize
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/RawValue.kt b/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/RawValue.kt
deleted file mode 100644
index df3a15e8a3c..00000000000
--- a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/RawValue.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlinx.android.parcel
-
-/**
- * Write the corresponding property value with [android.os.Parcel.writeValue].
- * Serialization may fail at runtime, depending on actual property value type.
- */
-@Target(AnnotationTarget.TYPE)
-@Retention(AnnotationRetention.BINARY)
-@Deprecated("Use kotlinx.parcelize.RawValue instead.", ReplaceWith("kotlinx.parcelize.RawValue"))
-annotation class RawValue
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/TypeParceler.kt b/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/TypeParceler.kt
deleted file mode 100644
index b3c57ab9f28..00000000000
--- a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/TypeParceler.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlinx.android.parcel
-
-import kotlinx.parcelize.Parceler
-
-/**
- * Specifies what [Parceler] should be used for a particular type [T].
- */
-@Retention(AnnotationRetention.SOURCE)
-@Repeatable
-@Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
-@Deprecated("Use kotlinx.parcelize.TypeParceler instead.", ReplaceWith("kotlinx.parcelize.TypeParceler"))
-annotation class TypeParceler<T, P : @Suppress("DEPRECATION_ERROR") Parceler<in T>>
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/WriteWith.kt b/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/WriteWith.kt
deleted file mode 100644
index f247e8864bd..00000000000
--- a/plugins/parcelize/parcelize-runtime/src/kotlinx/android/parcel/WriteWith.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlinx.android.parcel
-
-/**
- * Specifies what [Parceler] should be used for the annotated type.
- */
-@Retention(AnnotationRetention.SOURCE)
-@Target(AnnotationTarget.TYPE)
-@Deprecated("Use kotlinx.parcelize.WriteWith instead.", ReplaceWith("kotlinx.parcelize.WriteWith"))
-annotation class WriteWith<P : @Suppress("DEPRECATION_ERROR") Parceler<*>>
\ No newline at end of file
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
index 4c319582997..8f79c1e3ca0 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
@@ -21,10 +21,7 @@ dependencies {
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(project(":kotlin-scripting-jvm-host-unshaded"))
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
-    }
+    testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
 }
 
 sourceSets {
diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptClassMemberScope.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptClassMemberScope.kt
index 61d942dd83c..fc9521cbb47 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptClassMemberScope.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptClassMemberScope.kt
@@ -5,18 +5,13 @@
 
 package org.jetbrains.kotlin.scripting.resolve
 
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.annotations.Annotations
-import org.jetbrains.kotlin.descriptors.impl.ClassConstructorDescriptorImpl
-import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
+import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider
 import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassMemberScope
-import org.jetbrains.kotlin.types.KotlinType
-import org.jetbrains.kotlin.types.KotlinTypeFactory
-import org.jetbrains.kotlin.types.typeUtil.asTypeProjection
 
 class LazyScriptClassMemberScope(
     resolveSession: ResolveSession,
@@ -28,65 +23,17 @@ class LazyScriptClassMemberScope(
     private val _variableNames: MutableSet<Name>
             by lazy(LazyThreadSafetyMode.PUBLICATION) {
                 super.getVariableNames().apply {
+                    scriptDescriptor.scriptProvidedProperties.forEach {
+                        add(it.name)
+                    }
                     scriptDescriptor.resultFieldName()?.let {
                         add(it)
                     }
                 }
             }
 
-    private val scriptPrimaryConstructor: () -> ClassConstructorDescriptorImpl? = resolveSession.storageManager.createNullableLazyValue {
-        val baseClass = scriptDescriptor.baseClassDescriptor()
-        val baseConstructorDescriptor = baseClass?.unsubstitutedPrimaryConstructor
-        if (baseConstructorDescriptor != null) {
-            val implicitReceiversParamTypes =
-                scriptDescriptor.implicitReceivers.mapIndexed { idx, receiver ->
-                    val name =
-                        if (receiver is ScriptDescriptor) "$IMPORTED_SCRIPT_PARAM_NAME_PREFIX${receiver.name}"
-                        else "$IMPLICIT_RECEIVER_PARAM_NAME_PREFIX$idx"
-                    name to receiver.defaultType
-                }
-            val providedPropertiesParamTypes =
-                scriptDescriptor.scriptProvidedProperties.map {
-                    it.name.identifier to it.type
-                }
-            val annotations = baseConstructorDescriptor.annotations
-            val constructorDescriptor = ClassConstructorDescriptorImpl.create(
-                scriptDescriptor, annotations, baseConstructorDescriptor.isPrimary, scriptDescriptor.source
-            )
-            var paramsIndexBase = baseConstructorDescriptor.valueParameters.lastIndex + 1
-            val syntheticParameters =
-                (implicitReceiversParamTypes + providedPropertiesParamTypes).map { param: Pair<String, KotlinType> ->
-                    ValueParameterDescriptorImpl(
-                        constructorDescriptor,
-                        null,
-                        paramsIndexBase++,
-                        Annotations.EMPTY,
-                        Name.identifier(param.first),
-                        param.second,
-                        false, false, false, null, SourceElement.NO_SOURCE
-                    )
-                }
-            val parameters = baseConstructorDescriptor.valueParameters.map { it.copy(constructorDescriptor, it.name, it.index) } +
-                    syntheticParameters
-            constructorDescriptor.initialize(parameters, baseConstructorDescriptor.visibility)
-            constructorDescriptor.returnType = scriptDescriptor.defaultType
-            constructorDescriptor
-        } else {
-            null
-        }
-    }
-
-    override fun resolvePrimaryConstructor(): ClassConstructorDescriptor? {
-        val constructor = scriptPrimaryConstructor()
-                ?: ClassConstructorDescriptorImpl.create(
-                    scriptDescriptor,
-                    Annotations.EMPTY,
-                    true,
-                    SourceElement.NO_SOURCE
-                ).initialize(
-                    emptyList(),
-                    DescriptorVisibilities.PUBLIC
-                )
+    override fun resolvePrimaryConstructor(): ClassConstructorDescriptor {
+        val constructor = scriptDescriptor.scriptPrimaryConstructorWithParams().constructor
         setDeferredReturnType(constructor)
         return constructor
     }
@@ -100,6 +47,7 @@ class LazyScriptClassMemberScope(
                 result.add(it)
             }
         }
+        scriptDescriptor.scriptProvidedProperties.forEach { if (it.name == name) result.add(it) }
     }
 
     override fun createPropertiesFromPrimaryConstructorParameters(name: Name, result: MutableSet<PropertyDescriptor>) {
@@ -111,5 +59,3 @@ class LazyScriptClassMemberScope(
     }
 }
 
-private fun ClassDescriptor.substitute(vararg types: KotlinType): KotlinType? =
-    KotlinTypeFactory.simpleType(this.defaultType, arguments = types.map { it.asTypeProjection() })
diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt
index 2427bf9e60b..a463288fea9 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt
@@ -7,11 +7,14 @@ package org.jetbrains.kotlin.scripting.resolve
 
 import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.openapi.vfs.VirtualFileManager
+import com.intellij.openapi.vfs.VirtualFileSystem
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiManager
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.annotations.FilteredAnnotations
+import org.jetbrains.kotlin.descriptors.impl.ClassConstructorDescriptorImpl
+import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.diagnostics.Errors.MISSING_IMPORTED_SCRIPT_FILE
@@ -53,6 +56,7 @@ import kotlin.script.experimental.host.GetScriptingClass
 import kotlin.script.experimental.host.ScriptingHostConfiguration
 import kotlin.script.experimental.host.getScriptingClass
 import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
+import kotlin.script.experimental.jvm.util.toValidJvmIdentifier
 
 
 class LazyScriptDescriptor(
@@ -179,11 +183,11 @@ class LazyScriptDescriptor(
 
     private inner class ImportedScriptDescriptorsFinder {
 
-        val localFS by lazy {
+        val localFS: VirtualFileSystem by lazy(LazyThreadSafetyMode.PUBLICATION) {
             val fileManager = VirtualFileManager.getInstance()
             fileManager.getFileSystem(StandardFileSystems.FILE_PROTOCOL)
         }
-        val psiManager by lazy { PsiManager.getInstance(scriptInfo.script.project) }
+        val psiManager by lazy(LazyThreadSafetyMode.PUBLICATION) { PsiManager.getInstance(scriptInfo.script.project) }
 
         operator fun invoke(importedScript: SourceCode): ScriptDescriptor? {
             // Note: is not an error now - if import references other valid source file, it is simply compiled along with script
@@ -264,22 +268,93 @@ class LazyScriptDescriptor(
 
     override fun getImplicitReceivers(): List<ClassDescriptor> = scriptImplicitReceivers()
 
-    private val scriptProvidedProperties: () -> ScriptProvidedPropertiesDescriptor = resolveSession.storageManager.createLazyValue {
-        ScriptProvidedPropertiesDescriptor(this)
+    private val scriptProvidedProperties: () -> List<ScriptProvidedPropertyDescriptor> = resolveSession.storageManager.createLazyValue {
+        scriptCompilationConfiguration()[ScriptCompilationConfiguration.providedProperties].orEmpty()
+            .mapNotNull { (name, type) ->
+                findTypeDescriptor(getScriptingClass(type), Errors.MISSING_SCRIPT_PROVIDED_PROPERTY_CLASS)
+                    ?.let { name.toValidJvmIdentifier() to it }
+            }.map { (name, classDescriptor) ->
+                ScriptProvidedPropertyDescriptor(
+                    Name.identifier(name),
+                    classDescriptor,
+                    thisAsReceiverParameter,
+                    true,
+                    this
+                )
+            }
     }
 
-    override fun getScriptProvidedProperties(): List<PropertyDescriptor> = scriptProvidedProperties().properties()
+    override fun getScriptProvidedProperties(): List<PropertyDescriptor> = scriptProvidedProperties()
+
+    internal class ConstructorWithParams(
+        val constructor: ClassConstructorDescriptorImpl,
+        val explicitConstructorParameters: List<ValueParameterDescriptor>,
+        val implicitReceiversParameters: List<ValueParameterDescriptor>,
+        val scriptProvidedPropertiesParameters: List<ValueParameterDescriptor>
+    )
+
+    internal val scriptPrimaryConstructorWithParams: () -> ConstructorWithParams = resolveSession.storageManager.createLazyValue {
+        val baseConstructorDescriptor = baseClassDescriptor()?.unsubstitutedPrimaryConstructor
+        val inheritedAnnotations = baseConstructorDescriptor?.annotations ?: Annotations.EMPTY
+        val baseExplicitParameters = baseConstructorDescriptor?.valueParameters ?: emptyList()
+
+        val implicitReceiversParamTypes =
+            implicitReceivers.mapIndexed { idx, receiver ->
+                val receiverName =
+                    if (receiver is ScriptDescriptor) "${LazyScriptClassMemberScope.IMPORTED_SCRIPT_PARAM_NAME_PREFIX}${receiver.name}"
+                    else "${LazyScriptClassMemberScope.IMPLICIT_RECEIVER_PARAM_NAME_PREFIX}$idx"
+                receiverName to receiver.defaultType
+            }
+
+        val providedPropertiesParamTypes =
+            scriptProvidedProperties().map {
+                it.name.identifier to it.type
+            }
+        val constructorDescriptor = ClassConstructorDescriptorImpl.create(this, inheritedAnnotations, true, source)
+
+        var paramsIndexBase = baseExplicitParameters.lastIndex + 1
+
+        fun createValueParameter(param: Pair<String, org.jetbrains.kotlin.types.KotlinType>) =
+            ValueParameterDescriptorImpl(
+                constructorDescriptor,
+                null,
+                paramsIndexBase++,
+                Annotations.EMPTY,
+                Name.identifier(param.first),
+                param.second,
+                declaresDefaultValue = false, isCrossinline = false, isNoinline = false, varargElementType = null,
+                source = SourceElement.NO_SOURCE
+            )
+
+        val explicitParameters = baseExplicitParameters.map { it.copy(constructorDescriptor, it.name, it.index) }
+        val implicitReceiversParameters = implicitReceiversParamTypes.map(::createValueParameter)
+        val providedPropertiesParameters = providedPropertiesParamTypes.map(::createValueParameter)
+
+        constructorDescriptor.initialize(
+            explicitParameters + implicitReceiversParameters + providedPropertiesParameters, DescriptorVisibilities.PUBLIC
+        )
+        constructorDescriptor.returnType = defaultType()
+
+        ConstructorWithParams(
+            constructorDescriptor,
+            explicitConstructorParameters = explicitParameters,
+            implicitReceiversParameters = implicitReceiversParameters,
+            scriptProvidedPropertiesParameters = providedPropertiesParameters
+        )
+    }
+
+    override fun getExplicitConstructorParameters(): List<ValueParameterDescriptor> =
+        scriptPrimaryConstructorWithParams().explicitConstructorParameters
+
+    override fun getImplicitReceiversParameters(): List<ValueParameterDescriptor> =
+        scriptPrimaryConstructorWithParams().implicitReceiversParameters
+
+    override fun getScriptProvidedPropertiesParameters(): List<ValueParameterDescriptor> =
+        scriptPrimaryConstructorWithParams().scriptProvidedPropertiesParameters
 
     private val scriptOuterScope: () -> LexicalScope = resolveSession.storageManager.createLazyValue {
         var outerScope = super.getOuterScope()
-        val outerScopeReceivers = implicitReceivers.let {
-            if (scriptCompilationConfiguration()[ScriptCompilationConfiguration.providedProperties]?.isNotEmpty() == true) {
-                it + ScriptProvidedPropertiesDescriptor(this)
-            } else {
-                it
-            }
-        }
-        for (receiverClassDescriptor in outerScopeReceivers.asReversed()) {
+        for (receiverClassDescriptor in implicitReceivers.asReversed()) {
             outerScope = LexicalScopeImpl(
                 outerScope,
                 receiverClassDescriptor,
diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertiesDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertiesDescriptor.kt
deleted file mode 100644
index 8f1d7167a93..00000000000
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertiesDescriptor.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.scripting.resolve
-
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor
-import org.jetbrains.kotlin.diagnostics.Errors
-import org.jetbrains.kotlin.incremental.components.LookupLocation
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
-import org.jetbrains.kotlin.utils.Printer
-import kotlin.script.experimental.api.ScriptCompilationConfiguration
-import kotlin.script.experimental.api.providedProperties
-import kotlin.script.experimental.jvm.util.toValidJvmIdentifier
-
-class ScriptProvidedPropertiesDescriptor(script: LazyScriptDescriptor) :
-    MutableClassDescriptor(
-        script,
-        ClassKind.CLASS, false, false,
-        Name.special("<synthetic script provided properties for ${script.name}>"),
-        SourceElement.NO_SOURCE,
-        LockBasedStorageManager.NO_LOCKS
-    ) {
-
-    init {
-        modality = Modality.FINAL
-        visibility = DescriptorVisibilities.PUBLIC
-        setTypeParameterDescriptors(emptyList())
-        createTypeConstructor()
-    }
-
-    private val memberScope: () -> ScriptProvidedPropertiesMemberScope = script.resolveSession.storageManager.createLazyValue {
-        ScriptProvidedPropertiesMemberScope(
-            script.name.identifier,
-            properties()
-        )
-    }
-
-    override fun getUnsubstitutedMemberScope(kotlinTypeRefiner: KotlinTypeRefiner): MemberScope = memberScope()
-
-    val properties: () -> List<ScriptProvidedPropertyDescriptor> = script.resolveSession.storageManager.createLazyValue {
-        script.scriptCompilationConfiguration()[ScriptCompilationConfiguration.providedProperties].orEmpty().mapNotNull { (name, type) ->
-            script.findTypeDescriptor(script.getScriptingClass(type), Errors.MISSING_SCRIPT_PROVIDED_PROPERTY_CLASS)
-                ?.let { name.toValidJvmIdentifier() to it }
-        }.map { (name, classDescriptor) ->
-            ScriptProvidedPropertyDescriptor(
-                Name.identifier(name),
-                classDescriptor,
-                thisAsReceiverParameter,
-                true,
-                script
-            )
-        }
-    }
-
-    private class ScriptProvidedPropertiesMemberScope(
-        private val scriptId: String,
-        private val providedProperties: List<PropertyDescriptor>
-    ) : MemberScopeImpl() {
-        override fun getContributedDescriptors(
-            kindFilter: DescriptorKindFilter,
-            nameFilter: (Name) -> Boolean
-        ): Collection<DeclarationDescriptor> =
-            providedProperties
-
-        override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor> =
-            providedProperties.filter { it.name == name }
-
-        override fun printScopeStructure(p: Printer) {
-            p.println("Scope of script provided properties: $scriptId")
-        }
-    }
-}
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt
index fdec93aabe1..e7c9210f1a2 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt
@@ -5,19 +5,22 @@
 package org.jetbrains.kotlin.scripting.compiler.plugin.impl
 
 import org.jetbrains.kotlin.analyzer.AnalysisResult
+import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
+import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
+import org.jetbrains.kotlin.backend.jvm.jvmPhases
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.NoScopeRecordCliBindingTrace
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
-import org.jetbrains.kotlin.cli.jvm.config.JvmContentRoot
-import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots
 import org.jetbrains.kotlin.codegen.ClassBuilderFactories
+import org.jetbrains.kotlin.codegen.DefaultCodegenFactory
 import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
 import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
@@ -231,4 +234,11 @@ private fun generate(
     analysisResult.bindingContext,
     sourceFiles,
     kotlinCompilerConfiguration
-).build().also(KotlinCodegenFacade::compileCorrectFiles)
+).codegenFactory(
+    if (kotlinCompilerConfiguration.getBoolean(JVMConfigurationKeys.IR) || kotlinCompilerConfiguration.getBoolean(CommonConfigurationKeys.USE_FIR))
+        JvmIrCodegenFactory(
+            kotlinCompilerConfiguration.get(CLIConfigurationKeys.PHASE_CONFIG) ?: PhaseConfig(jvmPhases)
+        ) else DefaultCodegenFactory
+).build().also {
+    KotlinCodegenFacade.compileCorrectFiles(it)
+}
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt
index 61a668b1d23..30e6950791f 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt
@@ -150,8 +150,8 @@ internal fun makeCompiledScript(
     val module = makeCompiledModule(generationState)
 
     val resultField = with(generationState.scriptSpecific) {
-        if (resultType == null || resultFieldName == null) null
-        else resultFieldName!! to KotlinType(DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(resultType!!))
+        if (resultFieldName == null) null
+        else resultFieldName!! to KotlinType(resultTypeString ?: DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(resultType!!))
     }
 
     return KJvmCompiledScript(
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/GenericReplCompiler.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/GenericReplCompiler.kt
index 868f0ffb87a..8e82ecd71ac 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/GenericReplCompiler.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/GenericReplCompiler.kt
@@ -119,7 +119,7 @@ open class GenericReplCompiler(
                 classes,
                 generationState.scriptSpecific.resultFieldName != null,
                 classpathAddendum ?: emptyList(),
-                generationState.scriptSpecific.resultType?.let {
+                generationState.scriptSpecific.resultTypeString ?: generationState.scriptSpecific.resultType?.let {
                     DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(it)
                 },
                 null
diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt
index b34d454acbc..54c70fba595 100644
--- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt
+++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt
@@ -21,6 +21,8 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.TestJdkKind
 import org.junit.Assert
 import java.io.File
+import java.nio.file.Files
+import kotlin.io.path.*
 import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.host.ScriptingHostConfiguration
@@ -160,7 +162,7 @@ object CompileTimeFibonacciConfiguration : ScriptCompilationConfiguration(
                     .mapIndexed { index, number -> "val FIB_${index + 1} = $number" }
                     .joinToString("\n")
 
-                val file = createTempFile("CompileTimeFibonacci", ".fib.kts")
+                val file = Files.createTempFile("CompileTimeFibonacci", ".fib.kts").toFile()
                     .apply {
                         deleteOnExit()
                         writeText(sourceCode)
diff --git a/plugins/scripting/scripting-ide-services-test/build.gradle.kts b/plugins/scripting/scripting-ide-services-test/build.gradle.kts
index 57da2c63106..8f82cb80737 100644
--- a/plugins/scripting/scripting-ide-services-test/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services-test/build.gradle.kts
@@ -18,6 +18,7 @@ val embeddableTestRuntime by configurations.creating {
 
 dependencies {
     allTestsRuntime(commonDep("junit"))
+    testCompile(kotlinStdlib("jdk8"))
     testCompile(project(":kotlin-scripting-ide-services-unshaded"))
     testCompile(project(":kotlin-scripting-compiler"))
     testCompile(project(":kotlin-scripting-dependencies"))
diff --git a/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/JvmReplTest.kt b/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/JvmReplTest.kt
index 54de9ddc179..6fc42175c34 100644
--- a/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/JvmReplTest.kt
+++ b/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/JvmReplTest.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.scripting.ide_services.test_util.*
 import java.io.File
+import kotlin.io.path.*
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.jvm.impl.KJvmCompiledScript
 import kotlin.script.experimental.jvm.jvm
@@ -318,14 +319,15 @@ class JvmIdeServicesTest : TestCase() {
             }
     }
 
+    @OptIn(ExperimentalPathApi::class)
     companion object {
         private const val MODULE_PATH = "plugins/scripting/scripting-ide-services-test"
-        private val outputJarDir = createTempDir("temp-ide-services").toPath()
+        private val outputJarDir = createTempDirectory("temp-ide-services")
 
         private data class CliCompilationResult(val exitCode: ExitCode, val outputJarPath: String)
 
         private fun compileFile(inputKtFileName: String, outputJarName: String): CliCompilationResult {
-            val jarPath = outputJarDir.resolve(outputJarName).toAbsolutePath().toString().replace('\\', '/')
+            val jarPath = outputJarDir.resolve(outputJarName).toAbsolutePath().invariantSeparatorsPath
 
             val compilerArgs = arrayOf(
                 "$MODULE_PATH/testData/$inputKtFileName",
diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts
index 3cc70972b73..1308b187d42 100644
--- a/plugins/uast-kotlin-idea/build.gradle.kts
+++ b/plugins/uast-kotlin-idea/build.gradle.kts
@@ -13,9 +13,7 @@ dependencies {
     compile(project(":idea:idea-core"))
     compile(project(":plugins:uast-kotlin"))
     compileOnly(intellijDep())
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java"))
-    }
+    compileOnly(intellijPluginDep("java"))
 }
 
 sourceSets {
diff --git a/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/generate/KotlinUastCodeGenerationPlugin.kt.193 b/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/generate/KotlinUastCodeGenerationPlugin.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/IdeaKotlinUastResolveProviderService.kt b/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/IdeaKotlinUastResolveProviderService.kt
index fb3532b971c..4e5536524a7 100644
--- a/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/IdeaKotlinUastResolveProviderService.kt
+++ b/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/IdeaKotlinUastResolveProviderService.kt
@@ -35,7 +35,8 @@ class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService {
     override fun getTypeMapper(element: KtElement): KotlinTypeMapper? {
         return KotlinTypeMapper(
             getBindingContext(element), ClassBuilderMode.LIGHT_CLASSES,
-            JvmProtoBufUtil.DEFAULT_MODULE_NAME, element.languageVersionSettings
+            JvmProtoBufUtil.DEFAULT_MODULE_NAME, element.languageVersionSettings,
+            useOldInlineClassesManglingScheme = false
         )
     }
 
diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts
index b4581ad99ca..d836daa7676 100644
--- a/plugins/uast-kotlin/build.gradle.kts
+++ b/plugins/uast-kotlin/build.gradle.kts
@@ -21,12 +21,10 @@ dependencies {
         compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
     }
 
-    if (Platform.P192.orHigher()) {
-        compileOnly(intellijDep()) { includeJars("platform-impl") }
-        compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
-        testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
-        testRuntime(intellijPluginDep("java"))
-    }
+    compileOnly(intellijDep()) { includeJars("platform-impl") }
+    compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
+    testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
+    testRuntime(intellijPluginDep("java"))
 
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":compiler:tests-common"))
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt
index a3c93004fe9..c05512eb069 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt
@@ -60,7 +60,8 @@ class UastAnalysisHandlerExtension : AnalysisHandlerExtension {
         val typeMapper = KotlinTypeMapper(
             bindingContext, ClassBuilderMode.LIGHT_CLASSES,
             JvmProtoBufUtil.DEFAULT_MODULE_NAME,
-            KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT // TODO use proper LanguageVersionSettings
+            KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT, // TODO use proper LanguageVersionSettings
+            useOldInlineClassesManglingScheme = false
         )
         this.typeMapper = typeMapper
         return typeMapper
diff --git a/plugins/uast-kotlin/tests/KotlinUastGenerationTest.kt.193 b/plugins/uast-kotlin/tests/KotlinUastGenerationTest.kt.193
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt b/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt
index aec3675251a..e17d596df9f 100644
--- a/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt
+++ b/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt
@@ -33,6 +33,7 @@ import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.PrintStream
+import java.nio.file.Files
 import kotlin.test.assertEquals
 
 
@@ -51,7 +52,7 @@ class CompilerClientIT {
     }
 
     private val clientAliveFile by lazy {
-        createTempFile("client", ".alive").apply {
+        Files.createTempFile("client", ".alive").toFile().apply {
             deleteOnExit()
         }
     }
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index a120c2d507b..2efc93714ba 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -215,15 +215,7 @@ dependencies {
         fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") }
     }
 
-    if (Platform.P192.orHigher()) {
-        fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }
-    } else {
-        fatJarContents(intellijDep()) { includeJars("lz4-1.3.0") }
-    }
-    
-    if (Platform.P183.orHigher() && Platform.P191.orLower()) {
-        fatJarContents(intellijCoreDep()) { includeJars("java-compatibility-1.0.1") }
-    }
+    fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }
 
     fatJarContents(intellijDep()) {
         includeIntellijCoreJarDependencies(project) {
diff --git a/prepare/compiler/compiler.pro b/prepare/compiler/compiler.pro
index f222854d398..e722ff84f68 100644
--- a/prepare/compiler/compiler.pro
+++ b/prepare/compiler/compiler.pro
@@ -269,3 +269,10 @@
 }
 
 -dontwarn org.jetbrains.kotlin.fir.**
+
+# used in commonizer
+-keep class com.intellij.util.SmartFMap {
+    public static ** emptyMap();
+    public ** plus(java.lang.Object, java.lang.Object);
+    public ** plusAll(java.util.Map);
+}
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 97db1ba59db..5e5698f7526 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -183,9 +183,7 @@ dependencies {
 
     libraries(kotlinStdlib("jdk8"))
 
-    Platform[193].orHigher {
-        libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))
-    }
+    libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))
 
     libraryProjects.forEach {
         libraries(project(it)) { isTransitive = false }
@@ -199,13 +197,8 @@ dependencies {
     gradleToolingModel(project(":noarg-ide-plugin")) { isTransitive = false }
     gradleToolingModel(project(":allopen-ide-plugin")) { isTransitive = false }
 
-    Platform[193].orLower {
-        gradleToolingModel(project(":idea:idea-gradle-tooling-api")) { isTransitive = false }
-    }
-
     jpsPlugin(project(":kotlin-jps-plugin")) { isTransitive = false }
 
-
     (libraries.dependencies + gradleToolingModel.dependencies)
         .map { if (it is ProjectDependency) it.dependencyProject else it }
         .forEach(::compile)
diff --git a/settings.gradle b/settings.gradle
index 1ebbde809b9..e139e8bfe77 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,12 +27,12 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.20")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
     }
 }
 
 plugins {
-    id "com.gradle.enterprise" version "3.4.1"
+    id "com.gradle.enterprise" version "3.5"
 }
 
 def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
@@ -153,7 +153,6 @@ include ":benchmarks",
         ":idea:idea-jvm",
         ":idea:idea-maven",
         ":idea:idea-gradle",
-        ":idea:idea-gradle-tooling-api",
         ":idea:idea-git",
         ":idea:idea-jps-common",
         ":idea:formatter",
@@ -241,6 +240,7 @@ include ":benchmarks",
         ":kotlin-gradle-plugin-dsl-codegen",
         ":kotlin-gradle-plugin-npm-versions-codegen",
         ":kotlin-gradle-statistics",
+        ":kotlin-gradle-build-metrics",
         ":kotlin-gradle-plugin",
         ":kotlin-gradle-plugin-model",
         ":kotlin-gradle-plugin-test-utils-embeddable",
@@ -301,7 +301,9 @@ include ":benchmarks",
         ":kotlinx-serialization-compiler-plugin",
         ":kotlinx-serialization-ide-plugin",
         ":kotlin-serialization",
-        ":kotlin-serialization-unshaded"
+        ":kotlin-serialization-unshaded",
+        ":wasm:wasm.ir"
+
 
 include ":compiler:fir:cones",
         ":compiler:fir:tree",
@@ -500,6 +502,7 @@ project(':kotlin-gradle-plugin-api').projectDir = "$rootDir/libraries/tools/kotl
 project(':kotlin-gradle-plugin-dsl-codegen').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-dsl-codegen" as File
 project(':kotlin-gradle-plugin-npm-versions-codegen').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen" as File
 project(':kotlin-gradle-statistics').projectDir = "$rootDir/libraries/tools/kotlin-gradle-statistics" as File
+project(':kotlin-gradle-build-metrics').projectDir = "$rootDir/libraries/tools/kotlin-gradle-build-metrics" as File
 project(':kotlin-gradle-plugin').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin" as File
 project(':kotlin-gradle-plugin-model').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-model" as File
 project(':kotlin-gradle-plugin-test-utils-embeddable').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable" as File
diff --git a/spec-docs/multi-declarations-in-parameters.md b/spec-docs/multi-declarations-in-parameters.md
index 6e7376d1b1e..97f1aefc9de 100644
--- a/spec-docs/multi-declarations-in-parameters.md
+++ b/spec-docs/multi-declarations-in-parameters.md
@@ -180,7 +180,7 @@ NOTE: function expression can not be passed to a function call outside the paren
 
 In a lambda, only parameters (possibly decomposed) and their types can be specified. There's no way to explicitly specify the return type or receiver type. Those have to be inferred, otherwise function expression must be used.
 
-TODO: support qualified returns in lambdas (when return type is unknown, nad has to be inferrred).
+TODO: support qualified returns in lambdas (when return type is unknown, nad has to be inferred).
 
 ### Nested multi-declarations
 
diff --git a/tests/mute-common.csv b/tests/mute-common.csv
index 5ac6afd500b..c8c737a976d 100644
--- a/tests/mute-common.csv
+++ b/tests/mute-common.csv
@@ -45,10 +45,7 @@ org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.WithJava.JavaUsedI
 org.jetbrains.kotlin.psi.injection.StringInterpolationInjectionTest.testInterpolationSimpleName, Stable failure during run may work in debug,,
 org.jetbrains.kotlin.shortenRefs.ShortenRefsTestGenerated.testExtensionForObject2, Always red,,
 org.jetbrains.kotlin.util.KotlinVersionsTest.testVersionsAreConsistent, KT-35567,,
-org.jetbrains.kotlin.jvm.compiler.CompileKotlinAgainstJavaTestGenerated.WithAPT.testClassWithTypeParameter, KT-36448,,
-org.jetbrains.kotlin.jvm.compiler.CompileKotlinAgainstJavaTestGenerated.WithoutAPT.testClassWithTypeParameter, KT-36448,,
 org.jetbrains.kotlin.idea.debugger.test.AsyncStackTraceTestGenerated.testAsyncLambdas, redesign test AsyncStackTraces,,
-org.jetbrains.kotlin.incremental.IncrementalJsKlibCompilerRunnerTestGenerated.ClassHierarchyAffected.testMethodRemoved, full fledged FO in klib required,,
 org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.ConvertToAnonymousObject.testHasConcreateMember2, Unprocessed,,
 org.jetbrains.uast.test.kotlin.KotlinUastTypesTest.testEa101715, Unprocessed,,
 org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.CreateFromUsage.CreateFunction.Invoke.testLambdaArgument, Unprocessed,,
diff --git a/tests/mute-platform.csv.193 b/tests/mute-platform.csv.193
deleted file mode 100644
index 2b1f9d59f75..00000000000
--- a/tests/mute-platform.csv.193
+++ /dev/null
@@ -1,119 +0,0 @@
-Test key, Issue, State (optional: MUTE or FAIL), Status (optional: FLAKY)
-org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule, KT-35225,,
-org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid, KT-35225,,
-org.jetbrains.kotlin.idea.caches.resolve.MultiModuleLineMarkerTestGenerated.testKotlinTestAnnotations, No line markers for test run,,
-org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed,,
-org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testTwoClasses,,, FLAKY
-org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValAndClass,,, FLAKY
-org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValOrder,,, FLAKY
-org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Val.testValWithTypeWoInitializer,,, FLAKY
-org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Var.testVarWithTypeWoInitializer, Unprocessed,, FLAKY
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Common.StaticMembers.testJavaStaticMethodsFromImports, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testNonPredictableSmartCast1, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testNonPredictableSmartCast2, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testSyntheticJavaProperties1, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testSyntheticJavaProperties2, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testNullableReceiver, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSafeCall, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast2, KT-32919,,
-org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSyntheticExtensions1, KT-32919,,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testClassObject, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testConstructor, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testEnum, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testExtensionFunction, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testExtensionProperty, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGenericFunctionWithExplicitlyDeclaredTypeArguments, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGenericFunctionWithInferredTypeArguments, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGlobalFunction, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGlobalProperty, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testNamedObject, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testOverloadedFunWithTypeParam, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testProperty, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testSameNameInDifferentSources, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testTypeAlias, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testTypeWithSameShortName, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testClassObject, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testConstructor, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testEnum, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testExtensionFunction, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testExtensionProperty, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGenericFunctionWithExplicitlyDeclaredTypeArguments, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGenericFunctionWithInferredTypeArguments, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGlobalFunction, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGlobalProperty, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testNamedObject, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testOverloadedFunWithTypeParam, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testProperty, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testSameNameInDifferentSources, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testTypeAlias, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testTypeWithSameShortName, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.filters.KotlinExceptionFilterTestGenerated.testInlineFunCallInLibrary, Unprocessed,,
-org.jetbrains.kotlin.idea.filters.KotlinExceptionFilterTestGenerated.testInlineFunInnerClassFromLibrary, Unprocessed,,
-org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testCoroutineContextCheck, KT-34659,,
-org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testDispatchersTypeDetection, KT-34659,,
-org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testLambdaReceiverType, KT-34659,,
-org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testNestedFunctionsInsideSuspendLambda, KT-34659,,
-org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testSimpleCoroutineScope, KT-34659,,
-org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression, KT-34672, FAIL,
-org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression2, KT-34672, FAIL,
-org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression3, KT-34672, FAIL,
-org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertFunctionTypeParameterToReceiver.testNonFirstParameterPrimaryConstructor, on ConvertFunctionTypeParameterToReceiver rerun,, FLAKY
-org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertFunctionTypeParameterToReceiver.testNonFirstParameterSecondaryConstructor, on ConvertFunctionTypeParameterToReceiver rerun,, FLAKY
-org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testInstancesAndMembers, Enum reorder,, FLAKY
-org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testInstancesOnly, Generated entries reordered,, FLAKY
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testBlankLineBetween, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testLongInit, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testLongInit2, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testPropertyWithAnnotation, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInit, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInit2, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks2, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks3, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithComments, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithComments2, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons2, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons3, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithType, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithType2, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.NestedIfs.testBlockBody, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testFunctionWithOneLineReturn, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testIf, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testNotSingleLineStatement, KT-34408,,
-org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testWhenEntry, KT-34408,,
-org.jetbrains.kotlin.idea.navigation.KotlinGotoImplementationMultiModuleTestGenerated.testExpectClassSuperclassFun,,, FLAKY
-org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib1.testUseJavaFromLib, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib2.testUseJavaSAMFromLib, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib3.testUseJavaSAMFromLib, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.ChangeSignature.Jk.testJkKeepValOnParameterTypeChange, Unprocessed,,
-org.jetbrains.kotlin.idea.quickfix.QuickFixMultiModuleTestGenerated.Other.testConvertActualSealedClassToEnum, Enum reorder,,
-org.jetbrains.kotlin.idea.quickfix.QuickFixMultiModuleTestGenerated.Other.testConvertExpectSealedClassToEnum, Enum reorder,,
-org.jetbrains.kotlin.idea.refactoring.inline.InlineTestGenerated.Function.ExpressionBody.testMultipleInExpression, Unstable order of usages,,FLAKY
-org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda_MoveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda, final modifier added,,
-org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance_MoveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance, final modifier added,,
-org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testInLibrarySource, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToFunParameter, KT-34542, FAIL,
-org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToLocalFun, KT-34542, FAIL,
-org.jetbrains.uast.test.kotlin.KotlinUastReferencesTest.`test original getter is visible when reference is under renaming`, Extensions API changed,,
-org.jetbrains.kotlin.idea.refactoring.introduce.ExtractionTestGenerated.IntroduceJavaParameter.testJavaMethodOverridingKotlinFunctionWithUsages, Unprocessed,, FLAKY
-org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testKotlin_moveTopLevelDeclarations_moveFunctionToPackage_MoveFunctionToPackage, fail on TeamCity but works well locally,, FLAKY
-org.jetbrains.kotlin.idea.refactoring.pullUp.PullUpTestGenerated.K2K.testAccidentalOverrides, Unprocessed,, FLAKY
-org.jetbrains.kotlin.idea.refactoring.rename.RenameTestGenerated.testOverloadsWithSameOrigin_OverloadsWithSameOrigin, Bad imports after rename,, FLAKY
-org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testWithNonObjectInheritors, Enum reorder,, FLAKY
-org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testImportIntermediateModules, KMM-304,,
-"org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testJvmWithJavaOnHMPP[8: Gradle-6.5.1, KotlinGradlePlugin-master]", KMM-304,,
-org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testProjectDependency, KMM-304,,
-org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDependencies, KMM-304,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", KMM-304,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP[7: Gradle-6.5.1, KotlinGradlePlugin-latest stable]", KMM-304,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP[8: Gradle-6.5.1, KotlinGradlePlugin-master]", KMM-304,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot[7: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", KMM-304,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot[8: Gradle-6.5.1, KotlinGradlePlugin-master]", KMM-304,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJavaTransitiveOnMPP[8: Gradle-6.5.1, KotlinGradlePlugin-master]", KMM-304,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild[8: Gradle-6.5.1, KotlinGradlePlugin-master]", KMM-304,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[7: Gradle-6.5.1, KotlinGradlePlugin-latest stable]", NoSuchMethodError,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[8: Gradle-6.5.1, KotlinGradlePlugin-master]", NoSuchMethodError,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testJDKImport, Old story with Idea core,,
-"org.jetbrains.kotlin.ide.konan.gradle.GradleNativeLibrariesInIDENamingTest.testLibrariesNaming[0: with Gradle-4.10.2]", Old IDE with new plugin problem,,
\ No newline at end of file
diff --git a/tests/mute-platform.csv.202 b/tests/mute-platform.csv.202
index c024effc23c..0821f4e6504 100644
--- a/tests/mute-platform.csv.202
+++ b/tests/mute-platform.csv.202
@@ -2,11 +2,10 @@ Test key, Issue, State (optional: MUTE or FAIL), Status (optional: FLAKY)
 "org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testJvmWithJavaOnHMPP", No module dependency found,,
 org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule, KT-35225,,
 org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl, Gradle Tests in 201,,
-org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid, NPE - no facet configured,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid, NPE - no facet configured,, FLAKY
 org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid, KT-35225,,
 org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig, Gradle Tests in 201,,
 org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement, Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDetectAndroidSources", Gradle Import Tests,,
 "org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP", Gradle Import Tests,,
 "org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot", Gradle Tests in 201,,
 "org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild", Gradle Tests in 201,,
@@ -16,7 +15,6 @@ org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImpl
 "org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testProjectDependency", Gradle Tests in 201,,
 org.jetbrains.kotlin.idea.caches.resolve.MultiModuleLineMarkerTestGenerated.testKotlinTestAnnotations, No line markers for test run,,
 org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testAndroidGradleJsDetection, NPE during import,,
 org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testTwoClasses,,, FLAKY
 org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValAndClass,,, FLAKY
 org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValOrder,,, FLAKY
diff --git a/wasm/wasm.ir/build.gradle.kts b/wasm/wasm.ir/build.gradle.kts
new file mode 100644
index 00000000000..8acead9d371
--- /dev/null
+++ b/wasm/wasm.ir/build.gradle.kts
@@ -0,0 +1,76 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+    kotlin("plugin.serialization")
+}
+
+dependencies {
+    implementation(kotlinStdlib())
+    testImplementation(commonDep("junit:junit"))
+    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
+    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(projectTests(":compiler:tests-common"))
+    testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0")
+}
+
+
+val testSuiteRevision = "18f8340"
+val testSuiteDir = File(buildDir, "testsuite")
+val testSuiteZip = File(testSuiteDir, testSuiteRevision + ".zip")
+
+val downloadTestSuite by task<de.undercouch.gradle.tasks.download.Download> {
+    src("https://github.com/WebAssembly/testsuite/zipball/$testSuiteRevision")
+    dest(testSuiteZip)
+    overwrite(false)
+}
+
+val unzipTestSuite by task<Copy> {
+    dependsOn(downloadTestSuite)
+    from(zipTree(downloadTestSuite.get().dest))
+    into(testSuiteDir)
+}
+
+val wabtDir = File(buildDir, "wabt")
+val wabtVersion = "1.0.19"
+
+val downloadWabt by task<de.undercouch.gradle.tasks.download.Download> {
+    val gradleOs = org.gradle.internal.os.OperatingSystem.current()
+    val os = when {
+        gradleOs.isMacOsX -> "macos"
+        gradleOs.isWindows -> "windows"
+        gradleOs.isLinux -> "ubuntu"
+        else -> error("Unsupported OS: $gradleOs")
+    }
+    val fileName = "wabt-$wabtVersion-$os.tar.gz"
+    src("https://github.com/WebAssembly/wabt/releases/download/$wabtVersion/$fileName")
+    dest(File(wabtDir, fileName))
+    overwrite(false)
+}
+
+val unzipWabt by task<Copy> {
+    dependsOn(downloadWabt)
+    from(tarTree(resources.gzip(downloadWabt.get().dest)))
+    into(wabtDir)
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { projectDefault() }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += listOf(
+        "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
+        "-Xskip-prerelease-check"
+    )
+}
+
+projectTest("test", true) {
+    dependsOn(unzipWabt)
+    dependsOn(unzipTestSuite)
+    systemProperty("wabt.bin.path", "$wabtDir/wabt-$wabtVersion/bin")
+    systemProperty("wasm.testsuite.path", "$testSuiteDir/WebAssembly-testsuite-$testSuiteRevision")
+    workingDir = projectDir
+}
+
+testsJar()
\ No newline at end of file
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Declarations.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Declarations.kt
new file mode 100644
index 00000000000..cbc7e971293
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Declarations.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+
+class WasmModule(
+    val functionTypes: List<WasmFunctionType> = emptyList(),
+    val structs: List<WasmStructDeclaration> = emptyList(),
+
+    val importsInOrder: List<WasmNamedModuleField> = emptyList(),
+    val importedFunctions: List<WasmFunction.Imported> = emptyList(),
+    val importedMemories: List<WasmMemory> = emptyList(),
+    val importedTables: List<WasmTable> = emptyList(),
+    val importedGlobals: List<WasmGlobal> = emptyList(),
+
+    val definedFunctions: List<WasmFunction.Defined> = emptyList(),
+    val tables: List<WasmTable> = emptyList(),
+    val memories: List<WasmMemory> = emptyList(),
+    val globals: List<WasmGlobal> = emptyList(),
+    val exports: List<WasmExport<*>> = emptyList(),
+    val elements: List<WasmElement> = emptyList(),
+
+    val startFunction: WasmFunction? = null,
+
+    val data: List<WasmData> = emptyList(),
+    val dataCount: Boolean = false,
+)
+
+sealed class WasmNamedModuleField {
+    var id: Int? = null
+    open val name: String = ""
+}
+
+sealed class WasmFunction(
+    override val name: String,
+    val type: WasmFunctionType
+) : WasmNamedModuleField() {
+    class Defined(
+        name: String,
+        type: WasmFunctionType,
+        val locals: MutableList<WasmLocal> = mutableListOf(),
+        val instructions: MutableList<WasmInstr> = mutableListOf()
+    ) : WasmFunction(name, type)
+
+    class Imported(
+        name: String,
+        type: WasmFunctionType,
+        val importPair: WasmImportPair
+    ) : WasmFunction(name, type)
+}
+
+class WasmMemory(
+    val limits: WasmLimits,
+    val importPair: WasmImportPair? = null,
+) : WasmNamedModuleField()
+
+sealed class WasmDataMode {
+    class Active(
+        val memoryIdx: Int,
+        val offset: MutableList<WasmInstr>
+    ) : WasmDataMode() {
+        constructor(memoryIdx: Int, offset: Int) : this(memoryIdx, mutableListOf<WasmInstr>().also<MutableList<WasmInstr>> {
+            WasmIrExpressionBuilder(it).buildConstI32(offset)
+        })
+    }
+
+    object Passive : WasmDataMode()
+}
+
+class WasmData(
+    val mode: WasmDataMode,
+    val bytes: ByteArray,
+) : WasmNamedModuleField()
+
+class WasmTable(
+    val limits: WasmLimits = WasmLimits(1u, null),
+    val elementType: WasmType,
+    val importPair: WasmImportPair? = null
+) : WasmNamedModuleField() {
+
+    sealed class Value {
+        class Function(val function: WasmSymbol<WasmFunction>) : Value() {
+            constructor(function: WasmFunction) : this(WasmSymbol(function))
+        }
+
+        class Expression(val expr: List<WasmInstr>) : Value()
+    }
+
+}
+
+class WasmElement(
+    val type: WasmType,
+    val values: List<WasmTable.Value>,
+    val mode: Mode,
+) : WasmNamedModuleField() {
+    sealed class Mode {
+        object Passive : Mode()
+        class Active(val table: WasmTable, val offset: List<WasmInstr>) : Mode()
+        object Declarative : Mode()
+    }
+}
+
+class WasmLocal(
+    val id: Int,
+    val name: String,
+    val type: WasmType,
+    val isParameter: Boolean
+)
+
+class WasmGlobal(
+    override val name: String,
+    val type: WasmType,
+    val isMutable: Boolean,
+    val init: List<WasmInstr>,
+    val importPair: WasmImportPair? = null
+) : WasmNamedModuleField()
+
+sealed class WasmExport<T : WasmNamedModuleField>(
+    val name: String,
+    val field: T,
+    val kind: Byte,
+    val keyword: String
+) {
+    class Function(name: String, field: WasmFunction) : WasmExport<WasmFunction>(name, field, 0x0, "func")
+    class Table(name: String, field: WasmTable) : WasmExport<WasmTable>(name, field, 0x1, "table")
+    class Memory(name: String, field: WasmMemory) : WasmExport<WasmMemory>(name, field, 0x2, "memory")
+    class Global(name: String, field: WasmGlobal) : WasmExport<WasmGlobal>(name, field, 0x3, "global")
+}
+
+sealed class WasmTypeDeclaration(
+    override val name: String
+) : WasmNamedModuleField()
+
+class WasmFunctionType(
+    name: String,
+    val parameterTypes: List<WasmType>,
+    val resultTypes: List<WasmType>
+) : WasmTypeDeclaration(name)
+
+class WasmStructDeclaration(
+    name: String,
+    val fields: List<WasmStructFieldDeclaration>
+) : WasmTypeDeclaration(name)
+
+class WasmStructFieldDeclaration(
+    val name: String,
+    val type: WasmType,
+    val isMutable: Boolean
+)
+
+class WasmInstr(
+    val operator: WasmOp,
+    val immediates: List<WasmImmediate> = emptyList()
+)
+
+data class WasmLimits(
+    val minSize: UInt,
+    val maxSize: UInt?
+)
+
+data class WasmImportPair(
+    val moduleName: String,
+    val declarationName: String
+)
\ No newline at end of file
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Operators.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Operators.kt
new file mode 100644
index 00000000000..7b5f7cff947
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Operators.kt
@@ -0,0 +1,339 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+import org.jetbrains.kotlin.wasm.ir.WasmImmediateKind.*
+
+enum class WasmImmediateKind {
+    CONST_I32,
+    CONST_I64,
+    CONST_F32,
+    CONST_F64,
+
+    MEM_ARG,
+
+    BLOCK_TYPE,
+
+    FUNC_IDX,
+    LOCAL_IDX,
+    GLOBAL_IDX,
+    TYPE_IDX,
+    VAL_TYPE_VECTOR,
+    MEMORY_IDX,
+    DATA_IDX,
+    TABLE_IDX,
+    LABEL_IDX,
+    LABEL_IDX_VECTOR,
+    ELEM_IDX,
+
+    STRUCT_TYPE_IDX,
+    STRUCT_FIELD_IDX,
+    TYPE_IMM,
+    HEAP_TYPE
+}
+
+sealed class WasmImmediate {
+    class ConstI32(val value: Int) : WasmImmediate()
+    class ConstI64(val value: Long) : WasmImmediate()
+    class ConstF32(val rawBits: UInt) : WasmImmediate()
+    class ConstF64(val rawBits: ULong) : WasmImmediate()
+    class SymbolI32(val value: WasmSymbol<Int>) : WasmImmediate()
+
+    class MemArg(val align: UInt, val offset: UInt) : WasmImmediate()
+
+    sealed class BlockType : WasmImmediate() {
+        class Function(val type: WasmFunctionType) : BlockType()
+        class Value(val type: WasmType?) : BlockType()
+    }
+
+    class FuncIdx(val value: WasmSymbol<WasmFunction>) : WasmImmediate() {
+        constructor(value: WasmFunction) : this(WasmSymbol(value))
+    }
+
+    class LocalIdx(val value: WasmSymbol<WasmLocal>) : WasmImmediate() {
+        constructor(value: WasmLocal) : this(WasmSymbol(value))
+    }
+
+    class GlobalIdx(val value: WasmSymbol<WasmGlobal>) : WasmImmediate() {
+        constructor(value: WasmGlobal) : this(WasmSymbol(value))
+    }
+
+    class TypeIdx(val value: WasmSymbol<WasmTypeDeclaration>) : WasmImmediate() {
+        constructor(value: WasmTypeDeclaration) : this(WasmSymbol(value))
+    }
+
+    class ValTypeVector(val value: List<WasmType>) : WasmImmediate()
+
+    class MemoryIdx(val value: WasmSymbol<WasmMemory>) : WasmImmediate() {
+        constructor(value: WasmMemory) : this(WasmSymbol(value))
+    }
+
+    class DataIdx(val value: Int) : WasmImmediate()
+    class TableIdx(val value: Int) : WasmImmediate()
+
+    class LabelIdx(val value: Int) : WasmImmediate()
+    class LabelIdxVector(val value: List<Int>) : WasmImmediate()
+    class ElemIdx(val value: WasmElement) : WasmImmediate()
+
+    class StructType(val value: WasmSymbol<WasmStructDeclaration>) : WasmImmediate() {
+        constructor(value: WasmStructDeclaration) : this(WasmSymbol(value))
+    }
+
+    class StructFieldIdx(val value: WasmSymbol<Int>) : WasmImmediate()
+
+    class HeapType(val value: WasmHeapType) : WasmImmediate() {
+        constructor(type: WasmType) : this(type.getHeapType())
+    }
+}
+
+
+enum class WasmOp(
+    val mnemonic: String,
+    val opcode: Int,
+    val immediates: List<WasmImmediateKind> = emptyList()
+) {
+
+    // Unary
+    I32_EQZ("i32.eqz", 0x45),
+    I64_EQZ("i64.eqz", 0x50),
+    I32_CLZ("i32.clz", 0x67),
+    I32_CTZ("i32.ctz", 0x68),
+    I32_POPCNT("i32.popcnt", 0x69),
+    I64_CLZ("i64.clz", 0x79),
+    I64_CTZ("i64.ctz", 0x7A),
+    I64_POPCNT("i64.popcnt", 0x7B),
+    F32_ABS("f32.abs", 0x8B),
+    F32_NEG("f32.neg", 0x8C),
+    F32_CEIL("f32.ceil", 0x8D),
+    F32_FLOOR("f32.floor", 0x8E),
+    F32_TRUNC("f32.trunc", 0x8F),
+    F32_NEAREST("f32.nearest", 0x90),
+    F32_SQRT("f32.sqrt", 0x91),
+    F64_ABS("f64.abs", 0x99),
+    F64_NEG("f64.neg", 0x9A),
+    F64_CEIL("f64.ceil", 0x9B),
+    F64_FLOOR("f64.floor", 0x9C),
+    F64_TRUNC("f64.trunc", 0x9D),
+    F64_NEAREST("f64.nearest", 0x9E),
+    F64_SQRT("f64.sqrt", 0x9F),
+    I32_WRAP_I64("i32.wrap_i64", 0xA7),
+    I32_TRUNC_F32_S("i32.trunc_f32_s", 0xA8),
+    I32_TRUNC_F32_U("i32.trunc_f32_u", 0xA9),
+    I32_TRUNC_F64_S("i32.trunc_f64_s", 0xAA),
+    I32_TRUNC_F64_U("i32.trunc_f64_u", 0xAB),
+    I64_EXTEND_I32_S("i64.extend_i32_s", 0xAC),
+    I64_EXTEND_I32_U("i64.extend_i32_u", 0xAD),
+    I64_TRUNC_F32_S("i64.trunc_f32_s", 0xAE),
+    I64_TRUNC_F32_U("i64.trunc_f32_u", 0xAF),
+    I64_TRUNC_F64_S("i64.trunc_f64_s", 0xB0),
+    I64_TRUNC_F64_U("i64.trunc_f64_u", 0xB1),
+    F32_CONVERT_I32_S("f32.convert_i32_s", 0xB2),
+    F32_CONVERT_I32_U("f32.convert_i32_u", 0xB3),
+    F32_CONVERT_I64_S("f32.convert_i64_s", 0xB4),
+    F32_CONVERT_I64_U("f32.convert_i64_u", 0xB5),
+    F32_DEMOTE_F64("f32.demote_f64", 0xB6),
+    F64_CONVERT_I32_S("f64.convert_i32_s", 0xB7),
+    F64_CONVERT_I32_U("f64.convert_i32_u", 0xB8),
+    F64_CONVERT_I64_S("f64.convert_i64_s", 0xB9),
+    F64_CONVERT_I64_U("f64.convert_i64_u", 0xBA),
+    F64_PROMOTE_F32("f64.promote_f32", 0xBB),
+    I32_REINTERPRET_F32("i32.reinterpret_f32", 0xBC),
+    I64_REINTERPRET_F64("i64.reinterpret_f64", 0xBD),
+    F32_REINTERPRET_I32("f32.reinterpret_i32", 0xBE),
+    F64_REINTERPRET_I64("f64.reinterpret_i64", 0xBF),
+    I32_EXTEND8_S("i32.extend8_s", 0xC0),
+    I32_EXTEND16_S("i32.extend16_s", 0xC1),
+    I64_EXTEND8_S("i64.extend8_s", 0xC2),
+    I64_EXTEND16_S("i64.extend16_s", 0xC3),
+    I64_EXTEND32_S("i64.extend32_s", 0xC4),
+
+    // Non-trapping float to int
+    I32_TRUNC_SAT_F32_S("i32.trunc_sat_f32_s", 0xFC_00),
+    I32_TRUNC_SAT_F32_U("i32.trunc_sat_f32_u", 0xFC_01),
+    I32_TRUNC_SAT_F64_S("i32.trunc_sat_f64_s", 0xFC_02),
+    I32_TRUNC_SAT_F64_U("i32.trunc_sat_f64_u", 0xFC_03),
+    I64_TRUNC_SAT_F32_S("i64.trunc_sat_f32_s", 0xFC_04),
+    I64_TRUNC_SAT_F32_U("i64.trunc_sat_f32_u", 0xFC_05),
+    I64_TRUNC_SAT_F64_S("i64.trunc_sat_f64_s", 0xFC_06),
+    I64_TRUNC_SAT_F64_U("i64.trunc_sat_f64_u", 0xFC_07),
+
+    // Binary
+    I32_EQ("i32.eq", 0x46),
+    I32_NE("i32.ne", 0x47),
+    I32_LT_S("i32.lt_s", 0x48),
+    I32_LT_U("i32.lt_u", 0x49),
+    I32_GT_S("i32.gt_s", 0x4A),
+    I32_GT_U("i32.gt_u", 0x4B),
+    I32_LE_S("i32.le_s", 0x4C),
+    I32_LE_U("i32.le_u", 0x4D),
+    I32_GE_S("i32.ge_s", 0x4E),
+    I32_GE_U("i32.ge_u", 0x4F),
+    I64_EQ("i64.eq", 0x51),
+    I64_NE("i64.ne", 0x52),
+    I64_LT_S("i64.lt_s", 0x53),
+    I64_LT_U("i64.lt_u", 0x54),
+    I64_GT_S("i64.gt_s", 0x55),
+    I64_GT_U("i64.gt_u", 0x56),
+    I64_LE_S("i64.le_s", 0x57),
+    I64_LE_U("i64.le_u", 0x58),
+    I64_GE_S("i64.ge_s", 0x59),
+    I64_GE_U("i64.ge_u", 0x5A),
+    F32_EQ("f32.eq", 0x5B),
+    F32_NE("f32.ne", 0x5C),
+    F32_LT("f32.lt", 0x5D),
+    F32_GT("f32.gt", 0x5E),
+    F32_LE("f32.le", 0x5F),
+    F32_GE("f32.ge", 0x60),
+    F64_EQ("f64.eq", 0x61),
+    F64_NE("f64.ne", 0x62),
+    F64_LT("f64.lt", 0x63),
+    F64_GT("f64.gt", 0x64),
+    F64_LE("f64.le", 0x65),
+    F64_GE("f64.ge", 0x66),
+    I32_ADD("i32.add", 0x6A),
+    I32_SUB("i32.sub", 0x6B),
+    I32_MUL("i32.mul", 0x6C),
+    I32_DIV_S("i32.div_s", 0x6D),
+    I32_DIV_U("i32.div_u", 0x6E),
+    I32_REM_S("i32.rem_s", 0x6F),
+    I32_REM_U("i32.rem_u", 0x70),
+    I32_AND("i32.and", 0x71),
+    I32_OR("i32.or", 0x72),
+    I32_XOR("i32.xor", 0x73),
+    I32_SHL("i32.shl", 0x74),
+    I32_SHR_S("i32.shr_s", 0x75),
+    I32_SHR_U("i32.shr_u", 0x76),
+    I32_ROTL("i32.rotl", 0x77),
+    I32_ROTR("i32.rotr", 0x78),
+    I64_ADD("i64.add", 0x7C),
+    I64_SUB("i64.sub", 0x7D),
+    I64_MUL("i64.mul", 0x7E),
+    I64_DIV_S("i64.div_s", 0x7F),
+    I64_DIV_U("i64.div_u", 0x80),
+    I64_REM_S("i64.rem_s", 0x81),
+    I64_REM_U("i64.rem_u", 0x82),
+    I64_AND("i64.and", 0x83),
+    I64_OR("i64.or", 0x84),
+    I64_XOR("i64.xor", 0x85),
+    I64_SHL("i64.shl", 0x86),
+    I64_SHR_S("i64.shr_s", 0x87),
+    I64_SHR_U("i64.shr_u", 0x88),
+    I64_ROTL("i64.rotl", 0x89),
+    I64_ROTR("i64.rotr", 0x8A),
+    F32_ADD("f32.add", 0x92),
+    F32_SUB("f32.sub", 0x93),
+    F32_MUL("f32.mul", 0x94),
+    F32_DIV("f32.div", 0x95),
+    F32_MIN("f32.min", 0x96),
+    F32_MAX("f32.max", 0x97),
+    F32_COPYSIGN("f32.copysign", 0x98),
+    F64_ADD("f64.add", 0xA0),
+    F64_SUB("f64.sub", 0xA1),
+    F64_MUL("f64.mul", 0xA2),
+    F64_DIV("f64.div", 0xA3),
+    F64_MIN("f64.min", 0xA4),
+    F64_MAX("f64.max", 0xA5),
+    F64_COPYSIGN("f64.copysign", 0xA6),
+
+    // Constants
+    I32_CONST("i32.const", 0x41, CONST_I32),
+    I64_CONST("i64.const", 0x42, CONST_I64),
+    F32_CONST("f32.const", 0x43, CONST_F32),
+    F64_CONST("f64.const", 0x44, CONST_F64),
+
+    // Load
+    I32_LOAD("i32.load", 0x28, MEM_ARG),
+    I64_LOAD("i64.load", 0x29, MEM_ARG),
+    F32_LOAD("f32.load", 0x2A, MEM_ARG),
+    F64_LOAD("f64.load", 0x2B, MEM_ARG),
+    I32_LOAD8_S("i32.load8_s", 0x2C, MEM_ARG),
+    I32_LOAD8_U("i32.load8_u", 0x2D, MEM_ARG),
+    I32_LOAD16_S("i32.load16_s", 0x2E, MEM_ARG),
+    I32_LOAD16_U("i32.load16_u", 0x2F, MEM_ARG),
+    I64_LOAD8_S("i64.load8_s", 0x30, MEM_ARG),
+    I64_LOAD8_U("i64.load8_u", 0x31, MEM_ARG),
+    I64_LOAD16_S("i64.load16_s", 0x32, MEM_ARG),
+    I64_LOAD16_U("i64.load16_u", 0x33, MEM_ARG),
+    I64_LOAD32_S("i64.load32_s", 0x34, MEM_ARG),
+    I64_LOAD32_U("i64.load32_u", 0x35, MEM_ARG),
+
+    // Store
+    I32_STORE("i32.store", 0x36, MEM_ARG),
+    I64_STORE("i64.store", 0x37, MEM_ARG),
+    F32_STORE("f32.store", 0x38, MEM_ARG),
+    F64_STORE("f64.store", 0x39, MEM_ARG),
+    I32_STORE8("i32.store8", 0x3A, MEM_ARG),
+    I32_STORE16("i32.store16", 0x3B, MEM_ARG),
+    I64_STORE8("i64.store8", 0x3C, MEM_ARG),
+    I64_STORE16("i64.store16", 0x3D, MEM_ARG),
+    I64_STORE32("i64.store32", 0x3E, MEM_ARG),
+
+    // Memory
+    MEMORY_SIZE("memory.size", 0x3F, MEMORY_IDX),
+    MEMORY_GROW("memory.grow", 0x40, MEMORY_IDX),
+    MEMORY_INIT("memory.init", 0xFC_08, listOf(DATA_IDX, MEMORY_IDX)),
+    DATA_DROP("data.drop", 0xFC_09, DATA_IDX),
+    MEMORY_COPY("memory.copy", 0xFC_0A, listOf(MEMORY_IDX, MEMORY_IDX)),
+    MEMORY_FILL("memory.fill", 0xFC_0B, MEMORY_IDX),
+
+    // Table
+    TABLE_GET("table.get", 0x25, TABLE_IDX),
+    TABLE_SET("table.set", 0x26, TABLE_IDX),
+    TABLE_GROW("table.grow", 0xFC_0F, TABLE_IDX),
+    TABLE_SIZE("table.size", 0xFC_10, TABLE_IDX),
+    TABLE_FILL("table.fill", 0xFC_11, TABLE_IDX),
+    TABLE_INIT("table.init", 0xFC_0C, listOf(ELEM_IDX, TABLE_IDX)),
+    ELEM_DROP("elem.drop", 0xFC_0D, ELEM_IDX),
+    TABLE_COPY("table.copy", 0xFC_0E, listOf(TABLE_IDX, TABLE_IDX)),
+
+    // Control
+    UNREACHABLE("unreachable", 0x00),
+    NOP("nop", 0x01),
+    BLOCK("block", 0x02, BLOCK_TYPE),
+    LOOP("loop", 0x03, BLOCK_TYPE),
+    IF("if", 0x04, BLOCK_TYPE),
+    ELSE("else", 0x05),
+    END("end", 0x0B),
+    BR("br", 0x0C, LABEL_IDX),
+    BR_IF("br_if", 0x0D, LABEL_IDX),
+    BR_TABLE("br_table", 0x0E, listOf(LABEL_IDX_VECTOR, LABEL_IDX)),
+    RETURN("return", 0x0F),
+    CALL("call", 0x10, FUNC_IDX),
+    CALL_INDIRECT("call_indirect", 0x11, listOf(TYPE_IDX, TABLE_IDX)),
+
+    // Parametric
+    DROP("drop", 0x1A),
+    SELECT("select", 0x1B),
+    SELECT_TYPED("select", 0x1C, VAL_TYPE_VECTOR),
+
+    // Variable OP
+    LOCAL_GET("local.get", 0x20, LOCAL_IDX),
+    LOCAL_SET("local.set", 0x21, LOCAL_IDX),
+    LOCAL_TEE("local.tee", 0x22, LOCAL_IDX),
+    GLOBAL_GET("global.get", 0x23, GLOBAL_IDX),
+    GLOBAL_SET("global.set", 0x24, GLOBAL_IDX),
+
+    // Reference types
+    REF_NULL("ref.null", 0xD0, HEAP_TYPE),
+    REF_IS_NULL("ref.is_null", 0xD1),
+    REF_EQ("ref.eq", 0xD5),
+    REF_FUNC("ref.func", 0xD2, FUNC_IDX),
+
+    // GC
+    STRUCT_NEW_WITH_RTT("struct.new_with_rtt", 0xFB_01, STRUCT_TYPE_IDX),
+    STRUCT_GET("struct.get", 0xFB_03, listOf(STRUCT_TYPE_IDX, STRUCT_FIELD_IDX)),
+    STRUCT_SET("struct.set", 0xFB_06, listOf(STRUCT_TYPE_IDX, STRUCT_FIELD_IDX)),
+
+    REF_CAST("ref.cast", 0xFB_41, listOf(HEAP_TYPE, HEAP_TYPE)),
+    RTT_CANON("rtt.canon", 0xFB_30, HEAP_TYPE),
+    RTT_SUB("rtt.sub", 0xFB_31, HEAP_TYPE);
+
+
+    constructor(mnemonic: String, opcode: Int, vararg immediates: WasmImmediateKind) : this(mnemonic, opcode, immediates.toList())
+}
+
+val opcodesToOp: Map<Int, WasmOp> =
+    enumValues<WasmOp>().associateBy { it.opcode }
\ No newline at end of file
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Symbol.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Symbol.kt
new file mode 100644
index 00000000000..e5278554b8f
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Symbol.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+// Late binding box
+
+interface WasmSymbolReadOnly<out T : Any> {
+    val owner: T
+}
+
+class WasmSymbol<out T : Any>(owner: T? = null) : WasmSymbolReadOnly<T> {
+    private var _owner: Any? = owner
+
+    @Suppress("UNCHECKED_CAST")
+    override val owner: T
+        get() = _owner as? T
+            ?: error("Unbound wasm symbol $this")
+
+    @Suppress("UNCHECKED_CAST")
+    fun bind(value: Any) {
+        _owner = value as T
+    }
+
+    override fun equals(other: Any?): Boolean =
+        other is WasmSymbol<*> && _owner == other._owner
+
+    override fun hashCode(): Int =
+        _owner.hashCode()
+
+    override fun toString(): String =
+        _owner?.toString() ?: "UNBOUND-WASM-SYMBOL"
+}
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Types.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Types.kt
new file mode 100644
index 00000000000..4ba81b2ed90
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Types.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+sealed class WasmType(
+    val name: String,
+    val code: Byte
+) {
+    override fun toString(): String = name
+}
+
+// TODO: Remove this type.
+object WasmUnreachableType : WasmType("unreachable", -0x40)
+object WasmI32 : WasmType("i32", -0x1)
+object WasmI1 : WasmType("i32", -0x1)
+object WasmI64 : WasmType("i64", -0x2)
+object WasmF32 : WasmType("f32", -0x3)
+object WasmF64 : WasmType("f64", -0x4)
+object WasmV128 : WasmType("v128", -0x5)
+object WasmI8 : WasmType("i8", -0x6)
+object WasmI16 : WasmType("i8", -0x7)
+object WasmFuncRef : WasmType("funcref", -0x10)
+object WasmExternRef : WasmType("externref", -0x11)
+object WasmAnyRef : WasmType("anyref", -0x12)
+object WasmEqRef : WasmType("eqref", -0x13)
+
+class WasmRefNullType(val heapType: WasmHeapType) : WasmType("ref null", -0x14)
+class WasmRefType(val heapType: WasmHeapType) : WasmType("ref", -0x15)
+
+@Suppress("unused")
+object WasmI31Ref : WasmType("i31ref", -0x16)
+class WasmRtt(val depth: Int, val heapType: WasmHeapType) : WasmType("rtt", -0x17)
+
+@Suppress("unused")
+object WasmExnRef : WasmType("exnref", -0x18)
+
+sealed class WasmHeapType {
+    class Type(val type: WasmSymbolReadOnly<WasmTypeDeclaration>) : WasmHeapType() {
+        override fun toString(): String {
+            return "Type:$type"
+        }
+    }
+
+    sealed class Simple(val name: String, val code: Byte) : WasmHeapType() {
+        object Func : Simple("func", -0x10)
+        object Extern : Simple("extern", -0x11)
+        object Eq : Simple("eq", -0x13)
+
+        @Suppress("unused")
+        object ExnH : Simple("exn", -0x18)
+
+        override fun toString(): String {
+            return "Simple:$name(${code.toString(16)})"
+        }
+    }
+}
+
+sealed class WasmBlockType {
+    class Function(val type: WasmFunctionType) : WasmBlockType()
+    class Value(val type: WasmType) : WasmBlockType()
+}
+
+
+fun WasmType.getHeapType(): WasmHeapType =
+    when (this) {
+        is WasmRefType -> heapType
+        is WasmRefNullType -> heapType
+        is WasmEqRef -> WasmHeapType.Simple.Eq
+        is WasmExternRef -> WasmHeapType.Simple.Extern
+        is WasmFuncRef -> WasmHeapType.Simple.Func
+        else -> error("Unknown heap type for type $this")
+    }
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Utils.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Utils.kt
new file mode 100644
index 00000000000..b4656e9c967
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Utils.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+/**
+ * Calculate declaration IDs of linked wasm module
+ */
+fun WasmModule.calculateIds() {
+    fun List<WasmNamedModuleField>.calculateIds(startIndex: Int = 0) {
+        for ((index, field) in this.withIndex()) {
+            field.id = index + startIndex
+        }
+    }
+
+    functionTypes.calculateIds()
+    structs.calculateIds(startIndex = functionTypes.size)
+    importedFunctions.calculateIds()
+    importedMemories.calculateIds()
+    importedTables.calculateIds()
+    importedGlobals.calculateIds()
+    elements.calculateIds()
+
+    definedFunctions.calculateIds(startIndex = importedFunctions.size)
+    globals.calculateIds(startIndex = importedGlobals.size)
+    memories.calculateIds(startIndex = importedMemories.size)
+    tables.calculateIds(startIndex = importedTables.size)
+}
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt
new file mode 100644
index 00000000000..15d3f1e5d41
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+abstract class WasmExpressionBuilder {
+    abstract fun buildInstr(op: WasmOp, vararg immediates: WasmImmediate)
+    abstract var numberOfNestedBlocks: Int
+
+    abstract val lastInstr: WasmOp?
+
+    fun buildConstI32(value: Int) {
+        buildInstr(WasmOp.I32_CONST, WasmImmediate.ConstI32(value))
+    }
+
+    fun buildConstI64(value: Long) {
+        buildInstr(WasmOp.I64_CONST, WasmImmediate.ConstI64(value))
+    }
+
+    fun buildConstF32(value: Float) {
+        buildInstr(WasmOp.F32_CONST, WasmImmediate.ConstF32(value.toRawBits().toUInt()))
+    }
+
+    fun buildConstF64(value: Double) {
+        buildInstr(WasmOp.F64_CONST, WasmImmediate.ConstF64(value.toRawBits().toULong()))
+    }
+
+    fun buildConstI32Symbol(value: WasmSymbol<Int>) {
+        buildInstr(WasmOp.I32_CONST, WasmImmediate.SymbolI32(value))
+    }
+
+    fun buildUnreachable() {
+        // Unreachable is not needed
+        if (lastInstr == WasmOp.UNREACHABLE || lastInstr == WasmOp.RETURN)
+            return
+
+        buildInstr(WasmOp.UNREACHABLE)
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun buildBlock(label: String?, resultType: WasmType? = null) {
+        numberOfNestedBlocks++
+        buildInstr(WasmOp.BLOCK, WasmImmediate.BlockType.Value(resultType))
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun buildLoop(label: String?, resultType: WasmType? = null) {
+        numberOfNestedBlocks++
+        buildInstr(WasmOp.LOOP, WasmImmediate.BlockType.Value(resultType))
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun buildIf(label: String?, resultType: WasmType? = null) {
+        numberOfNestedBlocks++
+        buildInstr(WasmOp.IF, WasmImmediate.BlockType.Value(resultType))
+    }
+
+    fun buildElse() {
+        buildInstr(WasmOp.ELSE)
+    }
+
+    fun buildEnd() {
+        numberOfNestedBlocks--
+        buildInstr(WasmOp.END)
+    }
+
+    fun buildBr(absoluteBlockLevel: Int) {
+        val relativeLevel = numberOfNestedBlocks - absoluteBlockLevel
+        assert(relativeLevel >= 0) { "Negative relative block index" }
+        buildInstr(WasmOp.BR, WasmImmediate.LabelIdx(relativeLevel))
+    }
+
+    fun buildBrIf(absoluteBlockLevel: Int) {
+        val relativeLevel = numberOfNestedBlocks - absoluteBlockLevel
+        assert(relativeLevel >= 0) { "Negative relative block index" }
+        buildInstr(WasmOp.BR_IF, WasmImmediate.LabelIdx(relativeLevel))
+    }
+
+    fun buildCall(symbol: WasmSymbol<WasmFunction>) {
+        buildInstr(WasmOp.CALL, WasmImmediate.FuncIdx(symbol))
+    }
+
+    fun buildCallIndirect(symbol: WasmSymbol<WasmFunctionType>) {
+        buildInstr(
+            WasmOp.CALL_INDIRECT,
+            WasmImmediate.TypeIdx(symbol),
+            WasmImmediate.TableIdx(0)
+        )
+    }
+
+    fun buildGetLocal(local: WasmLocal) {
+        buildInstr(WasmOp.LOCAL_GET, WasmImmediate.LocalIdx(local))
+    }
+
+    fun buildSetLocal(local: WasmLocal) {
+        buildInstr(WasmOp.LOCAL_SET, WasmImmediate.LocalIdx(local))
+    }
+
+    fun buildGetGlobal(global: WasmSymbol<WasmGlobal>) {
+        buildInstr(WasmOp.GLOBAL_GET, WasmImmediate.GlobalIdx(global))
+    }
+
+    fun buildSetGlobal(global: WasmSymbol<WasmGlobal>) {
+        buildInstr(WasmOp.GLOBAL_SET, WasmImmediate.GlobalIdx(global))
+    }
+
+    fun buildStructGet(struct: WasmSymbol<WasmStructDeclaration>, fieldId: WasmSymbol<Int>) {
+        buildInstr(
+            WasmOp.STRUCT_GET,
+            WasmImmediate.StructType(struct),
+            WasmImmediate.StructFieldIdx(fieldId)
+        )
+    }
+
+    fun buildStructNew(struct: WasmSymbol<WasmStructDeclaration>) {
+        buildInstr(WasmOp.STRUCT_NEW_WITH_RTT, WasmImmediate.StructType(struct))
+    }
+
+    fun buildStructSet(struct: WasmSymbol<WasmStructDeclaration>, fieldId: WasmSymbol<Int>) {
+        buildInstr(
+            WasmOp.STRUCT_SET,
+            WasmImmediate.StructType(struct),
+            WasmImmediate.StructFieldIdx(fieldId)
+        )
+    }
+
+
+    fun buildRefCast(fromType: WasmType, toType: WasmType) {
+        buildInstr(
+            WasmOp.REF_CAST,
+            WasmImmediate.HeapType(fromType.getHeapType()),
+            WasmImmediate.HeapType(toType.getHeapType())
+        )
+    }
+
+    fun buildRefNull(type: WasmHeapType) {
+        buildInstr(WasmOp.REF_NULL, WasmImmediate.HeapType(WasmRefType(type)))
+    }
+
+    fun buildRttSub(heapType: WasmType) {
+        buildInstr(WasmOp.RTT_SUB, WasmImmediate.HeapType(heapType))
+    }
+
+    fun buildRttCanon(heapType: WasmType) {
+        buildInstr(WasmOp.RTT_CANON, WasmImmediate.HeapType(heapType))
+    }
+}
+
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmIrExpressionBuilder.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmIrExpressionBuilder.kt
new file mode 100644
index 00000000000..54bc7eaf983
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmIrExpressionBuilder.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+class WasmIrExpressionBuilder(
+    val expression: MutableList<WasmInstr>
+) : WasmExpressionBuilder() {
+
+    override fun buildInstr(op: WasmOp, vararg immediates: WasmImmediate) {
+        expression.add(WasmInstr(op, immediates.toList()))
+    }
+
+
+    override var numberOfNestedBlocks: Int = 0
+        set(value) {
+            assert(value >= 0) { "end without matching block" }
+            field = value
+        }
+
+    override val lastInstr: WasmOp?
+        get() = expression.lastOrNull()?.operator
+}
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmBinaryToIR.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmBinaryToIR.kt
new file mode 100644
index 00000000000..a9c38336fc4
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmBinaryToIR.kt
@@ -0,0 +1,647 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("MemberVisibilityCanBePrivate", "MemberVisibilityCanBePrivate")
+
+package org.jetbrains.kotlin.wasm.ir.convertors
+
+import org.jetbrains.kotlin.wasm.ir.*
+import java.nio.ByteBuffer
+
+
+class WasmBinaryToIR(val b: MyByteReader) {
+    val validVersion = 1u
+
+    val functionTypes: MutableList<WasmFunctionType> = mutableListOf()
+    val structs: MutableList<WasmStructDeclaration> = mutableListOf()
+
+    val importsInOrder: MutableList<WasmNamedModuleField> = mutableListOf()
+    val importedFunctions: MutableList<WasmFunction.Imported> = mutableListOf()
+    val importedMemories: MutableList<WasmMemory> = mutableListOf()
+    val importedTables: MutableList<WasmTable> = mutableListOf()
+    val importedGlobals: MutableList<WasmGlobal> = mutableListOf()
+
+    val definedFunctions: MutableList<WasmFunction.Defined> = mutableListOf()
+    val table: MutableList<WasmTable> = mutableListOf()
+    val memory: MutableList<WasmMemory> = mutableListOf()
+    val globals: MutableList<WasmGlobal> = mutableListOf()
+    val exports: MutableList<WasmExport<*>> = mutableListOf()
+    var startFunction: WasmFunction? = null
+    val elements: MutableList<WasmElement> = mutableListOf()
+    val data: MutableList<WasmData> = mutableListOf()
+    var dataCount: Boolean = false
+
+
+    private fun <T> byIdx(l1: List<T>, l2: List<T>, index: Int): T {
+        if (index < l1.size)
+            return l1[index]
+        return l2[index - l1.size]
+    }
+
+    private fun funByIdx(index: Int) = byIdx(importedFunctions, definedFunctions, index)
+    private fun memoryByIdx(index: Int) = byIdx(importedMemories, memory, index)
+    private fun elemByIdx(index: Int) = elements[index]
+    private fun tableByIdx(index: Int) = byIdx(importedTables, table, index)
+    private fun globalByIdx(index: Int) = byIdx(importedGlobals, globals, index)
+
+    fun parseModule(): WasmModule {
+        if (b.readUInt32() != 0x6d736100u)
+            error("InvalidMagicNumber")
+
+        val version = b.readUInt32()
+        if (version != validVersion)
+            error("InvalidVersion(version.toLong(), listOf(validVersion.toLong()))")
+
+        var maxSectionId = 0
+        while (true) {
+            val sectionId = try {
+                b.readVarUInt7().toInt()
+            } catch (e: Throwable) { // Unexpected end
+                break
+            }
+            if (sectionId > 12) error("InvalidSectionId(sectionId)")
+            require(sectionId == 12 || maxSectionId == 12 || sectionId == 0 || sectionId > maxSectionId) {
+                "Section ID $sectionId came after $maxSectionId"
+            }
+            maxSectionId = maxOf(sectionId, maxSectionId)
+
+            val sectionLength = b.readVarUInt32AsInt()
+            b.limitSize(sectionLength, "Wasm section $sectionId of size $sectionLength") {
+                when (sectionId) {
+                    // Skip custom section
+                    0 -> b.readBytes(sectionLength)
+
+                    // Type section
+                    1 -> {
+                        forEachVectorElement {
+                            when (val type = readTypeDeclaration()) {
+                                is WasmFunctionType ->
+                                    functionTypes += type
+                                is WasmStructDeclaration ->
+                                    structs += type
+                            }
+                        }
+                    }
+
+                    // Import section
+                    2 -> {
+                        forEachVectorElement {
+                            val importPair = WasmImportPair(readString(), readString())
+                            when (val kind = b.readByte().toInt()) {
+                                0 -> {
+                                    val type = functionTypes[b.readVarUInt32AsInt()]
+                                    importedFunctions += WasmFunction.Imported(
+                                        name = "",
+                                        type = type,
+                                        importPair = importPair,
+                                    ).also { importsInOrder.add(it) }
+                                }
+                                // Table
+                                1 -> {
+                                    val elementType = readRefType()
+                                    val limits = readLimits()
+                                    importedTables.add(WasmTable(limits, elementType, importPair).also { importsInOrder.add(it) })
+                                }
+                                2 -> {
+                                    val limits = readLimits()
+                                    importedMemories.add(WasmMemory(limits, importPair).also { importsInOrder.add(it) })
+                                }
+                                3 -> {
+                                    importedGlobals.add(
+                                        WasmGlobal(
+                                            name = "",
+                                            type = readValueType(),
+                                            isMutable = b.readVarUInt1(),
+                                            init = emptyList(),
+                                            importPair = importPair
+                                        ).also { importsInOrder.add(it) }
+                                    )
+                                }
+                                else -> error(
+                                    "Unsupported import kind $kind"
+                                )
+                            }
+                        }
+                    }
+
+                    // Function section
+                    3 -> {
+                        forEachVectorElement {
+                            val functionType = functionTypes[b.readVarUInt32AsInt()]
+                            definedFunctions.add(
+                                WasmFunction.Defined(
+                                    "",
+                                    functionType,
+                                    locals = functionType.parameterTypes.mapIndexed { index, wasmType ->
+                                        WasmLocal(index, "", wasmType, true)
+                                    }.toMutableList()
+                                )
+                            )
+                        }
+                    }
+
+
+                    // Table section
+                    4 -> {
+                        forEachVectorElement {
+                            val elementType = readRefType()
+                            val limits = readLimits()
+                            table.add(
+                                WasmTable(limits, elementType)
+                            )
+                        }
+                    }
+
+                    // Memory section
+                    5 -> {
+                        forEachVectorElement {
+                            val limits = readLimits()
+                            memory.add(WasmMemory(limits))
+                        }
+                    }
+
+                    // Globals section
+                    6 -> {
+                        forEachVectorElement {
+                            val expr = mutableListOf<WasmInstr>()
+                            globals.add(
+                                WasmGlobal(
+                                    name = "",
+                                    type = readValueType(),
+                                    isMutable = b.readVarUInt1(),
+                                    init = expr
+                                )
+                            )
+                            readExpression(expr)
+                        }
+                    }
+
+                    // Export section
+                    7 -> {
+                        forEachVectorElement {
+                            val name = readString()
+                            val kind = b.readByte().toInt()
+                            val index = b.readVarUInt32AsInt()
+                            exports.add(
+                                when (kind) {
+                                    0 -> WasmExport.Function(name, funByIdx(index))
+                                    1 -> WasmExport.Table(name, tableByIdx(index))
+                                    2 -> WasmExport.Memory(name, memoryByIdx(index))
+                                    3 -> WasmExport.Global(name, globalByIdx(index))
+                                    else -> error("Invalid export kind $kind")
+                                }
+                            )
+                        }
+                    }
+
+                    // Start section
+                    8 -> {
+                        require(startFunction == null) { "Start function is already defined" }
+                        startFunction = funByIdx(b.readVarUInt32AsInt())
+                    }
+
+                    // Element section
+                    9 -> {
+                        forEachVectorElement {
+                            val firstByte = b.readUByte().toInt()
+
+                            val mode: WasmElement.Mode = when (firstByte) {
+                                0, 4 -> {
+                                    val offset = readExpression()
+                                    WasmElement.Mode.Active(tableByIdx(0), offset)
+                                }
+
+                                1, 5 ->
+                                    WasmElement.Mode.Passive
+
+                                2, 6 -> {
+                                    val tableIdx = b.readVarUInt32()
+                                    val offset = readExpression()
+                                    WasmElement.Mode.Active(tableByIdx(tableIdx.toInt()), offset)
+                                }
+
+                                3, 7 ->
+                                    WasmElement.Mode.Declarative
+
+                                else ->
+                                    error("Invalid element first byte $firstByte")
+                            }
+
+                            val type = if (firstByte < 5) {
+                                if (firstByte in 1..3) {
+                                    val elemKind = b.readByte()
+                                    require(elemKind == 0.toByte())
+                                }
+                                WasmFuncRef
+                            } else {
+                                readValueType()
+                            }
+
+                            val values: List<WasmTable.Value> = mapVector {
+                                if (firstByte < 4) {
+                                    WasmTable.Value.Function(funByIdx(b.readVarUInt32AsInt()))
+                                } else {
+                                    val exprBody = mutableListOf<WasmInstr>()
+                                    readExpression(exprBody)
+                                    WasmTable.Value.Expression(exprBody)
+                                }
+                            }
+
+                            elements += WasmElement(
+                                type,
+                                values,
+                                mode,
+                            )
+                        }
+                    }
+
+                    // Code section
+                    10 -> {
+                        forEachVectorElement { functionId ->
+                            val function = definedFunctions[functionId.toInt()]
+                            val size = b.readVarUInt32AsInt()
+                            b.limitSize(size, "function body size") {
+                                mapVector {
+                                    val count = b.readVarUInt32AsInt()
+                                    val valueType = readValueType()
+
+                                    val firstLocalId =
+                                        function.locals.lastOrNull()?.id?.plus(1) ?: 0
+
+                                    repeat(count) { thisIdx ->
+                                        function.locals.add(
+                                            WasmLocal(
+                                                firstLocalId + thisIdx,
+                                                "",
+                                                valueType,
+                                                false
+                                            )
+                                        )
+                                    }
+                                }
+
+                                readExpression(function.instructions, function.locals)
+                            }
+                        }
+                    }
+
+                    // Data section
+                    11 -> {
+                        forEachVectorElement {
+                            val mode = when (val firstByte = b.readByte().toInt()) {
+                                0 -> WasmDataMode.Active(0, readExpression())
+                                1 -> WasmDataMode.Passive
+                                2 -> WasmDataMode.Active(b.readVarUInt32AsInt(), readExpression())
+                                else -> error("Unsupported data mode $firstByte")
+                            }
+                            val size = b.readVarUInt32AsInt()
+                            val bytes = b.readBytes(size)
+                            data += WasmData(mode, bytes)
+                        }
+                    }
+
+                    // Data count section
+                    12 -> {
+                        b.readVarUInt32() // Data count
+                        dataCount = true
+                    }
+                }
+            }
+        }
+
+        return WasmModule(
+            functionTypes = functionTypes,
+            structs = structs,
+            importsInOrder = importsInOrder,
+            importedFunctions = importedFunctions,
+            importedMemories = importedMemories,
+            importedTables = importedTables,
+            importedGlobals = importedGlobals,
+            definedFunctions = definedFunctions,
+            tables = table,
+            memories = memory,
+            globals = globals,
+            exports = exports,
+            startFunction = startFunction,
+            elements = elements,
+            data = data,
+            dataCount = dataCount
+        ).also {
+            it.calculateIds()
+        }
+    }
+
+    private fun readLimits(): WasmLimits {
+        val hasMax = b.readVarUInt1()
+        return WasmLimits(
+            minSize = b.readVarUInt32(),
+            maxSize = if (hasMax) b.readVarUInt32() else null
+        )
+    }
+
+    private fun readExpression(): MutableList<WasmInstr> =
+        mutableListOf<WasmInstr>().also { readExpression(it) }
+
+    private fun readExpression(instructions: MutableList<WasmInstr>, locals: List<WasmLocal> = emptyList()) {
+        var blockCount = 0
+        while (true) {
+            require(blockCount >= 0)
+            val inst = readInstruction(locals)
+
+            when (inst.operator) {
+                WasmOp.END -> {
+                    // Last instruction in expression is end.
+                    if (blockCount == 0) {
+                        return
+                    }
+                    blockCount--
+                }
+                WasmOp.BLOCK, WasmOp.LOOP, WasmOp.IF -> {
+                    blockCount++
+                }
+                else -> {
+                }
+            }
+
+            instructions.add(inst)
+        }
+    }
+
+    private fun readInstruction(locals: List<WasmLocal>): WasmInstr {
+        val firstByte = b.readByte().toUByte().toInt()
+        val opcode = if (firstByte in twoByteOpcodes) {
+            val secondByte = b.readByte().toUByte().toInt()
+            (firstByte shl 8) + secondByte
+        } else {
+            firstByte
+        }
+
+        val op = opcodesToOp[opcode]
+            ?: error("Wrong opcode 0x${opcode.toString(16)}")
+
+
+        val immediates = op.immediates.map {
+            when (it) {
+                WasmImmediateKind.CONST_I32 -> WasmImmediate.ConstI32(b.readVarInt32())
+                WasmImmediateKind.CONST_I64 -> WasmImmediate.ConstI64(b.readVarInt64())
+                WasmImmediateKind.CONST_F32 -> WasmImmediate.ConstF32(b.readUInt32())
+                WasmImmediateKind.CONST_F64 -> WasmImmediate.ConstF64(b.readUInt64())
+
+                WasmImmediateKind.MEM_ARG -> {
+                    WasmImmediate.MemArg(
+                        align = b.readVarUInt32(),
+                        offset = b.readVarUInt32()
+                    )
+                }
+                WasmImmediateKind.BLOCK_TYPE -> readBlockType()
+                WasmImmediateKind.FUNC_IDX -> WasmImmediate.FuncIdx(funByIdx(b.readVarUInt32AsInt()))
+                WasmImmediateKind.LOCAL_IDX -> WasmImmediate.LocalIdx(locals[b.readVarUInt32AsInt()])
+                WasmImmediateKind.GLOBAL_IDX -> WasmImmediate.GlobalIdx(globalByIdx(b.readVarUInt32AsInt()))
+                WasmImmediateKind.TYPE_IDX -> WasmImmediate.TypeIdx(functionTypes[b.readVarUInt32AsInt()])
+                WasmImmediateKind.MEMORY_IDX -> WasmImmediate.MemoryIdx(memoryByIdx(b.readVarUInt32AsInt()))
+                WasmImmediateKind.DATA_IDX -> WasmImmediate.DataIdx(b.readVarUInt32AsInt())
+                WasmImmediateKind.TABLE_IDX -> WasmImmediate.TableIdx(b.readVarUInt32AsInt())
+                WasmImmediateKind.LABEL_IDX -> WasmImmediate.LabelIdx(b.readVarUInt32AsInt())
+                WasmImmediateKind.LABEL_IDX_VECTOR -> WasmImmediate.LabelIdxVector(mapVector { b.readVarUInt32AsInt() })
+                WasmImmediateKind.ELEM_IDX -> WasmImmediate.ElemIdx(elemByIdx(b.readVarUInt32AsInt()))
+                WasmImmediateKind.VAL_TYPE_VECTOR -> WasmImmediate.ValTypeVector(mapVector { readValueType() })
+                WasmImmediateKind.STRUCT_TYPE_IDX -> TODO()
+                WasmImmediateKind.STRUCT_FIELD_IDX -> TODO()
+                WasmImmediateKind.TYPE_IMM -> TODO()
+                WasmImmediateKind.HEAP_TYPE -> WasmImmediate.HeapType(readRefType())
+            }
+        }
+
+
+        return WasmInstr(op, immediates)
+    }
+
+    private fun readTypeDeclaration(): WasmTypeDeclaration {
+        when (b.readVarInt7()) {
+            (-0x20).toByte() -> {
+                val types = mapVector { readValueType() }
+                val returnTypes = mapVector { readValueType() }
+                return WasmFunctionType("", types, returnTypes)
+            }
+
+            else -> TODO()
+        }
+    }
+
+    private val codeToSimpleValueType: Map<Byte, WasmType> = listOf(
+        WasmI32,
+        WasmI64,
+        WasmF32,
+        WasmF64,
+        WasmV128,
+        WasmI8,
+        WasmI16,
+        WasmFuncRef,
+        WasmExternRef,
+        WasmAnyRef,
+        WasmEqRef
+    ).associateBy { it.code }
+
+    private fun readValueType(): WasmType {
+        val code = b.readVarInt7()
+        return readValueTypeImpl(code)
+    }
+
+    private fun readBlockType(): WasmImmediate.BlockType {
+        val code = b.readVarInt64()
+        return when {
+            code >= 0 -> WasmImmediate.BlockType.Function(functionTypes[code.toInt()])
+            code == -0x40L -> WasmImmediate.BlockType.Value(null)
+            else -> WasmImmediate.BlockType.Value(readValueTypeImpl(code.toByte()))
+        }
+    }
+
+    private fun readRefType(): WasmType {
+        val code = b.readByte()
+
+        return when (code.toInt()) {
+            0x70 -> WasmFuncRef
+            0x6F -> WasmExternRef
+            else -> error("Unsupported heap type ${code.toString(16)}")
+        }
+    }
+
+
+    private fun readValueTypeImpl(code: Byte): WasmType {
+        codeToSimpleValueType[code]?.let {
+            return it
+        }
+
+        error("InvalidType 0x${code.toString(16)}")
+    }
+
+    private inline fun forEachVectorElement(block: (index: UInt) -> Unit) {
+        val size = b.readVarUInt32()
+        for (index in 0u until size) {
+            block(index)
+        }
+    }
+
+    private inline fun <T> mapVector(block: (index: UInt) -> T): List<T> {
+        return (0u until b.readVarUInt32()).map { block(it) }
+    }
+
+    private fun MyByteReader.readVarUInt32AsInt() =
+        this.readVarUInt32().toInt()
+
+    fun readString() = b.readVarUInt32AsInt().let {
+        // We have to use the decoder directly to get malformed-input errors
+        Charsets.UTF_8.newDecoder().decode(ByteBuffer.wrap(b.readBytes(it))).toString()
+    }
+}
+
+class MyByteReader(val ins: java.io.InputStream) : ByteReader() {
+    var offset: Long = 0
+
+    class SizeLimit(val maxSize: Long, val reason: String)
+
+    var sizeLimits = mutableListOf(SizeLimit(Long.MAX_VALUE, "Root"))
+    var currentMaxSize: Long = Long.MAX_VALUE
+
+    override val isEof: Boolean
+        get() {
+            error("Not implemented")
+        }
+
+    override fun read(amount: Int): ByteReader {
+        error("Not implemented")
+    }
+
+    @OptIn(ExperimentalStdlibApi::class)
+    inline fun limitSize(size: Int, reason: String, block: () -> Unit) {
+        val maxSize = offset + size
+        sizeLimits.add(SizeLimit(maxSize, reason))
+        currentMaxSize = maxSize
+        block()
+        require(offset == currentMaxSize) {
+            "Ending size-limited block \"$reason\". We haven't read all $size bytes."
+        }
+        sizeLimits.removeLast()
+        currentMaxSize = sizeLimits.last().maxSize
+    }
+
+    override fun readByte(): Byte {
+        val b = ins.read()
+        if (b == -1)
+            error("UnexpectedEnd")
+
+        offset++
+        if (offset > currentMaxSize) {
+            error("Reading bytes past limit $currentMaxSize Reason: ${sizeLimits.last().reason}")
+        }
+        return b.toByte()
+    }
+
+    override fun readBytes(amount: Int?): ByteArray {
+        require(amount != null)
+        return ByteArray(amount) { readByte() }
+    }
+}
+
+// First byte of two byte opcodes
+val twoByteOpcodes: Set<Int> =
+    opcodesToOp.keys.filter { it > 0xFF }.map { it ushr 8 }.toSet()
+
+
+abstract class ByteReader {
+    abstract val isEof: Boolean
+
+    // Slices the next set off as its own and moves the position up that much
+    abstract fun read(amount: Int): ByteReader
+    abstract fun readByte(): Byte
+    abstract fun readBytes(amount: Int? = null): ByteArray
+
+    fun readUByte(): UByte =
+        readByte().toUByte()
+
+    fun readUInt32(): UInt =
+        readUByte().toUInt() or
+                (readUByte().toUInt() shl 8) or
+                (readUByte().toUInt() shl 16) or
+                (readUByte().toUInt() shl 24)
+
+    fun readUInt64(): ULong =
+        readUByte().toULong() or
+                (readUByte().toULong() shl 8) or
+                (readUByte().toULong() shl 16) or
+                (readUByte().toULong() shl 24) or
+                (readUByte().toULong() shl 32) or
+                (readUByte().toULong() shl 40) or
+                (readUByte().toULong() shl 48) or
+                (readUByte().toULong() shl 56)
+
+
+    fun readVarInt7() = readSignedLeb128().let {
+        if (it < Byte.MIN_VALUE.toLong() || it > Byte.MAX_VALUE.toLong()) error("InvalidLeb128Number")
+        it.toByte()
+    }
+
+    fun readVarInt32() = readSignedLeb128().let {
+        if (it < Int.MIN_VALUE.toLong() || it > Int.MAX_VALUE.toLong()) error("InvalidLeb128Number")
+        it.toInt()
+    }
+
+    fun readVarInt64() = readSignedLeb128(9)
+
+    fun readVarUInt1() = readUnsignedLeb128().let {
+        if (it != 1u && it != 0u) error("InvalidLeb128Number")
+        it == 1u
+    }
+
+    fun readVarUInt7() = readUnsignedLeb128().let {
+        if (it > 255u) error("InvalidLeb128Number")
+        it.toShort()
+    }
+
+    fun readVarUInt32() = readUnsignedLeb128()
+
+    protected fun readUnsignedLeb128(maxCount: Int = 4): UInt {
+        // Taken from Android source, Apache licensed
+        var result = 0u
+        var cur: UInt
+        var count = 0
+        do {
+            cur = readUByte().toUInt() and 0xffu
+            result = result or ((cur and 0x7fu) shl (count * 7))
+            count++
+        } while (cur and 0x80u == 0x80u && count <= maxCount)
+        if (cur and 0x80u == 0x80u) error("InvalidLeb128Number")
+        return result
+    }
+
+    private fun readSignedLeb128(maxCount: Int = 4): Long {
+        // Taken from Android source, Apache licensed
+        var result = 0L
+        var cur: Int
+        var count = 0
+        var signBits = -1L
+        do {
+            cur = readByte().toInt() and 0xff
+            result = result or ((cur and 0x7f).toLong() shl (count * 7))
+            signBits = signBits shl 7
+            count++
+        } while (cur and 0x80 == 0x80 && count <= maxCount)
+        if (cur and 0x80 == 0x80) error("InvalidLeb128Number")
+
+        // Check for 64 bit invalid, taken from Apache/MIT licensed:
+        //  https://github.com/paritytech/parity-wasm/blob/2650fc14c458c6a252c9dc43dd8e0b14b6d264ff/src/elements/primitives.rs#L351
+        // TODO: probably need 32 bit checks too, but meh, not in the suite
+        if (count > maxCount && maxCount == 9) {
+            if (cur and 0b0100_0000 == 0b0100_0000) {
+                if ((cur or 0b1000_0000).toByte() != (-1).toByte()) error("InvalidLeb128Number")
+            } else if (cur != 0) {
+                error("InvalidLeb128Number")
+            }
+        }
+
+        if ((signBits shr 1) and result != 0L) result = result or signBits
+        return result
+    }
+}
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmIrToBinary.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmIrToBinary.kt
new file mode 100644
index 00000000000..1c289091d66
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmIrToBinary.kt
@@ -0,0 +1,513 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:OptIn(ExperimentalUnsignedTypes::class)
+
+package org.jetbrains.kotlin.wasm.ir.convertors
+
+import org.jetbrains.kotlin.wasm.ir.*
+import java.io.ByteArrayOutputStream
+import java.io.OutputStream
+
+class WasmIrToBinary(outputStream: OutputStream, val module: WasmModule) {
+    var b: ByteWriter = ByteWriter.OutputStream(outputStream)
+
+    fun appendWasmModule() {
+        b.writeUInt32(0x6d736100u) // WebAssembly magic
+        b.writeUInt32(1u)          // version
+
+        with(module) {
+            // type section
+            appendSection(1u) {
+                appendVectorSize(functionTypes.size + structs.size)
+                functionTypes.forEach { appendFunctionTypeDeclaration(it) }
+                structs.forEach { appendStructTypeDeclaration(it) }
+            }
+
+            // import section
+            appendSection(2u) {
+                appendVectorSize(importsInOrder.size)
+                importsInOrder.forEach {
+                    when (it) {
+                        is WasmFunction.Imported -> appendImportedFunction(it)
+                        is WasmMemory -> appendMemory(it)
+                        is WasmTable -> appendTable(it)
+                        is WasmGlobal -> appendGlobal(it)
+                        else -> error("Unknown import kind ${it::class}")
+                    }
+                }
+            }
+
+            // function section
+            appendSection(3u) {
+                appendVectorSize(definedFunctions.size)
+                definedFunctions.forEach { appendDefinedFunction(it) }
+            }
+
+            // table section
+            appendSection(4u) {
+                appendVectorSize(tables.size)
+                tables.forEach { appendTable(it) }
+            }
+
+            // memory section
+            appendSection(5u) {
+                appendVectorSize(memories.size)
+                memories.forEach { appendMemory(it) }
+            }
+
+            // Good
+
+            appendSection(6u) {
+                appendVectorSize(globals.size)
+                globals.forEach { appendGlobal(it) }
+            }
+
+            appendSection(7u) {
+                appendVectorSize(exports.size)
+                exports.forEach { appendExport(it) }
+            }
+
+            if (startFunction != null) {
+                appendSection(8u) {
+                    appendStartFunction(startFunction)
+                }
+            }
+
+            // element section
+            appendSection(9u) {
+                appendVectorSize(elements.size)
+                elements.forEach { appendElement(it) }
+            }
+
+            if (dataCount) {
+                appendSection(12u) {
+                    b.writeVarUInt32(data.size.toUInt())
+                }
+            }
+
+            // code section
+            appendSection(10u) {
+                appendVectorSize(definedFunctions.size)
+                definedFunctions.forEach { appendCode(it) }
+            }
+
+            appendSection(11u) {
+                appendVectorSize(data.size)
+                data.forEach { appendData(it) }
+            }
+        }
+    }
+
+    private fun appendInstr(instr: WasmInstr) {
+        val opcode = instr.operator.opcode
+        if (opcode > 0xFF) {
+            b.writeByte((opcode ushr 8).toByte())
+            b.writeByte((opcode and 0xFF).toByte())
+        } else {
+            b.writeByte(opcode.toByte())
+        }
+
+        instr.immediates.forEach {
+            appendImmediate(it)
+        }
+    }
+
+    private fun appendImmediate(x: WasmImmediate) {
+        when (x) {
+            is WasmImmediate.ConstI32 -> b.writeVarInt32(x.value)
+            is WasmImmediate.ConstI64 -> b.writeVarInt64(x.value)
+            is WasmImmediate.ConstF32 -> b.writeUInt32(x.rawBits)
+            is WasmImmediate.ConstF64 -> b.writeUInt64(x.rawBits)
+            is WasmImmediate.SymbolI32 -> b.writeVarInt32(x.value.owner)
+            is WasmImmediate.MemArg -> {
+                b.writeVarUInt32(x.align)
+                b.writeVarUInt32(x.offset)
+            }
+            is WasmImmediate.BlockType -> appendBlockType(x)
+            is WasmImmediate.FuncIdx -> appendModuleFieldReference(x.value.owner)
+            is WasmImmediate.LocalIdx -> appendLocalReference(x.value.owner)
+            is WasmImmediate.GlobalIdx -> appendModuleFieldReference(x.value.owner)
+            is WasmImmediate.TypeIdx -> appendModuleFieldReference(x.value.owner)
+            is WasmImmediate.MemoryIdx -> appendModuleFieldReference(x.value.owner)
+            is WasmImmediate.DataIdx -> b.writeVarUInt32(x.value)
+            is WasmImmediate.TableIdx -> b.writeVarUInt32(x.value)
+            is WasmImmediate.LabelIdx -> b.writeVarUInt32(x.value)
+            is WasmImmediate.LabelIdxVector -> {
+                b.writeVarUInt32(x.value.size)
+                for (target in x.value) {
+                    b.writeVarUInt32(target)
+                }
+            }
+            is WasmImmediate.ElemIdx -> appendModuleFieldReference(x.value)
+            is WasmImmediate.ValTypeVector -> {
+                b.writeVarUInt32(x.value.size)
+                for (type in x.value) {
+                    appendType(type)
+                }
+            }
+            is WasmImmediate.StructType -> appendModuleFieldReference(x.value.owner)
+            is WasmImmediate.StructFieldIdx -> b.writeVarUInt32(x.value.owner)
+            is WasmImmediate.HeapType -> appendHeapType(x.value)
+        }
+    }
+
+    private fun appendSection(id: UShort, content: () -> Unit) {
+        b.writeVarUInt7(id)
+        withVarUInt32PayloadSizePrepended { content() }
+    }
+
+    @OptIn(ExperimentalStdlibApi::class)
+    fun withVarUInt32PayloadSizePrepended(fn: () -> Unit) {
+        val previousWriter = b
+        val newWriter = b.createTemp()
+        b = newWriter
+        fn()
+        b = previousWriter
+        b.writeVarUInt32(newWriter.written)
+        b.write(newWriter)
+    }
+
+    private fun appendVectorSize(size: Int) {
+        b.writeVarUInt32(size)
+    }
+
+    private fun appendFunctionTypeDeclaration(type: WasmFunctionType) {
+        b.writeVarInt7(-0x20)
+        b.writeVarUInt32(type.parameterTypes.size)
+        type.parameterTypes.forEach { appendType(it) }
+        b.writeVarUInt32(type.resultTypes.size)
+        type.resultTypes.forEach { appendType(it) }
+    }
+
+    private fun appendBlockType(type: WasmImmediate.BlockType) {
+        when (type) {
+            is WasmImmediate.BlockType.Function -> appendModuleFieldReference(type.type)
+            is WasmImmediate.BlockType.Value -> when (type.type) {
+                null -> b.writeVarInt7(-0x40)
+                else -> appendType(type.type)
+            }
+        }
+    }
+
+    private fun appendStructTypeDeclaration(type: WasmStructDeclaration) {
+        b.writeVarInt7(-0x21)
+        b.writeVarUInt32(type.fields.size)
+        type.fields.forEach {
+            appendType(it.type)
+            b.writeVarUInt1(it.isMutable)
+        }
+    }
+
+    val WasmFunctionType.index: Int
+        get() = module.functionTypes.indexOf(this)
+
+    private fun appendLimits(limits: WasmLimits) {
+        b.writeVarUInt1(limits.maxSize != null)
+        b.writeVarUInt32(limits.minSize)
+        if (limits.maxSize != null)
+            b.writeVarUInt32(limits.maxSize)
+    }
+
+    private fun appendImportedFunction(function: WasmFunction.Imported) {
+        b.writeString(function.importPair.moduleName)
+        b.writeString(function.importPair.declarationName)
+        b.writeByte(0)  // Function external kind.
+        b.writeVarUInt32(function.type.index)
+    }
+
+    private fun appendDefinedFunction(function: WasmFunction.Defined) {
+        b.writeVarUInt32(function.type.index)
+    }
+
+    private fun appendTable(table: WasmTable) {
+        if (table.importPair != null) {
+            b.writeString(table.importPair.moduleName)
+            b.writeString(table.importPair.declarationName)
+            b.writeByte(1)
+        }
+
+        b.writeVarInt7(table.elementType.code)
+        appendLimits(table.limits)
+    }
+
+    private fun appendMemory(memory: WasmMemory) {
+        if (memory.importPair != null) {
+            b.writeString(memory.importPair.moduleName)
+            b.writeString(memory.importPair.declarationName)
+            b.writeByte(2)
+        }
+        appendLimits(memory.limits)
+    }
+
+    private fun appendGlobal(c: WasmGlobal) {
+        if (c.importPair != null) {
+            b.writeString(c.importPair.moduleName)
+            b.writeString(c.importPair.declarationName)
+            b.writeByte(3)
+            appendType(c.type)
+            b.writeVarUInt1(c.isMutable)
+            return
+        }
+        appendType(c.type)
+        b.writeVarUInt1(c.isMutable)
+        appendExpr(c.init)
+    }
+
+    private fun appendExpr(expr: Iterable<WasmInstr>) {
+        expr.forEach { appendInstr(it) }
+        appendInstr(WasmInstr(WasmOp.END))
+    }
+
+    private fun appendExport(export: WasmExport<*>) {
+        b.writeString(export.name)
+        b.writeByte(export.kind)
+        appendModuleFieldReference(export.field)
+    }
+
+    private fun appendStartFunction(startFunction: WasmFunction) {
+        appendModuleFieldReference(startFunction)
+    }
+
+    private fun appendElement(element: WasmElement) {
+        val isFuncIndices = element.values.all { it is WasmTable.Value.Function }
+
+        val funcIndices = if (isFuncIndices) {
+            element.values.map { (it as WasmTable.Value.Function).function.owner.id!! }
+        } else null
+
+        fun writeElements() {
+            appendVectorSize(element.values.size)
+            if (funcIndices != null) {
+                funcIndices.forEach { b.writeVarUInt32(it) }
+            } else {
+                element.values.forEach {
+                    appendExpr((it as WasmTable.Value.Expression).expr)
+                }
+            }
+        }
+
+        fun writeTypeOrKind() {
+            if (isFuncIndices) {
+                b.writeByte(0x00)
+            } else {
+                appendType(element.type)
+            }
+        }
+
+        when (val mode = element.mode) {
+            WasmElement.Mode.Passive -> {
+                b.writeByte(if (isFuncIndices) 0x01 else 0x05)
+                writeTypeOrKind()
+                writeElements()
+            }
+            is WasmElement.Mode.Active -> {
+                val tableId = mode.table.id!!
+                when {
+                    tableId == 0 && isFuncIndices -> {
+                        b.writeByte(0x0)
+                        appendExpr(mode.offset)
+                    }
+                    isFuncIndices -> {
+                        b.writeByte(0x2)
+                        appendModuleFieldReference(mode.table)
+                        appendExpr(mode.offset)
+                        writeTypeOrKind()
+                    }
+                    else -> {
+                        b.writeByte(0x6)
+                        appendModuleFieldReference(mode.table)
+                        appendExpr(mode.offset)
+                        writeTypeOrKind()
+                    }
+                }
+                writeElements()
+            }
+            WasmElement.Mode.Declarative -> {
+                b.writeByte(if (isFuncIndices) 0x03 else 0x07)
+                writeTypeOrKind()
+                writeElements()
+            }
+        }
+    }
+
+    private fun appendCode(function: WasmFunction.Defined) {
+        withVarUInt32PayloadSizePrepended {
+            b.writeVarUInt32(function.locals.count { !it.isParameter })
+            function.locals.forEach { local ->
+                if (!local.isParameter) {
+                    b.writeVarUInt32(1u)
+                    appendType(local.type)
+                }
+            }
+
+            appendExpr(function.instructions)
+        }
+    }
+
+    private fun appendData(wasmData: WasmData) {
+        when (val mode = wasmData.mode) {
+            is WasmDataMode.Active -> {
+                if (mode.memoryIdx == 0) {
+                    b.writeByte(0)
+                } else {
+                    b.writeByte(2)
+                    b.writeVarUInt32(mode.memoryIdx)
+                }
+                appendExpr(mode.offset)
+            }
+            WasmDataMode.Passive -> b.writeByte(1)
+        }
+
+        b.writeVarUInt32(wasmData.bytes.size)
+        b.writeBytes(wasmData.bytes)
+    }
+
+    fun appendHeapType(type: WasmHeapType) {
+        val code: Int = when (type) {
+            is WasmHeapType.Simple -> type.code.toInt()
+            is WasmHeapType.Type -> type.type.owner.id!!
+        }
+        b.writeVarInt32(code)
+    }
+
+    fun appendType(type: WasmType) {
+        b.writeVarInt7(type.code)
+
+        if (type is WasmRefType) {
+            appendHeapType(type.heapType)
+        }
+        if (type is WasmRefNullType) {
+            appendHeapType(type.heapType)
+        }
+        if (type is WasmRtt) {
+            b.writeVarUInt32(type.depth)
+            appendHeapType(type.heapType)
+        }
+    }
+
+    fun appendLocalReference(local: WasmLocal) {
+        b.writeVarUInt32(local.id)
+    }
+
+    fun appendModuleFieldReference(field: WasmNamedModuleField) {
+        val id = field.id ?: error("${field::class} ${field.name} ID is unlinked")
+        b.writeVarUInt32(id)
+    }
+
+    fun ByteWriter.writeVarUInt32(v: Int) {
+        this.writeVarUInt32(v.toUInt())
+    }
+
+    private fun ByteWriter.writeString(str: String) {
+        val bytes = str.toByteArray()
+        this.writeVarUInt32(bytes.size)
+        this.writeBytes(bytes)
+    }
+}
+
+abstract class ByteWriter {
+    abstract val written: Int
+
+    abstract fun write(v: ByteWriter)
+    abstract fun writeByte(v: Byte)
+    abstract fun writeBytes(v: ByteArray)
+    abstract fun createTemp(): ByteWriter
+
+    fun writeUInt32(v: UInt) {
+        writeByte(v.toByte())
+        writeByte((v shr 8).toByte())
+        writeByte((v shr 16).toByte())
+        writeByte((v shr 24).toByte())
+    }
+
+    fun writeUInt64(v: ULong) {
+        writeByte(v.toByte())
+        writeByte((v shr 8).toByte())
+        writeByte((v shr 16).toByte())
+        writeByte((v shr 24).toByte())
+        writeByte((v shr 32).toByte())
+        writeByte((v shr 40).toByte())
+        writeByte((v shr 48).toByte())
+        writeByte((v shr 56).toByte())
+    }
+
+    fun writeVarInt7(v: Byte) {
+        writeSignedLeb128(v.toLong())
+    }
+
+    fun writeVarInt32(v: Int) {
+        writeSignedLeb128(v.toLong())
+    }
+
+    fun writeVarInt64(v: Long) {
+        writeSignedLeb128(v)
+    }
+
+    fun writeVarUInt1(v: Boolean) {
+        writeUnsignedLeb128(if (v) 1u else 0u)
+    }
+
+    fun writeVarUInt7(v: UShort) {
+        writeUnsignedLeb128(v.toUInt())
+    }
+
+    fun writeVarUInt32(v: UInt) {
+        writeUnsignedLeb128(v)
+    }
+
+    private fun writeUnsignedLeb128(v: UInt) {
+        // Taken from Android source, Apache licensed
+        @Suppress("NAME_SHADOWING")
+        var v = v
+        var remaining = v shr 7
+        while (remaining != 0u) {
+            val byte = (v and 0x7fu) or 0x80u
+            writeByte(byte.toByte())
+            v = remaining
+            remaining = remaining shr 7
+        }
+        val byte = v and 0x7fu
+        writeByte(byte.toByte())
+    }
+
+    private fun writeSignedLeb128(v: Long) {
+        // Taken from Android source, Apache licensed
+        @Suppress("NAME_SHADOWING")
+        var v = v
+        var remaining = v shr 7
+        var hasMore = true
+        val end = if (v and Long.MIN_VALUE == 0L) 0L else -1L
+        while (hasMore) {
+            hasMore = remaining != end || remaining and 1 != (v shr 6) and 1
+            val byte = ((v and 0x7f) or if (hasMore) 0x80 else 0).toInt()
+            writeByte(byte.toByte())
+            v = remaining
+            remaining = remaining shr 7
+        }
+    }
+
+    class OutputStream(val os: java.io.OutputStream) : ByteWriter() {
+        override var written = 0; private set
+
+        override fun write(v: ByteWriter) {
+            if (v !is OutputStream || v.os !is ByteArrayOutputStream) error("Writer not created from createTemp")
+            v.os.writeTo(os)
+            written += v.os.size()
+        }
+
+        override fun writeByte(v: Byte) {
+            os.write(v.toInt())
+            written++
+        }
+
+        override fun writeBytes(v: ByteArray) {
+            os.write(v)
+            written += v.size
+        }
+
+        override fun createTemp() = OutputStream(ByteArrayOutputStream())
+    }
+}
diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmIrToText.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmIrToText.kt
new file mode 100644
index 00000000000..d8ea08533d4
--- /dev/null
+++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/convertors/WasmIrToText.kt
@@ -0,0 +1,504 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir.convertors
+
+import org.jetbrains.kotlin.wasm.ir.*
+
+open class SExpressionBuilder {
+    protected val stringBuilder = StringBuilder()
+    protected var indent = 0
+
+    protected inline fun indented(body: () -> Unit) {
+        indent++
+        body()
+        indent--
+    }
+
+    protected fun newLine() {
+        stringBuilder.appendLine()
+        repeat(indent) { stringBuilder.append("    ") }
+    }
+
+    protected inline fun newLineList(name: String, body: () -> Unit) {
+        newLine()
+        stringBuilder.append("($name")
+        indented { body() }
+        stringBuilder.append(")")
+    }
+
+    protected inline fun sameLineList(name: String, body: () -> Unit) {
+        stringBuilder.append(" ($name")
+        body()
+        stringBuilder.append(")")
+    }
+
+    protected fun appendElement(value: String) {
+        stringBuilder.append(" ")
+        stringBuilder.append(value)
+    }
+
+    override fun toString(): String =
+        stringBuilder.toString()
+}
+
+
+class WasmIrToText : SExpressionBuilder() {
+    fun appendOffset(value: UInt) {
+        if (value != 0u)
+            appendElement("offset=$value")
+    }
+
+    fun appendAlign(value: UInt) {
+        var alignEffective: Long = 1
+        repeat(value.toInt()) { alignEffective *= 2 }
+        if (alignEffective != 0L)
+            appendElement("align=$alignEffective")
+    }
+
+    private fun appendInstr(wasmInstr: WasmInstr) {
+        val op = wasmInstr.operator
+        if (op == WasmOp.END || op == WasmOp.ELSE)
+            indent--
+
+        newLine()
+        stringBuilder.append(wasmInstr.operator.mnemonic)
+
+        if (op == WasmOp.BLOCK || op == WasmOp.LOOP || op == WasmOp.IF || op == WasmOp.ELSE)
+            indent++
+
+        if (wasmInstr.operator in setOf(WasmOp.CALL_INDIRECT, WasmOp.TABLE_INIT)) {
+            wasmInstr.immediates.reversed().forEach {
+                appendImmediate(it)
+            }
+            return
+        }
+        wasmInstr.immediates.forEach {
+            appendImmediate(it)
+        }
+    }
+
+    private fun appendImmediate(x: WasmImmediate) {
+        when (x) {
+            is WasmImmediate.ConstI32 -> appendElement(x.value.toString().toLowerCase())
+            is WasmImmediate.ConstI64 -> appendElement(x.value.toString().toLowerCase())
+            is WasmImmediate.ConstF32 -> appendElement(f32Str(x).toLowerCase())
+            is WasmImmediate.ConstF64 -> appendElement(f64Str(x).toLowerCase())
+            is WasmImmediate.SymbolI32 -> appendElement(x.value.owner.toString())
+            is WasmImmediate.MemArg -> {
+                appendOffset(x.offset)
+                appendAlign(x.align)
+            }
+            is WasmImmediate.BlockType -> appendBlockType(x)
+            is WasmImmediate.FuncIdx -> appendModuleFieldReference(x.value.owner)
+            is WasmImmediate.LocalIdx -> appendLocalReference(x.value.owner)
+            is WasmImmediate.GlobalIdx -> appendModuleFieldReference(x.value.owner)
+            is WasmImmediate.TypeIdx -> sameLineList("type") { appendModuleFieldReference(x.value.owner) }
+            is WasmImmediate.MemoryIdx -> appendModuleFieldIdIfNotNull(x.value.owner)
+            is WasmImmediate.DataIdx -> appendElement(x.value.toString())
+            is WasmImmediate.TableIdx -> appendElement(x.value.toString())
+            is WasmImmediate.LabelIdx -> appendElement(x.value.toString())
+            is WasmImmediate.LabelIdxVector ->
+                x.value.forEach { appendElement(it.toString()) }
+
+            is WasmImmediate.ElemIdx -> appendElement(x.value.id!!.toString())
+
+            is WasmImmediate.ValTypeVector -> sameLineList("result") { x.value.forEach { appendType(it) } }
+
+            is WasmImmediate.StructType -> appendModuleFieldReference(x.value.owner)
+            is WasmImmediate.StructFieldIdx -> appendElement(x.value.owner.toString())
+            is WasmImmediate.HeapType -> {
+                appendHeapType(x.value)
+            }
+        }
+    }
+
+
+    private fun f32Str(x: WasmImmediate.ConstF32): String {
+        val bits = x.rawBits.toInt()
+        val v = Float.fromBits(bits)
+        return if (v.isNaN()) {
+            val sign = if ((bits and Int.MIN_VALUE) == 0) {
+                ""
+            } else {
+                "-"
+            }
+            if (bits != Float.NaN.toRawBits()) {
+                val customPayload = bits and 0x7fffff
+                "${sign}nan:0x${customPayload.toString(16)}"
+            } else {
+                "${sign}nan"
+            }
+        } else {
+            when (v) {
+                Float.POSITIVE_INFINITY -> "inf"
+                Float.NEGATIVE_INFINITY -> "-inf"
+                else -> v.toString()
+            }
+        }
+    }
+
+
+    private fun f64Str(x: WasmImmediate.ConstF64): String {
+        val bits = x.rawBits.toLong()
+        val v = Double.fromBits(bits)
+
+        return if (v.isNaN()) {
+            val sign = if ((bits and Long.MIN_VALUE) == 0L) {
+                ""
+            } else {
+                "-"
+            }
+            if (bits != Double.NaN.toRawBits()) {
+                val customPayload = bits and 0xfffffffffffff
+                "${sign}nan:0x${customPayload.toString(16)}"
+            } else {
+                "${sign}nan"
+            }
+        } else {
+            when (v) {
+                Double.POSITIVE_INFINITY -> "inf"
+                Double.NEGATIVE_INFINITY -> "-inf"
+                else -> v.toString()
+            }
+        }
+    }
+
+    fun appendBlockType(type: WasmImmediate.BlockType) {
+        when (type) {
+            is WasmImmediate.BlockType.Value -> {
+                if (type.type != null && type.type !is WasmUnreachableType) {
+                    sameLineList("result") { appendType(type.type) }
+                }
+            }
+            is WasmImmediate.BlockType.Function -> {
+                val parameters = type.type.parameterTypes
+                val results = type.type.resultTypes
+                if (parameters.isNotEmpty()) {
+                    sameLineList("param") { parameters.forEach { appendType(it) } }
+                }
+                if (results.isNotEmpty()) {
+                    sameLineList("result") { results.forEach { appendType(it) } }
+                }
+            }
+        }
+    }
+
+    fun appendRefType(type: WasmRefType) {
+        when (type.heapType) {
+            is WasmHeapType.Simple -> appendElement(type.heapType.name + "ref")
+            is WasmHeapType.Type -> sameLineList("ref") { appendHeapType(type.heapType) }
+        }
+    }
+
+    fun appendWasmModule(module: WasmModule) {
+        with(module) {
+            newLineList("module") {
+                functionTypes.forEach { appendFunctionTypeDeclaration(it) }
+                structs.forEach { appendStructTypeDeclaration(it) }
+                importsInOrder.forEach {
+                    when (it) {
+                        is WasmFunction.Imported -> appendImportedFunction(it)
+                        is WasmMemory -> appendMemory(it)
+                        is WasmTable -> appendTable(it)
+                        is WasmGlobal -> appendGlobal(it)
+                        else -> error("Unknown import kind ${it::class}")
+                    }
+                }
+                definedFunctions.forEach { appendDefinedFunction(it) }
+                tables.forEach { appendTable(it) }
+                memories.forEach { appendMemory(it) }
+                globals.forEach { appendGlobal(it) }
+                exports.forEach { appendExport(it) }
+                elements.forEach { appendWasmElement(it) }
+                startFunction?.let { appendStartFunction(it) }
+                data.forEach { appendData(it) }
+            }
+        }
+    }
+
+    private fun appendFunctionTypeDeclaration(type: WasmFunctionType) {
+        newLineList("type") {
+            appendModuleFieldReference(type)
+            sameLineList("func") {
+                sameLineList("param") {
+                    type.parameterTypes.forEach { appendType(it) }
+                }
+                if (type.resultTypes.isNotEmpty()) {
+                    sameLineList("result") {
+                        type.resultTypes.forEach { appendType(it) }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun appendStructTypeDeclaration(type: WasmStructDeclaration) {
+        newLineList("type") {
+            appendModuleFieldReference(type)
+            sameLineList("struct") {
+                type.fields.forEach {
+                    appendStructField(it)
+                }
+            }
+        }
+    }
+
+    private fun appendImportedFunction(function: WasmFunction.Imported) {
+        newLineList("func") {
+            appendModuleFieldReference(function)
+            function.importPair.appendImportPair()
+            sameLineList("type") { appendModuleFieldReference(function.type) }
+        }
+    }
+
+    private fun WasmImportPair.appendImportPair() {
+        sameLineList("import") {
+            toWatString(moduleName)
+            toWatString(declarationName)
+        }
+    }
+
+    private fun appendDefinedFunction(function: WasmFunction.Defined) {
+        newLineList("func") {
+            appendModuleFieldReference(function)
+            sameLineList("type") { appendModuleFieldReference(function.type) }
+            function.locals.forEach { if (it.isParameter) appendLocal(it) }
+            if (function.type.resultTypes.isNotEmpty()) {
+                sameLineList("result") {
+                    function.type.resultTypes.forEach { appendType(it) }
+                }
+            }
+            function.locals.forEach { if (!it.isParameter) appendLocal(it) }
+            function.instructions.forEach { appendInstr(it) }
+        }
+    }
+
+    private fun appendTable(table: WasmTable) {
+        newLineList("table") {
+            appendModuleFieldReference(table)
+            table.importPair?.appendImportPair()
+            appendLimits(table.limits)
+            appendType(table.elementType)
+        }
+    }
+
+    private fun appendMemory(memory: WasmMemory) {
+        newLineList("memory") {
+            appendModuleFieldReference(memory)
+            memory.importPair?.appendImportPair()
+            appendLimits(memory.limits)
+        }
+    }
+
+    private fun appendLimits(limits: WasmLimits) {
+        appendElement(limits.minSize.toString())
+        limits.maxSize?.let { appendElement(it.toString()) }
+    }
+
+    private fun appendGlobal(global: WasmGlobal) {
+        newLineList("global") {
+            appendModuleFieldReference(global)
+
+            global.importPair?.appendImportPair()
+
+            if (global.isMutable)
+                sameLineList("mut") { appendType(global.type) }
+            else
+                appendType(global.type)
+
+            global.init.forEach { appendInstr(it) }
+        }
+    }
+
+    private fun appendExport(export: WasmExport<*>) {
+        newLineList("export") {
+            toWatString(export.name)
+            sameLineList(export.keyword) {
+                appendModuleFieldReference(export.field)
+            }
+        }
+    }
+
+    private fun appendWasmElement(element: WasmElement) {
+        newLineList("elem") {
+            when (val mode = element.mode) {
+                WasmElement.Mode.Passive -> {
+                }
+                is WasmElement.Mode.Active -> {
+                    if (mode.table.id != 0) {
+                        sameLineList("table") { appendModuleFieldReference(mode.table) }
+                    }
+                    sameLineList("") { appendInstr(mode.offset.single()) }
+                }
+                WasmElement.Mode.Declarative -> {
+                    appendElement("declare")
+                }
+            }
+
+            val allFunctions = element.values.all { it is WasmTable.Value.Function }
+            if (allFunctions) {
+                appendElement("func")
+                for (value in element.values) {
+                    require(value is WasmTable.Value.Function)
+                    appendModuleFieldReference(value.function.owner)
+                }
+            } else {
+                appendType(element.type)
+                for (value in element.values) {
+                    require(value is WasmTable.Value.Expression)
+                    sameLineList("item") {
+                        appendInstr(value.expr.single())
+                    }
+                }
+            }
+        }
+    }
+
+    private fun appendStartFunction(startFunction: WasmFunction) {
+        newLineList("start") {
+            appendModuleFieldReference(startFunction)
+        }
+    }
+
+    private fun appendData(wasmData: WasmData) {
+        newLineList("data") {
+            when (val mode = wasmData.mode) {
+                is WasmDataMode.Active -> {
+                    if (mode.memoryIdx != 0) {
+                        sameLineList("memory") { appendElement(mode.memoryIdx.toString()) }
+                    }
+                    sameLineList("") {
+                        appendInstr(mode.offset.single())
+                    }
+                }
+                WasmDataMode.Passive -> {
+                }
+            }
+
+            appendElement(wasmData.bytes.toWatData())
+        }
+    }
+
+    private fun appendLocal(local: WasmLocal) {
+        newLineList(if (local.isParameter) "param" else "local") {
+            appendLocalReference(local)
+            appendType(local.type)
+        }
+    }
+
+    fun appendHeapType(type: WasmHeapType) {
+        when (type) {
+            is WasmHeapType.Simple ->
+                appendElement(type.name)
+
+            is WasmHeapType.Type -> {
+//                appendElement("opt")
+                appendModuleFieldReference(type.type.owner)
+            }
+        }
+    }
+
+    fun appendReferencedType(type: WasmType) {
+        when (type) {
+            is WasmFuncRef -> appendElement("func")
+            is WasmExternRef -> appendElement("extern")
+            else -> TODO()
+        }
+    }
+
+    fun appendType(type: WasmType) {
+        when (type) {
+            is WasmRefType ->
+                sameLineList("ref") {
+                    appendHeapType(type.heapType)
+                }
+
+            is WasmRefNullType ->
+                sameLineList("ref null") {
+                    appendHeapType(type.heapType)
+                }
+
+            is WasmRtt ->
+                sameLineList("rtt") {
+                    appendElement(type.depth.toString())
+                    appendHeapType(type.heapType)
+                }
+
+            WasmUnreachableType -> {
+            }
+
+            else ->
+                appendElement(type.name)
+        }
+    }
+
+    private fun appendStructField(field: WasmStructFieldDeclaration) {
+        sameLineList("field") {
+            if (field.isMutable) {
+                sameLineList("mut") { appendType(field.type) }
+            } else {
+                appendType(field.type)
+            }
+        }
+    }
+
+    fun appendLocalReference(local: WasmLocal) {
+        appendElement("$${local.id}_${sanitizeWatIdentifier(local.name)}")
+    }
+
+    fun appendModuleFieldIdIfNotNull(field: WasmNamedModuleField) {
+        val id = field.id
+            ?: error("${field::class} ${field.name} ID is unlinked")
+        if (id != 0) appendElement(id.toString())
+    }
+
+    fun appendModuleFieldReference(field: WasmNamedModuleField) {
+        val id = field.id
+            ?: error("${field::class} ${field.name} ID is unlinked")
+
+        val indexSpaceKind = when (field) {
+            is WasmData -> "data"
+            is WasmFunction -> "fun"
+            is WasmMemory -> "mem"
+            is WasmTable -> "table"
+            is WasmElement -> "elem"
+            is WasmGlobal -> "g"
+            is WasmTypeDeclaration -> "type"
+        }
+
+        appendElement("\$${sanitizeWatIdentifier(field.name)}___${indexSpaceKind}_$id")
+    }
+
+    private fun toWatString(s: String) {
+        if (s.all { isValidWatIdentifierChar(it) }) {
+            stringBuilder.append(" \"")
+            stringBuilder.append(s)
+            stringBuilder.append('"')
+        } else {
+            stringBuilder.append(s.toByteArray().toWatData())
+        }
+    }
+}
+
+
+fun Byte.toWatData() = "\\" + this.toUByte().toString(16).padStart(2, '0')
+fun ByteArray.toWatData(): String = "\"" + joinToString("") { it.toWatData() } + "\""
+
+fun sanitizeWatIdentifier(indent: String): String {
+    if (indent.isEmpty())
+        return "_"
+    if (indent.all(::isValidWatIdentifierChar))
+        return indent
+    return indent.map { if (isValidWatIdentifierChar(it)) it else "_" }.joinToString("")
+}
+
+// https://webassembly.github.io/spec/core/text/values.html#text-id
+fun isValidWatIdentifierChar(c: Char): Boolean =
+    c in '0'..'9' || c in 'A'..'Z' || c in 'a'..'z'
+            // TODO: SpiderMonkey js shell can't parse some of the
+            //  permitted identifiers: '?', '<'
+            || c in "!#$%&′*+-./:<=>?@\\^_`|~"
+            || c in "$.@_"
diff --git a/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/BinaryCodecTest.kt b/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/BinaryCodecTest.kt
new file mode 100644
index 00000000000..7b52b9b8c85
--- /dev/null
+++ b/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/BinaryCodecTest.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+import org.junit.Ignore
+import org.junit.Test
+
+class BinaryCodecTest {
+    @Test
+    fun core() {
+        runSpecTests("core", wasmTestSuitePath, emptyList())
+    }
+
+    @Test
+    @Ignore
+    fun `bulk-memory-operations`() =
+        testProposal("bulk-memory-operations")
+
+    @Test
+    @Ignore
+    fun `exception-handling`() =
+        testProposal("exception-handling")
+
+    @Test
+    @Ignore
+    fun `function-references`() =
+        testProposal("function-references")
+
+    @Test
+    fun `reference-types`() =
+        testProposal("reference-types", ignoreFiles = listOf("ref_func.wast"))
+
+    @Test
+    @Ignore
+    fun simd() =
+        testProposal("simd")
+
+    @Test
+    @Ignore
+    fun `tail-call`() =
+        testProposal("tail-call")
+
+    @Test
+    @Ignore
+    fun threads() =
+        testProposal("threads")
+}
diff --git a/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/SpecTestRunner.kt b/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/SpecTestRunner.kt
new file mode 100644
index 00000000000..875c4849012
--- /dev/null
+++ b/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/SpecTestRunner.kt
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import org.jetbrains.kotlin.test.KotlinTestUtils.assertEqualsToFile
+import org.jetbrains.kotlin.utils.fileUtils.withReplacedExtensionOrNull
+import org.jetbrains.kotlin.wasm.ir.convertors.MyByteReader
+import org.jetbrains.kotlin.wasm.ir.convertors.WasmIrToBinary
+import org.jetbrains.kotlin.wasm.ir.convertors.WasmBinaryToIR
+import org.jetbrains.kotlin.wasm.ir.convertors.WasmIrToText
+import java.io.ByteArrayOutputStream
+import java.io.File
+
+@Suppress("unused")
+@Serializable
+data class SpecTest(
+    val source_filename: String,
+    val commands: List<Command>
+) {
+    @Serializable
+    sealed class Command {
+        @SerialName("module")
+        @Serializable
+        data class Module(
+            val line: Int,
+            val filename: String,
+            val name: String? = null,
+        ) : Command()
+
+        @SerialName("register")
+        @Serializable
+        data class Register(
+            val line: Int,
+            val name: String? = null,
+            val `as`: String? = null
+        ) : Command()
+
+        @SerialName("assert_return")
+        @Serializable
+        data class AssertReturn(
+            val line: Int,
+            val action: Action,
+            val expected: List<Value>,
+        ) : Command()
+
+        // TODO: Assert trap for modules?
+        @SerialName("assert_trap")
+        @Serializable
+        data class AssertTrap(
+            val line: Int,
+            val action: Action,
+            val text: String,
+            val expected: List<Value>,
+        ) : Command()
+
+        @SerialName("assert_exhaustion")
+        @Serializable
+        data class AssertExhaustion(
+            val line: Int,
+            val action: Action,
+            val text: String,
+            val expected: List<Value>,
+        ) : Command()
+
+        @SerialName("assert_malformed")
+        @Serializable
+        data class AssertMalformed(
+            val line: Int,
+            val filename: String,
+            val text: String,
+            val module_type: String,
+        ) : Command()
+
+        @SerialName("assert_invalid")
+        @Serializable
+        data class AssertInvalid(
+            val line: Int,
+            val filename: String,
+            val text: String,
+            val module_type: String,
+        ) : Command()
+
+        @SerialName("assert_unlinkable")
+        @Serializable
+        data class AssertUnlinkable(
+            val line: Int,
+            val filename: String,
+            val text: String,
+            val module_type: String,
+        ) : Command()
+
+        @SerialName("assert_uninstantiable")
+        @Serializable
+        data class AssertUninstantiable(
+            val line: Int,
+            val filename: String,
+            val text: String,
+            val module_type: String,
+        ) : Command()
+
+        @SerialName("action")
+        @Serializable
+        data class ActionCommand(
+            val line: Int,
+            val action: Action,
+            val expected: List<Value>,
+        ) : Command()
+    }
+
+    @Serializable
+    data class Action(
+        val type: String,
+        val field: String,
+        val args: List<Value> = emptyList(),
+        val module: String? = null
+    )
+
+    @Serializable
+    data class Value(
+        val type: String,
+        val value: String? = null
+    )
+}
+
+private fun runSpecTest(specTest: SpecTest, testDir: File, wastFile: File, wabtOptions: List<String>) {
+    for (command in specTest.commands) {
+        when (command) {
+            is SpecTest.Command.Module -> {
+                val wasmFile = File(testDir, command.filename)
+                testWasmFile(wasmFile, testDir.name)
+            }
+        }
+    }
+}
+
+private fun runJsonTest(jsonFile: File, wastFile: File, wabtOptions: List<String>) {
+    require(jsonFile.isFile && jsonFile.exists())
+    val jsonText = jsonFile.readText()
+    val specTest = Json.decodeFromString(SpecTest.serializer(), jsonText)
+    val wasmDir = jsonFile.parentFile!!
+    println("Running json test ${jsonFile.path} ...")
+    runSpecTest(specTest, wasmDir, wastFile, wabtOptions)
+}
+
+val wasmTestSuitePath: String
+    get() = System.getProperty("wasm.testsuite.path")!!
+
+fun testProposal(
+    name: String,
+    wabtOptions: List<String> = listOf("--enable-all"),
+    ignoreFiles: List<String> = emptyList()
+) {
+
+    runSpecTests(name, "$wasmTestSuitePath/proposals/$name", wabtOptions, ignoreFiles)
+}
+
+
+fun runSpecTests(
+    name: String,
+    wastDirectoryPath: String,
+    wabtOptions: List<String>,
+    ignoreFiles: List<String> = emptyList()
+) {
+    // Clean and prepare output dir for spec tests
+    val specTestsDir = File("build/spec-tests/$name")
+    if (specTestsDir.exists())
+        specTestsDir.deleteRecursively()
+    specTestsDir.mkdirs()
+
+    val testSuiteDir = File(wastDirectoryPath)
+    assert(testSuiteDir.isDirectory) { "${testSuiteDir.absolutePath} is not a directory" }
+    for (file in testSuiteDir.listFiles()!!) {
+        if (file.name in ignoreFiles) {
+            println("Ignoring file: ${file.absolutePath}")
+            continue
+        }
+        if (file.isFile && file.name.endsWith(".wast")) {
+            val jsonFileName = file.withReplacedExtensionOrNull(".wast", ".json")!!.name
+            val jsonFile = File(specTestsDir, jsonFileName)
+            println("Creating JSON for ${file.path}")
+            Wabt.wast2json(file, jsonFile, *wabtOptions.toTypedArray())
+            runJsonTest(jsonFile, file, wabtOptions)
+        }
+    }
+}
+
+
+fun testWasmFile(wasmFile: File, dirName: String) {
+    val testName = wasmFile.nameWithoutExtension
+
+    fun newFile(suffix: String): File =
+        File("build/spec-tests/tmp/$dirName/${testName}_$suffix")
+            .also {
+                it.parentFile.mkdirs()
+                it.createNewFile()
+            }
+
+    println("Testing wasm file : ${wasmFile.absolutePath} ... ")
+    val module = fileToWasmModule(wasmFile)
+    val kotlinTextFormat = module.toTextFormat()
+    val kotlinBinaryFormat = module.toBinaryFormat()
+
+    val kotlinTextFile = newFile("kwt.wat")
+    kotlinTextFile.writeText(kotlinTextFormat)
+    val kotlinBinaryFile = newFile("kwt.wasm")
+    kotlinBinaryFile.writeBytes(kotlinBinaryFormat)
+
+    val kotlinTextToWasmTmpFile = newFile("kwt.tmp.wasm")
+    Wabt.wat2wasm(kotlinTextFile, kotlinTextToWasmTmpFile)
+
+    val kotlinTextCanonicalFile = newFile("kwt.canonical.wat")
+    Wabt.wasm2wat(kotlinTextToWasmTmpFile, kotlinTextCanonicalFile)
+
+    val wabtWatFile = newFile("wabt.wat")
+    Wabt.wasm2wat(wasmFile, wabtWatFile)
+
+    assertEqualsToFile("Kwt text format", wabtWatFile, kotlinTextCanonicalFile.readText())
+
+    val kotlinBinaryCanonicalFile = newFile("kwt.bin.canonical.wat")
+    Wabt.wasm2wat(kotlinBinaryFile, kotlinBinaryCanonicalFile)
+    assertEqualsToFile("Kwt binary format", wabtWatFile, kotlinBinaryCanonicalFile.readText())
+}
+
+fun WasmModule.toBinaryFormat(): ByteArray {
+    val os = ByteArrayOutputStream()
+    WasmIrToBinary(os, this).appendWasmModule()
+    return os.toByteArray()
+}
+
+fun WasmModule.toTextFormat(): String {
+    val builder = WasmIrToText()
+    builder.appendWasmModule(this)
+    return builder.toString()
+}
+
+fun fileToWasmModule(file: File): WasmModule =
+    WasmBinaryToIR(MyByteReader(file.inputStream())).parseModule()
diff --git a/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/Wabt.kt b/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/Wabt.kt
new file mode 100644
index 00000000000..1d562f0588a
--- /dev/null
+++ b/wasm/wasm.ir/test/org/jetbrains/kotlin/wasm/ir/Wabt.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.wasm.ir
+
+import java.io.BufferedReader
+import java.io.File
+import java.io.InputStream
+import java.io.InputStreamReader
+import kotlin.test.fail
+
+open class ExternalTool(private val path: String) {
+    fun runAndPrint(vararg arguments: String) {
+        val command = arrayOf(path, *arguments)
+        val process = ProcessBuilder(*command)
+            .redirectErrorStream(true)
+            .start()
+
+        val commandString = command.joinToString(" ") { escapeShellArgument(it) }
+        println(commandString)
+        val inputStream: InputStream = process.inputStream
+        val input = BufferedReader(InputStreamReader(inputStream))
+        while (true) println(input.readLine() ?: break)
+
+        val exitValue = process.waitFor()
+        if (exitValue != 0) {
+            fail("Command \"$commandString\" terminated with exit code $exitValue")
+        }
+    }
+}
+
+object Wabt {
+    private val wabtBinPath = System.getProperty("wabt.bin.path")
+    private val wasm2watTool = ExternalTool("$wabtBinPath/wasm2wat")
+    private val wat2wasmTool = ExternalTool("$wabtBinPath/wat2wasm")
+    private val wast2jsonTool = ExternalTool("$wabtBinPath/wast2json")
+
+    fun wasm2wat(input: File, output: File) {
+        wasm2watTool.runAndPrint("--enable-all", input.absolutePath, "-o", output.absolutePath)
+    }
+
+    fun wat2wasm(input: File, output: File) {
+        wat2wasmTool.runAndPrint("--enable-all", input.absolutePath, "-o", output.absolutePath)
+    }
+
+    fun wast2json(input: File, output: File, vararg args: String) {
+        wast2jsonTool.runAndPrint(*args, input.absolutePath, "-o", output.absolutePath)
+    }
+}
+
+private fun escapeShellArgument(arg: String): String =
+    "'${arg.replace("'", "'\\''")}'"